UncountablePythonSDK 0.0.53__py3-none-any.whl → 0.0.55__py3-none-any.whl

{UncountablePythonSDK-0.0.53.dist-info → UncountablePythonSDK-0.0.55.dist-info}/METADATA

@@ -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.dist-info → UncountablePythonSDK-0.0.55.dist-info}/RECORD

@@ -16,8 +16,8 @@ docs/static/favicons/mstile-150x150.png,sha256=eAK4QdEofhdLtfmjuPTpnX3MJqYnvGXsH
 docs/static/favicons/safari-pinned-tab.svg,sha256=S84fRnz0ZxLnQrKtmmFZytiRyu1xLtMR_RVy5jmwU7k,1926
 examples/async_batch.py,sha256=CffQ8O9drJ-Mdd6S5DnMIOBsHv5aVkTZrD3l3xBnB4s,1094
 examples/create_entity.py,sha256=noZdtJ5f9Wfiob3zUH-8bDVbrCPJnFtXFk_W9pSjvUA,664
-examples/edit_recipe_inputs.py,sha256=SFHhccktlpWlz4ujh30KZ-hZTFneRWuEp9b3nJSbNn8,1647
-examples/invoke_uploader.py,sha256=Rn5sSZowW6_0yX6843q2HOSIECfK4cOCB1Hmco3iWVo,625
+examples/edit_recipe_inputs.py,sha256=9ZtpdeMSO5HGsVBQtftc_PI7-qpafY-YMWoYbtcUXvo,1649
+examples/invoke_uploader.py,sha256=rEvmVY5TjigN_-4PTQdkjY-bC5DrYMcJgquyZ4Tt5FM,748
 examples/upload_files.py,sha256=tUfKFqiqwnw08OL5Y8_e4j5pSRhp94cFex8XTuVa_ig,487
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=CsQ6QoPKSLLRVl-z6URAmPkiUL9ZPZoV4rJHgy_-RjA,385
@@ -28,7 +28,7 @@ pkgs/argument_parser/case_convert.py,sha256=NuJLJUJRbyVb6_Slen4uqaStEHbcOS1d-hBB
 pkgs/filesystem_utils/__init__.py,sha256=NSsQrUCoGISBCqCCyq6_583sYHTVEQeDjDO8hvZn3ag,1261
 pkgs/filesystem_utils/_gdrive_session.py,sha256=OZudNoP2HikolnpurVJhJdh5fgzqbaZQvn53ReGGXx4,11015
 pkgs/filesystem_utils/_local_session.py,sha256=xFEYhAvNqrOYqwt4jrEYOuYkjJn0zclZhTelW_Q1-rw,2325
-pkgs/filesystem_utils/_s3_session.py,sha256=LtFGCs6nhIY6z8wWCC5mQYDg54qFIo4iFIBwCeXMcZU,3909
+pkgs/filesystem_utils/_s3_session.py,sha256=UbVTUM5olc2Kq_1TX7e5rI3UD5w49ko7CWjsMnSJVmg,3946
 pkgs/filesystem_utils/_sftp_session.py,sha256=gNoUD_b4MuVqWj31nU-FpfpXZlyWkwdEHtX1S8W6gpQ,4727
 pkgs/filesystem_utils/file_type_utils.py,sha256=Xd-mg35mAENUgNJVz5uK8nEfrUp-NQld_gnXFEq3K-8,1487
 pkgs/filesystem_utils/filesystem_session.py,sha256=BQ2Go8Mu9-GcnaWh2Pm4x7ugLVsres6XrOQ8RoiEpcE,1045
@@ -89,13 +89,13 @@ uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 uncountable/integration/db/connect.py,sha256=YtQHJ1DBGPhxKFRCfiXqohOYUceKSxMVOJ88aPI48Ug,181
 uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/executors/executors.py,sha256=v5ClGVUlvrZcMdmGQa8Ll668G_HGTnKpGOnTM7UMZCQ,956
-uncountable/integration/executors/generic_upload_executor.py,sha256=wafNY_gpbUiQhvkFPDw-GGiJLmDVtTRgH_5jwMLy2Z4,10283
+uncountable/integration/executors/generic_upload_executor.py,sha256=Tl7Aw908CJzH3Sv-mXRAvDVHbVgghMd2WGJH-JXmQ10,10251
 uncountable/integration/executors/script_executor.py,sha256=OmSBOtU48G3mqza9c2lCm84pGGyaDk-ZBJCx3RsdJXc,846
 uncountable/integration/secret_retrieval/__init__.py,sha256=3QXVj35w8rRMxVvmmsViFYDi3lcb3g70incfalOEm6o,87
 uncountable/integration/secret_retrieval/retrieve_secret.py,sha256=BS1dXVaChgpgBDKWkcLrl9hBDQIASRQMr3l41ytfbEc,3036
 uncountable/types/__init__.py,sha256=UuLBpo8Uxv9k-UZS8DINg3y-LPrs2dC7Qg83BB8p2_k,8222
 uncountable/types/async_batch.py,sha256=ihCv5XWSTTPmuO-GMPn1EACGI2CBUIJTATZ3aPgsNBA,523
-uncountable/types/async_batch_processor.py,sha256=R--exgi4Gw0HWCnh8M-3_2PqG2ByTBtdyuSQ2eYtYn8,8671
+uncountable/types/async_batch_processor.py,sha256=rU9s_EiaoHFp0dEL0f2tmNM0bMa01Loqv4px5SKnhj4,8595
 uncountable/types/async_batch_t.py,sha256=9jp9rOyetRdD5aQVyijzQggTyYU4021PBVGXk0ooBCQ,1911
 uncountable/types/base.py,sha256=xVSjWvA_fUUnkCg83EjoYEFvAfmskinKFMeYFOxNc9E,359
 uncountable/types/base_t.py,sha256=XXjZXexx0xWFUxMMhW8i9nIL6n8dsZVsHwdgnhZ0zJ4,2714
