UncountablePythonSDK 0.0.115__py3-none-any.whl → 0.0.142.dev0__py3-none-any.whl

uncountable/integration/queue_runner/command_server/protocol/command_server_pb2_grpc.py

@@ -24,11 +24,31 @@ class CommandServerStub(object):
             request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.EnqueueJobRequest.SerializeToString,
             response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.EnqueueJobResult.FromString,
         )
+        self.RetryJob = channel.unary_unary(
+            "/CommandServer/RetryJob",
+            request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobRequest.SerializeToString,
+            response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobResult.FromString,
+        )
         self.CheckHealth = channel.unary_unary(
             "/CommandServer/CheckHealth",
             request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CheckHealthRequest.SerializeToString,
             response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CheckHealthResult.FromString,
         )
+        self.ListQueuedJobs = channel.unary_unary(
+            "/CommandServer/ListQueuedJobs",
+            request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsRequest.SerializeToString,
+            response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsResult.FromString,
+        )
+        self.VaccuumQueuedJobs = channel.unary_unary(
+            "/CommandServer/VaccuumQueuedJobs",
+            request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsRequest.SerializeToString,
+            response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsResult.FromString,
+        )
+        self.CancelJob = channel.unary_unary(
+            "/CommandServer/CancelJob",
+            request_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobRequest.SerializeToString,
+            response_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobResult.FromString,
+        )
 
 
 class CommandServerServicer(object):
@@ -40,12 +60,36 @@ class CommandServerServicer(object):
         context.set_details("Method not implemented!")
         raise NotImplementedError("Method not implemented!")
 
+    def RetryJob(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details("Method not implemented!")
+        raise NotImplementedError("Method not implemented!")
+
     def CheckHealth(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details("Method not implemented!")
         raise NotImplementedError("Method not implemented!")
 
+    def ListQueuedJobs(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details("Method not implemented!")
+        raise NotImplementedError("Method not implemented!")
+
+    def VaccuumQueuedJobs(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details("Method not implemented!")
+        raise NotImplementedError("Method not implemented!")
+
+    def CancelJob(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details("Method not implemented!")
+        raise NotImplementedError("Method not implemented!")
+
 
 def add_CommandServerServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -54,11 +98,31 @@ def add_CommandServerServicer_to_server(servicer, server):
             request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.EnqueueJobRequest.FromString,
             response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.EnqueueJobResult.SerializeToString,
         ),
+        "RetryJob": grpc.unary_unary_rpc_method_handler(
+            servicer.RetryJob,
+            request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobRequest.FromString,
+            response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobResult.SerializeToString,
+        ),
         "CheckHealth": grpc.unary_unary_rpc_method_handler(
             servicer.CheckHealth,
             request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CheckHealthRequest.FromString,
             response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CheckHealthResult.SerializeToString,
         ),
+        "ListQueuedJobs": grpc.unary_unary_rpc_method_handler(
+            servicer.ListQueuedJobs,
+            request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsRequest.FromString,
+            response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsResult.SerializeToString,
+        ),
+        "VaccuumQueuedJobs": grpc.unary_unary_rpc_method_handler(
+            servicer.VaccuumQueuedJobs,
+            request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsRequest.FromString,
+            response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsResult.SerializeToString,
+        ),
+        "CancelJob": grpc.unary_unary_rpc_method_handler(
+            servicer.CancelJob,
+            request_deserializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobRequest.FromString,
+            response_serializer=uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobResult.SerializeToString,
+        ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
         "CommandServer", rpc_method_handlers
@@ -99,6 +163,35 @@ class CommandServer(object):
             metadata,
         )
 
+    @staticmethod
+    def RetryJob(
+        request,
+        target,
+        options=(),
+        channel_credentials=None,
+        call_credentials=None,
+        insecure=False,
+        compression=None,
+        wait_for_ready=None,
+        timeout=None,
+        metadata=None,
+    ):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            "/CommandServer/RetryJob",
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobRequest.SerializeToString,
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.RetryJobResult.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+        )
+
     @staticmethod
     def CheckHealth(
         request,
@@ -127,3 +220,90 @@ class CommandServer(object):
             timeout,
             metadata,
         )
+
+    @staticmethod
+    def ListQueuedJobs(
+        request,
+        target,
+        options=(),
+        channel_credentials=None,
+        call_credentials=None,
+        insecure=False,
+        compression=None,
+        wait_for_ready=None,
+        timeout=None,
+        metadata=None,
+    ):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            "/CommandServer/ListQueuedJobs",
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsRequest.SerializeToString,
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.ListQueuedJobsResult.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+        )
+
+    @staticmethod
+    def VaccuumQueuedJobs(
+        request,
+        target,
+        options=(),
+        channel_credentials=None,
+        call_credentials=None,
+        insecure=False,
+        compression=None,
+        wait_for_ready=None,
+        timeout=None,
+        metadata=None,
+    ):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            "/CommandServer/VaccuumQueuedJobs",
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsRequest.SerializeToString,
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.VaccuumQueuedJobsResult.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+        )
+
+    @staticmethod
+    def CancelJob(
+        request,
+        target,
+        options=(),
+        channel_credentials=None,
+        call_credentials=None,
+        insecure=False,
+        compression=None,
+        wait_for_ready=None,
+        timeout=None,
+        metadata=None,
+    ):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            "/CommandServer/CancelJob",
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobRequest.SerializeToString,
+            uncountable_dot_integration_dot_queue__runner_dot_command__server_dot_protocol_dot_command__server__pb2.CancelJobResult.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+        )

