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

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

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

@@ -3,7 +3,7 @@ docs/conf.py,sha256=YF5J-9g_Wg8wXmyHsGaE8xYlDEzqocNl3UWUmP0CwBg,1702
 docs/index.md,sha256=eEdirX_Ds6ICTRtIS5iT4irCquHcQyKN7E4M5QP9T8A,257
 docs/justfile,sha256=cvNcpb-ByPOF2aCrFlg3DDZBoYMx5W8xGdr13m9HcnI,215
 docs/quickstart.md,sha256=3GuJ0MB1O5kjlsrgAmdSkDq0rYqATrYy-tzEHDy8H-c,422
-docs/requirements.txt,sha256=YDDAaHfuLxkdLhrjEUJeHDE-NSmD5chTgVTIO7BEeto,139
+docs/requirements.txt,sha256=jD38J5O9MhuLHpA86cUgbFO8fVXouYupS3nGRAnh2x0,138
 docs/static/logo_blue.png,sha256=SyYpMTVhhBbhF5Wl8lWaVwz-_p1MIR6dW6bVhufQRME,46708
 docs/static/favicons/android-chrome-192x192.png,sha256=XoF-AhD55JlSBDGsEPJKfT_VeXT-awhwKyZnxLhrwvk,1369
 docs/static/favicons/android-chrome-512x512.png,sha256=1S4xwY9YtJQ5ifFsZ-DOzssoyBYs0t9uwdOUmYx0Xso,3888
@@ -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=q4q0MTWXWu5RNRVZ5ibv4M4UXXxWl_J6xCnitvngIMM,3957
+pkgs/filesystem_utils/_s3_session.py,sha256=LtFGCs6nhIY6z8wWCC5mQYDg54qFIo4iFIBwCeXMcZU,3909
 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
@@ -83,8 +83,8 @@ uncountable/integration/construct_client.py,sha256=e1uAMVp4FTbValCJ3gfaZFuObKxHb
 uncountable/integration/cron.py,sha256=e5456IYJF2ipiSsd1R2T334lfe7mtp-gwP7JpS645L0,1858
 uncountable/integration/entrypoint.py,sha256=9rk06gBTsCqytIs8Shsnlf6ir_4Uq5d5rfP1veiSLzc,1437
 uncountable/integration/job.py,sha256=UTzcMes2KrBBRLOM3u94imMKLLnv50glqOkNf8-JOZw,1022
-uncountable/integration/server.py,sha256=JlnbidtiSLCEod0DzLKIzTCxP1qgaHBIBolUvnihJn8,3980
-uncountable/integration/telemetry.py,sha256=H5XQnRTszDL6Nl_oQYuWRr_oNYMocDaCCpKlwll-qZI,5127
+uncountable/integration/server.py,sha256=bmX-ukLiNDq0ThVB2lUyXl-vtID5HI4gqJHxhsVNG3w,4440
+uncountable/integration/telemetry.py,sha256=wgQnaWZFmUM_4lwyghOmL4Pd8DU0qUJvxXcrgBekAKQ,5261
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=YtQHJ1DBGPhxKFRCfiXqohOYUceKSxMVOJ88aPI48Ug,181
 uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,8 +92,8 @@ uncountable/integration/executors/executors.py,sha256=v5ClGVUlvrZcMdmGQa8Ll668G_
 uncountable/integration/executors/generic_upload_executor.py,sha256=wafNY_gpbUiQhvkFPDw-GGiJLmDVtTRgH_5jwMLy2Z4,10283
 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=iDqLbYKKLv8Wl5hNSKl7b4hKJnDshFe6tgdAJmQgQyA,2205
-uncountable/types/__init__.py,sha256=95iOd3WXWoI_4a461IS2ieWRic3zRyNaCYzfTpX764o,8162
+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_t.py,sha256=9jp9rOyetRdD5aQVyijzQggTyYU4021PBVGXk0ooBCQ,1911
@@ -130,6 +130,8 @@ uncountable/types/job_definition.py,sha256=Cgwop6iNcWEsEpfjMl1EtkRES_3-SVzpMe-w7
 uncountable/types/job_definition_t.py,sha256=pL-0YVyR0oz6-5wWXJsX1UyYo4R_FPwhOYFj9iMKgvo,7170
 uncountable/types/outputs.py,sha256=sUZx_X-TKCZtLm1YCEH8OISX9DdPlv9ZuUfM3-askCc,281
 uncountable/types/outputs_t.py,sha256=2aORUOr0ls1ZYo-ddkWax3D1ZndmQsWtHfJxpYozlhg,656
