UncountablePythonSDK 0.0.118__tar.gz → 0.0.120__tar.gz

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.118
+Version: 0.0.120
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -40,6 +40,7 @@ Requires-Dist: protobuf>=4.21.1
 Requires-Dist: azure-storage-blob==12.*
 Requires-Dist: boto3-stubs[essential,ses]==1.*
 Requires-Dist: msgspec==0.19.*
+Requires-Dist: tabulate==0.9.0
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.118
+Version: 0.0.120
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -40,6 +40,7 @@ Requires-Dist: protobuf>=4.21.1
 Requires-Dist: azure-storage-blob==12.*
 Requires-Dist: boto3-stubs[essential,ses]==1.*
 Requires-Dist: msgspec==0.19.*
+Requires-Dist: tabulate==0.9.0
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/UncountablePythonSDK.egg-info/requires.txt

@@ -22,6 +22,7 @@ protobuf>=4.21.1
 azure-storage-blob==12.*
 boto3-stubs[essential,ses]==1.*
 msgspec==0.19.*
+tabulate==0.9.0
 
 [test]
 mypy==1.*

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/examples/integration-server/jobs/materials_auto/example_cron.py

@@ -1,3 +1,5 @@
+import time
+
 from uncountable.integration.job import CronJob, JobArguments, register_job
 from uncountable.types import entity_t
 from uncountable.types.job_definition_t import JobResult
@@ -15,4 +17,5 @@ class MyCronJob(CronJob):
             if field_val.field_ref_name == "name":
                 name = field_val.value
         args.logger.log_info(f"material family found with name: {name}")
+        time.sleep(1.5)
         return JobResult(success=True)

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/pkgs/type_spec/builder.py

@@ -1521,8 +1521,10 @@ class SpecBuilder:
         if len(path) == 2:
             if isinstance(defn_type, SpecTypeDefnStringEnum):
                 assert path[1].parameters is None
