UncountablePythonSDK 0.0.26__py3-none-any.whl → 0.0.27__py3-none-any.whl

{UncountablePythonSDK-0.0.26.dist-info → UncountablePythonSDK-0.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.26
+Version: 0.0.27
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -16,21 +16,21 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiotus ==0.1.15
-Requires-Dist: aiohttp ==3.9.5
-Requires-Dist: requests ==2.31.0
-Requires-Dist: SQLAlchemy ==1.4.52
-Requires-Dist: APScheduler ==3.10.4
-Requires-Dist: python-dateutil ==2.9.0.post0
-Requires-Dist: shelljob ==0.6.3
-Requires-Dist: PyYAML ==6.0.1
+Requires-Dist: aiotus ==0.*
+Requires-Dist: aiohttp ==3.*
+Requires-Dist: requests ==2.*
+Requires-Dist: SQLAlchemy ==1.4.*
+Requires-Dist: APScheduler ==3.*
+Requires-Dist: python-dateutil ==2.*
+Requires-Dist: shelljob ==0.*
+Requires-Dist: PyYAML ==6.*
 Provides-Extra: test
-Requires-Dist: mypy >=1.8.1 ; extra == 'test'
-Requires-Dist: ruff >=0.2.1 ; extra == 'test'
-Requires-Dist: pytest >=7.4.3 ; extra == 'test'
-Requires-Dist: coverage[toml] >=6.5.0 ; extra == 'test'
-Requires-Dist: pytest-cov >=4.1.0 ; extra == 'test'
-Requires-Dist: pytest-xdist >=3.5.0 ; extra == 'test'
+Requires-Dist: mypy ==1.* ; extra == 'test'
+Requires-Dist: ruff ==0.* ; extra == 'test'
+Requires-Dist: pytest ==7.* ; extra == 'test'
+Requires-Dist: coverage[toml] ==6.* ; extra == 'test'
+Requires-Dist: pytest-cov ==4.* ; extra == 'test'
+Requires-Dist: pytest-xdist ==3.* ; extra == 'test'
 
 # Uncountable Python SDK
 

{UncountablePythonSDK-0.0.26.dist-info → UncountablePythonSDK-0.0.27.dist-info}/RECORD

@@ -38,7 +38,7 @@ pkgs/type_spec/__main__.py,sha256=5bJaX9Y_-FavP0qwzhk-z-V97UY7uaezJTa1zhO_HHQ,10
 pkgs/type_spec/builder.py,sha256=S7lZCbGbeQ9cUQHnhY9vvpgFUQj8DjsOaNBVqRUff6Y,43253
 pkgs/type_spec/config.py,sha256=INfEiDcUsZFUKasHprsE6i33siPB0RnfmTKOsWcGnQ8,5043
 pkgs/type_spec/emit_io_ts.py,sha256=Ghd8XYqyNYldHQDepwa9GLfHXcoi48ztBw84K28ETic,5707
-pkgs/type_spec/emit_open_api.py,sha256=nDUlVSmzqc1GkbyND9rbeM2AHOO-mbtzRmdOqA6KKXE,23821
+pkgs/type_spec/emit_open_api.py,sha256=rAxfPVsqJU7ass76dPhImgPao6AW6xyz-rMaQDhSp1I,23822
 pkgs/type_spec/emit_open_api_util.py,sha256=XAA6zH59aZWLVl0BvKAICXXl4sdBqx01QAtv5oB0bMI,2266
 pkgs/type_spec/emit_python.py,sha256=aGPnp86DZN0N7c5eiBHVAT_smDf1uCLmRldDhxmWx9g,42673
 pkgs/type_spec/emit_typescript.py,sha256=4hpCJwiDf-v8LJaNFVfFtf8zvtG73YNPFwwa_5NuffI,17729
@@ -114,9 +114,9 @@ uncountable/__init__.py,sha256=281cC2hs8pbrD0jVKMol-tbWSh7Zcsc8oRT42dKteyE,102
 uncountable/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/core/__init__.py,sha256=J0CeeztqyJe7klvHM-8fwSivN1sud6xZThOdaThnQrU,314
 uncountable/core/async_batch.py,sha256=0cRmCr6Z9sNxZyfY9Dl8wlCA4anISVZuHGgBegHhUbc,749
-uncountable/core/client.py,sha256=cP6yEHv5KGE2NJn0BAQh470mirBfITMLsfEs-zj-6Ys,9024
-uncountable/core/file_upload.py,sha256=zTpAFSd7_-TmEVWxOn1rDznyWE6_AdZyuDQC3LP34iI,2667
-uncountable/core/types.py,sha256=RaNVuUPpcMBCfk-stS4Jh-9WBFzKK6_cVgRfPv7Dz6g,280
+uncountable/core/client.py,sha256=1a8vstovmqsRvrE4YsKCoZAKDNWXMECnR-BlKEWsxoY,9033
+uncountable/core/file_upload.py,sha256=YWOay69i_-sNGBNnwzKb3bY3OMaV4lRsdVZZK-ScXVc,2829
+uncountable/core/types.py,sha256=zM_FqVT41qqZAhXxKSK_kQccArfw6B_p2qMYBRKJHqE,332
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/construct_client.py,sha256=r6M5pnIO0fKcjf5d_AREPtWZ6AkWgcjkdu_jHQEYlT8,1084
 uncountable/integration/cron.py,sha256=TIPqMPMSMtMJTu4aXwLf6QY-OLrpmyITLDp48UIr4Ok,919
@@ -226,7 +226,7 @@ uncountable/types/api/recipes/set_recipe_tags.py,sha256=U710hgq9-t6QZGRB-ZGHskpt
 uncountable/types/api/recipes/unarchive_recipes.py,sha256=WcwFYbBsX2SKXnoBQ8locnRn7Bj1rHdtrURQVOfqgfU,814
 uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/triggers/run_trigger.py,sha256=9m9M8-nlGB_sAU2Qm2lWugp4h4Osqj6QpjNfU8osd1U,901
-UncountablePythonSDK-0.0.26.dist-info/METADATA,sha256=4LIsxPuj2u8AZ23XHXjF3L1mQdcVsa_renQYEwZhNJM,1613
-UncountablePythonSDK-0.0.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-UncountablePythonSDK-0.0.26.dist-info/top_level.txt,sha256=HaMiBnH1wA7SG9-RVHIJPBH3l8X5gee2jUf-77Nz-Dk,41
-UncountablePythonSDK-0.0.26.dist-info/RECORD,,
+UncountablePythonSDK-0.0.27.dist-info/METADATA,sha256=yVmNKAUq4GanaGOubm1rLlAzKLIxqJjgU0hFWmbCv_w,1577
+UncountablePythonSDK-0.0.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+UncountablePythonSDK-0.0.27.dist-info/top_level.txt,sha256=HaMiBnH1wA7SG9-RVHIJPBH3l8X5gee2jUf-77Nz-Dk,41
+UncountablePythonSDK-0.0.27.dist-info/RECORD,,

pkgs/type_spec/emit_open_api.py

@@ -63,7 +63,7 @@ base_name_map = {
 def _rewrite_with_notice(
     file_path: str, file_content: str, *, notice: str = MODIFY_NOTICE
 ) -> bool:
-    pattern = re.compile("^\S", re.MULTILINE)
+    pattern = re.compile(r"^\S", re.MULTILINE)
 
     file_lines = file_content.split("\n")
     comment_lines = []

uncountable/core/client.py

@@ -15,7 +15,7 @@ from pkgs.serialization_util.serialization_helpers import JsonValue
 from uncountable.types.client_base import APIRequest, ClientMethods
 
 from .file_upload import FileUpload, FileUploader, UploadedFile
-from .types import AuthDetails, AuthDetailsApiKey, AuthDetailsOAuth
+from .types import AuthDetailsAll, AuthDetailsApiKey, AuthDetailsOAuth
 
 DT = typing.TypeVar("DT")
 
@@ -129,7 +129,7 @@ oauth_bearer_token_data_parser = CachedParser(GetOauthBearerTokenData)
 
 class Client(ClientMethods):
     _parser_map: dict[type, CachedParser] = {}
-    _auth_details: AuthDetails
+    _auth_details: AuthDetailsAll
     _base_url: str
     _file_uploader: FileUploader
     _cfg: ClientConfig
@@ -139,7 +139,7 @@ class Client(ClientMethods):
         self,
         *,
         base_url: str,
-        auth_details: AuthDetails,
+        auth_details: AuthDetailsAll,
         config: ClientConfig | None = None,
     ):
         self._auth_details = auth_details

uncountable/core/file_upload.py

@@ -4,12 +4,12 @@ from dataclasses import dataclass
 from enum import StrEnum
 from io import BytesIO
 from pathlib import Path
-from typing import Generator, Literal, Self
+from typing import Generator, Self
 
 import aiohttp
 import aiotus
 
-from .types import AuthDetails
+from .types import AuthDetailsAll, AuthDetailsApiKey
 
 _CHUNK_SIZE = 5 * 1024 * 1024  # s3 requires 5MiB minimum
 
@@ -56,15 +56,18 @@ class UploadFailed(Exception):
 
 
 class FileUploader:
-    _auth_details: AuthDetails
+    _auth_details: AuthDetailsAll
     _base_url: str
 
-    def __init__(self: Self, base_url: str, auth_details: AuthDetails) -> None:
+    def __init__(self: Self, base_url: str, auth_details: AuthDetailsAll) -> None:
         self._base_url = base_url
         self._auth_details = auth_details
 
     async def _upload_file(self: Self, file_upload: FileUpload) -> UploadedFile:
         creation_url = f"{self._base_url}/api/external/file_upload/files"
+        if not isinstance(self._auth_details, AuthDetailsApiKey):
+            raise NotImplementedError("Unsupported authentication method.")
+
         auth = aiohttp.BasicAuth(
             self._auth_details.api_id, self._auth_details.api_secret_key
         )

uncountable/core/types.py

@@ -13,4 +13,5 @@ class AuthDetailsOAuth:
     scope: str = "unc.rnd"
 
 
-AuthDetails = AuthDetailsApiKey | AuthDetailsOAuth
+AuthDetails = AuthDetailsApiKey # Legacy Mapping
+AuthDetailsAll = AuthDetailsApiKey | AuthDetailsOAuth