UncountablePythonSDK 0.0.70__py3-none-any.whl → 0.0.72__py3-none-any.whl

{UncountablePythonSDK-0.0.70.dist-info → UncountablePythonSDK-0.0.72.dist-info}/METADATA

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

@@ -21,7 +21,7 @@ examples/invoke_uploader.py,sha256=rEvmVY5TjigN_-4PTQdkjY-bC5DrYMcJgquyZ4Tt5FM,7
 examples/set_recipe_metadata_file.py,sha256=oPBhMo9T17zj4YpJRkmVH9lknYcT8livph0KssxYtg4,1048
 examples/set_recipe_output_file_sdk.py,sha256=Lz1amqppnWTX83z-C090wCJ4hcKmCD3kb-4v0uBRi0Y,782
 examples/upload_files.py,sha256=tUfKFqiqwnw08OL5Y8_e4j5pSRhp94cFex8XTuVa_ig,487
-examples/integration-server/pyproject.toml,sha256=yVYpx5VG3bKQCYjmCSKN_MRjxoOoF2xF2KzkCcvDHh4,9134
+examples/integration-server/pyproject.toml,sha256=mB0uj-_Wo8WRmhdMwOwcdOB5lAhiW_8Kf-epMFrOq34,9133
 examples/integration-server/jobs/materials_auto/example_cron.py,sha256=7VVQ-UJsq3DbGpN3XPnorRVZYo-vCwbfSU3VVDluIzA,699
 examples/integration-server/jobs/materials_auto/profile.yaml,sha256=WZTNlgc8uH412oRmWHWWuenYo_6LnrIL11V0HMkGsB0,352
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,7 +85,7 @@ uncountable/core/environment.py,sha256=n46mWvG5uBOy6H_aetu_iuaYmO_d23uSbQBRgb6xS
 uncountable/core/file_upload.py,sha256=qR7BBBWVxFNrb1_WICreo3dkZygE9lcE1fmZCQrDZU0,3469
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/cli.py,sha256=wv9XHXujO0Zop-R4jmjNQttPOjEDQlXPfvmfZ5HW9QE,2898
+uncountable/integration/cli.py,sha256=h3RE0l1SdjkveOKeY2amlmrJppK4HEQJXk8VG9UJRWg,1359
 uncountable/integration/construct_client.py,sha256=I2XTamht13vs-JYkV4PpNS_Pc4FJm-KVYqNNvxI4qNk,1916
 uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0hw,887
 uncountable/integration/entrypoint.py,sha256=EjJdTmED80MrVcNoQ5BhFP3bAYHdU6CzRGiPSZF9y8w,802
@@ -102,7 +102,7 @@ uncountable/integration/executors/executors.py,sha256=CbwatKkHrLhnqYr_nsBjr0KYeO
 uncountable/integration/executors/generic_upload_executor.py,sha256=NlW5WcYePPA7_fwp5uW_2afAiQLKK7rCkKF06wQ948E,10375
 uncountable/integration/executors/script_executor.py,sha256=OmSBOtU48G3mqza9c2lCm84pGGyaDk-ZBJCx3RsdJXc,846
 uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/queue_runner/job_scheduler.py,sha256=4AdI_89mPNAgO-WSJvqRaN3HbKlzlVRh9aIkwfQvL7o,4679
+uncountable/integration/queue_runner/job_scheduler.py,sha256=n6bM6ZqVOPD0PoJuZV5Y5tuhmw2gI-_p6JbnVlK42uI,5016
 uncountable/integration/queue_runner/queue_runner.py,sha256=0BmYu5zHdothTevGsB-nXg6MBd1UD-WkP3h1WCKMdQg,710
 uncountable/integration/queue_runner/types.py,sha256=8qTq29BTSa5rmW6CBlBntP0pNIiDcwu1wHa78pjroS0,219
 uncountable/integration/queue_runner/worker.py,sha256=GNz8PmPUBMLA-R2VWkC_86WOaeHjHFI2mvBlNRcI3wE,4238
