UncountablePythonSDK 0.0.26__tar.gz → 0.0.28__tar.gz

{uncountablepythonsdk-0.0.26/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.26
+Version: 0.0.28
 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 → uncountablepythonsdk-0.0.28/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.26
+Version: 0.0.28
 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.28/UncountablePythonSDK.egg-info/requires.txt

@@ -0,0 +1,16 @@
+aiotus==0.*
+aiohttp==3.*
+requests==2.*
+SQLAlchemy==1.4.*
+APScheduler==3.*
+python-dateutil==2.*
+shelljob==0.*
+PyYAML==6.*
+
+[test]
+mypy==1.*
+ruff==0.*
+pytest==7.*
+coverage[toml]==6.*
+pytest-cov==4.*
+pytest-xdist==3.*

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/pkgs/type_spec/builder.py

@@ -744,6 +744,8 @@ class SpecEndpoint:
     result_type: ResultType = ResultType.json
     has_attachment: bool = False
     desc: str | None = None
+    account_type: str | None
+    route_group: str | None
 
     is_external: bool = False
 
@@ -767,6 +769,8 @@ class SpecEndpoint:
                 "deprecated",
                 "result_type",
                 "has_attachment",
+                "account_type",
+                "route_group",
             ],
         )
         self.method = RouteMethod(data["method"])
@@ -787,6 +791,14 @@ class SpecEndpoint:
         assert isinstance(is_sdk, bool)
         self.is_sdk = is_sdk
 
+        route_group = data.get("route_group")
+        assert route_group is None or isinstance(route_group, str)
+        self.route_group = route_group
+
+        account_type = data.get("account_type")
+        assert account_type is None or isinstance(account_type, str)
+        self.account_type = account_type
+
         is_beta = data.get("is_beta", False)
         assert isinstance(is_beta, bool)
         self.is_beta = is_beta

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/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 = []

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/pkgs/type_spec/emit_python.py

