Merge pull request #563 from UiPath/fix/httpx_header

fix(httpx_header): allow httpx determine the correct header

Author: giuliastf

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.47"
+version = "2.1.48"
 description = "Python SDK and CLI for UiPath Platform, enabling programmatic interaction with automation services, process management, and deployment tools."
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"

src/uipath/_cli/_utils/_studio_project.py

@@ -311,7 +311,6 @@ async def upload_file_async(
                 files=files_data,
                 url=f"{self.file_operations_base_url}/File/{remote_file.id}",
                 scoped="org",
-                infer_content_type=True,
                 headers=headers or {},
             )
             action = "Updated"
@@ -322,7 +321,6 @@ async def upload_file_async(
                 data={"parentId": folder.id} if folder else None,
                 files=files_data,
                 scoped="org",
-                infer_content_type=True,
                 headers=headers or {},
             )
             action = "Uploaded"
@@ -451,7 +449,6 @@ async def perform_structural_migration_async(
             url=f"{self.file_operations_base_url}/StructuralMigration",
             scoped="org",
             files=files,
-            infer_content_type=True,
             headers=headers or {},
         )
 

src/uipath/_services/_base_service.py

@@ -74,7 +74,6 @@ def request(
         url: Union[URL, str],
         *,
         scoped: Literal["org", "tenant"] = "tenant",
-        infer_content_type=False,
         **kwargs: Any,
     ) -> Response:
         self._logger.debug(f"Request: {method} {url}")
