udl-sdk 0.1.0a16__py3-none-any.whl → 0.1.0a17__py3-none-any.whl

{udl_sdk-0.1.0a16.dist-info → udl_sdk-0.1.0a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: udl-sdk
-Version: 0.1.0a16
+Version: 0.1.0a17
 Summary: The official Python library for the unifieddatalibrary API
 Project-URL: Homepage, https://github.com/Bluestaq/udl-python-sdk
 Project-URL: Repository, https://github.com/Bluestaq/udl-python-sdk

{udl_sdk-0.1.0a16.dist-info → udl_sdk-0.1.0a17.dist-info}/RECORD

@@ -1,6 +1,6 @@
 unifieddatalibrary/__init__.py,sha256=562u3LZ5X6bc29nGRt5uXC91XbddnlSfk7tSqKA4yVk,2727
 unifieddatalibrary/_base_client.py,sha256=BeN6_E2mC2gbNLe35cF--RaIrSGhGXZ5PV0RETLnoxA,67692
-unifieddatalibrary/_client.py,sha256=mrBWoR1advnC0xyt7nMU-eiLqRf8ZBFqU8xFsrP4grU,136998
+unifieddatalibrary/_client.py,sha256=1YrguzziaItqgqEU_CmlDsUdBcBjKr17HA8EVMSLvfw,139032
 unifieddatalibrary/_compat.py,sha256=VWemUKbj6DDkQ-O4baSpHVLJafotzeXmCQGJugfVTIw,6580
 unifieddatalibrary/_constants.py,sha256=S14PFzyN9-I31wiV7SmIlL5Ga0MLHxdvegInGdXH7tM,462
 unifieddatalibrary/_exceptions.py,sha256=rkk8r4oyqb4bxjMtx0OFWsh1m8gsMfrnIGnNPO6zRz0,3244
@@ -11,7 +11,7 @@ unifieddatalibrary/_resource.py,sha256=Ik-pULzkvFIY2OgB9Ra7mIQKCle38FSP36dWWCH9v
 unifieddatalibrary/_response.py,sha256=hdekMRMvxTvYdKfYIPvAxSpdiuRILRCYd5Dwcye-icg,28890
 unifieddatalibrary/_streaming.py,sha256=LwKrocz7ZRmYd47TA3q-PLXwgdTgjANE-TCIRZB958s,10148
 unifieddatalibrary/_types.py,sha256=mslWUKYM1Q3bMXxgq4Mr9fo3QvAwzQJrscV44EPbmGA,6209
-unifieddatalibrary/_version.py,sha256=bWzWPOjM3DpaNc2DUOE7yLUFrM3ZgHlIFsh7_xmI52A,179
+unifieddatalibrary/_version.py,sha256=I4gSFbLVU5pg8fGBseAmxOT-y9miBJimqgCF_ZwwlZY,179
 unifieddatalibrary/pagination.py,sha256=jRNsKPCwBHKIHIIX5V5yB7NUsvfy-k7UqnpPGrGyFNU,5758
 unifieddatalibrary/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unifieddatalibrary/_utils/__init__.py,sha256=PNZ_QJuzZEgyYXqkO1HVhGkj5IU9bglVUcw7H-Knjzw,2062
@@ -2634,7 +2634,7 @@ unifieddatalibrary/types/weather_report/history_count_params.py,sha256=KFXFsL7q4
 unifieddatalibrary/types/weather_report/history_count_response.py,sha256=ZAHTF5IoOvMAg9GyvtMvgeowh-ythtIJhcWtMbcM8wk,202
 unifieddatalibrary/types/weather_report/history_list_params.py,sha256=JUd53E70wjtn7HlQ7LOZ7lUJREDJkaDYHv2eYW60T3Q,1019
 unifieddatalibrary/types/weather_report/weather_report_full.py,sha256=iv7fHg9aQh6ztvl0ztve5Z3_8Ww-efPMBgrS0n5gXvM,20751
-udl_sdk-0.1.0a16.dist-info/METADATA,sha256=SrG90u4GaJxzJpydQCE-la4gBG907IsenkytiAJjBvs,17014
-udl_sdk-0.1.0a16.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-udl_sdk-0.1.0a16.dist-info/licenses/LICENSE,sha256=YBMC8KbJHXtxIo1-d_G5WdWjtiwFyrcZ5jAsRwN4POI,11348
-udl_sdk-0.1.0a16.dist-info/RECORD,,
+udl_sdk-0.1.0a17.dist-info/METADATA,sha256=E1gLINcZVaM7C6kxcdejyf4bw4av4zurKfFNCi5i5EU,17014
+udl_sdk-0.1.0a17.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+udl_sdk-0.1.0a17.dist-info/licenses/LICENSE,sha256=YBMC8KbJHXtxIo1-d_G5WdWjtiwFyrcZ5jAsRwN4POI,11348
+udl_sdk-0.1.0a17.dist-info/RECORD,,

unifieddatalibrary/_client.py

@@ -14,6 +14,7 @@ from ._qs import Querystring
 from ._types import (
     NOT_GIVEN,
     Omit,
+    Headers,
     Timeout,
     NotGiven,
     Transport,
@@ -117,7 +118,7 @@ from .resources import (
     seradata_spacecraft_details,
 )
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
-from ._exceptions import APIStatusError, UnifieddatalibraryError
+from ._exceptions import APIStatusError
 from ._base_client import (
     DEFAULT_MAX_RETRIES,
     SyncAPIClient,
@@ -377,14 +378,16 @@ class Unifieddatalibrary(SyncAPIClient):
     with_streaming_response: UnifieddatalibraryWithStreamedResponse
 
     # client options
-    password: str
-    username: str
+    password: str | None
+    username: str | None
+    access_token: str | None
 
     def __init__(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -409,23 +412,20 @@ class Unifieddatalibrary(SyncAPIClient):
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `password` from `UDL_AUTH_PASSWORD`
         - `username` from `UDL_AUTH_USERNAME`
+        - `access_token` from `UDL_ACCESS_TOKEN`
         """
         if password is None:
             password = os.environ.get("UDL_AUTH_PASSWORD")
-        if password is None:
-            raise UnifieddatalibraryError(
-                "The password client option must be set either by passing password to the client or by setting the UDL_AUTH_PASSWORD environment variable"
-            )
         self.password = password
 
         if username is None:
             username = os.environ.get("UDL_AUTH_USERNAME")
-        if username is None:
-            raise UnifieddatalibraryError(
-                "The username client option must be set either by passing username to the client or by setting the UDL_AUTH_USERNAME environment variable"
-            )
         self.username = username
 
+        if access_token is None:
+            access_token = os.environ.get("UDL_ACCESS_TOKEN")
+        self.access_token = access_token
+
         if base_url is None:
             base_url = os.environ.get("UNIFIEDDATALIBRARY_BASE_URL")
         self._base_url_overridden = base_url is not None
@@ -618,10 +618,25 @@ class Unifieddatalibrary(SyncAPIClient):
     @property
     @override
     def auth_headers(self) -> dict[str, str]:
+        return {**self._basic_auth, **self._bearer_auth}
+
+    @property
+    def _basic_auth(self) -> dict[str, str]:
+        if self.username is None:
+            return {}
+        if self.password is None:
+            return {}
         credentials = f"{self.username}:{self.password}".encode("ascii")
         header = f"Basic {base64.b64encode(credentials).decode('ascii')}"
         return {"Authorization": header}
 
+    @property
+    def _bearer_auth(self) -> dict[str, str]:
+        access_token = self.access_token
+        if access_token is None:
+            return {}
+        return {"Authorization": f"Bearer {access_token}"}
+
     @property
     @override
     def default_headers(self) -> dict[str, str | Omit]:
@@ -631,11 +646,28 @@ class Unifieddatalibrary(SyncAPIClient):
             **self._custom_headers,
         }
 
+    @override
+    def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
+        if self.username and self.password and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        if self.access_token and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        raise TypeError(
+            '"Could not resolve authentication method. Expected either username, password or access_token to be set. Or for one of the `Authorization` or `Authorization` headers to be explicitly omitted"'
+        )
+
     def copy(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.Client | None = None,
@@ -671,6 +703,7 @@ class Unifieddatalibrary(SyncAPIClient):
         client = self.__class__(
             password=password or self.password,
             username=username or self.username,
+            access_token=access_token or self.access_token,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
@@ -889,14 +922,16 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
     with_streaming_response: AsyncUnifieddatalibraryWithStreamedResponse
 
     # client options
-    password: str
-    username: str
+    password: str | None
+    username: str | None
+    access_token: str | None
 
     def __init__(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -921,23 +956,20 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `password` from `UDL_AUTH_PASSWORD`
         - `username` from `UDL_AUTH_USERNAME`
+        - `access_token` from `UDL_ACCESS_TOKEN`
         """
         if password is None:
             password = os.environ.get("UDL_AUTH_PASSWORD")
-        if password is None:
-            raise UnifieddatalibraryError(
-                "The password client option must be set either by passing password to the client or by setting the UDL_AUTH_PASSWORD environment variable"
-            )
         self.password = password
 
         if username is None:
             username = os.environ.get("UDL_AUTH_USERNAME")
-        if username is None:
-            raise UnifieddatalibraryError(
-                "The username client option must be set either by passing username to the client or by setting the UDL_AUTH_USERNAME environment variable"
-            )
         self.username = username
 
+        if access_token is None:
+            access_token = os.environ.get("UDL_ACCESS_TOKEN")
+        self.access_token = access_token
+
         if base_url is None:
             base_url = os.environ.get("UNIFIEDDATALIBRARY_BASE_URL")
         self._base_url_overridden = base_url is not None
@@ -1130,10 +1162,25 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
     @property
     @override
     def auth_headers(self) -> dict[str, str]:
+        return {**self._basic_auth, **self._bearer_auth}
+
+    @property
+    def _basic_auth(self) -> dict[str, str]:
+        if self.username is None:
+            return {}
+        if self.password is None:
+            return {}
         credentials = f"{self.username}:{self.password}".encode("ascii")
         header = f"Basic {base64.b64encode(credentials).decode('ascii')}"
         return {"Authorization": header}
 
+    @property
+    def _bearer_auth(self) -> dict[str, str]:
+        access_token = self.access_token
+        if access_token is None:
+            return {}
+        return {"Authorization": f"Bearer {access_token}"}
+
     @property
     @override
     def default_headers(self) -> dict[str, str | Omit]:
@@ -1143,11 +1190,28 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
             **self._custom_headers,
         }
 
+    @override
+    def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
+        if self.username and self.password and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        if self.access_token and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        raise TypeError(
+            '"Could not resolve authentication method. Expected either username, password or access_token to be set. Or for one of the `Authorization` or `Authorization` headers to be explicitly omitted"'
+        )
+
     def copy(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.AsyncClient | None = None,
@@ -1183,6 +1247,7 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
         client = self.__class__(
             password=password or self.password,
             username=username or self.username,
+            access_token=access_token or self.access_token,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,

unifieddatalibrary/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "unifieddatalibrary"
-__version__ = "0.1.0-alpha.16"  # x-release-please-version
+__version__ = "0.1.0-alpha.17"  # x-release-please-version