latitudesh-python-sdk 1.1.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

latitudesh_python_sdk/_hooks/types.py

@@ -3,10 +3,12 @@
 from abc import ABC, abstractmethod
 import httpx
 from latitudesh_python_sdk.httpclient import HttpClient
+from latitudesh_python_sdk.sdkconfiguration import SDKConfiguration
 from typing import Any, Callable, List, Optional, Tuple, Union
 
 
 class HookContext:
+    config: SDKConfiguration
     base_url: str
     operation_id: str
     oauth2_scopes: Optional[List[str]] = None
@@ -14,11 +16,13 @@ class HookContext:
 
     def __init__(
         self,
+        config: SDKConfiguration,
         base_url: str,
         operation_id: str,
         oauth2_scopes: Optional[List[str]],
         security_source: Optional[Union[Any, Callable[[], Any]]],
     ):
+        self.config = config
         self.base_url = base_url
         self.operation_id = operation_id
         self.oauth2_scopes = oauth2_scopes
@@ -28,6 +32,7 @@ class HookContext:
 class BeforeRequestContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
+            hook_ctx.config,
             hook_ctx.base_url,
             hook_ctx.operation_id,
             hook_ctx.oauth2_scopes,
@@ -38,6 +43,7 @@ class BeforeRequestContext(HookContext):
 class AfterSuccessContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
+            hook_ctx.config,
             hook_ctx.base_url,
             hook_ctx.operation_id,
             hook_ctx.oauth2_scopes,
@@ -48,6 +54,7 @@ class AfterSuccessContext(HookContext):
 class AfterErrorContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
+            hook_ctx.config,
             hook_ctx.base_url,
             hook_ctx.operation_id,
             hook_ctx.oauth2_scopes,

latitudesh_python_sdk/_version.py

@@ -3,10 +3,12 @@
 import importlib.metadata
 
 __title__: str = "latitudesh-python-sdk"
-__version__: str = "1.1.0"
-__openapi_doc_version__: str = "v3"
-__gen_version__: str = "2.593.4"
-__user_agent__: str = "speakeasy-sdk/python 1.1.0 2.593.4 v3 latitudesh-python-sdk"
+__version__: str = "2.0.0"
+__openapi_doc_version__: str = "2023-06-01"
+__gen_version__: str = "2.640.2"
+__user_agent__: str = (
+    "speakeasy-sdk/python 2.0.0 2.640.2 2023-06-01 latitudesh-python-sdk"
+)
 
 try:
     if __package__ is not None:

latitudesh_python_sdk/apikeys.py

@@ -3,9 +3,9 @@
 from .basesdk import BaseSDK
 from latitudesh_python_sdk import models, utils
 from latitudesh_python_sdk._hooks import HookContext
-from latitudesh_python_sdk.types import BaseModel, OptionalNullable, UNSET
+from latitudesh_python_sdk.types import OptionalNullable, UNSET
 from latitudesh_python_sdk.utils import get_security_from_env
-from typing import Any, Mapping, Optional, Union, cast
+from typing import Any, Mapping, Optional, Union
 
 
 class APIKeys(BaseSDK):