+uncountable/types/overrides.py,sha256=Mv-smwK1B3pvbt48fNOiqkeQn9wMgYlBFJKUBOJqceE,431
+uncountable/types/overrides_t.py,sha256=-DMuW3Iqxlf7pb3HmPN8cswYrhG9UrRstRUzM9wDVHo,960
 uncountable/types/permissions.py,sha256=1mRnSsmRgjuLgp6pylTwwACD_YRIcmlqxHkufwZtMns,297
 uncountable/types/permissions_t.py,sha256=i0vFwVvmmnInrA5qW8uuo0_tM6KYn3VYZ75d9084Vko,1625
 uncountable/types/phases.py,sha256=YCsU77DdjRJJWdLTwLuOZNG4e9ML82NIBI1xTWr3ggA,266
@@ -155,7 +157,7 @@ uncountable/types/recipes_t.py,sha256=04dh2wn_lIWB3KF36sxcdJxb_JDclkHp5g3AHbfoc-
 uncountable/types/response.py,sha256=WOlSgQYKK_fnnXk1i-h3Bwx2ZiYqpLj-lnt-hXhmbWs,274
 uncountable/types/response_t.py,sha256=jjTyB0bM-xEz7WjqPb6GUIkMgUvqXvM9trMdKdIcAZw,622
 uncountable/types/secret_retrieval.py,sha256=Jt_-sjYBKBwJytS4QgF1KnUVEEu9YAsCYI3NtYlbqa4,592
-uncountable/types/secret_retrieval_t.py,sha256=UQjkNUKMDMRG-44vXE28MxcD5HjHWQD9LTRMmMVx1EI,1864
+uncountable/types/secret_retrieval_t.py,sha256=i9Aq1HoNvARYVgKmSjTjECUYp1AZtW4052hYJi9Jngo,1930
 uncountable/types/units.py,sha256=R_TBhxWCIWSSXK9J3S0Omtj3t5BZNK9C80MyqFjMO7k,275
 uncountable/types/units_t.py,sha256=w_k7SQ_J_-XTGY-BMcWC5sQi2z3uInqtrRUPHgniuew,559
 uncountable/types/users.py,sha256=YEk8v0vDOBFvmOQMQw7MAOicSGzMui8Hb9hdFX2Vw3E,275
@@ -240,7 +242,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=4zOcB_38uT73Jm3-XqkG40fBM1R5vpvPpGAg-U4lzxY,1059
-UncountablePythonSDK-0.0.51.dist-info/METADATA,sha256=AzvBprRKL--Fkabx8qrLx9P07XsCyTu1BqpTGl9AMFg,1934
-UncountablePythonSDK-0.0.51.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-UncountablePythonSDK-0.0.51.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.51.dist-info/RECORD,,
+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,,

docs/requirements.txt

@@ -1,7 +1,7 @@
-furo==2024.7.18
-myst-parser==3.0.1
+furo==2024.8.6
+myst-parser==4.0.0
 sphinx-autoapi==3.2.0
 sphinx-copybutton==0.5.2
 Sphinx==8.0.0
-sphinx_design==0.6.0
+sphinx_design==0.6.1
 sphinx-favicon==1.0.1

pkgs/filesystem_utils/_s3_session.py

