UncountablePythonSDK 0.0.64__tar.gz → 0.0.66__tar.gz

{uncountablepythonsdk-0.0.64/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.66}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.64
+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.64 → uncountablepythonsdk-0.0.66}/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.66/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.66/uncountable/integration/cron.py

@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+
+from pkgs.argument_parser import CachedParser
+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.telemetry import JobLogger, get_otel_tracer
+from uncountable.types.job_definition_t import JobDefinition, ProfileMetadata
+
+
+@dataclass
+class CronJobArgs:
+    definition: JobDefinition
+    profile_metadata: ProfileMetadata
+
+
+cron_args_parser = CachedParser(CronJobArgs)
+
+
+def cron_job_executor(**kwargs: dict) -> None:
+    args_passed = cron_args_parser.parse_storage(kwargs)
+    with get_otel_tracer().start_as_current_span(name="cron_executor") as span:
+        job_logger = JobLogger(
+            base_span=span,
+            profile_metadata=args_passed.profile_metadata,
+            job_definition=args_passed.definition,
+        )
+        client = construct_uncountable_client(
+            profile_meta=args_passed.profile_metadata, job_logger=job_logger
+        )
+        batch_processor = AsyncBatchProcessor(client=client)
+        args = CronJobArguments(
+            job_definition=args_passed.definition,
+            client=client,
+            batch_processor=batch_processor,
+            profile_metadata=args_passed.profile_metadata,
+            logger=job_logger,
+        )
+
+        execute_job(
+            args=args,
+            profile_metadata=args_passed.profile_metadata,
+            job_definition=args_passed.definition,
+        )

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/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.64 → uncountablepythonsdk-0.0.66}/uncountable/integration/server.py

@@ -8,6 +8,7 @@ from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.triggers.cron import CronTrigger
+from opentelemetry.trace import get_current_span
 from sqlalchemy.engine.base import Engine
 
 from uncountable.integration.cron import CronJobArgs, cron_job_executor
@@ -37,7 +38,7 @@ class IntegrationServer:
             jobstores={"default": SQLAlchemyJobStore(engine=engine)},
             executors={"default": ThreadPoolExecutor(_MAX_APSCHEDULER_CONCURRENT_JOBS)},
         )
-        self._server_logger = Logger()
+        self._server_logger = Logger(get_current_span())
 
     def register_profile(
         self,

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/uncountable/integration/telemetry.py

@@ -74,18 +74,17 @@ class LogSeverity(StrEnum):
 
 
 class Logger:
-    current_span: Span | None = None
+    current_span: Span
+
+    def __init__(self, base_span: Span) -> None:
+        self.current_span = base_span
 
     @property
-    def current_span_id(self) -> int | None:
-        if self.current_span is None:
-            return None
+    def current_span_id(self) -> int:
         return self.current_span.get_span_context().span_id
 
     @property
     def current_trace_id(self) -> int | None:
-        if self.current_span is None:
-            return None
         return self.current_span.get_span_context().trace_id
 
     def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
@@ -134,10 +133,9 @@ class Logger:
     ) -> None:
         traceback_str = "".join(traceback.format_tb(exception.__traceback__))
         patched_attributes = self._patch_attributes(attributes)
-        if self.current_span is not None:
-            self.current_span.record_exception(
-                exception=exception, attributes=patched_attributes
-            )
+        self.current_span.record_exception(
+            exception=exception, attributes=patched_attributes
+        )
         self.log_error(
             message=f"error: {message}\nexception: {exception}{traceback_str}",
             attributes=patched_attributes,
@@ -149,8 +147,7 @@ class Logger:
     ) -> Generator[typing.Self, None, None]:
         with get_otel_tracer().start_as_current_span(
             scope_name, attributes=self._patch_attributes(attributes)
-        ) as span:
-            self.current_span = span
+        ):
             yield self
 
 
@@ -158,11 +155,13 @@ class JobLogger(Logger):
     def __init__(
         self,
         *,
+        base_span: Span,
         profile_metadata: job_definition_t.ProfileMetadata,
         job_definition: job_definition_t.JobDefinition,
     ) -> None:
         self.profile_metadata = profile_metadata
         self.job_definition = job_definition
