Minor test updates

Author: awalker4

_test_contract/platform_api/test_destinations.py

@@ -108,7 +108,8 @@ def test_list_destinations_5xx_code(
 
 
 def test_get_destination(httpx_mock, client: UnstructuredClient, platform_api_url: str):
-    url = f"{platform_api_url}/api/v1/destinations/0c363dec-3c70-45ee-8041-481044a6e1cc"
+    dest_id = "0c363dec-3c70-45ee-8041-481044a6e1cc"
+    url = f"{platform_api_url}/api/v1/destinations/{dest_id}"
 
     httpx_mock.add_response(
         method="GET",
@@ -124,7 +125,7 @@ def test_get_destination(httpx_mock, client: UnstructuredClient, platform_api_ur
     )
 
     destination_response = client.destinations.get_destination(
-        request=operations.GetDestinationRequest(destination_id="1")
+        request=operations.GetDestinationRequest(destination_id=dest_id)
     )
     assert destination_response.status_code == 200
 
@@ -147,7 +148,8 @@ def test_get_destination(httpx_mock, client: UnstructuredClient, platform_api_ur
 def test_get_destination_not_found(
     httpx_mock, client: UnstructuredClient, platform_api_url: str
 ):
-    url = f"{platform_api_url}/api/v1/destinations/0c363dec-3c70-45ee-8041-481044a6e1cc"
+    dest_id = "0c363dec-3c70-45ee-8041-481044a6e1cc"
+    url = f"{platform_api_url}/api/v1/destinations/{dest_id}"
 
     httpx_mock.add_response(
         method="GET",
@@ -158,7 +160,7 @@ def test_get_destination_not_found(
 
     with pytest.raises(SDKError) as excinfo:
         client.destinations.get_destination(
-            request=operations.GetDestinationRequest(destination_id="1")
+            request=operations.GetDestinationRequest(destination_id=dest_id)
         )
 
     requests = httpx_mock.get_requests()
@@ -215,7 +217,8 @@ def test_create_destination(
 def test_update_destination(
     httpx_mock, client: UnstructuredClient, platform_api_url: str
 ):
-    url = f"{platform_api_url}/api/v1/destinations/b25d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "b25d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/destinations/{dest_id}"
 
     httpx_mock.add_response(
         method="PUT",
@@ -232,7 +235,7 @@ def test_update_destination(
 
     destination_update_response = client.destinations.update_destination(
         request=operations.UpdateDestinationRequest(
-            destination_id="1",
+            destination_id=dest_id,
             update_destination_connector=shared.UpdateDestinationConnector(
                 config={}
             ),
@@ -260,7 +263,8 @@ def test_update_destination(
 def test_delete_destination(
     httpx_mock, client: UnstructuredClient, platform_api_url: str
 ):
-    url = f"{platform_api_url}/api/v1/destinations/b25d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "b25d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/destinations/{dest_id}"
 
     httpx_mock.add_response(
         method="DELETE",
@@ -271,7 +275,7 @@ def test_delete_destination(
     )
 
     response = client.destinations.delete_destination(
-        request=operations.DeleteDestinationRequest(destination_id="1")
+        request=operations.DeleteDestinationRequest(destination_id=dest_id)
     )
     assert response.status_code == 200
 

_test_contract/platform_api/test_sources.py

@@ -107,7 +107,8 @@ def test_list_sources_5xx_code(
 
 
 def test_get_source(httpx_mock, client: UnstructuredClient, platform_api_url: str):
-    url = f"{platform_api_url}/api/v1/sources/a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/sources/{dest_id}"
 
     httpx_mock.add_response(
         method="GET",
@@ -123,7 +124,7 @@ def test_get_source(httpx_mock, client: UnstructuredClient, platform_api_url: st
     )
 
     source_response = client.sources.get_source(
-        request=operations.GetSourceRequest(source_id="1")
+        request=operations.GetSourceRequest(source_id=dest_id)
     )
     assert source_response.status_code == 200
 
@@ -144,7 +145,8 @@ def test_get_source(httpx_mock, client: UnstructuredClient, platform_api_url: st
 def test_get_source_not_found(
     httpx_mock, client: UnstructuredClient, platform_api_url: str
 ):
-    url = f"{platform_api_url}/api/v1/sources/a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/sources/{dest_id}"
 
     httpx_mock.add_response(
         method="GET",
@@ -154,7 +156,7 @@ def test_get_source_not_found(
     )
 
     with pytest.raises(SDKError) as excinfo:
-        client.sources.get_source(request=operations.GetSourceRequest(source_id="1"))
+        client.sources.get_source(request=operations.GetSourceRequest(source_id=dest_id))
 
     requests = httpx_mock.get_requests()
     assert len(requests) == 1
@@ -204,7 +206,8 @@ def test_create_source(httpx_mock, client: UnstructuredClient, platform_api_url:
 
 
 def test_update_source(httpx_mock, client: UnstructuredClient, platform_api_url: str):
-    url = f"{platform_api_url}/api/v1/sources/a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/sources/{dest_id}"
 
     httpx_mock.add_response(
         method="PUT",
@@ -222,7 +225,7 @@ def test_update_source(httpx_mock, client: UnstructuredClient, platform_api_url:
 
     source_update_response = client.sources.update_source(
         request=operations.UpdateSourceRequest(
-            source_id="1",
+            source_id=dest_id,
             update_source_connector=shared.UpdateSourceConnector(
                 config={}
             ),
@@ -248,7 +251,8 @@ def test_update_source(httpx_mock, client: UnstructuredClient, platform_api_url:
 
 
 def test_delete_source(httpx_mock, client: UnstructuredClient, platform_api_url: str):
-    url = f"{platform_api_url}/api/v1/sources/a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    dest_id = "a15d4161-77a0-4e08-b65e-86f398ce15ad"
+    url = f"{platform_api_url}/api/v1/sources/{dest_id}"
 
     httpx_mock.add_response(
         method="DELETE",
@@ -259,7 +263,7 @@ def test_delete_source(httpx_mock, client: UnstructuredClient, platform_api_url:
     )
 
     response = client.sources.delete_source(
-        request=operations.DeleteSourceRequest(source_id="1")
+        request=operations.DeleteSourceRequest(source_id=dest_id)
     )
     assert response.status_code == 200
 

_test_unstructured_client/unit/test_custom_hooks.py

@@ -210,10 +210,6 @@ def test_unit_clean_server_url_fixes_malformed_localhost_url(server_url: str):
     assert client.general.sdk_configuration.server_url == "http://localhost:8000"
 
 
-def test_unit_clean_server_url_returns_empty_string_given_empty_string():
-    client = UnstructuredClient(server_url="", api_key_auth=FAKE_KEY)
-    assert client.general.sdk_configuration.server_url == ""
-
 
 def test_unit_clean_server_url_returns_None_given_no_server_url():
     client = UnstructuredClient(api_key_auth=FAKE_KEY)
@@ -230,7 +226,7 @@ def test_unit_clean_server_url_returns_None_given_no_server_url():
     ],
 )
 def test_unit_clean_server_url_fixes_malformed_urls_with_positional_arguments(server_url: str):
-    client = UnstructuredClient(FAKE_KEY, "", server_url)
+    client = UnstructuredClient(FAKE_KEY, server_url=server_url)
     assert (
         client.general.sdk_configuration.server_url
         == "https://unstructured-000mock.api.unstructuredapp.io"

src/unstructured_client/_hooks/custom/clean_server_url_hook.py

@@ -13,6 +13,8 @@ class CleanServerUrlSDKInitHook(SDKInitHook):
     def clean_server_url(self, base_url) -> str:
         """Fix url scheme and remove the '/general/v0/general' path."""
 
+        if not base_url:
+            return None
         # -- add a url scheme if not present (urllib.parse does not work reliably without it)
         if "http" not in base_url:
             base_url = "http://" + base_url