UncountablePythonSDK 0.0.36__tar.gz → 0.0.38__tar.gz

{uncountablepythonsdk-0.0.36/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.36
+Version: 0.0.38
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.36 → uncountablepythonsdk-0.0.38/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.36
+Version: 0.0.38
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.36 → uncountablepythonsdk-0.0.38}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -166,6 +166,7 @@ uncountable/types/api/project/get_projects.py
 uncountable/types/api/project/get_projects_data.py
 uncountable/types/api/recipe_links/__init__.py
 uncountable/types/api/recipe_links/create_recipe_link.py
+uncountable/types/api/recipe_links/remove_recipe_link.py
 uncountable/types/api/recipe_metadata/__init__.py
 uncountable/types/api/recipe_metadata/get_recipe_metadata_data.py
 uncountable/types/api/recipes/__init__.py

{uncountablepythonsdk-0.0.36 → uncountablepythonsdk-0.0.38}/uncountable/core/client.py

@@ -4,6 +4,7 @@ import typing
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from enum import StrEnum
+from importlib.metadata import PackageNotFoundError, version
 from urllib.parse import urljoin
 from uuid import uuid4
 
@@ -20,6 +21,13 @@ from .types import AuthDetailsAll, AuthDetailsApiKey, AuthDetailsOAuth
 
 DT = typing.TypeVar("DT")
 UNC_REQUEST_ID_HEADER = "X-UNC-REQUEST-ID"
+UNC_SDK_VERSION_HEADER = "X-UNC-SDK-VERSION"
+
+
+try:
+    __version__ = version("uncountable")
+except PackageNotFoundError:
+    __version__ = "unknown"
 
 
 class EndpointMethod(StrEnum):
@@ -52,6 +60,8 @@ HTTPRequest = HTTPPostRequest | HTTPGetRequest
 @dataclass(kw_only=True)
 class ClientConfig:
     allow_insecure_tls: bool = False
+    extra_headers: dict[str, str] | None = None
+    transform_request: typing.Callable[[requests.Request], requests.Request] | None = None
 
 
 OAUTH_REFRESH_WINDOW_SECONDS = 60 * 5
@@ -136,6 +146,7 @@ class Client(ClientMethods):
     _file_uploader: FileUploader
     _cfg: ClientConfig
     _oauth_bearer_token_cache: OAuthBearerTokenCache | None = None
