UncountablePythonSDK 0.0.127__py3-none-any.whl → 0.0.129__py3-none-any.whl

uncountable/integration/queue_runner/command_server/command_server.py

@@ -1,8 +1,9 @@
 import asyncio
 
+import grpc.aio as grpc_aio
 import simplejson as json
 from google.protobuf.timestamp_pb2 import Timestamp
-from grpc import StatusCode, aio
+from grpc import StatusCode
 
 from pkgs.argument_parser import CachedParser
 from uncountable.core.environment import get_local_admin_server_port
@@ -40,11 +41,11 @@ queued_job_payload_parser = CachedParser(queued_job_t.QueuedJobPayload)
 
 
 async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None:
-    server = aio.server()
+    server = grpc_aio.server()
 
     class CommandServerHandler(CommandServerServicer):
         async def EnqueueJob(
-            self, request: EnqueueJobRequest, context: aio.ServicerContext
+            self, request: EnqueueJobRequest, context: grpc_aio.ServicerContext
         ) -> EnqueueJobResult:
             payload_json = json.loads(request.serialized_payload)
             payload = queued_job_payload_parser.parse_api(payload_json)
@@ -63,7 +64,7 @@ async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None
             return result
 
         async def RetryJob(
-            self, request: RetryJobRequest, context: aio.ServicerContext
+            self, request: RetryJobRequest, context: grpc_aio.ServicerContext
         ) -> RetryJobResult:
             response_queue: asyncio.Queue[CommandRetryJobResponse] = asyncio.Queue()
             await command_queue.put(
@@ -80,12 +81,12 @@ async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None
                 return RetryJobResult(successfully_queued=False, queued_job_uuid="")
 
         async def CheckHealth(
-            self, request: CheckHealthRequest, context: aio.ServicerContext
+            self, request: CheckHealthRequest, context: grpc_aio.ServicerContext
         ) -> CheckHealthResult:
             return CheckHealthResult(success=True)
 
         async def ListQueuedJobs(
-            self, request: ListQueuedJobsRequest, context: aio.ServicerContext
+            self, request: ListQueuedJobsRequest, context: grpc_aio.ServicerContext
         ) -> ListQueuedJobsResult:
             if (
                 request.limit < ListQueuedJobsConstants.LIMIT_MIN
@@ -121,7 +122,7 @@ async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None
             return ListQueuedJobsResult(queued_jobs=response_list)
 
         async def VaccuumQueuedJobs(
-            self, request: VaccuumQueuedJobsRequest, context: aio.ServicerContext
+            self, request: VaccuumQueuedJobsRequest, context: grpc_aio.ServicerContext
         ) -> VaccuumQueuedJobsResult:
             response_queue: asyncio.Queue[CommandVaccuumQueuedJobsResponse] = (
                 asyncio.Queue()

uncountable/integration/telemetry.py

@@ -12,7 +12,10 @@ from opentelemetry import _logs, trace
 from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.sdk._logs import Logger as OTELLogger
-from opentelemetry.sdk._logs import LoggerProvider, LogRecord
+from opentelemetry.sdk._logs import (
+    LoggerProvider,
+    LogRecord,
+)
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, ConsoleLogExporter
 from opentelemetry.sdk.resources import Attributes, Resource
 from opentelemetry.sdk.trace import TracerProvider
@@ -95,8 +98,27 @@ class Logger:
     def current_trace_id(self) -> int | None:
         return self.current_span.get_span_context().trace_id
 
-    def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
-        return attributes or {}
+    def _patch_attributes(
+        self,
+        attributes: Attributes | None,
+        *,
+        message: str | None = None,
+        severity: LogSeverity | None = None,
+    ) -> Attributes:
+        patched_attributes = {**(attributes if attributes is not None else {})}
+        if message is not None:
+            patched_attributes["message"] = message
+        elif "body" in patched_attributes:
+            patched_attributes["message"] = patched_attributes["body"]
+
+        if severity is not None:
+            patched_attributes["status"] = severity.lower()
+        elif "severity_text" in patched_attributes and isinstance(
+            patched_attributes["severity_text"], str
+        ):
+            patched_attributes["status"] = patched_attributes["severity_text"].lower()
+
+        return patched_attributes
 
     def _emit_log(
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
@@ -106,7 +128,9 @@ class Logger:
             body=message,
             severity_text=severity,
             timestamp=time.time_ns(),
-            attributes=self._patch_attributes(attributes),
+            attributes=self._patch_attributes(
+                message=message, severity=severity, attributes=attributes
+            ),
             span_id=self.current_span_id,
             trace_id=self.current_trace_id,
             trace_flags=DEFAULT_TRACE_OPTIONS,
@@ -140,7 +164,9 @@ class Logger:
         attributes: Attributes | None = None,
     ) -> None:
         traceback_str = "".join(traceback.format_exception(exception))
-        patched_attributes = self._patch_attributes(attributes)
+        patched_attributes = self._patch_attributes(
+            message=message, severity=LogSeverity.ERROR, attributes=attributes
+        )
         self.current_span.record_exception(
             exception=exception, attributes=patched_attributes
         )
@@ -171,9 +197,17 @@ class JobLogger(Logger):
         self.job_definition = job_definition
         super().__init__(base_span)
 
-    def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
+    def _patch_attributes(
+        self,
+        attributes: Attributes | None,
+        *,
+        message: str | None = None,
+        severity: LogSeverity | None = None,
+    ) -> Attributes:
         patched_attributes: dict[str, base_t.JsonValue] = {
-            **(attributes if attributes is not None else {})
+            **super()._patch_attributes(
+                attributes=attributes, message=message, severity=severity
+            )
         }
         patched_attributes["profile.name"] = self.profile_metadata.name
         patched_attributes["profile.base_url"] = self.profile_metadata.base_url

uncountable/integration/webhook_server/entrypoint.py

@@ -73,6 +73,8 @@ def register_route(
 
 
 def main() -> None:
+    app.add_url_rule("/health", "health", lambda: ("OK", 200))
+
     profiles = load_profiles()
     for profile_metadata in profiles:
         server_logger = Logger(get_current_span())

uncountable/types/__init__.py

@@ -70,6 +70,7 @@ from . import integration_session_t as integration_session_t
 from . import integrations_t as integrations_t
 from .api.uploader import invoke_uploader as invoke_uploader_t
 from . import job_definition_t as job_definition_t
+from .api.entity import list_aggregate as list_aggregate_t
 from .api.entity import list_entities as list_entities_t
 from .api.id_source import list_id_source as list_id_source_t
 from .api.entity import lock_entity as lock_entity_t
@@ -199,6 +200,7 @@ __all__: list[str] = [
     "integrations_t",
     "invoke_uploader_t",
     "job_definition_t",
+    "list_aggregate_t",
     "list_entities_t",
     "list_id_source_t",
     "lock_entity_t",

uncountable/types/api/entity/list_aggregate.py

@@ -0,0 +1,79 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+import dataclasses
+from pkgs.serialization import serial_class
+from ... import base_t
+
+__all__: list[str] = [
+    "Arguments",
+    "AttributeValue",
+    "ColumnAccess",
+    "ColumnResults",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+]
+
+ENDPOINT_METHOD = "GET"
+ENDPOINT_PATH = "api/external/entity/list_aggregate"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_aggregate.AttributeValue",
+    unconverted_values={"value"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class AttributeValue:
+    name: str
+    value: base_t.JsonValue
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_aggregate.Arguments",
+    unconverted_values={"attribute_values"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class Arguments:
+    config_reference: str
+    attribute_values: list[AttributeValue] | None = None
+    offset: int | None = None
+    limit: int | None = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_aggregate.ColumnResults",
+    unconverted_values={"column_values"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ColumnResults:
+    column_values: list[base_t.JsonValue]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_aggregate.ColumnAccess",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ColumnAccess:
+    name: str
+    table_label: str | None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_aggregate.Data",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class Data:
+    columns: list[ColumnAccess]
+    results: list[ColumnResults]
+# DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/entity/list_entities.py

@@ -11,9 +11,12 @@ from pkgs.serialization import serial_class
 from pkgs.serialization import OpaqueKey
 from ... import base_t
 from ... import entity_t
+from ... import identifier_t
 
 __all__: list[str] = [
+    "AdditionalFilterConfig",
     "Arguments",
+    "AttributeValue",
     "ColumnAccess",
     "Data",
     "ENDPOINT_METHOD",
@@ -25,6 +28,27 @@ ENDPOINT_METHOD = "GET"
 ENDPOINT_PATH = "api/external/entity/external_list_entities"
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_entities.AttributeValue",
+    unconverted_values={"value"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class AttributeValue:
+    name: str
+    value: base_t.JsonValue
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.list_entities.AdditionalFilterConfig",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class AdditionalFilterConfig:
+    config_key: identifier_t.IdentifierKey
+    attribute_values: list[AttributeValue] | None = None
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.api.entity.list_entities.Arguments",
@@ -37,6 +61,7 @@ class Arguments:
     attributes: dict[OpaqueKey, base_t.JsonValue] | None = None
     offset: int | None = None
     limit: int | None = None
+    additional_filter_configs: list[AdditionalFilterConfig] | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/api/recipes/get_recipes_data.py

@@ -26,6 +26,7 @@ __all__: list[str] = [
     "ENDPOINT_PATH",
     "Recipe",
     "RecipeInput",
+    "RecipeLockStatus",
     "RecipeOutput",
     "RecipeOutputInclusion",
     "RecipeStep",
@@ -154,6 +155,7 @@ class RecipeStepGroup:
 )
 @dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
 class RecipeWorkflowStep:
+    recipe_workflow_step_name: str | None
     recipe_workflow_step_id: base_t.ObjectId
     workflow_step_id: base_t.ObjectId
     recipe_step_groups: list[RecipeStepGroup]
@@ -174,6 +176,16 @@ class RecipeStepRelationship:
     actual_quantity_dec: Decimal | None = None
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.recipes.get_recipes_data.RecipeLockStatus",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class RecipeLockStatus:
+    has_locked_inputs: bool
+    has_locked_outputs: bool
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.api.recipes.get_recipes_data.Recipe",
@@ -193,6 +205,7 @@ class Recipe:
     tag_ids: list[base_t.ObjectId]
     experiment_group_ids: list[base_t.ObjectId]
     step_relationships: list[RecipeStepRelationship]
+    recipe_lock_status: RecipeLockStatus
     creating_user_id: base_t.ObjectId | None = None
     barcode_value: str | None = None
 

uncountable/types/async_batch_processor.py

@@ -13,6 +13,7 @@ import uncountable.types.api.recipes.associate_recipe_as_lot as associate_recipe
 from uncountable.types import async_batch_t
 from uncountable.types import base_t
 import uncountable.types.api.recipes.clear_recipe_outputs as clear_recipe_outputs_t
+from uncountable.types import client_config_t
 import uncountable.types.api.uploader.complete_async_parse as complete_async_parse_t
 import uncountable.types.api.runsheet.complete_async_upload as complete_async_upload_t
 import uncountable.types.api.recipes.create_mix_order as create_mix_order_t
@@ -57,6 +58,7 @@ class AsyncBatchProcessorBase(ABC):
         equipment_key: identifier_t.IdentifierKey,
         material_family_ids: list[base_t.ObjectId],
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Create or return the input association for equipment
 
@@ -93,6 +95,7 @@ class AsyncBatchProcessorBase(ABC):
         input_key: identifier_t.IdentifierKey | None = None,
         show_in_listings: bool | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Create or return the input association for a recipe
 
@@ -130,6 +133,7 @@ class AsyncBatchProcessorBase(ABC):
         recipe_key: identifier_t.IdentifierKey,
         ingredient_key: identifier_t.IdentifierKey,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Create a new lot association for the provided recipe with the provided ingredient
 
@@ -164,6 +168,7 @@ class AsyncBatchProcessorBase(ABC):
         *,
         recipe_key: identifier_t.IdentifierKey,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Clears all output values & output metadata for a given recipe
 
@@ -198,6 +203,7 @@ class AsyncBatchProcessorBase(ABC):
         async_job_key: identifier_t.IdentifierKey,
         upload_destination: generic_upload_t.UploadDestinationRecipe,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Parses uploaded files asynchronously
 
@@ -232,6 +238,7 @@ class AsyncBatchProcessorBase(ABC):
         async_job_id: base_t.ObjectId,
         file_id: base_t.ObjectId,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Processes an file id with a given async job id to be uploaded asynchronously
 
@@ -265,6 +272,7 @@ class AsyncBatchProcessorBase(ABC):
         recipe_key: identifier_t.IdentifierKey,
         recipe_workflow_step_identifier: recipe_workflow_steps_t.RecipeWorkflowStepIdentifier,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Creates mix order on a recipe workflow step
 
@@ -301,6 +309,7 @@ class AsyncBatchProcessorBase(ABC):
         entity_key: identifier_t.IdentifierKey | None = None,
         on_create_init_field_values: list[field_values_t.FieldArgumentValue] | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Creates or updates field values for an entity
 
@@ -344,6 +353,7 @@ class AsyncBatchProcessorBase(ABC):
         identifiers: recipe_identifiers_t.RecipeIdentifiers | None = None,
         definition_key: identifier_t.IdentifierKey | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Returns the id of the recipe being created.
 
@@ -392,6 +402,7 @@ class AsyncBatchProcessorBase(ABC):
         recipe_workflow_step_identifier: recipe_workflow_steps_t.RecipeWorkflowStepIdentifier,
         edits: list[edit_recipe_inputs_t.RecipeInputEdit],
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Clear, update, or add inputs on a recipe
 
@@ -431,6 +442,7 @@ class AsyncBatchProcessorBase(ABC):
         user_group_keys: list[identifier_t.IdentifierKey] | None = None,
         all_users: bool | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Grant entity permissions to a list of users or user groups or to all users.
 
@@ -470,6 +482,7 @@ class AsyncBatchProcessorBase(ABC):
         file_id: base_t.ObjectId | None = None,
         file_ids: list[base_t.ObjectId] | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Runs a file through an uploader.
 
@@ -509,6 +522,7 @@ class AsyncBatchProcessorBase(ABC):
         lock_samples: bool | None = None,
         comments: str | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Lock experiments. Experiments will require unlocking to be editable. Edits to the experiments are blocked while they are locked.
 
@@ -553,6 +567,7 @@ class AsyncBatchProcessorBase(ABC):
         entity_type: entity_t.EntityType,
         query: lookup_entity_t.LookupEntityQuery,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Look up an entity based on an identifier or field values
 
@@ -589,6 +604,7 @@ class AsyncBatchProcessorBase(ABC):
         display_notice: bool = False,
         entity: entity_t.EntityIdentifier | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Push a notification to a user or user group
 
@@ -625,6 +641,7 @@ class AsyncBatchProcessorBase(ABC):
         entity_identifier: entity_t.EntityIdentifier,
         field_values: list[field_values_t.FieldArgumentValue],
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Sets field values for an entity
 
@@ -660,6 +677,7 @@ class AsyncBatchProcessorBase(ABC):
         recipe_key: identifier_t.IdentifierKey,
         recipe_metadata: list[recipe_metadata_t.MetadataValue],
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Set metadata values on a recipe
 
@@ -696,6 +714,7 @@ class AsyncBatchProcessorBase(ABC):
         recipes: list[identifier_t.IdentifierKey],
         unlock_samples: bool | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Unlock experiments. Experiments will edtiable after unlocking if they are currently locked.
 
@@ -736,6 +755,7 @@ class AsyncBatchProcessorBase(ABC):
         output_conditions: list[identifier_t.IdentifierKey] | None = None,
         existing_condition_match: identifier_t.IdentifierKey | None = None,
         depends_on: list[str] | None = None,
+        _request_options: client_config_t.RequestOptions | None = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Creates or updates condition match