@@ -103,7 +103,7 @@ uncountable/types/calculations.py,sha256=FFO_D3BbKoGDZnqWvTKpW4KF359i2vrKjpdFCLY
 uncountable/types/calculations_t.py,sha256=7GTSi2L8NYjzjUJJx3cmtVkK9uD-uhfYvIFK-ffQj-8,556
 uncountable/types/chemical_structure.py,sha256=E-LnikTFDoVQ1b2zKaVUIO_PAKm-7aZZYJi8I8SDSic,302
 uncountable/types/chemical_structure_t.py,sha256=aFsTkkbzy6Gvyde3qrrEYD95gcYhxkgKMiDRaRE0o-Y,760
-uncountable/types/client_base.py,sha256=db6V-Jea8iWT4kz2hXc5c_doLJKLZTd5T-F4ehobWMs,65431
+uncountable/types/client_base.py,sha256=qu1g7K5eLirZbAXRLJ_QDaVAbotC4tDW5-HZ_mkSHwE,65355
 uncountable/types/client_config.py,sha256=4h5Liko9uKCo9_0gdbPhoK6Jr2Kv7tioLiQ8iKeq-_4,301
 uncountable/types/client_config_t.py,sha256=_HdS37gMSTIiD4qLnW9dIgt8_Rt5A6xhwMGGga7vnLg,625
 uncountable/types/curves.py,sha256=W6uMpG5SyW1MS82szNpxkFEn1MnxNpBFyFbQb2Ysfng,366
@@ -116,8 +116,8 @@ uncountable/types/field_values.py,sha256=uuIWX-xmfvcinYPdfkWJeb56zzQY01mc9rmotMP
 uncountable/types/field_values_t.py,sha256=_JYzmHlPczEnROz_tUbY0r3mZWffCB8m2_a9ktZLgP0,1700
 uncountable/types/fields.py,sha256=GUY5ne8Zp2_Lalikr0zcbdJrin8dG81eyS8fKWJ9yf8,266
 uncountable/types/fields_t.py,sha256=9pDroeNvj4hQQ4QB4-2ioTAFR30YTuW_364Q-Ka9SoQ,564
-uncountable/types/generic_upload.py,sha256=hbtuOVMJhCRfPQM_BwtLMV509--iv8NXjtlTfCeRqdU,395
-uncountable/types/generic_upload_t.py,sha256=euOF_oFwT62a---oBjZeGVvU67TpXh8da9njrhlg46w,1202
+uncountable/types/generic_upload.py,sha256=n6hue9BX_rLSXeEt_DcGwL2ckxfNXg1wEPR9JNEGQxQ,879
+uncountable/types/generic_upload_t.py,sha256=Hv4cVyllV1BMW2HDOlA6XuF3lQOA8DTAMblgAsu0AIU,3314
 uncountable/types/id_source.py,sha256=wGLA0fMl-5IqBG_fg2UDC7fY-8CWRBNFJOokejOoN_w,567
 uncountable/types/id_source_t.py,sha256=ReOuIHIuFbkE2mQ58x6UP4jCV4_JUxMCvAU9bxUxG84,1369
 uncountable/types/identifier.py,sha256=6ziONd__L07ijhVwpIehUUDvxgKTtHbunk-6CivJqxQ,503
@@ -241,8 +241,8 @@ uncountable/types/api/recipes/unlock_recipes.py,sha256=AvzQeZCLs9i7CuhMs3Xltdi4n
 uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/triggers/run_trigger.py,sha256=_Rpha9nxXI3Xr17CrGDtofg4HZ81x2lt0rMZ6As0qfE,893
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
-uncountable/types/api/uploader/invoke_uploader.py,sha256=4zOcB_38uT73Jm3-XqkG40fBM1R5vpvPpGAg-U4lzxY,1059
-UncountablePythonSDK-0.0.53.dist-info/METADATA,sha256=grgR1LMtYrZy0VXQH5w99anOyuZr7qC26fCjfRJk7BE,1934
-UncountablePythonSDK-0.0.53.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-UncountablePythonSDK-0.0.53.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.53.dist-info/RECORD,,
+uncountable/types/api/uploader/invoke_uploader.py,sha256=Rc77y5q-3R9-SNQgm8P35zKaW2D1Hbtm7PDixnOn1G0,1025
+UncountablePythonSDK-0.0.55.dist-info/METADATA,sha256=yp10_5j-eNLvAsecV4ydazDBKLEnYB0N8-62LPziMDE,1934
+UncountablePythonSDK-0.0.55.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+UncountablePythonSDK-0.0.55.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.55.dist-info/RECORD,,

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(

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)
+    ),
 )

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
             ):

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)

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

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)
 

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,

uncountable/types/generic_upload.py

@@ -5,5 +5,11 @@
 # 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

uncountable/types/generic_upload_t.py

@@ -7,12 +7,21 @@ 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",
 ]
 
 
@@ -31,10 +40,67 @@ class GenericRemoteDirectoryScope:
     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
-    material_family_keys: list[identifier_t.IdentifierKey]
+    destinations: list[UploadDestination]
     skip_moving_files: bool = False
 # DO NOT MODIFY -- This file is generated by type_spec