UncountablePythonSDK 0.0.48__py3-none-any.whl → 0.0.49__py3-none-any.whl

{UncountablePythonSDK-0.0.48.dist-info → UncountablePythonSDK-0.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.48
+Version: 0.0.49
 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.48.dist-info → UncountablePythonSDK-0.0.49.dist-info}/RECORD

@@ -25,7 +25,7 @@ pkgs/argument_parser/_is_enum.py,sha256=Gw6jJa8nBwYGqXwwCZbSnWL8Rvr5alkg5lSVAqXt
 pkgs/argument_parser/_is_namedtuple.py,sha256=Rjc1bKanIPPogl3qG5JPBxglG1TqWYOo1nxxhBASQWY,265
 pkgs/argument_parser/argument_parser.py,sha256=S5x4yDpaBqTRkmcOyX2UuBWw9iCE4j2Po5LZPg9jhe4,17308
 pkgs/argument_parser/case_convert.py,sha256=NuJLJUJRbyVb6_Slen4uqaStEHbcOS1d-hBBfDrrw-c,605
-pkgs/filesystem_utils/__init__.py,sha256=yxfwtYFvqq_fjMl-tg2jwa6eNPNZUF4ykqsSzALyNdw,1143
+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=q4q0MTWXWu5RNRVZ5ibv4M4UXXxWl_J6xCnitvngIMM,3957
@@ -87,7 +87,7 @@ 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=Ixxg01LLzc9pBpptBqJG6-jG82eltZTF7igFqORujyo,8393
+uncountable/integration/executors/generic_upload_executor.py,sha256=HR5bZE1DMVLRB-lwmsfZnoLEsaL66aHZM0xCEO_D3-4,10238
 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=M0qXVJpD8hMYIFypHFeyh598sqmIDX8ZOyXK23CluF0,1323
@@ -124,8 +124,8 @@ uncountable/types/input_attributes.py,sha256=IrIKQnHqHdS1Utdfzr9GnOe17a8riaqYcO1
 uncountable/types/input_attributes_t.py,sha256=wE1ekiQfb72Z9VpF5SHipKJkgaJFUHJrNkkJdmuhF9w,820
 uncountable/types/inputs.py,sha256=6RIEFfCxLqpeHEGOpu63O4i8zPogjGeB7wiV_rPBw_g,404
 uncountable/types/inputs_t.py,sha256=RW7gF9zTOwByu-nMTMVuBabLOuWKx4O1nvfgvx_R55o,1611
-uncountable/types/job_definition.py,sha256=W2wth9vPRBVL0temwnSmvfxxPMKFxZqbQtsMXn8BU3U,1637
-uncountable/types/job_definition_t.py,sha256=1VZO3l5oGnvtG-ikQB6YuukblHhEwtmJfQpGmo0Gi40,5735
+uncountable/types/job_definition.py,sha256=sCQqtyHI3hksc5pVpk5tqbG55F91ST4FoDwr2TmTOuQ,1787
+uncountable/types/job_definition_t.py,sha256=DpqTYDocJ6n6kVq5PBFhFb5Dlb2vpHdp9IZfFb1Qcpo,6590
 uncountable/types/outputs.py,sha256=sUZx_X-TKCZtLm1YCEH8OISX9DdPlv9ZuUfM3-askCc,281
 uncountable/types/outputs_t.py,sha256=2aORUOr0ls1ZYo-ddkWax3D1ZndmQsWtHfJxpYozlhg,656
 uncountable/types/permissions.py,sha256=1mRnSsmRgjuLgp6pylTwwACD_YRIcmlqxHkufwZtMns,297
@@ -238,7 +238,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 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=w7NVSpTpKxsF2TgLzVrji1Ql5Z8QWTz6d5OvXpRtyDo,992
-UncountablePythonSDK-0.0.48.dist-info/METADATA,sha256=j72rX6737WefzshiwZNBrM8nqCM55gDs2DH6dH79C24,1734
-UncountablePythonSDK-0.0.48.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-UncountablePythonSDK-0.0.48.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.48.dist-info/RECORD,,
+UncountablePythonSDK-0.0.49.dist-info/METADATA,sha256=YzHISP7OjFmFRJWuVPWl6jgdlvsE6W7glCma0mhU7sc,1734
+UncountablePythonSDK-0.0.49.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+UncountablePythonSDK-0.0.49.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.49.dist-info/RECORD,,

pkgs/filesystem_utils/__init__.py

@@ -5,12 +5,14 @@ from ._gdrive_session import list_gdrive_files as list_gdrive_files
 from ._gdrive_session import move_gdrive_file as move_gdrive_file
 from ._gdrive_session import upload_file_gdrive as upload_file_gdrive
 from ._local_session import LocalSession as LocalSession
+from ._s3_session import S3Session as S3Session
 from ._sftp_session import SFTPSession as SFTPSession
 from ._sftp_session import list_sftp_files as list_sftp_files
 from ._sftp_session import move_sftp_files as move_sftp_files
 from .file_type_utils import FileObjectData as FileObjectData
 from .file_type_utils import FileSystemFileReference as FileSystemFileReference
 from .file_type_utils import FileSystemObject as FileSystemObject
+from .file_type_utils import FileSystemS3Config as FileSystemS3Config
 from .file_type_utils import FileSystemSFTPConfig as FileSystemSFTPConfig
 from .file_type_utils import FileTransfer as FileTransfer
 from .file_type_utils import IncompatibleFileReference as IncompatibleFileReference

