refactor

Author: Coniferish

_test_unstructured_client/test_check_url_protocol.py

@@ -34,10 +34,9 @@ def test_clean_server_url_on_paid_api_url(server_url: str):
     ("server_url"),
     [
         ("http://localhost:8000"), # correct url
-        ("https://localhost:8000"),
         ("localhost:8000"),
         ("localhost:8000/general/v0/general"),
-        ("https://localhost:8000/general/v0/general"),
+        ("http://localhost:8000/general/v0/general"),
     ]
 )
 def test_clean_server_url_on_localhost(server_url: str):

src/unstructured_client/utils/_decorators.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 import functools
-import inspect
-from typing import Any, Callable, Dict, Optional
-from typing_extensions import ParamSpec, Concatenate
+from typing import cast, Callable, Optional
+from typing_extensions import ParamSpec
 from urllib.parse import urlparse, urlunparse, ParseResult
 
 
@@ -14,21 +13,14 @@ def clean_server_url(func: Callable[_P, None]) -> Callable[_P, None]:
 
     @functools.wraps(func)
     def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> None:
+        SERVER_URL_ARG_IDX = 3
+        url_is_in_kwargs = True
 
-        def get_call_args_applying_defaults() -> Dict[str, Any]:
-            """Map both explicit and default arguments of decorated func call by param name."""
-            sig = inspect.signature(func)
-            call_args: Dict[str, Any] = dict(
-                **dict(zip(sig.parameters, args)), **kwargs
-            )
-            for param in sig.parameters.values():
-                if param.name not in call_args and param.default is not param.empty:
-                    call_args[param.name] = param.default
-            return call_args
+        server_url: Optional[str] = cast(Optional[str], kwargs.get("server_url"))
 
-        call_args = get_call_args_applying_defaults()
-
-        server_url: Optional[str] = call_args.get("server_url")
+        if server_url is None and len(args) > SERVER_URL_ARG_IDX:
+            server_url = cast(str, args[SERVER_URL_ARG_IDX])
+            url_is_in_kwargs = False
 
         if server_url:
             # -- add a url scheme if not present (urllib.parse does not work reliably without it)
@@ -40,20 +32,15 @@ def get_call_args_applying_defaults() -> Dict[str, Any]:
             if "api.unstructuredapp.io" in server_url:
                 if parsed_url.scheme != "https":
                     parsed_url = parsed_url._replace(scheme="https")
-            else:
-                # -- if not a paid api url, assume the api is hosted locally and the scheme is "http"
-                if parsed_url.scheme != "http":
-                    parsed_url = parsed_url._replace(scheme="http")
 
             # -- path should always be empty
             cleaned_url = parsed_url._replace(path="")
-            call_args["server_url"] = urlunparse(cleaned_url)
 
-        # -- call_args contains all args and kwargs. If users define some parameters using
-        # -- kwargs, param definitions would be duplicated. Pass only the `self`
-        # -- param as an arg and keep the rest in kwargs to prevent duplicates.
-        self_arg = (call_args.pop("self"),)
+            if url_is_in_kwargs:
+                kwargs["server_url"] = urlunparse(cleaned_url)
+            else:
+                args = args[:SERVER_URL_ARG_IDX] + (urlunparse(cleaned_url),) + args[SERVER_URL_ARG_IDX+1:] # type: ignore
 
-        return func(*self_arg, **call_args) # type: ignore
+        return func(*args, **kwargs)
 
     return wrapper