UncountablePythonSDK 0.0.13__py3-none-any.whl → 0.0.15__py3-none-any.whl

{UncountablePythonSDK-0.0.13.dist-info → UncountablePythonSDK-0.0.15.dist-info}/METADATA

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

@@ -71,11 +71,11 @@ uncountable/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/core/__init__.py,sha256=GCXRRhhYv-yKzqKjAij7GcNiOr90BBbgdhhpusWtmUc,100
 uncountable/core/client.py,sha256=jcJBGwe31fOqfGiUJzW_KMcfE0hax55jgVVliALBNLQ,4160
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/construct_client.py,sha256=Ojdj6Mh5orAjXZLxb6SzvH4zRmkvqp6nHF_8Ph7h1ho,896
-uncountable/integration/cron.py,sha256=QZP4yvxdGUZsOH5wtxZzqja_0UBHL4lwERzEHGTR-E0,917
-uncountable/integration/entrypoint.py,sha256=31QJO6pFDvPR8k5Bi7RSm-IUI5kXj_VHdz4XZW3j5DI,1363
-uncountable/integration/job.py,sha256=orPmhLWs5mB4U8XweIb1Pa3fUKKE89yUnHXLkHy7KOs,699
-uncountable/integration/server.py,sha256=VfbJLFqHl6cQAL8e2EOmrtSRfruskQ89h_2Mu3EMeOI,2998
+uncountable/integration/construct_client.py,sha256=r6M5pnIO0fKcjf5d_AREPtWZ6AkWgcjkdu_jHQEYlT8,1084
+uncountable/integration/cron.py,sha256=TIPqMPMSMtMJTu4aXwLf6QY-OLrpmyITLDp48UIr4Ok,919
+uncountable/integration/entrypoint.py,sha256=sPtUeKJEivf0iqY-H4LHWhyeUHMZK_U4CrDj1Kw8Ld0,1395
+uncountable/integration/job.py,sha256=5QuCjeze9vtEirntP9P9hDD3LVrBn5pApDWh2IZeEiY,817
+uncountable/integration/server.py,sha256=DSYflR8tIo20Kixt4AmQI6nOP_BHeTGUiq7iFKaf31s,3342
 uncountable/integration/types.py,sha256=n9idu2_qHOA5CQdE6NK8HS6aZ8ugTZKTfTTnm4sy8tI,2066
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=iI9e8a2hfbFP-dvH0MGLsrG-RpM0dHKCL-oCLkah9hs,181
@@ -139,7 +139,7 @@ uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=L9s2ykPP4pd02
 uncountable/types/api/recipes/get_recipes_data.py,sha256=dOKokz6rJp3AiqNrF8rAZFlmJSs3ejdNIJhwKw0Utr0,5317
 uncountable/types/api/recipes/set_recipe_inputs.py,sha256=sHEwPocBucWRnnoX7nbNaFqdflxFkqdjuVydNezqluY,1326
 uncountable/types/api/recipes/set_recipe_outputs.py,sha256=QYq39TNchQ80ET1C77OE9fwhbu_HmIoEDmrQJHkkCu0,1609
-UncountablePythonSDK-0.0.13.dist-info/METADATA,sha256=m8sJxcGIlD2Bf89mLsaSTITEjN08Ypq7d7MDFhKO4pw,1298
-UncountablePythonSDK-0.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-UncountablePythonSDK-0.0.13.dist-info/top_level.txt,sha256=8ga1DCSWt4Uc_XJ5cR0QrDQuyoeo2uoSzaAJdQT2KBo,36
-UncountablePythonSDK-0.0.13.dist-info/RECORD,,
+UncountablePythonSDK-0.0.15.dist-info/METADATA,sha256=mO5xBMNi8X3Ek9wcHUAD8FD-2A3as4klF2PU6R4H2dA,1298
+UncountablePythonSDK-0.0.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+UncountablePythonSDK-0.0.15.dist-info/top_level.txt,sha256=8ga1DCSWt4Uc_XJ5cR0QrDQuyoeo2uoSzaAJdQT2KBo,36
+UncountablePythonSDK-0.0.15.dist-info/RECORD,,

uncountable/integration/construct_client.py

@@ -8,14 +8,19 @@ from uncountable.integration.types import (
 )
 
 
-def construct_uncountable_client(
-    profile_meta: ProfileMetadata
-) -> Client:
+def _get_env_var(name: str) -> str:
+    value = os.getenv(name)
+    if value is None:
+        raise Exception(f"environment variable {name} is missing")
+    return value
+
+
+def construct_uncountable_client(profile_meta: ProfileMetadata) -> Client:
     match profile_meta.auth_retrieval:
         case AuthRetrievalEnv():
-            api_id = os.getenv(f"UNC_PROFILE_{profile_meta.name}_API_ID")
-            api_secret_key = os.getenv(
-                f"UNC_PROFILE_{profile_meta.name}_API_SECRET_KEY"
+            api_id = _get_env_var(f"UNC_PROFILE_{profile_meta.name.upper()}_API_ID")
+            api_secret_key = _get_env_var(
+                f"UNC_PROFILE_{profile_meta.name.upper()}_API_SECRET_KEY"
             )
 
             assert api_id is not None

uncountable/integration/cron.py

@@ -23,7 +23,6 @@ def cron_job_executor(**kwargs: dict) -> None:
         client=construct_uncountable_client(profile_meta=args_passed.profile_metadata),
     )
 
-    job_class = resolve_script_executor(args_passed.definition.executor)
+    job = resolve_script_executor(args_passed.definition.executor, args_passed.profile_metadata)
 
-    job = job_class()
     job.run(args)

uncountable/integration/entrypoint.py

@@ -36,6 +36,8 @@ def main() -> None:
                 jobs=profile.jobs,
             )
 
+        server.serve_forever()
+
 
 if __name__ == "__main__":
     main()

uncountable/integration/job.py

@@ -26,6 +26,7 @@ class JobResult:
 
 
 class Job(ABC):
+    _unc_job_registered: bool = False
 
     @abstractmethod
     def run(self, args: JobArguments) -> JobResult:
@@ -37,3 +38,8 @@ class CronJob(Job):
     @abstractmethod
     def run(self, args: CronJobArguments) -> JobResult:
         ...
+
+
+def register_job(cls: Job):
+    cls._unc_job_registered = True
+    return cls

uncountable/integration/server.py

@@ -1,5 +1,7 @@
+import signal
+from types import TracebackType
 from dataclasses import asdict
-from typing import assert_never
+from typing import Optional, assert_never
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
@@ -57,7 +59,9 @@ class IntegrationServer:
                             name=job_defn.name,
                             kwargs=job_kwargs,
                         )
-                        existing_job.reschedule(job_defn.cron_spec)
+                        existing_job.reschedule(
+                            CronTrigger.from_crontab(job_defn.cron_spec)
+                        )
                     else:
                         self._scheduler.add_job(
                             cron_job_executor,
@@ -72,6 +76,9 @@ class IntegrationServer:
                 case _:
                     assert_never(job_defn.trigger)
 
+    def serve_forever(self) -> None:
+        signal.pause()
+
     def _start_apscheduler(self) -> None:
         self._scheduler.start()
 
@@ -82,5 +89,10 @@ class IntegrationServer:
         self._start_apscheduler()
         return self
 
-    def __exit__(self) -> None:
+    def __exit__(
+        self,
+        exc_type: Optional[type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> None:
         self._stop_apscheduler()