UncountablePythonSDK 0.0.27__tar.gz → 0.0.29__tar.gz

{uncountablepythonsdk-0.0.27/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.27
+Version: 0.0.29
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.27 → uncountablepythonsdk-0.0.29/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.27
+Version: 0.0.29
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.27 → uncountablepythonsdk-0.0.29}/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.27 → uncountablepythonsdk-0.0.29}/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.27 → uncountablepythonsdk-0.0.29}/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.27 → uncountablepythonsdk-0.0.29}/type_spec/external/api/recipes/get_recipes_data.yaml

@@ -33,17 +33,17 @@ RecipeOutput:
         replicate_num:
             type: Integer
             desc: "The replicate number (1-indexed) of the output in question within the recipe. (Output, Output condition, Replicate_Num) form a unique index"
-        quantity_dec:
+        quantity_dec?:
             type: Decimal
             desc: "The quantity of the output, if numeric or ordinal"
         quantity_json:
             type: JsonValue
             desc: "The quantity of the output, if not numeric"
         curve_id:
-            type: ObjectId
+            type: Optional<ObjectId>
             desc: "The id of the curve associated with the output if the output is of curve type."
         output_condition_id:
-            type: ObjectId
+            type: Optional<ObjectId>
             desc: "A reference to the condition ID for the output (null if there are no conditions). Used to encode complicated test settings such as test standard, aging time, etc."
 
 ConditionParameterValue:
@@ -56,7 +56,7 @@ ConditionParameterValue:
         condition_parameter_name:
             type: String
             desc: "The name of the condition parameter"
-        quantity_dec:
+        quantity_dec?:
             type: Decimal
             desc: "The quantity associated with the parameter if the parameter is of numeric type. If this is filled in, quantity_json will be null"
         quantity_json:
@@ -89,7 +89,7 @@ RecipeInput:
         recipe_step_id:
             type: ObjectId
             desc: "The unique Recipe Step ID for the input, allowing for placement within the workflow"
-        quantity_dec:
+        quantity_dec?:
             type: Decimal
             desc: "The quantity of the input if it is numeric or recipe type. If this is filled in, quantity_json will not be filled in"
         quantity_json:
@@ -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.27 → uncountablepythonsdk-0.0.29}/uncountable/core/client.py

@@ -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.27 → uncountablepythonsdk-0.0.29}/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.27 → uncountablepythonsdk-0.0.29}/uncountable/types/api/recipes/get_recipes_data.py

@@ -57,10 +57,10 @@ class RecipeOutput:
     id: base_t.ObjectId
     output_id: base_t.ObjectId
     replicate_num: int
-    quantity_dec: Decimal
     quantity_json: base_t.JsonValue
-    curve_id: base_t.ObjectId
-    output_condition_id: base_t.ObjectId
+    curve_id: typing.Optional[base_t.ObjectId]
+    output_condition_id: typing.Optional[base_t.ObjectId]
+    quantity_dec: typing.Optional[Decimal] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -72,8 +72,8 @@ class RecipeOutput:
 class ConditionParameterValue:
     condition_parameter_id: base_t.ObjectId
     condition_parameter_name: str
-    quantity_dec: Decimal
     quantity_json: base_t.JsonValue
+    quantity_dec: typing.Optional[Decimal] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -94,13 +94,13 @@ class RecipeInput:
     input_id: base_t.ObjectId
     input_lot_recipe_id: typing.Optional[base_t.ObjectId]
     recipe_step_id: base_t.ObjectId
-    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
+    quantity_dec: typing.Optional[Decimal] = None
+    actual_quantity_dec: typing.Optional[Decimal] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec