UncountablePythonSDK 0.0.65__tar.gz → 0.0.67__tar.gz

{uncountablepythonsdk-0.0.65/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.67}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.65
+Version: 0.0.67
 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 → uncountablepythonsdk-0.0.67}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ uncountable/core/environment.py
 uncountable/core/file_upload.py
 uncountable/core/types.py
 uncountable/integration/__init__.py
+uncountable/integration/cli.py
 uncountable/integration/construct_client.py
 uncountable/integration/cron.py
 uncountable/integration/entrypoint.py

uncountablepythonsdk-0.0.67/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()

{uncountablepythonsdk-0.0.65 → uncountablepythonsdk-0.0.67}/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)
             )

{uncountablepythonsdk-0.0.65 → uncountablepythonsdk-0.0.67}/uncountable/integration/server.py

@@ -76,6 +76,7 @@ class IntegrationServer:
                         existing_job.modify(
                             name=job_defn.name,
                             kwargs=job_kwargs,
+                            misfire_grace_period=None,
                         )
                         existing_job.reschedule(
                             CronTrigger.from_crontab(job_defn.cron_spec)
@@ -97,6 +98,7 @@ class IntegrationServer:
                             name=job_defn.name,
                             id=job_defn.id,
                             kwargs=job_kwargs,
+                            misfire_grace_period=None,
                             **job_opts,
                         )
                 case WebhookJobDefinition():

{uncountablepythonsdk-0.0.65 → uncountablepythonsdk-0.0.67}/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
 
 

{uncountablepythonsdk-0.0.65 → uncountablepythonsdk-0.0.67}/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(