UncountablePythonSDK 0.0.65__py3-none-any.whl → 0.0.66__py3-none-any.whl

{UncountablePythonSDK-0.0.65.dist-info → UncountablePythonSDK-0.0.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.65
+Version: 0.0.66
 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.65.dist-info → UncountablePythonSDK-0.0.66.dist-info}/RECORD

@@ -80,11 +80,12 @@ uncountable/core/environment.py,sha256=4rLWeUIDYB6w1iqrAiSEaD_OqMoo_ed3xcjz5jM4H
 uncountable/core/file_upload.py,sha256=qR7BBBWVxFNrb1_WICreo3dkZygE9lcE1fmZCQrDZU0,3469
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+uncountable/integration/cli.py,sha256=R_z84CejxV8QW8pXQWX1RxVgMiA3Sgt_X-zMFVNtXLw,2856
 uncountable/integration/construct_client.py,sha256=I2XTamht13vs-JYkV4PpNS_Pc4FJm-KVYqNNvxI4qNk,1916
 uncountable/integration/cron.py,sha256=Gwu1Mq4lZZvtvx5tlnWJHnXJp948Xk9CXdS1ULVCVws,1629
 uncountable/integration/entrypoint.py,sha256=wgOXhTzErttRjOzV4rS4psZW5qUKIa5ez89QndQl61k,785
 uncountable/integration/job.py,sha256=UrsZHWXKE2wD5M3lFKJCXvDdWj7QMDtAREKv6RBnT3Q,1548
-uncountable/integration/scan_profiles.py,sha256=3o_h5Ta8ZQEX1epWyXhtyEof0M1b7MobVG7bRKcsFuM,1166
+uncountable/integration/scan_profiles.py,sha256=fHRS9Su6JlYWKBGZkA3KgUSqbT_PrB91Xe2rkdvv1Ew,1396
 uncountable/integration/server.py,sha256=PfIIh0_uzJia1gsHyVDZGQhS3XcjxetXEnl35zX3VaE,4595
 uncountable/integration/telemetry.py,sha256=MwQLmgCoxpmA_UTp3e2ZB37wcDzKM0qzm5MrmaiJWhU,7142
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,7 +107,7 @@ uncountable/types/calculations.py,sha256=FFO_D3BbKoGDZnqWvTKpW4KF359i2vrKjpdFCLY
 uncountable/types/calculations_t.py,sha256=7GTSi2L8NYjzjUJJx3cmtVkK9uD-uhfYvIFK-ffQj-8,556
 uncountable/types/chemical_structure.py,sha256=E-LnikTFDoVQ1b2zKaVUIO_PAKm-7aZZYJi8I8SDSic,302
 uncountable/types/chemical_structure_t.py,sha256=aFsTkkbzy6Gvyde3qrrEYD95gcYhxkgKMiDRaRE0o-Y,760
-uncountable/types/client_base.py,sha256=my-n1qrfXM6TwIYw0hzp-2W-rH8FVFg1657DeYLreGU,66315
+uncountable/types/client_base.py,sha256=hjKTulIhW_zgRHxQz84JfUyEqIpV8sH3AB1TfWhlizU,66363
 uncountable/types/client_config.py,sha256=4h5Liko9uKCo9_0gdbPhoK6Jr2Kv7tioLiQ8iKeq-_4,301
 uncountable/types/client_config_t.py,sha256=_HdS37gMSTIiD4qLnW9dIgt8_Rt5A6xhwMGGga7vnLg,625
 uncountable/types/curves.py,sha256=W6uMpG5SyW1MS82szNpxkFEn1MnxNpBFyFbQb2Ysfng,366
@@ -200,7 +201,7 @@ uncountable/types/api/inputs/get_input_data.py,sha256=HpSNow6fzyzru83rf45OacNimH
 uncountable/types/api/inputs/get_input_names.py,sha256=m7drfXhYwNnLKIOMTOGHehDQIZGGFmiwXcobyvIAOv8,1171
 uncountable/types/api/inputs/get_inputs_data.py,sha256=hXu7AVHaMpdoOhAfKcoUZqhix1nAOzmKG6qdWAUAprE,1875
 uncountable/types/api/inputs/set_input_attribute_values.py,sha256=J-vi3lc_aPyNSRJLg1iXjwpv_aY1J10NcpCWjzzTpQA,1347
-uncountable/types/api/inputs/set_input_category.py,sha256=V6QVFBJaeOyULj4a2rA6Hs7BEPvPnFk6CIzJmiywFh0,955
+uncountable/types/api/inputs/set_input_category.py,sha256=PLV6yLgdRxiO4oSMHGUTbS7amjPztNkEt5VA7uHrMNo,972
 uncountable/types/api/inputs/set_input_subcategories.py,sha256=wZ6ogTtBRQlJV5619jxW5fGiF4WbHC7x3CwzdcxvQYQ,979
 uncountable/types/api/inputs/set_intermediate_type.py,sha256=KZXfkcb7zEZ1wuoNb0RbD2AzirPujnGQbwcABX66juY,1109
 uncountable/types/api/material_families/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
