chore(connection): content type doesn't have to be parametrized (#752)

dasch-swiss · Jan 22, 2024 · 2c0febb · 2c0febb
1 parent bac7c79
commit 2c0febb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/dsp_tools/utils/connection.py b/src/dsp_tools/utils/connection.py
@@ -30,7 +30,6 @@ def put(
         route: str,
         data: dict[str, Any] | None = None,
         headers: dict[str, str] | None = None,
-        content_type: str = "application/json",
     ) -> dict[str, Any]:
         """
         Make a HTTP GET request to the server to which this connection has been established.
@@ -39,7 +38,6 @@ def put(
             route: route that will be called on the server
             data: payload of the HTTP request
             headers: headers for the HTTP request
-            content_type: HTTP Content-Type [default: 'application/json']
         """
 
     def post(

diff --git a/src/dsp_tools/utils/connection_live.py b/src/dsp_tools/utils/connection_live.py
@@ -116,7 +116,8 @@ def post(
         url = self.server + route
         if data:
             headers = headers or {}
-            headers["Content-Type"] = "application/json; charset=UTF-8"
+            if "Content-Type" not in headers:
+                headers["Content-Type"] = "application/json; charset=UTF-8"
         timeout = timeout or self.timeout_put_post
 
         self._log_request(
@@ -184,7 +185,6 @@ def put(
         route: str,
         data: dict[str, Any] | None = None,
         headers: dict[str, str] | None = None,
-        content_type: str = "application/json",
     ) -> dict[str, Any]:
         """
         Make a HTTP GET request to the server to which this connection has been established.
@@ -193,7 +193,6 @@ def put(
             route: route that will be called on the server
             data: payload of the HTTP request
             headers: headers of the HTTP request
-            content_type: HTTP Content-Type [default: 'application/json']
 
         Returns:
             response from server
@@ -206,7 +205,8 @@ def put(
         url = self.server + route
         if data:
             headers = headers or {}
-            headers["Content-Type"] = f"{content_type}; charset=UTF-8"
+            if "Content-Type" not in headers:
+                headers["Content-Type"] = "application/json; charset=UTF-8"
         timeout = self.timeout_put_post
 
         self._log_request(

diff --git a/test/unittests/commands/xmlupload/connection_mock.py b/test/unittests/commands/xmlupload/connection_mock.py
@@ -19,7 +19,6 @@ def put(
         route: str,
         data: dict[str, Any] | None = None,
         headers: dict[str, str] | None = None,
-        content_type: str = "application/json",
     ) -> dict[str, Any]:
         raise AssertionError("PUT not implemented in mock")
 

diff --git a/test/unittests/commands/xmlupload/stash/test_upload_stash_with_mock.py b/test/unittests/commands/xmlupload/stash/test_upload_stash_with_mock.py
@@ -65,7 +65,6 @@ def put(
         route: str,
         data: dict[str, Any] | None = None,
         headers: dict[str, str] | None = None,
-        content_type: str = "application/json",
     ) -> dict[str, Any]:
         return self.put_responses.pop(0)