UncountablePythonSDK 0.0.85__tar.gz → 0.0.87__tar.gz

{uncountablepythonsdk-0.0.85/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.85
+Version: 0.0.87
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -36,7 +36,8 @@ Requires-Dist: boto3==1.*
 Requires-Dist: flask==3.*
 Requires-Dist: simplejson==3.*
 Requires-Dist: grpcio==1.67.1
-Requires-Dist: protobuf==4.*
+Requires-Dist: protobuf>=4.21.1
+Requires-Dist: azure-storage-blob==12.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.85
+Version: 0.0.87
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -36,7 +36,8 @@ Requires-Dist: boto3==1.*
 Requires-Dist: flask==3.*
 Requires-Dist: simplejson==3.*
 Requires-Dist: grpcio==1.67.1
-Requires-Dist: protobuf==4.*
+Requires-Dist: protobuf>=4.21.1
+Requires-Dist: azure-storage-blob==12.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ pkgs/argument_parser/_is_namedtuple.py
 pkgs/argument_parser/argument_parser.py
 pkgs/argument_parser/case_convert.py
 pkgs/filesystem_utils/__init__.py
+pkgs/filesystem_utils/_blob_session.py
 pkgs/filesystem_utils/_gdrive_session.py
 pkgs/filesystem_utils/_local_session.py
 pkgs/filesystem_utils/_s3_session.py

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/UncountablePythonSDK.egg-info/requires.txt

@@ -18,7 +18,8 @@ boto3==1.*
 flask==3.*
 simplejson==3.*
 grpcio==1.67.1
-protobuf==4.*
+protobuf>=4.21.1
+azure-storage-blob==12.*
 
 [test]
 mypy==1.*

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/examples/integration-server/pyproject.toml

@@ -197,7 +197,7 @@ lint.ignore = [
     # ## FROM RUFF UPGRADE
     "PLC2701",  # private name imports.  should add
     "PLR1702",  # too many nested blocks -- add with config.  skip
-    "RUF025",  # unnecessary dict comprehension.  skip
+    "C420",  # unnecessary dict comprehension.  skip
     "SIM113",  # index variable should use enumerate.  should add.
     "PLR0914"  # too many local variables.  configure below.  should add with config
 ]

uncountablepythonsdk-0.0.87/pkgs/filesystem_utils/_blob_session.py

@@ -0,0 +1,137 @@
+from io import BytesIO
+
+from azure.storage.blob import BlobServiceClient, ContainerClient
+
+from pkgs.filesystem_utils.file_type_utils import (
+    FileObjectData,
+    FileSystemBlobConfig,
+    FileSystemFileReference,
+    FileSystemObject,
+    FileTransfer,
+    IncompatibleFileReference,
+)
+
+from .filesystem_session import FileSystemSession
+
+
+def _add_slash(prefix: str) -> str:
+    if len(prefix) > 0 and prefix[-1] != "/":
+        prefix = prefix + "/"
+    return prefix
+
+
+class BlobSession(FileSystemSession):
+    config: FileSystemBlobConfig
+
+    def __init__(self, blob_config: FileSystemBlobConfig) -> None:
+        super().__init__()
+        self.config = blob_config
+
+    def start(self) -> None:
+        self.service_client: BlobServiceClient | None = BlobServiceClient(
+            self.config.account_url, credential=self.config.credential
+        )
+        self.container_client: ContainerClient | None = (
+            self.service_client.get_container_client(self.config.container)
+        )
+
+    def __enter__(self) -> "BlobSession":
+        self.start()
+        return self
+
+    def __exit__(self, exc_type: object, exc_val: object, exc_tb: object) -> None:
+        self.service_client = None
+        self.container_client = None
+
+    def list_files(
+        self,
+        dir_path: FileSystemObject,
+        *,
+        recursive: bool = False,
+        valid_extensions: list[str] | None = None,
+    ) -> list[FileSystemObject]:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReference()
+
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to list_files on uninitialized blob session"
+        )
+
+        filesystem_file_references: list[FileSystemObject] = []
+        prefix = _add_slash(dir_path.filepath)
+        for blob in self.container_client.list_blobs(name_starts_with=prefix):
+            if not recursive and (
+                blob.name == prefix or "/" in blob.name[len(prefix) :]
+            ):
+                continue
+            if valid_extensions is None or any(
+                blob.name.endswith(valid_extension)
+                for valid_extension in valid_extensions
+            ):
+                filesystem_file_references.append(
+                    FileSystemFileReference(
+                        filepath=blob.name,
+                    )
+                )
+
+        return filesystem_file_references
+
+    def download_files(
+        self,
+        filepaths: list[FileSystemObject],
+    ) -> list[FileObjectData]:
+        downloaded_files: list[FileObjectData] = []
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to download_files on uninitialized blob session"
+        )
+
+        for file_object in filepaths:
+            if (
+                not isinstance(file_object, FileSystemFileReference)
+                or file_object.filename is None
+            ):
+                raise IncompatibleFileReference()
+
+            blob_client = self.container_client.get_blob_client(file_object.filepath)
+            download_stream = blob_client.download_blob()
+            file_data = download_stream.readall()
+            downloaded_files.append(
+                FileObjectData(
+                    file_data=file_data,
+                    file_IO=BytesIO(file_data),
+                    filename=file_object.filename,
+                    filepath=file_object.filepath,
+                )
+            )
+
+        return downloaded_files
+
+    def move_files(self, file_mappings: list[FileTransfer]) -> None:
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to move_files on uninitialized blob session"
+        )
+
+        for src_file, dest_file in file_mappings:
+            if not isinstance(src_file, FileSystemFileReference) or not isinstance(
+                dest_file, FileSystemFileReference
+            ):
+                raise IncompatibleFileReference()
+
+            source_blob_client = self.container_client.get_blob_client(
+                src_file.filepath
+            )
+            dest_blob_client = self.container_client.get_blob_client(dest_file.filepath)
+
+            dest_blob_client.start_copy_from_url(source_blob_client.url)
+            source_blob_client.delete_blob()
+
+    def delete_files(self, filepaths: list[FileSystemObject]) -> None:
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to delete_files on uninitialized blob session"
+        )
+        for file_object in filepaths:
+            if not isinstance(file_object, FileSystemFileReference):
+                raise IncompatibleFileReference()
+
+            blob_client = self.container_client.get_blob_client(file_object.filepath)
+            blob_client.delete_blob()

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/pkgs/filesystem_utils/file_type_utils.py