@@ -106,9 +105,6 @@ def request(
 
         scoped_url = self._url.scope_url(str(url), scoped)
 
-        if infer_content_type:
-            self._client.headers.pop("Content-Type", None)
-
         response = self._client.request(method, scoped_url, **kwargs)
 
         try:
@@ -132,7 +128,6 @@ async def request_async(
         url: Union[URL, str],
         *,
         scoped: Literal["org", "tenant"] = "tenant",
-        infer_content_type=False,
         **kwargs: Any,
     ) -> Response:
         self._logger.debug(f"Request: {method} {url}")
@@ -147,9 +142,6 @@ async def request_async(
 
         scoped_url = self._url.scope_url(str(url), scoped)
 
-        if infer_content_type:
-            self._client_async.headers.pop("Content-Type", None)
-
         response = await self._client_async.request(method, scoped_url, **kwargs)
 
         try:
@@ -163,7 +155,6 @@ async def request_async(
     def default_headers(self) -> dict[str, str]:
         return {
             "Accept": "application/json",
-            "Content-Type": "application/json",
             **self.auth_headers,
             **self.custom_headers,
         }

src/uipath/_services/actions_service.py

@@ -1,6 +1,5 @@
 import os
 import uuid
-from json import dumps
 from typing import Any, Dict, List, Optional, Tuple
 
 from .._config import Config
@@ -81,30 +80,28 @@ def _create_spec(
     return RequestSpec(
         method="POST",
         endpoint=Endpoint("/orchestrator_/tasks/AppTasks/CreateAppTask"),
-        content=dumps(
-            {
-                "appId": app_key,
-                "appVersion": app_version,
-                "title": title,
-                "data": data if data is not None else {},
-                "actionableMessageMetaData": {
-                    "fieldSet": {
-                        "id": str(uuid.uuid4()),
-                        "fields": field_list,
-                    }
-                    if len(field_list) != 0
-                    else {},
-                    "actionSet": {
-                        "id": str(uuid.uuid4()),
-                        "actions": outcome_list,
-                    }
-                    if len(outcome_list) != 0
-                    else {},
+        json={
+            "appId": app_key,
+            "appVersion": app_version,
+            "title": title,
+            "data": data if data is not None else {},
+            "actionableMessageMetaData": {
+                "fieldSet": {
+                    "id": str(uuid.uuid4()),
+                    "fields": field_list,
+                }
+                if len(field_list) != 0
+                else {},
+                "actionSet": {
+                    "id": str(uuid.uuid4()),
+                    "actions": outcome_list,
                 }
-                if action_schema is not None
+                if len(outcome_list) != 0
                 else {},
             }
-        ),
+            if action_schema is not None
+            else {},
+        },
         headers=folder_headers(app_folder_key, app_folder_path),
     )
 
@@ -126,9 +123,7 @@ def _assign_task_spec(task_key: str, assignee: str) -> RequestSpec:
         endpoint=Endpoint(
             "/orchestrator_/odata/Tasks/UiPath.Server.Configuration.OData.AssignTasks"
         ),
-        content=dumps(
-            {"taskAssignments": [{"taskId": task_key, "UserNameOrEmail": assignee}]}
-        ),
+        json={"taskAssignments": [{"taskId": task_key, "UserNameOrEmail": assignee}]},
     )
 
 
@@ -224,12 +219,18 @@ async def create_async(
         )
 
         response = await self.request_async(
-            spec.method, spec.endpoint, content=spec.content, headers=spec.headers
+            spec.method,
+            spec.endpoint,
+            json=spec.json,
+            content=spec.content,
+            headers=spec.headers,
         )
         json_response = response.json()
         if assignee:
             spec = _assign_task_spec(json_response["id"], assignee)
-            await self.request_async(spec.method, spec.endpoint, content=spec.content)
+            await self.request_async(
+                spec.method, spec.endpoint, json=spec.json, content=spec.content
+            )
         return Action.model_validate(json_response)
 
     @traced(name="actions_create", run_type="uipath")
@@ -284,12 +285,18 @@ def create(
         )
 
         response = self.request(
-            spec.method, spec.endpoint, content=spec.content, headers=spec.headers
+            spec.method,
+            spec.endpoint,
+            json=spec.json,
+            content=spec.content,
+            headers=spec.headers,
         )
         json_response = response.json()
         if assignee:
             spec = _assign_task_spec(json_response["id"], assignee)
-            self.request(spec.method, spec.endpoint, content=spec.content)
+            self.request(
+                spec.method, spec.endpoint, json=spec.json, content=spec.content
+            )
         return Action.model_validate(json_response)
 
     @traced(name="actions_retrieve", run_type="uipath")

src/uipath/_services/api_client.py

@@ -25,7 +25,6 @@ def request(
         method: str,
         url: Union[URL, str],
         scoped: Literal["org", "tenant"] = "tenant",
-        infer_content_type=False,
         **kwargs: Any,
     ) -> Response:
         if kwargs.get("include_folder_headers", False):
@@ -37,16 +36,13 @@ def request(
         if "include_folder_headers" in kwargs:
             del kwargs["include_folder_headers"]
 
-        return super().request(
-            method, url, scoped=scoped, infer_content_type=infer_content_type, **kwargs
-        )
+        return super().request(method, url, scoped=scoped, **kwargs)
 
     async def request_async(
         self,
         method: str,
         url: Union[URL, str],
         scoped: Literal["org", "tenant"] = "tenant",
-        infer_content_type=False,
         **kwargs: Any,
     ) -> Response:
         if kwargs.get("include_folder_headers", False):
@@ -58,6 +54,4 @@ async def request_async(
         if "include_folder_headers" in kwargs:
             del kwargs["include_folder_headers"]
 
-        return await super().request_async(
-            method, url, scoped=scoped, infer_content_type=infer_content_type, **kwargs
-        )
+        return await super().request_async(method, url, scoped=scoped, **kwargs)

src/uipath/_services/assets_service.py

@@ -170,6 +170,8 @@ def retrieve_credential(
         response = self.request(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -223,6 +225,8 @@ async def retrieve_credential_async(
         response = await self.request_async(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -267,6 +271,8 @@ def update(
         response = self.request(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -298,6 +304,8 @@ async def update_async(
         response = await self.request_async(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -337,7 +345,7 @@ def _retrieve_spec(
             endpoint=Endpoint(
                 "/orchestrator_/odata/Assets/UiPath.Server.Configuration.OData.GetRobotAssetByNameForRobotKey"
             ),
-            content=str({"assetName": name, "robotKey": robot_key}),
+            json={"assetName": name, "robotKey": robot_key},
             headers={
                 **header_folder(folder_key, folder_path),
             },
@@ -355,12 +363,10 @@ def _update_spec(
             endpoint=Endpoint(
                 "/orchestrator_/odata/Assets/UiPath.Server.Configuration.OData.SetRobotAssetByRobotKey"
             ),
-            content=str(
-                {
-                    "robotKey": self._execution_context.robot_key,
-                    "robotAsset": robot_asset,
-                }
-            ),
+            json={
+                "robotKey": self._execution_context.robot_key,
+                "robotAsset": robot_asset.model_dump(by_alias=True, exclude_none=True),
+            },
             headers={
                 **header_folder(folder_key, folder_path),
             },

src/uipath/_services/processes_service.py

@@ -87,6 +87,8 @@ def invoke(
         response = self.request(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -146,6 +148,8 @@ async def main():
         response = await self.request_async(
             spec.method,
             url=spec.endpoint,
+            params=spec.params,
+            json=spec.json,
             content=spec.content,
             headers=spec.headers,
         )
@@ -230,18 +234,18 @@ def _invoke_spec(
         folder_key: Optional[str] = None,
         folder_path: Optional[str] = None,
     ) -> RequestSpec:
-        input_dict = {"startInfo": {"ReleaseName": name, **(input_data or {})}}
-        request_scope = RequestSpec(
+        request_spec = RequestSpec(
             method="POST",
             endpoint=Endpoint(
                 "/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"
             ),
-            content=str(input_dict),
+            json={"startInfo": {"ReleaseName": name, **(input_data or {})}},
             headers={
                 **header_folder(folder_key, folder_path),
             },
         )
         job_key = os.environ.get(ENV_JOB_KEY, None)
         if job_key:
-            request_scope.headers[HEADER_JOB_KEY] = job_key
-        return request_scope
+            request_spec.headers[HEADER_JOB_KEY] = job_key
+
+        return request_spec

tests/sdk/services/test_base_service.py

@@ -19,7 +19,6 @@ def test_init_base_service(self, service: BaseService):
     def test_base_service_default_headers(self, service: BaseService, secret: str):
         assert service.default_headers == {
             "Accept": "application/json",
-            "Content-Type": "application/json",
             "Authorization": f"Bearer {secret}",
         }
 

tests/sdk/services/test_processes_service.py

@@ -73,13 +73,14 @@ def test_invoke(
             sent_request.url
             == f"{base_url}{org}{tenant}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"
         )
-        assert sent_request.content.decode("utf-8") == str(
+        assert sent_request.content.decode("utf-8") == json.dumps(
             {
                 "startInfo": {
                     "ReleaseName": process_name,
                     "InputArguments": json.dumps(input_arguments),
                 }
-            }
+            },
+            separators=(",", ":"),
         )
 
         assert HEADER_USER_AGENT in sent_request.headers
@@ -130,13 +131,14 @@ def test_invoke_without_input_arguments(
             sent_request.url
             == f"{base_url}{org}{tenant}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"
         )
-        assert sent_request.content.decode("utf-8") == str(
+        assert sent_request.content.decode("utf-8") == json.dumps(
             {
                 "startInfo": {
                     "ReleaseName": process_name,
                     "InputArguments": "{}",
                 }
-            }
+            },
+            separators=(",", ":"),
         )
 
         assert HEADER_USER_AGENT in sent_request.headers
@@ -286,13 +288,14 @@ async def test_invoke_async(
             sent_request.url
             == f"{base_url}{org}{tenant}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"
         )
-        assert sent_request.content.decode("utf-8") == str(
+        assert sent_request.content.decode("utf-8") == json.dumps(
             {
                 "startInfo": {
                     "ReleaseName": process_name,
                     "InputArguments": json.dumps(input_arguments),
                 }
-            }
+            },
+            separators=(",", ":"),
         )
 
         assert HEADER_USER_AGENT in sent_request.headers
@@ -344,13 +347,14 @@ async def test_invoke_async_without_input_arguments(
             sent_request.url
             == f"{base_url}{org}{tenant}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"
         )
-        assert sent_request.content.decode("utf-8") == str(
+        assert sent_request.content.decode("utf-8") == json.dumps(
             {
                 "startInfo": {
                     "ReleaseName": process_name,
                     "InputArguments": "{}",
                 }
-            }
+            },
+            separators=(",", ":"),
         )
 
         assert HEADER_USER_AGENT in sent_request.headers