@@ -269,7 +269,7 @@ uncountable/types/api/recipes/set_recipe_inputs.py,sha256=yCGFQoguzsSK_weOK4kcvq
 uncountable/types/api/recipes/set_recipe_metadata.py,sha256=J2F1FDgFLKjlbGw29TW1Xefy38Zt-C7V1WDK70gRiuY,914
 uncountable/types/api/recipes/set_recipe_output_annotations.py,sha256=ayG9vnCroYGQ3mmNBALLlQhf9otrR-q0QiNLnWgmIsw,2930
 uncountable/types/api/recipes/set_recipe_output_file.py,sha256=8s0oxgjhv_hIyV3EoAjIBb970TrJJbKTFaSdNvbgU78,1225
-uncountable/types/api/recipes/set_recipe_outputs.py,sha256=I7NUDO_QrKt1rZB7zHr6WWS2FdXCK8Bqc0BxFkDfjyQ,1729
+uncountable/types/api/recipes/set_recipe_outputs.py,sha256=bLR-FtncB6hzqvzQhCts6ERdHJWgPMne4bQi6-xxu_k,1890
 uncountable/types/api/recipes/set_recipe_tags.py,sha256=kYX13RvHyUOlzL6LbBKDQ8yNvpvNobbnF2WDtgZsKRc,2493
 uncountable/types/api/recipes/unarchive_recipes.py,sha256=KZKzw0fbQdOBUR3YBunFrHFcex4qPMiA8mDgsB6n24k,814
 uncountable/types/api/recipes/unlock_recipes.py,sha256=AvzQeZCLs9i7CuhMs3Xltdi4n0q4Td55yHYyBGQgWag,1103
@@ -277,7 +277,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=Rc77y5q-3R9-SNQgm8P35zKaW2D1Hbtm7PDixnOn1G0,1025
-UncountablePythonSDK-0.0.70.dist-info/METADATA,sha256=_GI0ixHy91cpiMAMQfwyE-Sfvowp982PEBAw6-emnM0,2051
-UncountablePythonSDK-0.0.70.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-UncountablePythonSDK-0.0.70.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.70.dist-info/RECORD,,
+UncountablePythonSDK-0.0.72.dist-info/METADATA,sha256=Tg7-rgPrn3Yym3NA4cOfJjdjawKYQFKmEi6mMe7rPi0,2051
+UncountablePythonSDK-0.0.72.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+UncountablePythonSDK-0.0.72.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.72.dist-info/RECORD,,

examples/integration-server/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
   "ruff == 0.*",
   "openpyxl == 3.*",
   "more_itertools == 10.*",
-  "types-paramiko == 3.4.0.20240423",
+  "types-paramiko ==3.5.0.20240918",
   "types-openpyxl == 3.*",
   "types-pysftp == 0.*",
   "types-pytz == 2024.*",

uncountable/integration/cli.py

@@ -2,20 +2,17 @@ import argparse
 
 from opentelemetry.trace import get_current_span
 
-from uncountable.core.async_batch import AsyncBatchProcessor
-from uncountable.integration.construct_client import construct_uncountable_client
-from uncountable.integration.executors.executors import execute_job
-from uncountable.integration.job import CronJobArguments
-from uncountable.integration.scan_profiles import load_profiles
-from uncountable.integration.telemetry import JobLogger, Logger
-from uncountable.types import job_definition_t
+from uncountable.core.environment import get_local_admin_server_port
+from uncountable.integration.queue_runner.command_server.command_client import (
+    send_job_queue_message,
+)
+from uncountable.integration.telemetry import Logger
+from uncountable.types import queued_job_t
 
 
 def main() -> None:
     logger = Logger(get_current_span())
 
-    profiles = load_profiles()
-
     parser = argparse.ArgumentParser(
         description="Process a job with a given command and job ID."
     )
@@ -29,45 +26,22 @@ def main() -> None:
 
     parser.add_argument("job_id", type=str, help="The ID of the job to process")
 
+    parser.add_argument(
+        "--host", type=str, default="localhost", nargs="?", help="The host to run on"
+    )
+
     args = parser.parse_args()
 
     with logger.push_scope(args.command):
         if args.command == "run":
