UncountablePythonSDK 0.0.118__py3-none-any.whl → 0.0.120__py3-none-any.whl

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)

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,

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)
 

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(

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

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,

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)

{uncountablepythonsdk-0.0.118.dist-info → uncountablepythonsdk-0.0.120.dist-info}/METADATA

@@ -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.dist-info → uncountablepythonsdk-0.0.120.dist-info}/RECORD

@@ -25,7 +25,7 @@ examples/set_recipe_output_file_sdk.py,sha256=Lz1amqppnWTX83z-C090wCJ4hcKmCD3kb-
 examples/upload_files.py,sha256=qMaSvMSdTMPOOP55y1AwEurc0SOdZAMvEydlqJPsGpg,432
 examples/integration-server/pyproject.toml,sha256=-ZZ1R3B-Pf-F6gQX0-Me6u3G9cVW2B2_eechemCe7_4,9149
 examples/integration-server/jobs/materials_auto/concurrent_cron.py,sha256=xsK3H9ZEaniedC2nJUB0rqOcFI8y-ojfl_nLSJb9AMM,312
-examples/integration-server/jobs/materials_auto/example_cron.py,sha256=7VVQ-UJsq3DbGpN3XPnorRVZYo-vCwbfSU3VVDluIzA,699
+examples/integration-server/jobs/materials_auto/example_cron.py,sha256=spUMiiTEFaepbVXecjD_4aEEfqEtZGGZuWTKs9J6Xcw,736
 examples/integration-server/jobs/materials_auto/example_http.py,sha256=eVq-Fss_AhmztxOMqqO-GYGF3KvPt1O5HbNwwC2arh8,1037
 examples/integration-server/jobs/materials_auto/example_instrument.py,sha256=czJF3qBFay1S8fuESOvmkvBv1wCtZGAlHjwvCyYr-Mw,2336
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py,sha256=_wILTnbzzLf9zrcQb_KQKytxxcya1ej6MqQnoUSS4fA,1180
@@ -64,7 +64,7 @@ pkgs/strenum_compat/__init__.py,sha256=wXRFeNvBm8RU6dy1PFJ5sRLgUIEeH_DVR95Sv5qpG
 pkgs/strenum_compat/strenum_compat.py,sha256=uOUAgpYTjHs1MX8dG81jRlyTkt3KNbkV_25zp7xTX2s,36
 pkgs/type_spec/__init__.py,sha256=h5DmJTca4QVV10sZR1x0-MlkZfuGYDfapR3zHvXfzto,19
 pkgs/type_spec/__main__.py,sha256=5bJaX9Y_-FavP0qwzhk-z-V97UY7uaezJTa1zhO_HHQ,1048
-pkgs/type_spec/builder.py,sha256=upgRImVIikI7osMczX-Yiv-IBFo2Cl5NO4RIpj0NTvA,54421
+pkgs/type_spec/builder.py,sha256=fVFRSJwZDJz33CtD8lC9O5L53gtvcxdx4aNjH4z2j-k,54581
 pkgs/type_spec/config.py,sha256=m0Rky7Rg2jMglDPQChF30p5h5P86Ap1GObwzLzmypNE,5829
 pkgs/type_spec/cross_output_links.py,sha256=ttFNfuQmR3sNnPSeUER5IPgLiYc-FB5gjlf7RyFYMpc,3293
 pkgs/type_spec/emit_io_ts.py,sha256=CUvBs0boB_X-Kndh66yYcqFfq3oC_LGs8YffLkJ0ZXA,5707
@@ -101,7 +101,7 @@ uncountable/core/environment.py,sha256=4gdJB0ZhRxKlqSKLaE4vUvEUGZ5fy8IAwXcGDRdYt
 uncountable/core/file_upload.py,sha256=bgvXk9vfF5qlhy2NAUcEEG7Q7i-c1wr2HrpaWD7HldU,4516
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/cli.py,sha256=DxqnwKYDNzgWwJaCpta8nPGfX37wLLtUGAYsNAGxWOU,3188
+uncountable/integration/cli.py,sha256=eshJ0lv4u00UOFrlkCwamE8NaxX1qN2q79wCJcsFrJs,3580
 uncountable/integration/construct_client.py,sha256=I53mGcdS88hba3HFwgXmWQaTd1d5u0jWNSwyc_vlVsQ,1937
 uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0hw,887
 uncountable/integration/entrypoint.py,sha256=BHOYPQgKvZE6HG8Rv15MkdYl8lRkvfDgv1OdLo0oQ9Q,433