@@ -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()

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 = (

uncountable/integration/server.py

@@ -11,6 +11,7 @@ from apscheduler.triggers.cron import CronTrigger
 from sqlalchemy.engine.base import Engine
 
 from uncountable.integration.cron import CronJobArgs, cron_job_executor
+from uncountable.integration.telemetry import Logger
 from uncountable.types import base_t
 from uncountable.types.client_config_t import ClientConfigOptions
 from uncountable.types.job_definition_t import (
@@ -26,6 +27,7 @@ _MAX_APSCHEDULER_CONCURRENT_JOBS = 1
 class IntegrationServer:
     _scheduler: BaseScheduler
     _engine: Engine
+    _server_logger: Logger
 
     def __init__(self, engine: Engine) -> None:
         self._engine = engine
@@ -34,6 +36,7 @@ class IntegrationServer:
             jobstores={"default": SQLAlchemyJobStore(engine=engine)},
             executors={"default": ThreadPoolExecutor(_MAX_APSCHEDULER_CONCURRENT_JOBS)},
         )
+        self._server_logger = Logger()
 
     def register_profile(
         self,
@@ -59,7 +62,14 @@ class IntegrationServer:
                             definition=job_defn, profile_metadata=profile_metadata
                         )
                     )
-                    existing_job = self._scheduler.get_job(job_defn.id)
+                    try:
+                        existing_job = self._scheduler.get_job(job_defn.id)
+                    except ValueError as e:
+                        self._server_logger.log_warning(
+                            f"could not reconstitute job {job_defn.id}: {e}"
+                        )
+                        self._scheduler.remove_job(job_defn.id)
+                        existing_job = None
                     if existing_job is not None:
                         existing_job.modify(
                             name=job_defn.name,

uncountable/integration/telemetry.py

@@ -49,10 +49,39 @@ class LogSeverity(StrEnum):
     ERROR = "Error"
 
 
-class JobLogger:
+class Logger:
     current_span_id: int | None = None
     current_trace_id: int | None = None
 
+    def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
+        return attributes or {}
+
+    def _emit_log(
+        self, message: str, *, severity: LogSeverity, attributes: Attributes | None
+    ) -> None:
+        log_record = LogRecord(
+            body=message,
+            severity_text=severity,
+            timestamp=time.time_ns(),
+            attributes=self._patch_attributes(attributes),
+            span_id=self.current_span_id,
+            trace_id=self.current_trace_id,
+        )
+        log_file: TextIO = sys.stderr if severity == LogSeverity.ERROR else sys.stdout
+        log_file.write(log_record.to_json())
+        log_file.flush()
+
+    def log_info(self, message: str, *, attributes: Attributes | None = None) -> None:
+        self._emit_log(message=message, severity=LogSeverity.INFO, attributes=attributes)
+
+    def log_warning(self, message: str, *, attributes: Attributes | None = None) -> None:
+        self._emit_log(message=message, severity=LogSeverity.WARN, attributes=attributes)
+
+    def log_error(self, message: str, *, attributes: Attributes | None = None) -> None:
+        self._emit_log(message=message, severity=LogSeverity.ERROR, attributes=attributes)
+
+
+class JobLogger(Logger):
     def __init__(
         self,
         *,
@@ -104,27 +133,3 @@ class JobLogger:
             self.current_span_id = span.get_span_context().span_id
             self.current_trace_id = span.get_span_context().trace_id
             yield self
-
-    def _emit_log(
-        self, message: str, *, severity: LogSeverity, attributes: Attributes | None
-    ) -> None:
-        log_record = LogRecord(
-            body=message,
-            severity_text=severity,
-            timestamp=time.time_ns(),
-            attributes=self._patch_attributes(attributes),
-            span_id=self.current_span_id,
-            trace_id=self.current_trace_id,
-        )
-        log_file: TextIO = sys.stderr if severity == LogSeverity.ERROR else sys.stdout
-        log_file.write(log_record.to_json())
-        log_file.flush()
-
-    def log_info(self, message: str, *, attributes: Attributes | None = None) -> None:
-        self._emit_log(message=message, severity=LogSeverity.INFO, attributes=attributes)
-
-    def log_warning(self, message: str, *, attributes: Attributes | None = None) -> None:
-        self._emit_log(message=message, severity=LogSeverity.WARN, attributes=attributes)
-
-    def log_error(self, message: str, *, attributes: Attributes | None = None) -> None:
-        self._emit_log(message=message, severity=LogSeverity.ERROR, attributes=attributes)

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",

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

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

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