-            job_result: job_definition_t.JobResult | None = None
-            for profile in profiles:
-                for job in profile.definition.jobs:
-                    if job.id == args.job_id:
-                        profile_meta = job_definition_t.ProfileMetadata(
-                            name=profile.name,
-                            base_url=profile.definition.base_url,
-                            auth_retrieval=profile.definition.auth_retrieval,
-                            client_options=profile.definition.client_options,
-                        )
-                        job_logger = JobLogger(
-                            base_span=logger.current_span,
-                            profile_metadata=profile_meta,
-                            job_definition=job,
-                        )
-                        client = construct_uncountable_client(
-                            profile_meta=profile_meta, job_logger=job_logger
-                        )
-                        batch_processor = AsyncBatchProcessor(client=client)
-                        job_args = CronJobArguments(
-                            job_definition=job,
-                            profile_metadata=profile_meta,
-                            client=client,
-                            batch_processor=batch_processor,
-                            logger=job_logger,
-                            payload=None,
-                        )
-                        job_result = execute_job(
-                            job_definition=job,
-                            profile_metadata=profile_meta,
-                            args=job_args,
-                        )
-                        break
-            if job_result is None:
-                raise Exception(f"no such job id {args.job_id}")
+            send_job_queue_message(
+                job_ref_name=args.job_id,
+                payload=queued_job_t.QueuedJobPayload(
+                    invocation_context=queued_job_t.InvocationContextManual()
+                ),
+                host=args.host,
+                port=get_local_admin_server_port(),
+            )
         else:
             parser.print_usage()
 

uncountable/integration/queue_runner/job_scheduler.py

@@ -3,6 +3,8 @@ import typing
 from concurrent.futures import ProcessPoolExecutor
 from dataclasses import dataclass
 
+from opentelemetry.trace import get_current_span
+
 from uncountable.integration.db.connect import IntegrationDBService, create_db_engine
 from uncountable.integration.db.session import get_session_maker
 from uncountable.integration.queue_runner.command_server import (
@@ -14,6 +16,7 @@ from uncountable.integration.queue_runner.datastore import DatastoreSqlite
 from uncountable.integration.queue_runner.datastore.interface import Datastore
 from uncountable.integration.queue_runner.worker import Worker
 from uncountable.integration.scan_profiles import load_profiles
+from uncountable.integration.telemetry import Logger
 from uncountable.types import job_definition_t, queued_job_t
 
 from .types import ResultQueue, ResultTask
@@ -72,6 +75,7 @@ def _start_workers(
 
 
 async def start_scheduler(command_queue: CommandQueue) -> None:
+    logger = Logger(get_current_span())
     result_queue: ResultQueue = asyncio.Queue()
     engine = create_db_engine(IntegrationDBService.RUNNER)
     session_maker = get_session_maker(engine)
@@ -87,7 +91,12 @@ async def start_scheduler(command_queue: CommandQueue) -> None:
         queued_jobs = datastore.load_job_queue()
 
         async def enqueue_queued_job(queued_job: queued_job_t.QueuedJob) -> None:
-            worker = job_worker_lookup[queued_job.job_ref_name]
+            try:
+                worker = job_worker_lookup[queued_job.job_ref_name]
+            except KeyError as e:
+                logger.log_exception(e)
+                datastore.remove_job_from_queue(queued_job.queued_job_uuid)
+                return
             await worker.listen_queue.put(queued_job)
 
         for queued_job in queued_jobs:

uncountable/types/api/recipes/set_recipe_outputs.py

@@ -10,6 +10,7 @@ from decimal import Decimal  # noqa: F401
 import dataclasses
 from pkgs.serialization import serial_class
 from ... import base_t
+from ... import field_values_t
 from ... import recipes_t
 from ... import response_t
 
@@ -47,6 +48,7 @@ class RecipeOutputValue:
     value_str: typing.Optional[str] = None
     value_curve: typing.Optional[CurveValues] = None
     formatting: typing.Optional[recipes_t.RecipeAttributeFormatting] = None
+    field_values: typing.Optional[list[typing.Union[field_values_t.ArgumentValueRefName, field_values_t.ArgumentValueId]]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec