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

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

@@ -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.dist-info → UncountablePythonSDK-0.0.29.dist-info}/RECORD

@@ -35,12 +35,12 @@ pkgs/strenum_compat/__init__.py,sha256=wXRFeNvBm8RU6dy1PFJ5sRLgUIEeH_DVR95Sv5qpG
 pkgs/strenum_compat/strenum_compat.py,sha256=uOUAgpYTjHs1MX8dG81jRlyTkt3KNbkV_25zp7xTX2s,36
 pkgs/type_spec/__init__.py,sha256=h5DmJTca4QVV10sZR1x0-MlkZfuGYDfapR3zHvXfzto,19
 pkgs/type_spec/__main__.py,sha256=5bJaX9Y_-FavP0qwzhk-z-V97UY7uaezJTa1zhO_HHQ,1048
-pkgs/type_spec/builder.py,sha256=S7lZCbGbeQ9cUQHnhY9vvpgFUQj8DjsOaNBVqRUff6Y,43253
+pkgs/type_spec/builder.py,sha256=1C_ELB7KfK118QxZDLLc_Uf_nh5TAg96ilpOCfEQuN4,43685
 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=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_python.py,sha256=1Ei2PaqRs1qeQj5LWYfcRUHyzEoMI3DhDzomXmhX_-A,44139
 pkgs/type_spec/emit_typescript.py,sha256=4hpCJwiDf-v8LJaNFVfFtf8zvtG73YNPFwwa_5NuffI,17729
 pkgs/type_spec/emit_typescript_util.py,sha256=93FzJnpYse4PKFzgdw4DGV4zFTi5tF4WR-CIi7cW498,873
 pkgs/type_spec/load_types.py,sha256=xEHwdB_miR3vNs161Oy1luafE0VC-yk9-utAyCJmbEo,3629
@@ -83,7 +83,7 @@ type_spec/external/api/inputs/set_input_attribute_values.yaml,sha256=RpOtVIWBlOp
 type_spec/external/api/inputs/set_input_category.yaml,sha256=2zcDYw_WzBfzFNkhfDDer45MgRxGnzOBLFicDWrvN80,676
 type_spec/external/api/inputs/set_input_subcategories.yaml,sha256=xbydzqVHIktslueosU3dJxdAu4a8uc5jQc5Cccdw7i8,682
 type_spec/external/api/material_families/update_entity_material_families.yaml,sha256=2WjU7XycTHEaZ2YA_FhwzndVN-PqWsyPCJhBE1WRKvQ,1231
-type_spec/external/api/outputs/get_output_data.yaml,sha256=N884q2C1xLQfFxsmjKr8MJ23IU4q2ORCVJh5y5h6ePE,3555
+type_spec/external/api/outputs/get_output_data.yaml,sha256=D-xr8u1SfYUGtXG1fcAi8V44d5rVg48LtOK5BhCDXr4,3556
 type_spec/external/api/outputs/get_output_names.yaml,sha256=p-3ubOjEFNjV746zpAkXurCu0yVUvonDssJKk48ueVM,1404
 type_spec/external/api/outputs/resolve_output_conditions.yaml,sha256=lGrG6XPGiQtHx24GccPcO18xxAoMynTSC_2WwxCjFrc,1640
 type_spec/external/api/permissions/set_core_permissions.yaml,sha256=SDM_3FE-ur00dv6Na9HlaJBIvSPgnfqRieGDKnBR1UY,1632
@@ -103,7 +103,7 @@ type_spec/external/api/recipes/get_recipe_calculations.yaml,sha256=ZE7PzfWrjS7Ti
 type_spec/external/api/recipes/get_recipe_links.yaml,sha256=Vwm0OVWl3VvDaI7chY_oZQqD8xZ1u09iFWKkZKn1ITo,766
 type_spec/external/api/recipes/get_recipe_names.yaml,sha256=4tqcVj-xLeEu0lhdm8NpLYmAvfkmq08GZ0Mr59I5nLI,896
 type_spec/external/api/recipes/get_recipe_output_metadata.yaml,sha256=YImW94JXVKR6Wz_7R7sRbhD9Ul51Ba-j-x9vJB__AAU,1216
