UncountablePythonSDK 0.0.148__tar.gz → 0.0.149__tar.gz

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.148
+Version: 0.0.149
 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.148 → uncountablepythonsdk-0.0.149}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.148
+Version: 0.0.149
 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.148 → uncountablepythonsdk-0.0.149}/uncountable/integration/executors/executors.py

@@ -107,22 +107,12 @@ def execute_job(
                     job_uuid=args.job_uuid,
                 )
             result = job.run_outer(args=args)
+
+            if args.batch_processor.current_queue_size() != 0:
+                args.batch_processor.send()
         except Exception as e:
             job_logger.log_exception(e)
-            if run_entity is not None:
-                args.client.set_values(
-                    entity=run_entity,
-                    values=[
-                        field_values_t.ArgumentValueRefName(
-                            field_ref_name=async_jobs_t.ASYNC_JOB_STATUS_FIELD_REF_NAME,
-                            value=async_jobs_t.AsyncJobStatus.ERROR,
-                        ),
-                    ],
-                )
-            return job_definition_t.JobResult(success=False)
-
-        if args.batch_processor.current_queue_size() != 0:
-            args.batch_processor.send()
+            result = job_definition_t.JobResult(success=False)
 
         submitted_batch_job_ids = args.batch_processor.get_submitted_job_ids()
         job_logger.log_info(

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/integration/queue_runner/datastore/datastore_sqlite.py

@@ -265,10 +265,10 @@ class DatastoreSqlite(Datastore):
                 else None
             )
 
-    def vaccuum_queued_jobs(self) -> None:
+    def vaccuum_queued_jobs(self) -> list[str]:
         with self.session_maker() as session:
-            delete_stmt = (
-                delete(QueuedJob)
+            select_stmt = (
+                select(QueuedJob.id)
                 .filter(QueuedJob.status == queued_job_t.JobStatus.QUEUED)
                 .filter(
                     QueuedJob.submitted_at
@@ -278,4 +278,9 @@ class DatastoreSqlite(Datastore):
                     )
                 )
             )
+            deleted_uuids: list[str] = [row.id for row in session.execute(select_stmt)]
+
+            delete_stmt = delete(QueuedJob).filter(QueuedJob.id.in_(deleted_uuids))
             session.execute(delete_stmt)
+
+        return deleted_uuids

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/integration/queue_runner/job_scheduler.py

@@ -135,6 +135,10 @@ async def start_scheduler(
                 job_payload=payload,
                 job_ref_name=job_ref_name,
             )
+            logger.log_info(
+                "Job submitted successfully.",
+                attributes={"job.queued_job_uuid": queued_job.queued_job_uuid},
+            )
             await enqueue_queued_job(queued_job)
             return queued_job.queued_job_uuid
 
@@ -163,6 +167,11 @@ async def start_scheduler(
                     )
                 )
 
+                logger.log_info(
+                    "Job cancelled successfully.",
+                    attributes={"job.queued_job_uuid": command.queued_job_uuid},
+                )
+
                 def delayed_exit() -> None:
                     os._exit(RESTART_EXIT_CODE)
 
@@ -192,7 +201,12 @@ async def start_scheduler(
             command: CommandVaccuumQueuedJobs,
         ) -> None:
             logger.log_info("Vaccuuming queued jobs...")
-            datastore.vaccuum_queued_jobs()
+            deleted_uuids = datastore.vaccuum_queued_jobs()
+
+            logger.log_info(
+                "Queued jobs vacuumed successfully.",
+                attributes={"job.queued_job_uuids": deleted_uuids},
+            )
 
         for queued_job in queued_jobs:
             await enqueue_queued_job(queued_job)

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/integration/queue_runner/worker.py

@@ -94,6 +94,7 @@ def run_queued_job(
             profile_metadata=job_details.profile_metadata,
             job_definition=job_details.job_definition,
             queued_job_uuid=queued_job.queued_job_uuid,
+            submitted_at=queued_job.submitted_at,
         )
         with job_logger.resource_tracking():
             try:

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/integration/telemetry.py

@@ -1,3 +1,4 @@
+import datetime
 import functools
 import json
 import os
@@ -308,10 +309,12 @@ class JobLogger(Logger):
         profile_metadata: job_definition_t.ProfileMetadata,
         job_definition: job_definition_t.JobDefinition,
         queued_job_uuid: str,
+        submitted_at: datetime.datetime,
     ) -> None:
         self.profile_metadata = profile_metadata
         self.job_definition = job_definition
         self.queued_job_uuid = queued_job_uuid
+        self.submitted_at = submitted_at
         super().__init__(base_span)
 
     def _patch_attributes(
@@ -332,6 +335,8 @@ class JobLogger(Logger):
         patched_attributes["job.id"] = self.job_definition.id
         patched_attributes["job.definition_type"] = self.job_definition.type
         patched_attributes["job.queued_job_uuid"] = self.queued_job_uuid
+        patched_attributes["job.submitted_at"] = self.submitted_at.isoformat()
+
         match self.job_definition:
             case job_definition_t.CronJobDefinition():
                 patched_attributes["job.definition.cron_spec"] = (

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/types/api/inputs/set_input_attribute_values.py

@@ -44,6 +44,7 @@ class InputAttributeValue:
     attribute_id: base_t.ObjectId
     quantity_dec: Decimal | None = None
     quantity_json: base_t.JsonValue | None = None
+    file_ids: list[base_t.ObjectId] | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.148 → uncountablepythonsdk-0.0.149}/uncountable/types/entity_t.py

@@ -72,7 +72,8 @@ __all__: list[str] = [
         "equipment": "Equipment",
         "equipment_maintenance": "Equipment Maintenance",
         "equipment_type": "Equipment Type",
-        "external_ai_model": "External Ai Model",
+        "external_ai_model": "External AI Model",
+        "external_ai_session": "External AI Session",
         "experiment_group": "Experiment Group",
         "experiment_group_member": "Experiment Group Member",
         "experiment_group_type": "Experiment Group Type",
@@ -291,6 +292,7 @@ class EntityType(StrEnum):
     EQUIPMENT_MAINTENANCE = "equipment_maintenance"
     EQUIPMENT_TYPE = "equipment_type"
     EXTERNAL_AI_MODEL = "external_ai_model"
+    EXTERNAL_AI_SESSION = "external_ai_session"
     EXPERIMENT_GROUP = "experiment_group"
     EXPERIMENT_GROUP_MEMBER = "experiment_group_member"
     EXPERIMENT_GROUP_TYPE = "experiment_group_type"