clean also on server level

Author: yuming-long

_test_unstructured_client/unit/test_server_urls.py

@@ -69,29 +69,29 @@ class URLTestCase:
         URLTestCase(
             description="non UNST domain client-level URL, no path",
             sdk_endpoint_name="general.partition_async",
-            client_url="http://localhost:8000",
+            client_url="http://localhost:8000/",
             endpoint_url=None,
             expected_url="http://localhost:8000"
         ),
         URLTestCase(
             description="non UNST domain client-level URL, with path",
             sdk_endpoint_name="general.partition_async",
-            client_url="http://localhost:8000/my/endpoint",
+            client_url="http://localhost:8000/my/endpoint/",
             endpoint_url=None,
             expected_url="http://localhost:8000/my/endpoint"
         ),
         URLTestCase(
             description="non UNST domain endpoint-level URL, no path",
             sdk_endpoint_name="general.partition_async",
             client_url=None,
-            endpoint_url="http://localhost:8000",
+            endpoint_url="http://localhost:8000/",
             expected_url="http://localhost:8000"
         ),
         URLTestCase(
             description="non UNST domain endpoint-level URL, with path",
             sdk_endpoint_name="general.partition_async",
             client_url=None,
-            endpoint_url="http://localhost:8000/my/endpoint",
+            endpoint_url="http://localhost:8000/my/endpoint/",
             expected_url="http://localhost:8000/my/endpoint"
         ),
         URLTestCase(
@@ -162,28 +162,28 @@ async def test_async_endpoint_uses_correct_url(monkeypatch, case: URLTestCase):
     [
         URLTestCase(
             description="non UNST domain client-level URL, no path",
-            sdk_endpoint_name="general.partition",
-            client_url="http://localhost:8000",
+            sdk_endpoint_name="destinations.create_destination",
+            client_url="http://localhost:8000/",
             endpoint_url=None,
             expected_url="http://localhost:8000"
         ),
         URLTestCase(
             description="non UNST domain client-level URL, with path",
-            sdk_endpoint_name="general.partition",
-            client_url="http://localhost:8000/my/endpoint",
+            sdk_endpoint_name="sources.create_source",
+            client_url="http://localhost:8000/my/endpoint/",
             endpoint_url=None,
             expected_url="http://localhost:8000/my/endpoint"
         ),
         URLTestCase(
             description="non UNST domain endpoint-level URL, no path",
-            sdk_endpoint_name="general.partition",
+            sdk_endpoint_name="jobs.get_job",
             client_url=None,
             endpoint_url="http://localhost:8000",
             expected_url="http://localhost:8000"
         ),
         URLTestCase(
             description="non UNST domain endpoint-level URL, with path",
-            sdk_endpoint_name="general.partition",
+            sdk_endpoint_name="workflows.create_workflow",
             client_url=None,
             endpoint_url="http://localhost:8000/my/endpoint",
             expected_url="http://localhost:8000/my/endpoint"

src/unstructured_client/_hooks/custom/clean_server_url_hook.py

@@ -29,7 +29,7 @@ def clean_server_url(base_url: str) -> str:
         # For other domains, we want to keep the path
         clean_url = urlunparse(parsed_url._replace(params="", query="", fragment=""))
 
-    return clean_url
+    return clean_url.rstrip("/")
 
 
 

src/unstructured_client/destinations.py

@@ -10,7 +10,7 @@
 class Destinations(BaseSDK):
     def get_default_server_url(self) -> str:
         client_url, *_ = self.sdk_configuration.get_server_details()
-        return client_url
+        return clean_server_url(client_url)
 
 
     def create_destination(

src/unstructured_client/general.py

@@ -18,12 +18,12 @@ class PartitionAcceptEnum(str, Enum):
 class General(BaseSDK):
     def get_default_server_url(self) -> str:
         client_url, *_ = self.sdk_configuration.get_server_details()
-        if client_url ==  utils.remove_suffix(SERVERS[SERVER_PLATFORM_API], "/"):
+        if client_url ==  SERVERS[SERVER_PLATFORM_API].rstrip("/"):
             #Note(yuming):get_server_details will set the default server to platform-api
             return operations.PARTITION_SERVERS[
                 operations.PARTITION_SERVER_SAAS_API
-            ]
-        return client_url
+            ].rstrip("/")
+        return clean_server_url(client_url)
 
     def partition(
         self,

src/unstructured_client/jobs.py

@@ -10,7 +10,7 @@
 class Jobs(BaseSDK):
     def get_default_server_url(self) -> str:
         client_url, *_ = self.sdk_configuration.get_server_details()
-        return client_url
+        return clean_server_url(client_url)
 
     def cancel_job(
         self,

src/unstructured_client/sources.py

@@ -10,7 +10,7 @@
 class Sources(BaseSDK):
     def get_default_server_url(self) -> str:
         client_url, *_ = self.sdk_configuration.get_server_details()
-        return client_url
+        return clean_server_url(client_url)
 
     def create_source(
         self,

src/unstructured_client/workflows.py

@@ -11,7 +11,7 @@
 class Workflows(BaseSDK):
     def get_default_server_url(self) -> str:
         client_url, *_ = self.sdk_configuration.get_server_details()
-        return client_url
+        return clean_server_url(client_url)
 
     def create_workflow(
         self,