UncountablePythonSDK 0.0.12__tar.gz → 0.0.14__tar.gz

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.12
+Version: 0.0.14
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -21,7 +21,7 @@ Requires-Dist: SQLAlchemy==2.0.29
 Requires-Dist: APScheduler==3.10.4
 Requires-Dist: python-dateutil==2.9.0
 Requires-Dist: shelljob==0.6.3
-Requires-Dist: yaml==6.0.1
+Requires-Dist: PyYAML==6.0.1
 Provides-Extra: test
 Requires-Dist: mypy>=1.8.1; extra == "test"
 Requires-Dist: ruff>=0.2.1; extra == "test"

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.12
+Version: 0.0.14
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -21,7 +21,7 @@ Requires-Dist: SQLAlchemy==2.0.29
 Requires-Dist: APScheduler==3.10.4
 Requires-Dist: python-dateutil==2.9.0
 Requires-Dist: shelljob==0.6.3
-Requires-Dist: yaml==6.0.1
+Requires-Dist: PyYAML==6.0.1
 Provides-Extra: test
 Requires-Dist: mypy>=1.8.1; extra == "test"
 Requires-Dist: ruff>=0.2.1; extra == "test"

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/UncountablePythonSDK.egg-info/requires.txt

@@ -3,7 +3,7 @@ SQLAlchemy==2.0.29
 APScheduler==3.10.4
 python-dateutil==2.9.0
 shelljob==0.6.3
-yaml==6.0.1
+PyYAML==6.0.1
 
 [test]
 mypy>=1.8.1

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/pyproject.toml

@@ -53,7 +53,7 @@ dependencies = [
     "APScheduler == 3.10.4",
     "python-dateutil == 2.9.0",
     "shelljob == 0.6.3",
-    "yaml == 6.0.1"
+    "PyYAML== 6.0.1"
 ]
 dynamic = ["version"]
 

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/uncountable/integration/construct_client.py

@@ -13,9 +13,9 @@ def construct_uncountable_client(
 ) -> Client:
     match profile_meta.auth_retrieval:
         case AuthRetrievalEnv():
-            api_id = os.getenv(f"UNC_PROFILE_{profile_meta.name}_API_ID")
+            api_id = os.getenv(f"UNC_PROFILE_{profile_meta.name.upper()}_API_ID")
             api_secret_key = os.getenv(
-                f"UNC_PROFILE_{profile_meta.name}_API_SECRET_KEY"
+                f"UNC_PROFILE_{profile_meta.name.upper()}_API_SECRET_KEY"
             )
 
             assert api_id is not None

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/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)

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/uncountable/integration/entrypoint.py

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

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/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

{UncountablePythonSDK-0.0.12 → UncountablePythonSDK-0.0.14}/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()