uncountable/integration/queue_runner/command_server/types.py

@@ -6,8 +6,17 @@ from enum import StrEnum
 from uncountable.types import queued_job_t
 
 
+class CommandCancelJobStatus(StrEnum):
+    CANCELLED_WITH_RESTART = "cancelled_with_restart"
+    NO_JOB_FOUND = "no_job_found"
+    JOB_ALREADY_COMPLETED = "job_already_completed"
+
+
 class CommandType(StrEnum):
     ENQUEUE_JOB = "enqueue_job"
+    RETRY_JOB = "retry_job"
+    VACCUUM_QUEUED_JOBS = "vaccuum_queued_jobs"
+    CANCEL_JOB = "cancel_job"
 
 
 RT = typing.TypeVar("RT")
@@ -24,6 +33,16 @@ class CommandEnqueueJobResponse:
     queued_job_uuid: str
 
 
+@dataclass(kw_only=True)
+class CommandRetryJobResponse:
+    queued_job_uuid: str | None
+
+
+@dataclass(kw_only=True)
+class CommandVaccuumQueuedJobsResponse:
+    pass
+
+
 @dataclass(kw_only=True)
 class CommandEnqueueJob(CommandBase[CommandEnqueueJobResponse]):
     type: CommandType = CommandType.ENQUEUE_JOB
@@ -32,7 +51,31 @@ class CommandEnqueueJob(CommandBase[CommandEnqueueJobResponse]):
     response_queue: asyncio.Queue[CommandEnqueueJobResponse]
 
 
-_Command = CommandEnqueueJob
+@dataclass(kw_only=True)
+class CommandRetryJob(CommandBase[CommandRetryJobResponse]):
+    type: CommandType = CommandType.RETRY_JOB
+    queued_job_uuid: str
+
+
+@dataclass(kw_only=True)
+class CommandVaccuumQueuedJobs(CommandBase[CommandVaccuumQueuedJobsResponse]):
+    type: CommandType = CommandType.VACCUUM_QUEUED_JOBS
+
+
+@dataclass(kw_only=True)
+class CommandCancelJobResponse:
+    status: CommandCancelJobStatus
+
+
+@dataclass(kw_only=True)
+class CommandCancelJob(CommandBase[CommandCancelJobResponse]):
+    type: CommandType = CommandType.CANCEL_JOB
+    queued_job_uuid: str
+
+
+_Command = (
+    CommandEnqueueJob | CommandRetryJob | CommandVaccuumQueuedJobs | CommandCancelJob
+)
 
 
 CommandQueue = asyncio.Queue[_Command]

uncountable/integration/queue_runner/datastore/datastore_sqlite.py

@@ -2,7 +2,7 @@ import datetime
 import uuid
 from datetime import UTC
 
-from sqlalchemy import delete, insert, select, update
+from sqlalchemy import delete, insert, or_, select, text, update
 from sqlalchemy.engine import Engine
 
 from pkgs.argument_parser import CachedParser