@@ -120,10 +120,10 @@ uncountable/integration/executors/script_executor.py,sha256=BBQ9f0l7uH2hgKf60jtm
 uncountable/integration/http_server/__init__.py,sha256=WY2HMcL0UCAGYv8y6Pz-j0azbDGXwubFF21EH_zNPkc,189
 uncountable/integration/http_server/types.py,sha256=zVXXN8FPstrF9qFduwQBtxPG8I4AOK41nXAnxrtSgxw,1832
 uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/queue_runner/job_scheduler.py,sha256=3HE9inu3scwRtxh4wrProKR0P7ghjxlXlo57b706rC4,6259
+uncountable/integration/queue_runner/job_scheduler.py,sha256=Roh7-mTj6rwMzFhBXv7hASNS2dMeTcAZEynJGVjkhEs,6080
 uncountable/integration/queue_runner/queue_runner.py,sha256=N4sUXmlGzVquybiJ7NQZavCJOBGrxBj6k7mb-TITaN0,1139
 uncountable/integration/queue_runner/types.py,sha256=8qTq29BTSa5rmW6CBlBntP0pNIiDcwu1wHa78pjroS0,219
-uncountable/integration/queue_runner/worker.py,sha256=WwJmwHkgovfiqrMeNJVtIyDYJAib5ajog5ag2l_AquI,4584
+uncountable/integration/queue_runner/worker.py,sha256=WnFeDQN53QRhiF255ThIT2EeHdPw3QZ503_wPeWRqNE,4493
 uncountable/integration/queue_runner/command_server/__init__.py,sha256=gQPVILGpWzCr2i5GJyoqna7AOSFvtn4tav69gB78mTQ,571
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=Kjov_fQdx-_jJpDeWxQEg8XmlfwWQL94ufIgEjib-nc,2776
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=nDTvFN3U5Tm2ZejQhqZpOaaWpVOJiVB26JlNIT2y0fY,3876
@@ -135,8 +135,8 @@ uncountable/integration/queue_runner/command_server/protocol/command_server_pb2.
 uncountable/integration/queue_runner/command_server/protocol/command_server_pb2.pyi,sha256=lWWZuDGoWwtP-gzhADnJi40_lFbO35fUPqNkoOXVnkA,2954
 uncountable/integration/queue_runner/command_server/protocol/command_server_pb2_grpc.py,sha256=I2kU_anlxOqfaiUR9IcMTuQYvCXa8xliY4sbvXgLYAE,7504
 uncountable/integration/queue_runner/datastore/__init__.py,sha256=6BefApqN8D2zlVOH14QAeVzwQ8j5NIb41-njT02Za0k,88
-uncountable/integration/queue_runner/datastore/datastore_sqlite.py,sha256=M5cg5pC0FokaRZPhmWDTS_JCzrmSE5yNChN15J47klw,4802
-uncountable/integration/queue_runner/datastore/interface.py,sha256=IrKdA7i_PWYKb4HXYYsggR589vn-6y408r6Bz8qFFOY,685
+uncountable/integration/queue_runner/datastore/datastore_sqlite.py,sha256=YG3BuivjkAl__ZRwfMnyfx5W_zgQTwSaIPBsl-6s--0,5863
+uncountable/integration/queue_runner/datastore/interface.py,sha256=tNlnY00D_OyuNOL3x_FtHXcJZAAON3SeX7fEU5C8z1U,824
 uncountable/integration/queue_runner/datastore/model.py,sha256=8-RI5A2yPZVGBLWINVmMd6VOl_oHtqGtnaNXcapAChw,577
 uncountable/integration/secret_retrieval/__init__.py,sha256=3QXVj35w8rRMxVvmmsViFYDi3lcb3g70incfalOEm6o,87
 uncountable/integration/secret_retrieval/retrieve_secret.py,sha256=LBEf18KHtXZxg-ZZ80stJ1vW39AWf0CQllP6pNu3Eq8,2994
@@ -324,7 +324,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=dgDX_sRWSJ36UuzMZhG25oHV1HIOUKYY2G3fjKugZrw,1204
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=Bj7Dq4A90k00suacwk3bLA_dCb2aovS1kAbVam2AQnM,1395
-uncountablepythonsdk-0.0.118.dist-info/METADATA,sha256=B6aSQpiK_t2hfoZCL1e2C6FrEJfaNuMNZCDs-lQ9EdI,2143
-uncountablepythonsdk-0.0.118.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-uncountablepythonsdk-0.0.118.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.118.dist-info/RECORD,,
+uncountablepythonsdk-0.0.120.dist-info/METADATA,sha256=v5j4j9nJrkLYfdm8h9Q-nEIwqmFiDSWSAGGlWUAO8bw,2174
+uncountablepythonsdk-0.0.120.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+uncountablepythonsdk-0.0.120.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.120.dist-info/RECORD,,