Update structure, some names and imports

.github/workflows/generate.yml

@@ -4,7 +4,7 @@ name: Generate
 on:
   push:
     branches-ignore:
-      - main
+      - '**'
   workflow_dispatch: {}
 
 jobs:

package.json

@@ -8,7 +8,7 @@
     "format": "prettier --write --ignore-path .gitignore ."
   },
   "devDependencies": {
-    "@seamapi/nextlove-sdk-generator": "1.11.0",
+    "@seamapi/nextlove-sdk-generator": "1.11.1",
     "@seamapi/types": "1.172.0",
     "del": "^7.1.0",
     "prettier": "^3.2.5"

pyproject.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/seamapi/python-next"
 [tool.poetry.dependencies]
 python = "^3.9.0"
 dataclasses-json = "^0.6.4"
-requests = "^2.26.0"
+niquests = "^3.6.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.3.0"

seam/__init__.py

@@ -1,12 +1,12 @@
 # flake8: noqa
 # type: ignore
 
-from seam.seam import Seam
-from seam.types import SeamHttpApiError
-from seam.seam_multi_workspace import SeamMultiWorkspace
-from seam.options import SeamHttpInvalidOptionsError
-from seam.auth import SeamHttpInvalidTokenError
-from seam.routes.action_attempts import (
+from .seam import Seam
+from .seam_multi_workspace import SeamMultiWorkspace
+from .options import SeamHttpInvalidOptionsError
+from .auth import SeamHttpInvalidTokenError
+from .exceptions import (
+    SeamHttpApiError,
     SeamActionAttemptError,
     SeamActionAttemptFailedError,
     SeamActionAttemptTimeoutError,

seam/auth.py

@@ -1,10 +1,10 @@
 from typing import Optional
-from seam.options import (
+from .options import (
     SeamHttpInvalidOptionsError,
     is_seam_http_options_with_api_key,
     is_seam_http_options_with_personal_access_token,
 )
-from seam.token import (
+from .token import (
     is_jwt,
     is_access_token,
     is_client_session_token,

seam/exceptions.py

@@ -0,0 +1,43 @@
+from niquests import Response
+from .routes.models import ActionAttempt
+
+
+# HTTP
+class SeamHttpApiError(Exception):
+    def __init__(
+        self,
+        response: Response,
+    ):
+        self.status_code = response.status_code
+        self.request_id = response.headers.get("seam-request-id", None)
+
+        self.metadata = None
+        if "application/json" in response.headers["content-type"]:
+            parsed_response = response.json()
+            self.metadata = parsed_response.get("error", None)
+
+        super().__init__(
+            f"SeamApiException: status={self.status_code}, request_id={self.request_id}, metadata={self.metadata}"
+        )
+
+
+# Action Attempt
+class SeamActionAttemptError(Exception):
+    def __init__(self, message: str, action_attempt: ActionAttempt):
+        super().__init__(message)
+        self.name = self.__class__.__name__
+        self.action_attempt = action_attempt
+
+
+class SeamActionAttemptFailedError(SeamActionAttemptError):
+    def __init__(self, action_attempt: ActionAttempt):
+        super().__init__(action_attempt.error.message, action_attempt)
+        self.name = self.__class__.__name__
+        self.code = action_attempt.error.type
+
+
+class SeamActionAttemptTimeoutError(SeamActionAttemptError):
+    def __init__(self, action_attempt: ActionAttempt, timeout: str):
+        message = f"Timed out waiting for action attempt after {timeout}s"
+        super().__init__(message, action_attempt)
+        self.name = self.__class__.__name__

seam/types.py → seam/models.py

@@ -1,35 +1,26 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
+import niquests as requests
 from typing_extensions import Self
 import abc
 
-from seam.routes.types import AbstractRoutes, Workspace
+from .routes.models import AbstractRoutes, Workspace
 
 
-class SeamHttpApiError(Exception):
-    def __init__(
-        self,
-        response,
-    ):
-        self.status_code = response.status_code
-        self.request_id = response.headers.get("seam-request-id", None)
-
-        self.metadata = None
-        if "application/json" in response.headers["content-type"]:
-            parsed_response = response.json()
-            self.metadata = parsed_response.get("error", None)
-
-        super().__init__(
-            f"SeamHttpApiError: status={self.status_code}, request_id={self.request_id}, metadata={self.metadata}"
-        )
+class AbstractSeamHttpClient(abc.ABC):
+    @abc.abstractmethod
+    def __init__(self, base_url: str, auth_headers: Dict[str, str], **kwargs):
+        raise NotImplementedError
 
+    @abc.abstractmethod
+    def request(self, method: str, url: str, *args, **kwargs):
+        raise NotImplementedError
 
-class AbstractRequestMixin(abc.ABC):
     @abc.abstractmethod
-    def make_request(self, method: str, path: str, **kwargs):
+    def _handle_response(self, response: requests.Response):
         raise NotImplementedError
 
 
-class AbstractSeam(AbstractRoutes, AbstractRequestMixin):
+class AbstractSeam(AbstractRoutes):
     lts_version: str
     wait_for_action_attempt: Optional[Union[bool, Dict[str, float]]]
 
@@ -89,7 +80,7 @@ def list(
         raise NotImplementedError()
 
 
-class AbstractSeamMultiWorkspace(AbstractRequestMixin):
+class AbstractSeamMultiWorkspace:
     lts_version: str
     wait_for_action_attempt: Optional[Union[bool, Dict[str, float]]]
 

seam/options.py

@@ -1,7 +1,7 @@
 import os
 from typing import Optional
 
-from seam.constants import DEFAULT_ENDPOINT
+from .constants import DEFAULT_ENDPOINT
 
 
 def get_endpoint(endpoint: Optional[str] = None):

seam/parse_options.py

@@ -1,8 +1,8 @@
 import os
 from typing import Optional
 
-from seam.auth import get_auth_headers
-from seam.options import get_endpoint
+from .auth import get_auth_headers
+from .options import get_endpoint
 
 
 def parse_options(

seam/request.py

@@ -1,43 +1,35 @@
-import requests
+from typing import Dict
+from urllib.parse import urljoin
+import niquests as requests
 from importlib.metadata import version
 
-from seam.types import AbstractRequestMixin, SeamHttpApiError
-
-
-class RequestMixin(AbstractRequestMixin):
-    def make_request(self, method: str, path: str, **kwargs):
-        """
-        Makes a request to the API
-
-        Parameters
-        ----------
-        method : str
-          Request method
-        path : str
-          Request path
-        **kwargs
-          Keyword arguments passed to requests.request
-
-        Raises
-        ------
-        SeamHttpApiError: If the response status code is not successful.
-        """
-
-        url = self._endpoint + path
-        sdk_version = version("seam")
-        headers = {
-            **self._auth_headers,
-            "Content-Type": "application/json",
-            "User-Agent": "Python SDK v"
-            + sdk_version
-            + " (https://github.com/seamapi/python-next)",
-            "seam-sdk-name": "seamapi/python",
-            "seam-sdk-version": sdk_version,
-            "seam-lts-version": self.lts_version,
-        }
-
-        response = requests.request(method, url, headers=headers, **kwargs)
+from .constants import LTS_VERSION
+from .exceptions import SeamHttpApiError
+from .models import AbstractSeamHttpClient
 
+SDK_HEADERS = {
+    "seam-sdk-name": "seamapi/python",
+    "seam-sdk-version": version("seam"),
+    "seam-lts-version": LTS_VERSION,
+}
+
+
+class SeamHttpClient(requests.Session, AbstractSeamHttpClient):
+    def __init__(self, base_url: str, auth_headers: Dict[str, str], **kwargs):
+        super().__init__(**kwargs)
+
+        self.base_url = base_url
+        headers = {**auth_headers, **kwargs.get("headers", {}), **SDK_HEADERS}
+
+        self.headers.update(headers)
+
+    def request(self, method, url, *args, **kwargs):
+        url = urljoin(self.base_url, url)
+        response = super().request(method, url, *args, **kwargs)
+
+        return self._handle_response(response)
+
+    def _handle_response(self, response: requests.Response):
         if response.status_code != 200:
             raise SeamHttpApiError(response)