@@ -4,6 +4,12 @@ from io import BytesIO
 from typing import Optional, Union
 
 import paramiko
+from azure.core.credentials import (
+    AzureNamedKeyCredential,
+    AzureSasCredential,
+    TokenCredential,
+)
+from azure.storage.blob import ContainerProperties
 
 
 @dataclass
@@ -69,3 +75,17 @@ class FileSystemS3Config:
     access_key_id: Optional[str]
     secret_access_key: Optional[str]
     session_token: Optional[str]
+
+
+@dataclass(kw_only=True)
+class FileSystemBlobConfig:
+    account_url: str
+    credential: (
+        str
+        | dict[str, str]
+        | AzureNamedKeyCredential
+        | AzureSasCredential
+        | TokenCredential
+        | None
+    )
+    container: ContainerProperties | str

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/pkgs/serialization/serial_class.py

@@ -114,8 +114,6 @@ def _get_merged_serial_class_data(type_class: type[Any]) -> _SerialClassData | N
         for base in type_class.__bases__:
             curr_base_class_data = _get_merged_serial_class_data(base)
             if curr_base_class_data is not None:
-                if base_class_data is None:
-                    base_class_data = _SerialClassData()
                 base_class_data.unconverted_keys |= (
                     curr_base_class_data.unconverted_keys
                 )

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/pkgs/type_spec/actions_registry/emit_typescript.py

@@ -111,9 +111,7 @@ def _get_argument_type(arguments: str | None) -> str | None:
     argument_parts = arguments.split(".")
     namespace = argument_parts[0]
     type_name = argument_parts[1]