+                statement = f"$import: [{defn_type.namespace.name}]"
                 self.ensure(
-                    path[1].name in defn_type.values, f"missing-enum-value: {path}"
+                    path[1].name in defn_type.values,
+                    f"missing-enum-value: {path} have you specified the dependency in an import statement: {statement}",
                 )
                 return SpecTypeLiteralWrapper(
                     value=path[1].name,

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/pyproject.toml

@@ -72,7 +72,8 @@ dependencies = [
     "protobuf >= 4.21.1",
     "azure-storage-blob == 12.*",
     "boto3-stubs[essential,ses]==1.*",
-    "msgspec == 0.19.*"
+    "msgspec == 0.19.*",
+    "tabulate == 0.9.0"
 ]
 dynamic = ["version"]
 

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/uncountable/integration/cli.py

@@ -15,10 +15,13 @@ from uncountable.types import queued_job_t
 
 def register_enqueue_job_parser(
     sub_parser_manager: argparse._SubParsersAction,
+    parents: list[argparse.ArgumentParser],
 ) -> None:
     run_parser = sub_parser_manager.add_parser(
         "run",
-        description="Process a job with a given command and job ID.",
+        parents=parents,
+        help="Process a job with a given host and job ID",
+        description="Process a job with a given host and job ID",
     )
     run_parser.add_argument("job_id", type=str, help="The ID of the job to process")
 
@@ -37,9 +40,13 @@ def register_enqueue_job_parser(
 
 def register_list_queued_jobs(
     sub_parser_manager: argparse._SubParsersAction,
+    parents: list[argparse.ArgumentParser],
 ) -> None:
     list_queued_jobs_parser = sub_parser_manager.add_parser(
-        "list-queued-jobs", description="List jobs queued on the integration server."
+        "list-queued-jobs",
+        parents=parents,
+        help="List all jobs queued on the integration server",
+        description="List all jobs queued on the integration server",
     )
 
     list_queued_jobs_parser.add_argument(
@@ -81,24 +88,25 @@ def register_list_queued_jobs(
 def main() -> None:
     logger = Logger(get_current_span())
 
-    parser = argparse.ArgumentParser(
+    main_parser = argparse.ArgumentParser(
         description="Execute a given integrations server command."
     )
 
-    parser.add_argument(
+    base_parser = argparse.ArgumentParser(add_help=False)
+    base_parser.add_argument(
         "--host", type=str, default="localhost", nargs="?", help="The host to run on"
     )
 
-    subparser_action = parser.add_subparsers(
+    subparser_action = main_parser.add_subparsers(
         dest="command",
         required=True,
         help="The command to execute (e.g., 'run')",
     )
 
-    register_enqueue_job_parser(subparser_action)
-    register_list_queued_jobs(subparser_action)
+    register_enqueue_job_parser(subparser_action, parents=[base_parser])
+    register_list_queued_jobs(subparser_action, parents=[base_parser])
 
-    args = parser.parse_args()
+    args = main_parser.parse_args()
     with logger.push_scope(args.command):
         args.func(args)
 

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/uncountable/integration/queue_runner/datastore/datastore_sqlite.py

@@ -96,6 +96,35 @@ class DatastoreSqlite(Datastore):
 
             return queued_job_metadata
 
+    def get_next_queued_job_for_ref_name(
+        self, job_ref_name: str
+    ) -> queued_job_t.QueuedJob | None:
+        with self.session_maker() as session:
+            select_stmt = (
+                select(
+                    QueuedJob.id,
+                    QueuedJob.payload,
+                    QueuedJob.num_attempts,
+                    QueuedJob.job_ref_name,
+                    QueuedJob.submitted_at,
+                )
+                .filter(QueuedJob.job_ref_name == job_ref_name)
+                .limit(1)
+                .order_by(QueuedJob.submitted_at)
+            )
+
+            for row in session.execute(select_stmt):
+                parsed_payload = queued_job_payload_parser.parse_storage(row.payload)
+                return queued_job_t.QueuedJob(
+                    queued_job_uuid=row.id,
+                    job_ref_name=row.job_ref_name,
+                    num_attempts=row.num_attempts,
+                    submitted_at=row.submitted_at,
+                    payload=parsed_payload,
+                )
+
+            return None
+
     def load_job_queue(self) -> list[queued_job_t.QueuedJob]:
         with self.session_maker() as session:
             select_stmt = select(

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/uncountable/integration/queue_runner/datastore/interface.py

@@ -18,6 +18,11 @@ class Datastore(ABC):
     @abstractmethod
     def load_job_queue(self) -> list[queued_job_t.QueuedJob]: ...
 
+    @abstractmethod
+    def get_next_queued_job_for_ref_name(
+        self, job_ref_name: str
+    ) -> queued_job_t.QueuedJob | None: ...
+
     @abstractmethod
     def list_queued_job_metadata(
         self, offset: int, limit: int | None

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/uncountable/integration/queue_runner/job_scheduler.py

@@ -114,17 +114,11 @@ async def start_scheduler(
                     queued_job_t.InvocationContextManual,
                 ),
             ):
-                existing_queued_jobs = datastore.load_job_queue()
-                duplicate_job = next(
-                    (
-                        job
-                        for job in existing_queued_jobs
-                        if job.job_ref_name == job_ref_name
-                    ),
-                    None,
+                existing_queued_job = datastore.get_next_queued_job_for_ref_name(
+                    job_ref_name=job_ref_name
                 )
-                if duplicate_job is not None:
-                    return duplicate_job.queued_job_uuid
+                if existing_queued_job is not None:
+                    return existing_queued_job.queued_job_uuid
             queued_job = datastore.add_job_to_queue(
                 job_payload=payload,
                 job_ref_name=job_ref_name,

{uncountablepythonsdk-0.0.118 → uncountablepythonsdk-0.0.120}/uncountable/integration/queue_runner/worker.py

@@ -111,9 +111,6 @@ def run_queued_job(
                 job_definition=job_details.job_definition,
                 job_uuid=queued_job.queued_job_uuid,
             )
-        except Exception as e:
-            job_logger.log_exception(e)
-            return job_definition_t.JobResult(success=False)
         except BaseException as e:
             job_logger.log_exception(e)
-            raise e
+            return job_definition_t.JobResult(success=False)