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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.51
+Version: 0.0.52
 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.52.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
@@ -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
@@ -240,7 +240,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.52.dist-info/METADATA,sha256=OUWoU--wdBpw37DliJoAfdWz3iXECZumjR4eK3nxzec,1934
+UncountablePythonSDK-0.0.52.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+UncountablePythonSDK-0.0.52.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.52.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

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)