@@ -248,7 +249,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=_Rpha9nxXI3Xr17CrGDtofg4HZ81x2lt0rMZ6As0qfE,893
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=Rc77y5q-3R9-SNQgm8P35zKaW2D1Hbtm7PDixnOn1G0,1025
-UncountablePythonSDK-0.0.65.dist-info/METADATA,sha256=5EGLuEpkaopCygq6bepsi86W93jQ6Q2YW_70rip6z-g,1993
-UncountablePythonSDK-0.0.65.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-UncountablePythonSDK-0.0.65.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.65.dist-info/RECORD,,
+UncountablePythonSDK-0.0.66.dist-info/METADATA,sha256=4pvhstadEVQXxm667KfT4PGMceZAQssJtfVplzhTui8,1993
+UncountablePythonSDK-0.0.66.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+UncountablePythonSDK-0.0.66.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.66.dist-info/RECORD,,

uncountable/integration/cli.py

@@ -0,0 +1,74 @@
+import argparse
+
+from opentelemetry.trace import get_current_span
+
+from uncountable.core.async_batch import AsyncBatchProcessor
+from uncountable.integration.construct_client import construct_uncountable_client
+from uncountable.integration.executors.executors import execute_job
+from uncountable.integration.job import CronJobArguments
+from uncountable.integration.scan_profiles import load_profiles
+from uncountable.integration.telemetry import JobLogger, Logger
+from uncountable.types import job_definition_t
+
+
+def main() -> None:
+    logger = Logger(get_current_span())
+
+    profiles = load_profiles()
+
+    parser = argparse.ArgumentParser(
+        description="Process a job with a given command and job ID."
+    )
+
+    parser.add_argument(
+        "command",
+        type=str,
+        choices=["run"],
+        help="The command to execute (e.g., 'run')",
+    )
+
+    parser.add_argument("job_id", type=str, help="The ID of the job to process")
+
+    args = parser.parse_args()
+
+    with logger.push_scope(args.command):
+        if args.command == "run":
+            job_result: job_definition_t.JobResult | None = None
+            for profile in profiles:
+                for job in profile.definition.jobs:
+                    if job.id == args.job_id:
+                        profile_meta = job_definition_t.ProfileMetadata(
+                            name=profile.name,
+                            base_url=profile.definition.base_url,
+                            auth_retrieval=profile.definition.auth_retrieval,
+                            client_options=profile.definition.client_options,
+                        )
+                        job_logger = JobLogger(
+                            base_span=logger.current_span,
+                            profile_metadata=profile_meta,
+                            job_definition=job,
+                        )
+                        client = construct_uncountable_client(
+                            profile_meta=profile_meta, job_logger=job_logger
+                        )
+                        batch_processor = AsyncBatchProcessor(client=client)
+                        job_args = CronJobArguments(
+                            job_definition=job,
+                            profile_metadata=profile_meta,
+                            client=client,
+                            batch_processor=batch_processor,
+                            logger=job_logger,
+                        )
+                        job_result = execute_job(
+                            job_definition=job,
+                            profile_metadata=profile_meta,
+                            args=job_args,
+                        )
+                        break
+            if job_result is None:
+                raise Exception(f"no such job id {args.job_id}")
+        else:
+            parser.print_usage()
+
+
+main()

uncountable/integration/scan_profiles.py

@@ -20,6 +20,7 @@ def load_profiles() -> list[ProfileDetails]:
         entry for entry in resources.files(profiles_module).iterdir() if entry.is_dir()
     ]
     profile_details: list[ProfileDetails] = []
+    seen_job_ids: set[str] = set()
     for profile_file in profiles:
         profile_name = profile_file.name
         try:
@@ -27,6 +28,10 @@ def load_profiles() -> list[ProfileDetails]:
                 package=".".join([profiles_module, profile_name]),
                 resource="profile.yaml",
             )
+            for job in definition.jobs:
+                if job.id in seen_job_ids:
+                    raise Exception(f"multiple jobs with id {job.id}")
+                seen_job_ids.add(job.id)
             profile_details.append(
                 ProfileDetails(name=profile_name, definition=definition)
             )

uncountable/types/api/inputs/set_input_category.py

@@ -26,7 +26,7 @@ ENDPOINT_PATH = "api/external/inputs/external_set_input_category"
 @dataclasses.dataclass(kw_only=True)
 class Arguments:
     input_key: identifier_t.IdentifierKey
-    category_id: int
+    category_id: typing.Optional[int]
     material_family_ids: typing.Optional[list[int]] = None
 
 

uncountable/types/client_base.py

@@ -1193,13 +1193,13 @@ class ClientMethods(ABC):
         self,
         *,
         input_key: identifier_t.IdentifierKey,
-        category_id: int,
+        category_id: typing.Optional[int],
         material_family_ids: typing.Optional[list[int]] = None,
     ) -> set_input_category_t.Data:
         """Sets subcategories for an input
 
         :param input_key: Identifier for the input
-        :param category_id: The subcategory identifiers to set
+        :param category_id: The category identifier to set. Null unsets the current category.
         :param material_family_ids: The material families to perform the update in
         """
         args = set_input_category_t.Arguments(