@@ -62,6 +62,7 @@ class APIKeys(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-api-keys",
                 oauth2_scopes=[],
@@ -149,6 +150,7 @@ class APIKeys(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-api-keys",
                 oauth2_scopes=[],
@@ -186,9 +188,7 @@ class APIKeys(BaseSDK):
     def create(
         self,
         *,
-        request: Union[
-            models.CreateAPIKey, models.CreateAPIKeyTypedDict
-        ] = models.CreateAPIKey(),
+        data: Optional[Union[models.Data, models.DataTypedDict]] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -199,7 +199,7 @@ class APIKeys(BaseSDK):
         Create a new API Key that is tied to the current user account. The created API key is only listed ONCE upon creation. It can however be regenerated or deleted.
 
 
-        :param request: The request object to send.
+        :param data:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -215,9 +215,9 @@ class APIKeys(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        if not isinstance(request, BaseModel):
-            request = utils.unmarshal(request, models.CreateAPIKey)
-        request = cast(models.CreateAPIKey, request)
+        request = models.CreateAPIKey(
+            data=utils.get_pydantic_model(data, Optional[models.Data]),
+        )
 
         req = self._build_request(
             method="POST",
@@ -233,7 +233,7 @@ class APIKeys(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request, False, True, "json", Optional[models.CreateAPIKey]
+                request, False, False, "json", models.CreateAPIKey
             ),
             timeout_ms=timeout_ms,
         )
@@ -248,6 +248,7 @@ class APIKeys(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="post-api-key",
                 oauth2_scopes=[],
@@ -289,9 +290,7 @@ class APIKeys(BaseSDK):
     async def create_async(
         self,
         *,
-        request: Union[
-            models.CreateAPIKey, models.CreateAPIKeyTypedDict
-        ] = models.CreateAPIKey(),
+        data: Optional[Union[models.Data, models.DataTypedDict]] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -302,7 +301,7 @@ class APIKeys(BaseSDK):
         Create a new API Key that is tied to the current user account. The created API key is only listed ONCE upon creation. It can however be regenerated or deleted.
 
 
-        :param request: The request object to send.
+        :param data:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -318,9 +317,9 @@ class APIKeys(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        if not isinstance(request, BaseModel):
-            request = utils.unmarshal(request, models.CreateAPIKey)
-        request = cast(models.CreateAPIKey, request)
+        request = models.CreateAPIKey(
+            data=utils.get_pydantic_model(data, Optional[models.Data]),
+        )
 
         req = self._build_request_async(
             method="POST",
@@ -336,7 +335,7 @@ class APIKeys(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request, False, True, "json", Optional[models.CreateAPIKey]
+                request, False, False, "json", models.CreateAPIKey
             ),
             timeout_ms=timeout_ms,
         )
@@ -351,6 +350,7 @@ class APIKeys(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="post-api-key",
                 oauth2_scopes=[],
@@ -459,6 +459,7 @@ class APIKeys(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="update-api-key",
                 oauth2_scopes=[],
@@ -567,6 +568,7 @@ class APIKeys(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="update-api-key",
                 oauth2_scopes=[],
@@ -665,6 +667,7 @@ class APIKeys(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-api-key",
                 oauth2_scopes=[],
@@ -763,6 +766,7 @@ class APIKeys(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-api-key",
                 oauth2_scopes=[],

latitudesh_python_sdk/basesdk.py

@@ -222,12 +222,12 @@ class BaseSDK:
         client = self.sdk_configuration.client
         logger = self.sdk_configuration.debug_logger
 
+        hooks = self.sdk_configuration.__dict__["_hooks"]
+
         def do():
             http_res = None
             try:
-                req = self.sdk_configuration.get_hooks().before_request(
-                    BeforeRequestContext(hook_ctx), request
-                )
+                req = hooks.before_request(BeforeRequestContext(hook_ctx), request)
                 logger.debug(
                     "Request:\nMethod: %s\nURL: %s\nHeaders: %s\nBody: %s",
                     req.method,
@@ -241,9 +241,7 @@ class BaseSDK:
 
                 http_res = client.send(req, stream=stream)
             except Exception as e:
-                _, e = self.sdk_configuration.get_hooks().after_error(
-                    AfterErrorContext(hook_ctx), None, e
-                )
+                _, e = hooks.after_error(AfterErrorContext(hook_ctx), None, e)
                 if e is not None:
                     logger.debug("Request Exception", exc_info=True)
                     raise e
@@ -261,7 +259,7 @@ class BaseSDK:
             )
 
             if utils.match_status_codes(error_status_codes, http_res.status_code):
-                result, err = self.sdk_configuration.get_hooks().after_error(
+                result, err = hooks.after_error(
                     AfterErrorContext(hook_ctx), http_res, None
                 )
                 if err is not None:
@@ -281,9 +279,7 @@ class BaseSDK:
             http_res = do()
 
         if not utils.match_status_codes(error_status_codes, http_res.status_code):
-            http_res = self.sdk_configuration.get_hooks().after_success(
-                AfterSuccessContext(hook_ctx), http_res
-            )
+            http_res = hooks.after_success(AfterSuccessContext(hook_ctx), http_res)
 
         return http_res
 
@@ -298,12 +294,12 @@ class BaseSDK:
         client = self.sdk_configuration.async_client
         logger = self.sdk_configuration.debug_logger
 
+        hooks = self.sdk_configuration.__dict__["_hooks"]
+
         async def do():
             http_res = None
             try:
-                req = self.sdk_configuration.get_hooks().before_request(
-                    BeforeRequestContext(hook_ctx), request
-                )
+                req = hooks.before_request(BeforeRequestContext(hook_ctx), request)
                 logger.debug(
                     "Request:\nMethod: %s\nURL: %s\nHeaders: %s\nBody: %s",
                     req.method,
@@ -317,9 +313,7 @@ class BaseSDK:
 
                 http_res = await client.send(req, stream=stream)
             except Exception as e:
-                _, e = self.sdk_configuration.get_hooks().after_error(
-                    AfterErrorContext(hook_ctx), None, e
-                )
+                _, e = hooks.after_error(AfterErrorContext(hook_ctx), None, e)
                 if e is not None:
                     logger.debug("Request Exception", exc_info=True)
                     raise e
@@ -337,7 +331,7 @@ class BaseSDK:
             )
 
             if utils.match_status_codes(error_status_codes, http_res.status_code):
-                result, err = self.sdk_configuration.get_hooks().after_error(
+                result, err = hooks.after_error(
                     AfterErrorContext(hook_ctx), http_res, None
                 )
                 if err is not None:
@@ -359,8 +353,6 @@ class BaseSDK:
             http_res = await do()
 
         if not utils.match_status_codes(error_status_codes, http_res.status_code):
-            http_res = self.sdk_configuration.get_hooks().after_success(
-                AfterSuccessContext(hook_ctx), http_res
-            )
+            http_res = hooks.after_success(AfterSuccessContext(hook_ctx), http_res)
 
         return http_res

latitudesh_python_sdk/billing.py

@@ -75,6 +75,7 @@ class Billing(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-billing-usage",
                 oauth2_scopes=[],
@@ -175,6 +176,7 @@ class Billing(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-billing-usage",
                 oauth2_scopes=[],

latitudesh_python_sdk/events_sdk.py

@@ -97,6 +97,7 @@ class EventsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-events",
                 oauth2_scopes=[],
@@ -251,6 +252,7 @@ class EventsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-events",
                 oauth2_scopes=[],

latitudesh_python_sdk/firewalls_sdk.py

@@ -75,6 +75,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="create-firewall",
                 oauth2_scopes=[],
@@ -178,6 +179,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="create-firewall",
                 oauth2_scopes=[],
@@ -281,6 +283,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="list-firewalls",
                 oauth2_scopes=[],
@@ -404,6 +407,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="list-firewalls",
                 oauth2_scopes=[],
@@ -521,6 +525,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-firewall",
                 oauth2_scopes=[],
@@ -618,6 +623,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-firewall",
                 oauth2_scopes=[],
@@ -730,6 +736,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="update-firewall",
                 oauth2_scopes=[],
@@ -842,6 +849,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="update-firewall",
                 oauth2_scopes=[],
@@ -939,6 +947,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-firewall",
                 oauth2_scopes=[],
@@ -1036,6 +1045,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-firewall",
                 oauth2_scopes=[],
@@ -1150,6 +1160,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="create-firewall-assignment",
                 oauth2_scopes=[],
@@ -1266,6 +1277,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="create-firewall-assignment",
                 oauth2_scopes=[],
@@ -1371,6 +1383,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-firewall-assignments",
                 oauth2_scopes=[],
@@ -1407,7 +1420,7 @@ class FirewallsSDK(BaseSDK):
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/vnd.api+json"):
             return models.GetFirewallAssignmentsResponse(
-                result=utils.unmarshal_json(http_res.text, models.FirewallServer),
+                result=utils.unmarshal_json(http_res.text, models.FirewallAssignments),
                 next=next_func,
             )
         if utils.match_response(http_res, "404", "application/vnd.api+json"):
@@ -1498,6 +1511,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-firewall-assignments",
                 oauth2_scopes=[],
@@ -1534,7 +1548,7 @@ class FirewallsSDK(BaseSDK):
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/vnd.api+json"):
             return models.GetFirewallAssignmentsResponse(
-                result=utils.unmarshal_json(http_res.text, models.FirewallServer),
+                result=utils.unmarshal_json(http_res.text, models.FirewallAssignments),
                 next=next_func,
             )
         if utils.match_response(http_res, "404", "application/vnd.api+json"):
@@ -1622,6 +1636,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-firewall-assignment",
                 oauth2_scopes=[],
@@ -1722,6 +1737,7 @@ class FirewallsSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="delete-firewall-assignment",
                 oauth2_scopes=[],

latitudesh_python_sdk/httpclient.py

@@ -2,7 +2,6 @@
 
 # pyright: reportReturnType = false
 import asyncio
-from concurrent.futures import ThreadPoolExecutor
 from typing_extensions import Protocol, runtime_checkable
 import httpx
 from typing import Any, Optional, Union
@@ -116,21 +115,12 @@ def close_clients(
             pass
 
     if async_client is not None and not async_client_supplied:
-        is_async = False
         try:
-            asyncio.get_running_loop()
-            is_async = True
+            loop = asyncio.get_running_loop()
+            asyncio.run_coroutine_threadsafe(async_client.aclose(), loop)
         except RuntimeError:
-            pass
-
-        try:
-            # If this function is called in an async loop then start another
-            # loop in a separate thread to close the async http client.
-            if is_async:
-                with ThreadPoolExecutor(max_workers=1) as executor:
-                    future = executor.submit(asyncio.run, async_client.aclose())
-                    future.result()
-            else:
+            try:
                 asyncio.run(async_client.aclose())
-        except Exception:
-            pass
+            except RuntimeError:
+                # best effort
+                pass

latitudesh_python_sdk/ipaddresses_sdk.py

@@ -97,6 +97,7 @@ class IPAddressesSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-ips",
                 oauth2_scopes=[],
@@ -252,6 +253,7 @@ class IPAddressesSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-ips",
                 oauth2_scopes=[],
@@ -382,6 +384,7 @@ class IPAddressesSDK(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-ip",
                 oauth2_scopes=[],
@@ -482,6 +485,7 @@ class IPAddressesSDK(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                config=self.sdk_configuration,
                 base_url=base_url or "",
                 operation_id="get-ip",
                 oauth2_scopes=[],