UncountablePythonSDK 0.0.52__tar.gz → 0.0.54__tar.gz

{uncountablepythonsdk-0.0.52/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.54}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.52
+Version: 0.0.54
 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.52 → uncountablepythonsdk-0.0.54}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -140,6 +140,8 @@ uncountable/types/job_definition.py
 uncountable/types/job_definition_t.py
 uncountable/types/outputs.py
 uncountable/types/outputs_t.py
+uncountable/types/overrides.py
+uncountable/types/overrides_t.py
 uncountable/types/permissions.py
 uncountable/types/permissions_t.py
 uncountable/types/phases.py

{uncountablepythonsdk-0.0.52 → uncountablepythonsdk-0.0.54}/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
             ):
@@ -85,7 +85,7 @@ class S3Session(FileSystemSession):
                 or file_object.filename is None
             ):
                 raise IncompatibleFileReference()
-            s3_file_obj = self.bucket.Object(_add_slash(file_object.filepath))
+            s3_file_obj = self.bucket.Object(file_object.filepath)
             response = s3_file_obj.get()
             file_obj_bytes = response["Body"].read()
             downloaded_files.append(
@@ -107,10 +107,10 @@ class S3Session(FileSystemSession):
                 dest_file, FileSystemFileReference
             ):
                 raise IncompatibleFileReference()
-            self.bucket.Object(_add_slash(dest_file.filepath)).copy_from(
+            self.bucket.Object(dest_file.filepath).copy_from(
                 CopySource={
                     "Bucket": self.bucket.name,
-                    "Key": _add_slash(src_file.filepath),
+                    "Key": src_file.filepath,
                 }
             )
-            self.bucket.Object(_add_slash(src_file.filepath)).delete()
+            self.bucket.Object(src_file.filepath).delete()

{uncountablepythonsdk-0.0.52 → uncountablepythonsdk-0.0.54}/uncountable/integration/secret_retrieval/retrieve_secret.py

@@ -5,6 +5,8 @@ import os
 
 import boto3
 
+from pkgs.argument_parser import CachedParser
+from uncountable.types import overrides_t
 from uncountable.types.job_definition_t import ProfileMetadata
 from uncountable.types.secret_retrieval_t import (
     SecretRetrieval,
@@ -46,9 +48,31 @@ def _get_aws_secret(*, secret_name: str, region_name: str, sub_key: str | None)
         return str(value)
 
 
+@functools.cache
+def _load_secret_overrides(profile_name: str) -> dict[SecretRetrieval, str]:
+    overrides_parser = CachedParser(overrides_t.Overrides)
+    profiles_module = os.environ["UNC_PROFILES_MODULE"]
+    try:
+        overrides = overrides_parser.parse_yaml_resource(
+            package=".".join([profiles_module, profile_name]),
+            resource="local_overrides.yaml",
+        )
+        return {
+            override.secret_retrieval: override.value for override in overrides.secrets
+        }
+    except FileNotFoundError:
+        return {}
+
+
 def retrieve_secret(
     secret_retrieval: SecretRetrieval, profile_metadata: ProfileMetadata
 ) -> str:
+    value_from_override = _load_secret_overrides(profile_metadata.name).get(
+        secret_retrieval
+    )
+    if value_from_override is not None:
+        return value_from_override
+
     match secret_retrieval:
         case SecretRetrievalEnv():
             env_name = (

{uncountablepythonsdk-0.0.52 → uncountablepythonsdk-0.0.54}/uncountable/types/__init__.py

@@ -58,6 +58,7 @@ from .api.entity import lock_entity as lock_entity_t
 from .api.recipes import lock_recipes as lock_recipes_t
 from .api.id_source import match_id_source as match_id_source_t
 from . import outputs_t as outputs_t
+from . import overrides_t as overrides_t
 from . import permissions_t as permissions_t
 from . import phases_t as phases_t
 from . import post_base_t as post_base_t
@@ -154,6 +155,7 @@ __all__: list[str] = [
     "lock_recipes_t",
     "match_id_source_t",
     "outputs_t",
+    "overrides_t",
     "permissions_t",
     "phases_t",
     "post_base_t",

uncountablepythonsdk-0.0.54/uncountable/types/overrides.py

@@ -0,0 +1,10 @@
+# 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 .overrides_t import SecretRetrievalOverride as SecretRetrievalOverride
+from .overrides_t import SecretRetrievalOverrides as SecretRetrievalOverrides
+from .overrides_t import Overrides as Overrides
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.54/uncountable/types/overrides_t.py

@@ -0,0 +1,36 @@
+# 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 secret_retrieval_t
+
+__all__: list[str] = [
+    "Overrides",
+    "SecretRetrievalOverride",
+    "SecretRetrievalOverrides",
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class SecretRetrievalOverride:
+    profile_name: str
+    secret_retrieval: secret_retrieval_t.SecretRetrieval
+    value: str
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+SecretRetrievalOverrides = list[SecretRetrievalOverride]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class Overrides:
+    secrets: SecretRetrievalOverrides
+# DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.52 → uncountablepythonsdk-0.0.54}/uncountable/types/secret_retrieval_t.py

@@ -22,7 +22,7 @@ __all__: list[str] = [
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
-@dataclasses.dataclass(kw_only=True)
+@dataclasses.dataclass(kw_only=True, frozen=True, eq=True)
 class SecretRetrievalBase:
     type: SecretRetrievalType
 
@@ -37,7 +37,7 @@ class SecretRetrievalType(StrEnum):
 @serial_class(
     parse_require={"type"},
 )
-@dataclasses.dataclass(kw_only=True)
+@dataclasses.dataclass(kw_only=True, frozen=True, eq=True)
 class SecretRetrievalEnv(SecretRetrievalBase):
     type: typing.Literal[SecretRetrievalType.ENV] = SecretRetrievalType.ENV
     env_key: str
@@ -47,7 +47,7 @@ class SecretRetrievalEnv(SecretRetrievalBase):
 @serial_class(
     parse_require={"type"},
 )
-@dataclasses.dataclass(kw_only=True)
+@dataclasses.dataclass(kw_only=True, frozen=True, eq=True)
 class SecretRetrievalAWS(SecretRetrievalBase):
     type: typing.Literal[SecretRetrievalType.AWS] = SecretRetrievalType.AWS
     secret_name: str