@@ -14,6 +14,8 @@ from uncountable.types import queued_job_t
 
 queued_job_payload_parser = CachedParser(queued_job_t.QueuedJobPayload)
 
+MAX_QUEUE_WINDOW_DAYS = 30
+
 
 class DatastoreSqlite(Datastore):
     def __init__(self, session_maker: DBSessionMaker) -> None:
@@ -23,6 +25,17 @@ class DatastoreSqlite(Datastore):
     @classmethod
     def setup(cls, engine: Engine) -> None:
         Base.metadata.create_all(engine)
+        with engine.connect() as connection:
+            if not bool(
+                connection.execute(
+                    text(
+                        "select exists (select 1 from pragma_table_info('queued_jobs') where name='status');"
+                    )
+                ).scalar()
+            ):
+                connection.execute(
+                    text("alter table queued_jobs add column status VARCHAR")
+                )
 
     def add_job_to_queue(
         self, job_payload: queued_job_t.QueuedJobPayload, job_ref_name: str
@@ -36,6 +49,7 @@ class DatastoreSqlite(Datastore):
                 QueuedJob.id.key: queued_job_uuid,
                 QueuedJob.job_ref_name.key: job_ref_name,
                 QueuedJob.payload.key: serialized_payload,
+                QueuedJob.status.key: queued_job_t.JobStatus.QUEUED,
                 QueuedJob.num_attempts: num_attempts,
                 QueuedJob.submitted_at: submitted_at,
             })
@@ -44,10 +58,48 @@ class DatastoreSqlite(Datastore):
                 queued_job_uuid=queued_job_uuid,
                 job_ref_name=job_ref_name,
                 payload=job_payload,
+                status=queued_job_t.JobStatus.QUEUED,
                 submitted_at=submitted_at,
                 num_attempts=num_attempts,
             )
 
+    def retry_job(
+        self,
+        queued_job_uuid: 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.status,
+                QueuedJob.submitted_at,
+            ).filter(QueuedJob.id == queued_job_uuid)
+            existing_job = session.execute(select_stmt).one_or_none()
+
+            if (
+                existing_job is None
+                or existing_job.status != queued_job_t.JobStatus.FAILED
+            ):
+                return None
+
+            update_stmt = (
+                update(QueuedJob)
+                .values({QueuedJob.status.key: queued_job_t.JobStatus.QUEUED})
+                .filter(QueuedJob.id == queued_job_uuid)
+            )
+            session.execute(update_stmt)
+
+            return queued_job_t.QueuedJob(
+                queued_job_uuid=existing_job.id,
+                job_ref_name=existing_job.job_ref_name,
+                num_attempts=existing_job.num_attempts,
+                status=queued_job_t.JobStatus.QUEUED,
+                submitted_at=existing_job.submitted_at,
+                payload=queued_job_payload_parser.parse_storage(existing_job.payload),
+            )
+
     def increment_num_attempts(self, queued_job_uuid: str) -> int:
         with self.session_maker() as session:
             update_stmt = (
@@ -68,15 +120,103 @@ class DatastoreSqlite(Datastore):
             delete_stmt = delete(QueuedJob).filter(QueuedJob.id == queued_job_uuid)
             session.execute(delete_stmt)
 
+    def update_job_status(
+        self, queued_job_uuid: str, status: queued_job_t.JobStatus
+    ) -> None:
+        with self.session_maker() as session:
+            update_stmt = (
+                update(QueuedJob)
+                .values({QueuedJob.status.key: status})
+                .filter(QueuedJob.id == queued_job_uuid)
+            )
+            session.execute(update_stmt)
+
+    def list_queued_job_metadata(
+        self, offset: int = 0, limit: int | None = 100
+    ) -> list[queued_job_t.QueuedJobMetadata]:
+        with self.session_maker() as session:
+            select_statement = (
+                select(
+                    QueuedJob.id,
+                    QueuedJob.job_ref_name,
+                    QueuedJob.num_attempts,
+                    QueuedJob.status,
+                    QueuedJob.submitted_at,
+                )
+                .order_by(QueuedJob.submitted_at)
+                .offset(offset)
+                .limit(limit)
+            )
+
+            queued_job_metadata: list[queued_job_t.QueuedJobMetadata] = [
+                queued_job_t.QueuedJobMetadata(
+                    queued_job_uuid=row.id,
+                    job_ref_name=row.job_ref_name,
+                    num_attempts=row.num_attempts,
+                    status=row.status or queued_job_t.JobStatus.QUEUED,
+                    submitted_at=row.submitted_at,
+                )
+                for row in session.execute(select_statement)
+            ]
+
+            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.status,
+                    QueuedJob.submitted_at,
+                )
+                .filter(QueuedJob.job_ref_name == job_ref_name)
+                .filter(
+                    or_(
+                        QueuedJob.status == queued_job_t.JobStatus.QUEUED,
+                        QueuedJob.status.is_(None),
+                    )
+                )
+                .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,
+                    status=row.status or queued_job_t.JobStatus.QUEUED,
+                    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(
-                QueuedJob.id,
-                QueuedJob.payload,
-                QueuedJob.num_attempts,
-                QueuedJob.job_ref_name,
-                QueuedJob.submitted_at,
-            ).order_by(QueuedJob.submitted_at)
+            select_stmt = (
+                select(
+                    QueuedJob.id,
+                    QueuedJob.payload,
+                    QueuedJob.num_attempts,
+                    QueuedJob.job_ref_name,
+                    QueuedJob.status,
+                    QueuedJob.submitted_at,
+                )
+                .filter(
+                    or_(
+                        QueuedJob.status == queued_job_t.JobStatus.QUEUED,
+                        QueuedJob.status.is_(None),
+                    )
+                )
+                .order_by(QueuedJob.submitted_at)
+            )
 
             queued_jobs: list[queued_job_t.QueuedJob] = []
             for row in session.execute(select_stmt):