@@ -1101,7 +1101,7 @@ def _emit_api_argument_lookup(
     for endpoint_root in builder.api_endpoints:
         routes_output = config.routes_output[endpoint_root]
 
-        imports = []
+        imports = ["import typing", "from dataclasses import dataclass"]
         mappings = []
         for namespace in sorted(
             builder.namespaces.values(),
@@ -1121,7 +1121,28 @@ def _emit_api_argument_lookup(
             import_alias = "_".join(namespace.path[1:])
             api_import = f"{config.types_package}.{'.'.join(namespace.path)}"
             imports.append(f"import {api_import} as {import_alias}")
-            mappings.append(f"{import_alias}.ENDPOINT_PATH: {import_alias}.Arguments")
+
+            route_group = (
+                f'"{endpoint.route_group}"'
+                if endpoint.route_group is not None
+                else "None"
+            )
+            account_type = (
+                f'"{endpoint.account_type}"'
+                if endpoint.account_type is not None
+                else "None"
+            )
+
+            mapping = f"{INDENT}ApiEndpointKey(route={import_alias}.ENDPOINT_PATH, method={import_alias}.ENDPOINT_METHOD): ApiEndpointSpec(\n"
+            mapping += f"{INDENT}{INDENT}arguments_type={import_alias}.Arguments,\n"
+            mapping += f"{INDENT}{INDENT}data_type={import_alias}.Data,\n"
+            mapping += f"{INDENT}{INDENT}route_group={route_group},\n"
+            mapping += f"{INDENT}{INDENT}account_type={account_type},\n"
+            mapping += f"{INDENT}{INDENT}route={import_alias}.ENDPOINT_PATH,\n"
+            mapping += f'{INDENT}{INDENT}handler="{endpoint.function}",\n'
+            mapping += f"{INDENT}{INDENT}method={import_alias}.ENDPOINT_METHOD,\n"
+            mapping += f"{INDENT})"
+            mappings.append(mapping)
 
         argument_lookup_out = io.StringIO()
         argument_lookup_out.write(MODIFY_NOTICE)
@@ -1129,8 +1150,29 @@ def _emit_api_argument_lookup(
         argument_lookup_out.write(
             f"""{LINE_BREAK.join(imports)}
 
-{API_ARGUMENTS_NAME} = {{
-    {f",{LINE_BREAK}{INDENT}".join(mappings)},
+AT = typing.TypeVar("AT")
+DT = typing.TypeVar("DT")
+
+
+@dataclass(kw_only=True, frozen=True)
+class ApiEndpointKey:
+    method: str
+    route: str
+
+
+@dataclass(kw_only=True)
+class ApiEndpointSpec(typing.Generic[AT, DT]):
+    route: str
+    arguments_type: type[AT]
+    data_type: type[DT]
+    route_group: str | None
+    account_type: str | None
+    handler: str
+    method: str
+
+
+{API_ARGUMENTS_NAME}: dict[ApiEndpointKey, ApiEndpointSpec] = {{
+{f",{LINE_BREAK}".join(mappings)},
 }}
 
 __all__ = ["{API_ARGUMENTS_NAME}"]

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/pyproject.toml

@@ -48,14 +48,14 @@ keywords = [ "uncountable", "sdk", "api", "uncountable-sdk" ]
 requires-python = ">=3.11"
 # May be compatible with older versions
 dependencies = [
-    "aiotus == 0.1.15",
-    "aiohttp==3.9.5",
-    "requests == 2.31.0",
-    "SQLAlchemy == 1.4.52",
-    "APScheduler == 3.10.4",
-    "python-dateutil == 2.9.0.post0",
-    "shelljob == 0.6.3",
-    "PyYAML== 6.0.1"
+    "aiotus == 0.*",
+    "aiohttp == 3.*",
+    "requests == 2.*",
+    "SQLAlchemy == 1.4.*",
+    "APScheduler == 3.*",
+    "python-dateutil == 2.*",
+    "shelljob == 0.*",
+    "PyYAML == 6.*"
 ]
 dynamic = ["version"]
 
@@ -64,13 +64,13 @@ dynamic = ["version"]
 # latest ones that support Python 3.7.
 test = [
     # Linting
-    "mypy >= 1.8.1",
-    "ruff >= 0.2.1",
+    "mypy == 1.*",
+    "ruff == 0.*",
     # Testing
-    "pytest >= 7.4.3",
-    "coverage[toml] >= 6.5.0",
-    "pytest-cov >= 4.1.0",
-    "pytest-xdist >= 3.5.0",
+    "pytest == 7.*",
+    "coverage[toml] == 6.*",
+    "pytest-cov == 4.*",
+    "pytest-xdist == 3.*",
 ]
 
 [project.urls]

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/type_spec/external/api/outputs/get_output_data.yaml

@@ -27,7 +27,7 @@ OutputAttrVal:
         attribute_id:
             type: ObjectId
             desc: "The unique integer ID for the output attribute value. Used for joining and identification elsewhere."
-        quantity_dec:
+        quantity_dec?:
             type: Decimal
             desc: "The value for the attribute, if it is of numeric type"
         quantity_json:

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/type_spec/external/api/recipes/get_recipes_data.yaml

@@ -98,7 +98,7 @@ RecipeInput:
         curve_id:
             type: Optional<ObjectId>
             desc: "The id of the curve associated with the input if the input is of curve type."
-        actual_quantity_dec:
+        actual_quantity_dec?:
             type: Decimal
             desc: "The actual quantity of the input if it is numeric or recipe type. If this is filled in, actual_quantity_json will not be filled in"
         actual_quantity_json:

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/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
@@ -189,8 +189,8 @@ class Client(ClientMethods):
         try:
             data = response_data["data"]
             return cached_parser.parse_api(data)
-        except ValueError | JSONDecodeError | KeyError:
-            raise SDKError("unable to process response")
+        except (ValueError, JSONDecodeError, KeyError) as e:
+            raise SDKError("unable to process response") from e
 
     def _get_cached_parser(self, data_type: type[DT]) -> CachedParser[DT]:
         if data_type not in self._parser_map:

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/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
         )

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/uncountable/core/types.py

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

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/uncountable/types/api/outputs/get_output_data.py

@@ -44,8 +44,8 @@ class Arguments:
 @dataclass(kw_only=True)
 class OutputAttrVal:
     attribute_id: base_t.ObjectId
-    quantity_dec: Decimal
     quantity_json: base_t.JsonValue
+    quantity_dec: typing.Optional[Decimal] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.26 → uncountablepythonsdk-0.0.28}/uncountable/types/api/recipes/get_recipes_data.py

@@ -97,10 +97,10 @@ class RecipeInput:
     quantity_dec: Decimal
     quantity_json: base_t.JsonValue
     curve_id: typing.Optional[base_t.ObjectId]
-    actual_quantity_dec: Decimal
     actual_quantity_json: base_t.JsonValue
     input_type: str
     behavior: str
+    actual_quantity_dec: typing.Optional[Decimal] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.26/UncountablePythonSDK.egg-info/requires.txt

@@ -1,16 +0,0 @@
-aiotus==0.1.15
-aiohttp==3.9.5
-requests==2.31.0
-SQLAlchemy==1.4.52
-APScheduler==3.10.4
-python-dateutil==2.9.0.post0
-shelljob==0.6.3
-PyYAML==6.0.1
-
-[test]
-mypy>=1.8.1
-ruff>=0.2.1
-pytest>=7.4.3
-coverage[toml]>=6.5.0
-pytest-cov>=4.1.0
-pytest-xdist>=3.5.0