RDBC-940 Add missing stream argument

Author: yh-0

ravendb/documents/commands/stream.py

@@ -9,7 +9,7 @@
 from ravendb.http.server_node import ServerNode
 from ravendb.http.raven_command import RavenCommand, RavenCommandResponseType
 from ravendb.json.metadata_as_dictionary import MetadataAsDictionary
-
+from ravendb.util.request_utils import RequestUtils
 
 _T = TypeVar("_T")
 
@@ -51,6 +51,11 @@ def process_response(self, cache: HttpCache, response: requests.Response, url) -
         except Exception as e:
             raise RuntimeError("Unable to process stream response", e)
 
+    def send(self, session: requests.Session, request: requests.Request) -> requests.Response:
+        prepared_request = session.prepare_request(request)
+        RequestUtils.remove_zstd_encoding(prepared_request)
+        return session.send(prepared_request, cert=session.cert, stream=True)
+
     def is_read_request(self) -> bool:
         return True
 
@@ -85,5 +90,10 @@ def process_response(self, cache: HttpCache, response: requests.Response, url) -
         except Exception as e:
             raise RuntimeError("Unable to process stream response: " + e.args[0], e)
 
+    def send(self, session: requests.Session, request: requests.Request) -> requests.Response:
+        prepared_request = session.prepare_request(request)
+        RequestUtils.remove_zstd_encoding(prepared_request)
+        return session.send(prepared_request, cert=session.cert, stream=True)
+
     def is_read_request(self) -> bool:
         return True

ravendb/http/raven_command.py

@@ -12,6 +12,7 @@
 from ravendb.http.http_cache import HttpCache
 from ravendb.http.misc import ResponseDisposeHandling
 from ravendb.http.server_node import ServerNode
+from ravendb.util.request_utils import RequestUtils
 
 
 class RavenCommandResponseType(Enum):
@@ -98,25 +99,9 @@ def set_response(self, response: Optional[str], from_cache: bool) -> None:
 
     def send(self, session: requests.Session, request: requests.Request) -> requests.Response:
         prepared_request = session.prepare_request(request)
-        self._remove_zstd_encoding(prepared_request)
+        RequestUtils.remove_zstd_encoding(prepared_request)
         return session.send(prepared_request, cert=session.cert)
 
-    # https://issues.hibernatingrhinos.com/issue/RDBC-940
-    # If user has installed module 'zstd' or 'zstandard',
-    # 'requests' module will automatically add 'zstd' to 'Accept-Encoding' header.
-    # This causes exceptions. Excluding 'zstd' from the header in this workaround,
-    # while we keep investigating cause of the issue.
-    @staticmethod
-    def _remove_zstd_encoding(request: requests.PreparedRequest) -> None:
-        accept_encoding = request.headers.get("Accept-Encoding")
-
-        if "zstd" in accept_encoding:
-            encodings = [
-                encoding.strip() for encoding in accept_encoding.split(",") if encoding.strip().lower() != "zstd"
-            ]
-            new_header_value = ", ".join(encodings)
-            request.headers["Accept-Encoding"] = new_header_value
-
     def set_response_raw(self, response: requests.Response, stream: bytes) -> None:
         raise RuntimeError(
             f"When {self.response_type} is set to Raw then please override this method to handle the response "

ravendb/util/request_utils.py

@@ -0,0 +1,20 @@
+import requests
+
+
+class RequestUtils:
+
+    # https://issues.hibernatingrhinos.com/issue/RDBC-940
+    # If user has installed module 'zstd' or 'zstandard',
+    # 'requests' module will automatically add 'zstd' to 'Accept-Encoding' header.
+    # This causes exceptions. Excluding 'zstd' from the header in this workaround,
+    # while we keep investigating cause of the issue.
+    @staticmethod
+    def remove_zstd_encoding(request: requests.PreparedRequest) -> None:
+        accept_encoding = request.headers.get("Accept-Encoding")
+
+        if "zstd" in accept_encoding:
+            encodings = [
+                encoding.strip() for encoding in accept_encoding.split(",") if encoding.strip().lower() != "zstd"
+            ]
+            new_header_value = ", ".join(encodings)
+            request.headers["Accept-Encoding"] = new_header_value