-    if namespace is not None and type_name is not None:
-        return f"{_action_namespace_name(namespace)}.{type_name}"
-    return None
+    return f"{_action_namespace_name(namespace)}.{type_name}"
 
 
 def _emit_action_definition(

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/pyproject.toml

@@ -61,15 +61,16 @@ dependencies = [
     "tqdm == 4.*",
     "pysftp == 0.*",
     "opentelemetry-api==1.*",
-    "opentelemetry-exporter-otlp-proto-common==1.*", 
-    "opentelemetry-exporter-otlp-proto-http==1.*", 
+    "opentelemetry-exporter-otlp-proto-common==1.*",
+    "opentelemetry-exporter-otlp-proto-http==1.*",
     "opentelemetry-sdk==1.*",
     "paramiko == 3.*",
     "boto3 == 1.*",
     "flask == 3.*",
     "simplejson == 3.*",
     "grpcio == 1.67.1",
-    "protobuf == 4.*"
+    "protobuf >= 4.21.1",
+    "azure-storage-blob == 12.*"
 ]
 dynamic = ["version"]
 

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/uncountable/integration/executors/executors.py

@@ -9,6 +9,7 @@ from uncountable.types import (
     entity_t,
     field_values_t,
     identifier_t,
+    integration_server_t,
     job_definition_t,
     transition_entity_phase_t,
 )
@@ -33,7 +34,10 @@ def resolve_executor(
 
 
 def _create_run_entity(
-    *, client: Client, logging_settings: job_definition_t.JobLoggingSettings
+    *,
+    client: Client,
+    logging_settings: job_definition_t.JobLoggingSettings,
+    job_uuid: str,
 ) -> entity_t.Entity:
     run_entity = client.create_entity(
         entity_type=entity_t.EntityType.ASYNC_JOB,
@@ -49,6 +53,10 @@ def _create_run_entity(
                 field_ref_name=async_jobs_t.ASYNC_JOB_STATUS_FIELD_REF_NAME,
                 value=async_jobs_t.AsyncJobStatus.IN_PROGRESS,
             ),
+            field_values_t.FieldRefNameValue(
+                field_ref_name=integration_server_t.INTEGRATION_SERVER_RUN_UUID_FIELD_REF_NAME,
+                value=job_uuid,
+            ),
         ],
     ).entity
     client.transition_entity_phase(
@@ -80,6 +88,7 @@ def execute_job(
     job_definition: job_definition_t.JobDefinition,
     profile_metadata: job_definition_t.ProfileMetadata,
     args: JobArguments,
+    job_uuid: str,
 ) -> job_definition_t.JobResult:
     with args.logger.push_scope(job_definition.name) as job_logger:
         job = resolve_executor(job_definition.executor, profile_metadata)
@@ -93,7 +102,9 @@ def execute_job(
                 and job_definition.logging_settings.enabled
             ):
                 run_entity = _create_run_entity(
-                    client=args.client, logging_settings=job_definition.logging_settings
+                    client=args.client,
+                    logging_settings=job_definition.logging_settings,
+                    job_uuid=job_uuid,
                 )
             result = job.run_outer(args=args)
         except Exception as e:

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/uncountable/integration/queue_runner/worker.py

@@ -109,6 +109,7 @@ def run_queued_job(
                 args=args,
                 profile_metadata=job_details.profile_metadata,
                 job_definition=job_details.job_definition,
+                job_uuid=queued_job.queued_job_uuid,
             )
         except Exception as e:
             job_logger.log_exception(e)

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/uncountable/types/api/recipes/edit_recipe_inputs.py

@@ -22,6 +22,9 @@ __all__: list[str] = [
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
+    "PlaceholderBase",
+    "PlaceholderDisplayMode",
+    "PlaceholderType",
     "RecipeInputEdit",
     "RecipeInputEditAddInput",
     "RecipeInputEditAddInstructions",
@@ -29,11 +32,14 @@ __all__: list[str] = [
     "RecipeInputEditChangeBasisViewed",
     "RecipeInputEditClearInputs",
     "RecipeInputEditInputBase",
+    "RecipeInputEditPlaceholder",
     "RecipeInputEditSetLot",
     "RecipeInputEditSetRole",
     "RecipeInputEditType",
     "RecipeInputEditUpdateAnnotations",
     "RecipeInputEditUpsertInput",
+    "RecipeInputPlaceholder",
+    "SubcategoryPlaceholder",
 ]
 
 ENDPOINT_METHOD = "POST"
@@ -50,6 +56,7 @@ class RecipeInputEditType(StrEnum):
     CHANGE_BASIS = "change_basis"
     ADD_INSTRUCTIONS = "add_instructions"
     SET_ROLE = "set_role"
+    SET_PLACEHOLDER = "set_placeholder"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -177,9 +184,66 @@ class RecipeInputEditSetRole(RecipeInputEditBase):
     ingredient_role_key: typing.Optional[identifier_t.IdentifierKey]
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+class PlaceholderType(StrEnum):
+    SUBCATEGORY = "subcategory"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+class PlaceholderDisplayMode(StrEnum):
+    INLINE = "inline"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.recipes.edit_recipe_inputs.PlaceholderBase",
+)
+@dataclasses.dataclass(kw_only=True)
+class PlaceholderBase:
+    type: PlaceholderType
+    require_for_creation: bool = True
+    display_mode: PlaceholderDisplayMode = PlaceholderDisplayMode.INLINE
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.recipes.edit_recipe_inputs.SubcategoryPlaceholder",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class SubcategoryPlaceholder(PlaceholderBase):
+    type: typing.Literal[PlaceholderType.SUBCATEGORY] = PlaceholderType.SUBCATEGORY
+    subcategory_identifier: identifier_t.IdentifierKey
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+RecipeInputPlaceholder = typing.Annotated[
+    typing.Union[SubcategoryPlaceholder],
+    serial_union_annotation(
+    named_type_path="sdk.api.recipes.edit_recipe_inputs.RecipeInputPlaceholder",
+        discriminator="type",
+        discriminator_map={
+            "subcategory": SubcategoryPlaceholder,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.recipes.edit_recipe_inputs.RecipeInputEditPlaceholder",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class RecipeInputEditPlaceholder(RecipeInputEditBase):
+    type: typing.Literal[RecipeInputEditType.SET_PLACEHOLDER] = RecipeInputEditType.SET_PLACEHOLDER
+    ingredient_key: identifier_t.IdentifierKey
+    placeholder: RecipeInputPlaceholder
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 RecipeInputEdit = typing.Annotated[
-    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations, RecipeInputEditSetLot, RecipeInputEditChangeBasisViewed, RecipeInputEditAddInstructions, RecipeInputEditSetRole],
+    typing.Union[RecipeInputEditClearInputs, RecipeInputEditUpsertInput, RecipeInputEditAddInput, RecipeInputEditUpdateAnnotations, RecipeInputEditSetLot, RecipeInputEditChangeBasisViewed, RecipeInputEditAddInstructions, RecipeInputEditSetRole, RecipeInputEditPlaceholder],
     serial_union_annotation(
     named_type_path="sdk.api.recipes.edit_recipe_inputs.RecipeInputEdit",
         discriminator="type",
@@ -192,6 +256,7 @@ RecipeInputEdit = typing.Annotated[
             "change_basis": RecipeInputEditChangeBasisViewed,
             "add_instructions": RecipeInputEditAddInstructions,
             "set_role": RecipeInputEditSetRole,
+            "set_placeholder": RecipeInputEditPlaceholder,
         },
     ),
 ]

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/uncountable/types/entity_t.py

@@ -60,6 +60,7 @@ __all__: list[str] = [
         "equipment_maintenance": "Equipment Maintenance",
         "equipment_type": "Equipment Type",
         "experiment_group": "Experiment Group",
+        "experiment_group_member": "Experiment Group Member",
         "experiment_group_type": "Experiment Group Type",
         "favorite_link": "Favorite Link",
         "field_option_set": "Field Option Set",
@@ -89,6 +90,7 @@ __all__: list[str] = [
         "license": "License",
         "maintenance_schedule": "Maintenance Schedule",
         "material_family": "Material Family",
+        "measurement_group_recipe": "Measurement Group Recipe",
         "ml_job": "Batch Processing Job",
         "naming_scheme": "Naming Scheme",
         "naming_counter": "Naming Counter",
@@ -217,6 +219,7 @@ class EntityType(StrEnum):
     EQUIPMENT_MAINTENANCE = "equipment_maintenance"
     EQUIPMENT_TYPE = "equipment_type"
     EXPERIMENT_GROUP = "experiment_group"
+    EXPERIMENT_GROUP_MEMBER = "experiment_group_member"
     EXPERIMENT_GROUP_TYPE = "experiment_group_type"
     FAVORITE_LINK = "favorite_link"
     FIELD_OPTION_SET = "field_option_set"
@@ -246,6 +249,7 @@ class EntityType(StrEnum):
     LICENSE = "license"
     MAINTENANCE_SCHEDULE = "maintenance_schedule"
     MATERIAL_FAMILY = "material_family"
+    MEASUREMENT_GROUP_RECIPE = "measurement_group_recipe"
     ML_JOB = "ml_job"
     NAMING_SCHEME = "naming_scheme"
     NAMING_COUNTER = "naming_counter"

{uncountablepythonsdk-0.0.85 → uncountablepythonsdk-0.0.87}/uncountable/types/integration_server_t.py

@@ -15,6 +15,7 @@ from . import client_config_t
 
 __all__: list[str] = [
     "EnvironmentConfig",
+    "INTEGRATION_SERVER_RUN_UUID_FIELD_REF_NAME",
     "IntegrationEnvironment",
 ]
 
@@ -34,4 +35,8 @@ class EnvironmentConfig:
     auth_retrieval: auth_retrieval_t.AuthRetrieval
     base_url: str
     client_options: typing.Optional[client_config_t.ClientConfigOptions] = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+INTEGRATION_SERVER_RUN_UUID_FIELD_REF_NAME = "unc_integration_server_run_uuid"
 # DO NOT MODIFY -- This file is generated by type_spec