-type_spec/external/api/recipes/get_recipes_data.yaml,sha256=NQTI4k7IgtXMfcOxcKjPzrvHGkPGuiLQj7GZuHqumUI,11608
+type_spec/external/api/recipes/get_recipes_data.yaml,sha256=F1CkFOtQroweYvURkw4wJx0X3UvSl3mmz87r-MIxfto,11632
 type_spec/external/api/recipes/set_recipe_inputs.yaml,sha256=MvnHuzI9JKfkYZb-pC4jeE7FRpGeacJKXd5_GImsDiY,1747
 type_spec/external/api/recipes/set_recipe_metadata.yaml,sha256=5N9AIY9x3pZhDXyzpM__e7pyKNTI2RS7OeBmwmj5nEs,585
 type_spec/external/api/recipes/set_recipe_outputs.yaml,sha256=Oe8XGYXbPNmrbEDXk3qucfS1L3P9TnXI5cxaNAl6x5A,1875
@@ -114,7 +114,7 @@ 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=1a8vstovmqsRvrE4YsKCoZAKDNWXMECnR-BlKEWsxoY,9033
+uncountable/core/client.py,sha256=J_J9zEfSpWRx4RBSl2gIDqtUpC7ca1hpEvbHVfe7_jQ,9045
 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
@@ -193,7 +193,7 @@ uncountable/types/api/inputs/set_input_subcategories.py,sha256=hRS1FcFWPaenO_08I
 uncountable/types/api/material_families/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/material_families/update_entity_material_families.py,sha256=h-vkua57yCNSO6P1akIxmmaFdwzOXPxm2s3Xt6x1c7c,1396
 uncountable/types/api/outputs/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
-uncountable/types/api/outputs/get_output_data.py,sha256=CpYlXNGWWNTiMgDPBRwucSseSrX4gnLuLIp2ljiONrI,2216
+uncountable/types/api/outputs/get_output_data.py,sha256=vlWDHhMUVMoHZSdN778-puOvmu7uGlDE3cQwKfYd1iI,2240
 uncountable/types/api/outputs/get_output_names.py,sha256=Id_ApombSzzFdq5rD4uOfWIKzthic6KBAeyqcrhsx18,1086
 uncountable/types/api/outputs/resolve_output_conditions.py,sha256=XZqUseXcGhApHmPm-2u7a37Y4blLRxoPoLhvYlBfCpI,1799
 uncountable/types/api/permissions/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
@@ -218,7 +218,7 @@ uncountable/types/api/recipes/get_recipe_calculations.py,sha256=eQmkdZzCEuq8S2f_
 uncountable/types/api/recipes/get_recipe_links.py,sha256=hk5dfQjv7yU2r-S9b8vwWEJLPHqU0-M6SFiTLMR3fVk,985
 uncountable/types/api/recipes/get_recipe_names.py,sha256=uCpXZq5oWjr9a_Vf-yYPaVS72XOlLHgAlju6KHeQ3UA,986
 uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=L9s2ykPP4pd02Pc98LDisY8bgV8CToS6t6fXKTWqGRw,1464
-uncountable/types/api/recipes/get_recipes_data.py,sha256=wAmS28Nmc_tlP72XgrFMaj1y_yhvfgYbGw55wwERG_w,5388
+uncountable/types/api/recipes/get_recipes_data.py,sha256=TbJo4pkp5ePgbeH1oldThpq9jWLDYRUbrYMAv8T_LsI,5518
 uncountable/types/api/recipes/set_recipe_inputs.py,sha256=lFVfv-o_O5wHuMZdH63qlG4exFTlJM078oSAtb3XNxA,1426
 uncountable/types/api/recipes/set_recipe_metadata.py,sha256=Ba6ttd1JuS_Ypt-KpckSviWtOcQ-OTdTEJiaSYyoQL8,933
 uncountable/types/api/recipes/set_recipe_outputs.py,sha256=QYq39TNchQ80ET1C77OE9fwhbu_HmIoEDmrQJHkkCu0,1609
@@ -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.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,,
+UncountablePythonSDK-0.0.29.dist-info/METADATA,sha256=AeSTcRIslBwKBr4qNGQlB55U9idSy18wek0K02w1Rvg,1577
+UncountablePythonSDK-0.0.29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+UncountablePythonSDK-0.0.29.dist-info/top_level.txt,sha256=HaMiBnH1wA7SG9-RVHIJPBH3l8X5gee2jUf-77Nz-Dk,41
+UncountablePythonSDK-0.0.29.dist-info/RECORD,,

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

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}"]

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:

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:

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:

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

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