uncountable/integration/executors/generic_upload_executor.py

@@ -9,8 +9,10 @@ from pkgs.filesystem_utils import (
     FileObjectData,
     FileSystemFileReference,
     FileSystemObject,
+    FileSystemS3Config,
     FileSystemSFTPConfig,
     FileTransfer,
+    S3Session,
     SFTPSession,
 )
 from pkgs.filesystem_utils.filesystem_session import FileSystemSession
@@ -23,8 +25,10 @@ from uncountable.types.generic_upload_t import (
 )
 from uncountable.types.job_definition_t import (
     GenericUploadDataSource,
+    GenericUploadDataSourceS3,
     GenericUploadDataSourceSFTP,
     JobResult,
+    S3CloudProvider,
 )
 
 
@@ -185,6 +189,42 @@ class GenericUploadJob(Job):
                     pem_key=pem_key,
                 )
                 return SFTPSession(sftp_config=sftp_config)
+            case GenericUploadDataSourceS3():
+                if self.data_source.access_key_secret is not None:
+                    secret_access_key = retrieve_secret(
+                        self.data_source.access_key_secret,
+                        profile_metadata=args.profile_metadata,
+                    )
+                else:
+                    secret_access_key = None
+
+                if self.data_source.endpoint_url is None:
+                    assert (
+                        self.data_source.cloud_provider is not None
+                    ), "either cloud_provider or endpoint_url must be specified"
+                    match self.data_source.cloud_provider:
+                        case S3CloudProvider.AWS:
+                            endpoint_url = "https://s3.amazonaws.com"
+                        case S3CloudProvider.OVH:
+                            assert (
+                                self.data_source.region_name is not None
+                            ), "region_name must be specified for cloud_provider OVH"
+                            endpoint_url = (
+                                f"https://s3.{self.data_source.region_name}.cloud.ovh.net"
+                            )
+                else:
+                    endpoint_url = self.data_source.endpoint_url
+
+                s3_config = FileSystemS3Config(
+                    endpoint_url=endpoint_url,
+                    bucket_name=self.data_source.bucket_name,
+                    region_name=self.data_source.region_name,
+                    access_key_id=self.data_source.access_key_id,
+                    secret_access_key=secret_access_key,
+                    session_token=None,
+                )
+
+                return S3Session(s3_config=s3_config)
 
     def run(self, args: JobArguments) -> JobResult:
         client = args.client

uncountable/types/job_definition.py

@@ -12,6 +12,8 @@ from .job_definition_t import JobExecutorBase as JobExecutorBase
 from .job_definition_t import JobExecutorScript as JobExecutorScript
 from .job_definition_t import GenericUploadDataSourceBase as GenericUploadDataSourceBase
 from .job_definition_t import GenericUploadDataSourceSFTP as GenericUploadDataSourceSFTP
+from .job_definition_t import S3CloudProvider as S3CloudProvider
+from .job_definition_t import GenericUploadDataSourceS3 as GenericUploadDataSourceS3
 from .job_definition_t import GenericUploadDataSource as GenericUploadDataSource
 from .job_definition_t import JobExecutorGenericUpload as JobExecutorGenericUpload
 from .job_definition_t import JobExecutor as JobExecutor

uncountable/types/job_definition_t.py

@@ -23,6 +23,7 @@ __all__: list[str] = [
     "CronJobDefinition",
     "GenericUploadDataSource",
     "GenericUploadDataSourceBase",
+    "GenericUploadDataSourceS3",
     "GenericUploadDataSourceSFTP",
     "GenericUploadDataSourceType",
     "JobDefinition",
@@ -36,6 +37,7 @@ __all__: list[str] = [
     "JobResult",
     "ProfileDefinition",
     "ProfileMetadata",
+    "S3CloudProvider",
 ]
 
 
@@ -58,6 +60,7 @@ class AuthRetrievalType(StrEnum):
 # DO NOT MODIFY -- This file is generated by type_spec
 class GenericUploadDataSourceType(StrEnum):
     SFTP = "sftp"
+    S3 = "s3"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -94,13 +97,35 @@ class GenericUploadDataSourceSFTP(GenericUploadDataSourceBase):
     pem_secret: secret_retrieval_t.SecretRetrieval
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+class S3CloudProvider(StrEnum):
+    OVH = "ovh"
+    AWS = "aws"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class GenericUploadDataSourceS3(GenericUploadDataSourceBase):
+    type: typing.Literal[GenericUploadDataSourceType.S3] = GenericUploadDataSourceType.S3
+    bucket_name: str
+    cloud_provider: typing.Optional[S3CloudProvider] = None
+    endpoint_url: typing.Optional[str] = None
+    region_name: typing.Optional[str] = None
+    access_key_id: typing.Optional[str] = None
+    access_key_secret: typing.Optional[secret_retrieval_t.SecretRetrieval] = None
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 GenericUploadDataSource = typing.Annotated[
-    typing.Union[GenericUploadDataSourceSFTP],
+    typing.Union[GenericUploadDataSourceSFTP, GenericUploadDataSourceS3],
     serial_union_annotation(
         discriminator="type",
         discriminator_map={
             "sftp": GenericUploadDataSourceSFTP,
+            "s3": GenericUploadDataSourceS3,
         },
     ),
 ]