+    _session: requests.Session
 
     def __init__(
         self,
@@ -148,6 +159,8 @@ class Client(ClientMethods):
         self._base_url = base_url
         self._file_uploader = FileUploader(self._base_url, self._auth_details)
         self._cfg = config or ClientConfig()
+        self._session = requests.Session()
+        self._session.verify = not self._cfg.allow_insecure_tls
 
     def _get_response_json(
         self, response: requests.Response, request_id: str
@@ -157,7 +170,7 @@ class Client(ClientMethods):
             try:
                 data = response.json()
                 if "error" in data:
-                    extra_details = data["error"]
+                    extra_details = data
             except JSONDecodeError:
                 pass
             raise APIResponseError.construct_error(
@@ -168,6 +181,15 @@ class Client(ClientMethods):
         except JSONDecodeError as e:
             raise SDKError("unable to process response", request_id=request_id) from e
 
+    def _send_request(self, request: requests.Request) -> requests.Response:
+        if self._cfg.extra_headers is not None:
+            request.headers = {**request.headers, **self._cfg.extra_headers}
+        if self._cfg.transform_request is not None:
+            request = self._cfg.transform_request(request)
+        prepared_request = request.prepare()
+        response = self._session.send(prepared_request)
+        return response
+
     def do_request(self, *, api_request: APIRequest, return_type: type[DT]) -> DT:
         request_id = str(uuid4())
         http_request = self._build_http_request(
@@ -175,21 +197,15 @@ class Client(ClientMethods):
         )
         match http_request:
             case HTTPGetRequest():
-                response = requests.get(
-                    http_request.url,
-                    headers=http_request.headers,
-                    params=http_request.query_params,
-                    verify=not self._cfg.allow_insecure_tls,
-                )
+                request = requests.Request("GET", http_request.url)
+                request.params = http_request.query_params
             case HTTPPostRequest():
-                response = requests.post(
-                    http_request.url,
-                    headers=http_request.headers,
-                    data=http_request.body,
-                    verify=not self._cfg.allow_insecure_tls,
-                )
+                request = requests.Request("POST", http_request.url)
+                request.data = http_request.body
             case _:
                 typing.assert_never(http_request)
+        request.headers = http_request.headers
+        response = self._send_request(request)
         response_data = self._get_response_json(response, request_id=request_id)
         cached_parser = self._get_cached_parser(return_type)
         try:
@@ -212,15 +228,13 @@ class Client(ClientMethods):
             < OAUTH_REFRESH_WINDOW_SECONDS
         ):
             refresh_url = urljoin(self._base_url, "/token/get_bearer_token")
-            response = requests.post(
-                refresh_url,
-                data={
-                    "client_secret": oauth_details.refresh_token,
-                    "scope": oauth_details.scope,
-                    "grant_type": "client_credentials",
-                },
-                verify=not self._cfg.allow_insecure_tls,
-            )
+            request = requests.Request("POST", refresh_url)
+            request.data = {
+                "client_secret": oauth_details.refresh_token,
+                "scope": oauth_details.scope,
+                "grant_type": "client_credentials",
+            }
+            response = self._send_request(request)
             data = self._get_response_json(response, request_id=str(uuid4()))
             token_data = oauth_bearer_token_data_parser.parse_storage(data)
             self._oauth_bearer_token_cache = OAuthBearerTokenCache(
@@ -247,6 +261,7 @@ class Client(ClientMethods):
     ) -> HTTPRequest:
         headers = self._build_auth_headers()
         headers[UNC_REQUEST_ID_HEADER] = request_id
+        headers[UNC_SDK_VERSION_HEADER] = __version__
         method = api_request.method.lower()
         data = {"data": json.dumps(serialize_for_api(api_request.args))}
         match method:

{uncountablepythonsdk-0.0.36 → uncountablepythonsdk-0.0.38}/uncountable/types/__init__.py

@@ -65,6 +65,7 @@ from . import recipe_tags as recipe_tags_t
 from . import recipe_workflow_steps as recipe_workflow_steps_t
 from . import recipes as recipes_t
 from .api.recipes import remove_recipe_from_project as remove_recipe_from_project_t
+from .api.recipe_links import remove_recipe_link as remove_recipe_link_t
 from .api.entity import resolve_entity_ids as resolve_entity_ids_t
 from .api.outputs import resolve_output_conditions as resolve_output_conditions_t
 from . import response as response_t
@@ -154,6 +155,7 @@ __all__: list[str] = [
     "recipe_workflow_steps_t",
     "recipes_t",
     "remove_recipe_from_project_t",
+    "remove_recipe_link_t",
     "resolve_entity_ids_t",
     "resolve_output_conditions_t",
     "response_t",

uncountablepythonsdk-0.0.38/uncountable/types/api/recipe_links/remove_recipe_link.py

@@ -0,0 +1,38 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# ruff: noqa: E402
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+from dataclasses import dataclass
+from ... import async_batch as async_batch_t
+from ... import identifier as identifier_t
+from ... import recipe_links as recipe_links_t
+
+__all__: list[str] = [
+    "Arguments",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/recipe_links/remove_recipe_link"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Arguments:
+    recipe_from_key: identifier_t.IdentifierKey
+    recipe_to_key: identifier_t.IdentifierKey
+    link_type: typing.Union[typing.Literal[recipe_links_t.RecipeLinkType.CHILD], typing.Literal[recipe_links_t.RecipeLinkType.CONTROL], typing.Literal[recipe_links_t.RecipeLinkType.USER_LINK]]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclass(kw_only=True)
+class Data(async_batch_t.AsyncBatchActionReturn):
+    pass
+# DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.36 → uncountablepythonsdk-0.0.38}/uncountable/types/client_base.py

@@ -58,6 +58,7 @@ from uncountable.types import recipe_links as recipe_links_t
 from uncountable.types import recipe_metadata as recipe_metadata_t
 from uncountable.types import recipe_workflow_steps as recipe_workflow_steps_t
 import uncountable.types.api.recipes.remove_recipe_from_project as remove_recipe_from_project_t
+import uncountable.types.api.recipe_links.remove_recipe_link as remove_recipe_link_t
 import uncountable.types.api.entity.resolve_entity_ids as resolve_entity_ids_t
 import uncountable.types.api.outputs.resolve_output_conditions as resolve_output_conditions_t
 import uncountable.types.api.triggers.run_trigger as run_trigger_t
@@ -987,6 +988,31 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=remove_recipe_from_project_t.Data)
 
+    def remove_recipe_link(
+        self,
+        *,
+        recipe_from_key: identifier_t.IdentifierKey,
+        recipe_to_key: identifier_t.IdentifierKey,
+        link_type: typing.Union[typing.Literal[recipe_links_t.RecipeLinkType.CHILD], typing.Literal[recipe_links_t.RecipeLinkType.CONTROL], typing.Literal[recipe_links_t.RecipeLinkType.USER_LINK]],
+    ) -> remove_recipe_link_t.Data:
+        """Remove a link between two recipes.  Skip if the link doesn't already exist
+
+        :param recipe_from_key: Identifier for the recipe the link comes from
+        :param recipe_to_key: Identifier for the recipe the link goes to
+        :param link_type: The type of link being removed
+        """
+        args = remove_recipe_link_t.Arguments(
+            recipe_from_key=recipe_from_key,
+            recipe_to_key=recipe_to_key,
+            link_type=link_type,
+        )
+        api_request = APIRequest(
+            method=remove_recipe_link_t.ENDPOINT_METHOD,
+            endpoint=remove_recipe_link_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=remove_recipe_link_t.Data)
+
     def resolve_entity_ids(
         self,
         *,