+        super().__init__(base_span)
 
     def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
         patched_attributes: dict[str, base_t.JsonValue] = {

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/uncountable/integration/webhook_server/entrypoint.py

@@ -5,6 +5,7 @@ import flask
 import simplejson
 from flask.typing import ResponseReturnValue
 from flask.wrappers import Response
+from opentelemetry.trace import get_current_span
 from uncountable.core.async_batch import AsyncBatchProcessor
 from uncountable.core.environment import get_integration_env, get_webhook_server_port
 from uncountable.integration.construct_client import construct_uncountable_client
@@ -12,7 +13,7 @@ from uncountable.integration.executors.executors import execute_job
 from uncountable.integration.job import WebhookJobArguments
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.secret_retrieval.retrieve_secret import retrieve_secret
-from uncountable.integration.telemetry import JobLogger, Logger
+from uncountable.integration.telemetry import JobLogger, Logger, get_otel_tracer
 from uncountable.types import job_definition_t, webhook_job_t
 
 from pkgs.argument_parser import CachedParser
@@ -109,26 +110,31 @@ def register_route(
                     passed_signature=passed_signature,
                 )
 
-                job_logger = JobLogger(
-                    profile_metadata=profile_metadata, job_definition=job
-                )
-                client = construct_uncountable_client(
-                    profile_meta=profile_meta, job_logger=job_logger
-                )
-                execute_job(
-                    job_definition=job,
-                    profile_metadata=profile_meta,
-                    args=WebhookJobArguments(
-                        job_definition=job,
+                with get_otel_tracer().start_as_current_span(
+                    "webhook_executor"
+                ) as span:
+                    job_logger = JobLogger(
                         profile_metadata=profile_metadata,
-                        client=client,
-                        batch_processor=AsyncBatchProcessor(client=client),
-                        logger=job_logger,
-                        payload=webhook_payload,
-                    ),
-                )
-
-                return flask.jsonify(WebhookResponse())
+                        job_definition=job,
+                        base_span=span,
+                    )
+                    client = construct_uncountable_client(
+                        profile_meta=profile_meta, job_logger=job_logger
+                    )
+                    execute_job(
+                        job_definition=job,
+                        profile_metadata=profile_meta,
+                        args=WebhookJobArguments(
+                            job_definition=job,
+                            profile_metadata=profile_metadata,
+                            client=client,
+                            batch_processor=AsyncBatchProcessor(client=client),
+                            logger=job_logger,
+                            payload=webhook_payload,
+                        ),
+                    )
+
+                    return flask.jsonify(WebhookResponse())
             except WebhookException as e:
                 server_logger.log_exception(e)
                 return e.make_error_response()
@@ -141,7 +147,7 @@ def register_route(
 
 profiles = load_profiles()
 for profile in profiles:
-    server_logger = Logger()
+    server_logger = Logger(get_current_span())
     profile_metadata = job_definition_t.ProfileMetadata(
         name=profile.name,
         auth_retrieval=profile.definition.auth_retrieval,

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/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.64 → uncountablepythonsdk-0.0.66}/uncountable/types/api/recipes/edit_recipe_inputs.py

@@ -12,6 +12,7 @@ import dataclasses
 from pkgs.serialization import serial_class
 from pkgs.serialization import serial_union_annotation
 from ... import identifier_t
+from ... import inputs_t
 from ... import recipe_inputs_t
 from ... import recipe_workflow_steps_t
 
@@ -29,6 +30,7 @@ __all__: list[str] = [
     "RecipeInputEditClearInputs",
     "RecipeInputEditInputBase",
     "RecipeInputEditSetLot",
+    "RecipeInputEditSetRole",
     "RecipeInputEditType",
     "RecipeInputEditUpdateAnnotations",
     "RecipeInputEditUpsertInput",
@@ -47,6 +49,7 @@ class RecipeInputEditType(StrEnum):
     SET_LOT = "set_lot"
     CHANGE_BASIS = "change_basis"
     ADD_INSTRUCTIONS = "add_instructions"
+    SET_ROLE = "set_role"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -75,6 +78,7 @@ class RecipeInputEditInputBase(RecipeInputEditBase):
     input_value_type: recipe_inputs_t.InputValueType = recipe_inputs_t.InputValueType.VALUE
     value_numeric: typing.Optional[Decimal] = None
     value_str: typing.Optional[str] = None
+    behavior: typing.Optional[inputs_t.IngredientBehavior] = None
     calculation_key: typing.Optional[identifier_t.IdentifierKey] = None
 
 
@@ -145,14 +149,24 @@ class AnnotationEdit:
 @dataclasses.dataclass(kw_only=True)
 class RecipeInputEditUpdateAnnotations(RecipeInputEditInputBase):
     type: typing.Literal[RecipeInputEditType.UPDATE_ANNOTATIONS] = RecipeInputEditType.UPDATE_ANNOTATIONS
-    ingredient_key: identifier_t.IdentifierKey
     clear_first: bool
     annotations: list[AnnotationEdit]
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class RecipeInputEditSetRole(RecipeInputEditBase):
+    type: typing.Literal[RecipeInputEditType.SET_ROLE] = RecipeInputEditType.SET_ROLE
+    ingredient_key: identifier_t.IdentifierKey
+    ingredient_role_key: typing.Optional[identifier_t.IdentifierKey]
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 RecipeInputEdit = typing.Annotated[
-    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations, RecipeInputEditSetLot, RecipeInputEditChangeBasisViewed, RecipeInputEditAddInstructions],
+    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations, RecipeInputEditSetLot, RecipeInputEditChangeBasisViewed, RecipeInputEditAddInstructions, RecipeInputEditSetRole],
     serial_union_annotation(
         discriminator="type",
         discriminator_map={
@@ -163,6 +177,7 @@ RecipeInputEdit = typing.Annotated[
             "set_lot": RecipeInputEditSetLot,
             "change_basis": RecipeInputEditChangeBasisViewed,
             "add_instructions": RecipeInputEditAddInstructions,
+            "set_role": RecipeInputEditSetRole,
         },
     ),
 ]

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/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(

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/uncountable/types/inputs.py

@@ -6,5 +6,6 @@
 # Kept only for SDK backwards compatibility
 from .inputs_t import IngredientQuantityType as IngredientQuantityType
 from .inputs_t import IngredientType as IngredientType
+from .inputs_t import IngredientBehavior as IngredientBehavior
 from .inputs_t import SimpleInput as SimpleInput
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.64 → uncountablepythonsdk-0.0.66}/uncountable/types/inputs_t.py

@@ -13,6 +13,7 @@ from pkgs.serialization import serial_string_enum
 from . import base_t
 
 __all__: list[str] = [
+    "IngredientBehavior",
     "IngredientQuantityType",
     "IngredientType",
     "SimpleInput",
@@ -50,6 +51,22 @@ class IngredientType(StrEnum):
     EQUIPMENT = "equipment"
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_string_enum(
+    labels={
+        "included": "Included",
+        "use_quantity": "Use Quantity",
+        "not_included": "Not Included",
+        "autofill": "Autofill",
+    },
+)
+class IngredientBehavior(StrEnum):
+    INCLUDED = "included"
+    USE_QUANTITY = "use_quantity"
+    NOT_INCLUDED = "not_included"
+    AUTOFILL = "autofill"
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @dataclasses.dataclass(kw_only=True)
 class SimpleInput:

uncountablepythonsdk-0.0.64/uncountable/integration/cron.py

@@ -1,43 +0,0 @@
-from dataclasses import dataclass
-
-from pkgs.argument_parser import CachedParser
-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.telemetry import JobLogger
-from uncountable.types.job_definition_t import JobDefinition, ProfileMetadata
-
-
-@dataclass
-class CronJobArgs:
-    definition: JobDefinition
-    profile_metadata: ProfileMetadata
-
-
-cron_args_parser = CachedParser(CronJobArgs)
-
-
-def cron_job_executor(**kwargs: dict) -> None:
-    args_passed = cron_args_parser.parse_storage(kwargs)
-    job_logger = JobLogger(
-        profile_metadata=args_passed.profile_metadata,
-        job_definition=args_passed.definition,
-    )
-    client = construct_uncountable_client(
-        profile_meta=args_passed.profile_metadata, job_logger=job_logger
-    )
-    batch_processor = AsyncBatchProcessor(client=client)
-    args = CronJobArguments(
-        job_definition=args_passed.definition,
-        client=client,
-        batch_processor=batch_processor,
-        profile_metadata=args_passed.profile_metadata,
-        logger=job_logger,
-    )
-
-    execute_job(
-        args=args,
-        profile_metadata=args_passed.profile_metadata,
-        job_definition=args_passed.definition,
-    )