@@ -86,9 +226,50 @@ class DatastoreSqlite(Datastore):
                         queued_job_uuid=row.id,
                         job_ref_name=row.job_ref_name,
                         num_attempts=row.num_attempts,
+                        status=row.status or queued_job_t.JobStatus.QUEUED,
                         submitted_at=row.submitted_at,
                         payload=parsed_payload,
                     )
                 )
 
             return queued_jobs
+
+    def get_queued_job(self, *, uuid: 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.status,
+                QueuedJob.submitted_at,
+            ).filter(QueuedJob.id == uuid)
+
+            row = session.execute(select_stmt).one_or_none()
+            return (
+                queued_job_t.QueuedJob(
+                    queued_job_uuid=row.id,
+                    job_ref_name=row.job_ref_name,
+                    num_attempts=row.num_attempts,
+                    status=row.status or queued_job_t.JobStatus.QUEUED,
+                    submitted_at=row.submitted_at,
+                    payload=queued_job_payload_parser.parse_storage(row.payload),
+                )
+                if row is not None
+                else None
+            )
+
+    def vaccuum_queued_jobs(self) -> None:
+        with self.session_maker() as session:
+            delete_stmt = (
+                delete(QueuedJob)
+                .filter(QueuedJob.status == queued_job_t.JobStatus.QUEUED)
+                .filter(
+                    QueuedJob.submitted_at
+                    <= (
+                        datetime.datetime.now(UTC)
+                        - datetime.timedelta(days=MAX_QUEUE_WINDOW_DAYS)
+                    )
+                )
+            )
+            session.execute(delete_stmt)

uncountable/integration/queue_runner/datastore/interface.py

@@ -17,3 +17,16 @@ 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
+    ) -> list[queued_job_t.QueuedJobMetadata]: ...
+
+    @abstractmethod
+    def get_queued_job(self, *, uuid: str) -> queued_job_t.QueuedJob | None: ...

uncountable/integration/queue_runner/datastore/model.py

@@ -1,7 +1,9 @@
-from sqlalchemy import JSON, BigInteger, Column, DateTime, Text
+from sqlalchemy import JSON, BigInteger, Column, DateTime, Enum, Text
 from sqlalchemy.orm import declarative_base
 from sqlalchemy.sql import func
 
+from uncountable.types import queued_job_t
+
 Base = declarative_base()
 
 
@@ -15,3 +17,8 @@ class QueuedJob(Base):
     )
     payload = Column(JSON, nullable=False)
     num_attempts = Column(BigInteger, nullable=False, default=0, server_default="0")
+    status = Column(
+        Enum(queued_job_t.JobStatus, length=None),
+        default=queued_job_t.JobStatus.QUEUED,
+        nullable=True,
+    )