UncountablePythonSDK 0.0.53__tar.gz → 0.0.55__tar.gz

{uncountablepythonsdk-0.0.53/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.55}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.53
+Version: 0.0.55
 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.53 → uncountablepythonsdk-0.0.55}/examples/edit_recipe_inputs.py

@@ -29,7 +29,7 @@ edits.append(
     edit_recipe_inputs_t.RecipeInputEditAddInput(
         quantity_basis=QuantityBasis.MASS,
         ingredient_key=IdentifierKeyId(id=1),
-        value_numeric=Decimal(56.7),
+        value_numeric=Decimal("56.7"),
     )
 )
 edits.append(

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/examples/invoke_uploader.py

@@ -1,6 +1,7 @@
 import os
 
 from uncountable.core import AuthDetailsApiKey, Client, MediaFileUpload
+from uncountable.types import generic_upload_t
 from uncountable.types.identifier_t import IdentifierKeyId
 
 client = Client(
@@ -19,5 +20,7 @@ uploaded_file = client.upload_files(
 client.invoke_uploader(
     file_id=uploaded_file.file_id,
     uploader_key=IdentifierKeyId(id=48),
-    material_family_key=IdentifierKeyId(id=1),
+    destination=generic_upload_t.UploadDestinationMaterialFamily(
+        material_family_key=IdentifierKeyId(id=7)
+    ),
 )

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/pkgs/filesystem_utils/_s3_session.py

@@ -53,16 +53,16 @@ class S3Session(FileSystemSession):
         recursive: bool = False,
         valid_extensions: list[str] | None = None,
     ) -> list[FileSystemObject]:
-        if recursive:
-            raise NotImplementedError("recursive file listings not implemented for s3")
-
         if not isinstance(dir_path, FileSystemFileReference):
             raise IncompatibleFileReference()
 
         assert self.bucket is not None, "call to list_files on uninitialized s3 session"
 
         filesystem_references: list[FileSystemObject] = []
-        for obj in self.bucket.objects.filter(Prefix=dir_path.filepath):
+        prefix = _add_slash(dir_path.filepath)
+        for obj in self.bucket.objects.filter(Prefix=prefix):
+            if not recursive and (obj.key == prefix or "/" in obj.key[len(prefix) :]):
+                continue
             if valid_extensions is None or any(
                 obj.key.endswith(valid_extension) for valid_extension in valid_extensions
             ):

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/uncountable/integration/executors/generic_upload_executor.py

@@ -267,12 +267,12 @@ class GenericUploadJob(Job):
 
         file_ids = [file.file_id for file in uploaded_files]
 
-        for material_family_key in self.upload_strategy.material_family_keys:
+        for destination in self.upload_strategy.destinations:
             for file_id in file_ids:
                 batch_processor.invoke_uploader(
                     file_id=file_id,
                     uploader_key=self.upload_strategy.uploader_key,
-                    material_family_key=material_family_key,
+                    destination=destination,
                 )
 
         return JobResult(success=True)

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/uncountable/types/api/uploader/invoke_uploader.py

@@ -10,6 +10,7 @@ from decimal import Decimal  # noqa: F401
 import dataclasses
 from ... import async_batch_t
 from ... import base_t
+from ... import generic_upload_t
 from ... import identifier_t
 
 __all__: list[str] = [
@@ -28,8 +29,7 @@ ENDPOINT_PATH = "api/external/uploader/invoke_uploader"
 class Arguments:
     file_id: base_t.ObjectId
     uploader_key: identifier_t.IdentifierKey
-    material_family_key: identifier_t.IdentifierKey
-    recipe_key: typing.Optional[identifier_t.IdentifierKey] = None
+    destination: generic_upload_t.UploadDestination
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/uncountable/types/async_batch_processor.py

@@ -13,6 +13,7 @@ from uncountable.types import async_batch_t
 from uncountable.types import base_t
 import uncountable.types.api.recipes.create_recipe as create_recipe_t
 import uncountable.types.api.recipes.edit_recipe_inputs as edit_recipe_inputs_t
+from uncountable.types import generic_upload_t
 from uncountable.types import identifier_t
 import uncountable.types.api.uploader.invoke_uploader as invoke_uploader_t
 from uncountable.types import recipe_identifiers_t
@@ -162,8 +163,7 @@ class AsyncBatchProcessorBase(ABC):
         *,
         file_id: base_t.ObjectId,
         uploader_key: identifier_t.IdentifierKey,
-        material_family_key: identifier_t.IdentifierKey,
-        recipe_key: typing.Optional[identifier_t.IdentifierKey] = None,
+        destination: generic_upload_t.UploadDestination,
         depends_on: typing.Optional[list[str]] = None,
     ) -> async_batch_t.QueuedAsyncBatchRequest:
         """Runs a file through an uploader.
@@ -173,8 +173,7 @@ class AsyncBatchProcessorBase(ABC):
         args = invoke_uploader_t.Arguments(
             file_id=file_id,
             uploader_key=uploader_key,
-            material_family_key=material_family_key,
-            recipe_key=recipe_key,
+            destination=destination,
         )
         json_data = serialize_for_api(args)
 

{uncountablepythonsdk-0.0.53 → uncountablepythonsdk-0.0.55}/uncountable/types/client_base.py

@@ -29,6 +29,7 @@ from uncountable.types import entity_t
 import uncountable.types.api.batch.execute_batch as execute_batch_t
 import uncountable.types.api.batch.execute_batch_load_async as execute_batch_load_async_t
 from uncountable.types import field_values_t
+from uncountable.types import generic_upload_t
 import uncountable.types.api.recipes.get_curve as get_curve_t
 import uncountable.types.api.entity.get_entities_data as get_entities_data_t
 import uncountable.types.api.inputs.get_input_data as get_input_data_t
@@ -856,8 +857,7 @@ class ClientMethods(ABC):
         *,
         file_id: base_t.ObjectId,
         uploader_key: identifier_t.IdentifierKey,
-        material_family_key: identifier_t.IdentifierKey,
-        recipe_key: typing.Optional[identifier_t.IdentifierKey] = None,
+        destination: generic_upload_t.UploadDestination,
     ) -> invoke_uploader_t.Data:
         """Runs a file through an uploader.
 
@@ -865,8 +865,7 @@ class ClientMethods(ABC):
         args = invoke_uploader_t.Arguments(
             file_id=file_id,
             uploader_key=uploader_key,
-            material_family_key=material_family_key,
-            recipe_key=recipe_key,
+            destination=destination,
         )
         api_request = APIRequest(
             method=invoke_uploader_t.ENDPOINT_METHOD,

uncountablepythonsdk-0.0.55/uncountable/types/generic_upload.py

@@ -0,0 +1,15 @@
+# flake8: noqa: F821
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+# DO NOT MODIFY -- This file is generated by type_spec
+# Kept only for SDK backwards compatibility
+from .generic_upload_t import GenericRemoteDirectoryScope as GenericRemoteDirectoryScope
+from .generic_upload_t import UploadDestinationType as UploadDestinationType
+from .generic_upload_t import UploadDestinationBase as UploadDestinationBase
+from .generic_upload_t import UploadDestinationProject as UploadDestinationProject
+from .generic_upload_t import UploadDestinationMaterialFamily as UploadDestinationMaterialFamily
+from .generic_upload_t import UploadDestinationRecipe as UploadDestinationRecipe
+from .generic_upload_t import UploadDestination as UploadDestination
+from .generic_upload_t import GenericUploadStrategy as GenericUploadStrategy
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.55/uncountable/types/generic_upload_t.py

@@ -0,0 +1,106 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# 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
+from pkgs.strenum_compat import StrEnum
+import dataclasses
+from pkgs.serialization import serial_class
+from pkgs.serialization import serial_union_annotation
+from . import identifier_t
+
+__all__: list[str] = [
+    "GenericRemoteDirectoryScope",
+    "GenericUploadStrategy",
+    "UploadDestination",
+    "UploadDestinationBase",
+    "UploadDestinationMaterialFamily",
+    "UploadDestinationProject",
+    "UploadDestinationRecipe",
+    "UploadDestinationType",
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class GenericRemoteDirectoryScope:
+    src_path: str
+    success_archive_path: str
+    failure_archive_path: str
+    recursive: bool
+    prepend_date_on_archive: bool
+    valid_file_extensions: list[str]
+    filename_regex: typing.Optional[str] = None
+    max_files: typing.Optional[int] = None
+    detection_keyword: typing.Optional[str] = None
+    delimiter: typing.Optional[str] = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+class UploadDestinationType(StrEnum):
+    PROJECT = "project"
+    MATERIAL_FAMILY = "material_family"
+    RECIPE = "recipe"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class UploadDestinationBase:
+    type: UploadDestinationType
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class UploadDestinationProject(UploadDestinationBase):
+    type: typing.Literal[UploadDestinationType.PROJECT] = UploadDestinationType.PROJECT
+    project_key: identifier_t.IdentifierKey
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class UploadDestinationMaterialFamily(UploadDestinationBase):
+    type: typing.Literal[UploadDestinationType.MATERIAL_FAMILY] = UploadDestinationType.MATERIAL_FAMILY
+    material_family_key: identifier_t.IdentifierKey
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class UploadDestinationRecipe(UploadDestinationBase):
+    type: typing.Literal[UploadDestinationType.RECIPE] = UploadDestinationType.RECIPE
+    recipe_key: identifier_t.IdentifierKey
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+UploadDestination = typing.Annotated[
+    typing.Union[UploadDestinationProject, UploadDestinationMaterialFamily, UploadDestinationRecipe],
+    serial_union_annotation(
+        discriminator="type",
+        discriminator_map={
+            "project": UploadDestinationProject,
+            "material_family": UploadDestinationMaterialFamily,
+            "recipe": UploadDestinationRecipe,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class GenericUploadStrategy:
+    uploader_key: identifier_t.IdentifierKey
+    destinations: list[UploadDestination]
+    skip_moving_files: bool = False
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.53/uncountable/types/generic_upload.py

@@ -1,9 +0,0 @@
-# flake8: noqa: F821
-# ruff: noqa: E402 Q003
-# fmt: off
-# isort: skip_file
-# DO NOT MODIFY -- This file is generated by type_spec
-# Kept only for SDK backwards compatibility
-from .generic_upload_t import GenericRemoteDirectoryScope as GenericRemoteDirectoryScope
-from .generic_upload_t import GenericUploadStrategy as GenericUploadStrategy
-# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.53/uncountable/types/generic_upload_t.py

@@ -1,40 +0,0 @@
-# DO NOT MODIFY -- This file is generated by type_spec
-# flake8: noqa: F821
-# 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 . import identifier_t
-
-__all__: list[str] = [
-    "GenericRemoteDirectoryScope",
-    "GenericUploadStrategy",
-]
-
-
-# DO NOT MODIFY -- This file is generated by type_spec
-@dataclasses.dataclass(kw_only=True)
-class GenericRemoteDirectoryScope:
-    src_path: str
-    success_archive_path: str
-    failure_archive_path: str
-    recursive: bool
-    prepend_date_on_archive: bool
-    valid_file_extensions: list[str]
-    filename_regex: typing.Optional[str] = None
-    max_files: typing.Optional[int] = None
-    detection_keyword: typing.Optional[str] = None
-    delimiter: typing.Optional[str] = None
-
-
-# DO NOT MODIFY -- This file is generated by type_spec
-@dataclasses.dataclass(kw_only=True)
-class GenericUploadStrategy:
-    uploader_key: identifier_t.IdentifierKey
-    material_family_keys: list[identifier_t.IdentifierKey]
-    skip_moving_files: bool = False
-# DO NOT MODIFY -- This file is generated by type_spec