UncountablePythonSDK 0.0.178__tar.gz → 0.0.179__tar.gz

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/.github/workflows/documentation.yml

@@ -9,7 +9,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
       - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
       - uses: extractions/setup-crate@0551596312d4008a6dfbc4d3c38fa20eaef46d2d # v2
         with:

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
     name: Build distribution packages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           tags: true

{uncountablepythonsdk-0.0.178/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.179}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.178
+Version: 0.0.179
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -20,6 +20,7 @@ Requires-Dist: aiotus==1.*
 Requires-Dist: aiohttp>=3.14.1
 Requires-Dist: requests==2.*
 Requires-Dist: SQLAlchemy>=1.4.0
+Requires-Dist: psycopg[binary]==3.*
 Requires-Dist: APScheduler==3.*
 Requires-Dist: python-dateutil==2.*
 Requires-Dist: PyYAML==6.*

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.178
+Version: 0.0.179
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -20,6 +20,7 @@ Requires-Dist: aiotus==1.*
 Requires-Dist: aiohttp>=3.14.1
 Requires-Dist: requests==2.*
 Requires-Dist: SQLAlchemy>=1.4.0
+Requires-Dist: psycopg[binary]==3.*
 Requires-Dist: APScheduler==3.*
 Requires-Dist: python-dateutil==2.*
 Requires-Dist: PyYAML==6.*

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -175,7 +175,10 @@ uncountable/integration/queue_runner/command_server/protocol/command_server_pb2.
 uncountable/integration/queue_runner/command_server/protocol/command_server_pb2.pyi
 uncountable/integration/queue_runner/command_server/protocol/command_server_pb2_grpc.py
 uncountable/integration/queue_runner/datastore/__init__.py
+uncountable/integration/queue_runner/datastore/datastore_postgres.py
+uncountable/integration/queue_runner/datastore/datastore_sql_base.py
 uncountable/integration/queue_runner/datastore/datastore_sqlite.py
+uncountable/integration/queue_runner/datastore/factory.py
 uncountable/integration/queue_runner/datastore/interface.py
 uncountable/integration/queue_runner/datastore/model.py
 uncountable/integration/secret_retrieval/__init__.py

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/UncountablePythonSDK.egg-info/requires.txt

@@ -2,6 +2,7 @@ aiotus==1.*
 aiohttp>=3.14.1
 requests==2.*
 SQLAlchemy>=1.4.0
+psycopg[binary]==3.*
 APScheduler==3.*
 python-dateutil==2.*
 PyYAML==6.*

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/examples/integration-server/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
   "ruff == 0.*",
   "openpyxl == 3.*",
   "more_itertools ==11.*",
-  "types-paramiko ==4.0.0.20260518",
+  "types-paramiko ==5.0.0.20260617",
   "types-openpyxl == 3.*",
   "types-pytz ==2026.*",
   "types-requests == 2.*",

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/pkgs/filesystem_utils/_file_share_session.py

@@ -26,6 +26,7 @@ class FileShareSession(FileSystemSession):
             account_url=self.config.account_url,
             share_name=self.config.share_name,
             credential=self.config.credential,
+            token_intent="backup",
         )
 
     def __enter__(self) -> Self:

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/pyproject.toml

@@ -55,6 +55,7 @@ dependencies = [
     "aiohttp >= 3.14.1",
     "requests == 2.*",
     "SQLAlchemy >= 1.4.0",
+    "psycopg[binary] == 3.*",
     "APScheduler == 3.*",
     "python-dateutil == 2.*",
     "PyYAML == 6.*",

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/core/client.py

@@ -201,7 +201,7 @@ DownloadedFiles = list[DownloadedFile]
 
 
 class Client(ClientMethods):
-    _parser_map: dict[type, CachedParser] = {}
+    _parser_map: typing.ClassVar[dict[type, CachedParser]] = {}
     _auth_details: AuthDetailsAll
     _base_url: str
     _file_uploader: FileUploader

uncountablepythonsdk-0.0.179/uncountable/integration/db/connect.py

@@ -0,0 +1,48 @@
+import os
+from enum import StrEnum
+
+from opentelemetry.trace import get_current_span
+from sqlalchemy import create_engine
+from sqlalchemy.engine.base import Engine
+
+from uncountable.integration.telemetry import Logger
+
+
+class IntegrationDBService(StrEnum):
+    CRON = "cron"
+    RUNNER = "runner"
+
+
+_DB_URI_ENV_VARS: dict[IntegrationDBService, str] = {
+    IntegrationDBService.CRON: "UNC_CRON_DB_URI",
+    IntegrationDBService.RUNNER: "UNC_RUNNER_DB_URI",
+}
+
+_DEPRECATED_DB_URI_ENV_VARS: dict[IntegrationDBService, str] = {
+    IntegrationDBService.CRON: "UNC_CRON_SQLITE_URI",
+    IntegrationDBService.RUNNER: "UNC_RUNNER_SQLITE_URI",
+}
+
+
+def _resolve_db_uri(service: IntegrationDBService) -> str:
+    logger = Logger(get_current_span())
+    env_var = _DB_URI_ENV_VARS[service]
+    uri = os.environ.get(env_var)
+    if uri is not None:
+        return uri
+
+    deprecated_env_var = _DEPRECATED_DB_URI_ENV_VARS[service]
+    deprecated_uri = os.environ.get(deprecated_env_var)
+    if deprecated_uri is not None:
+        logger.log_warning(
+            f"{deprecated_env_var} is deprecated and will be removed; set {env_var} instead.",
+        )
+        return deprecated_uri
+
+    raise KeyError(
+        f"no database URI configured for the {service} service: set {env_var}"
+    )
+
+
+def create_db_engine(service: IntegrationDBService) -> Engine:
+    return create_engine(_resolve_db_uri(service))

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/command_server/command_server.py

@@ -41,7 +41,7 @@ from uncountable.integration.queue_runner.command_server.types import (
     CommandVaccuumQueuedJobs,
     CommandVaccuumQueuedJobsResponse,
 )
-from uncountable.integration.queue_runner.datastore import DatastoreSqlite
+from uncountable.integration.queue_runner.datastore import Datastore
 from uncountable.types import queued_job_t
 
 from .constants import ListQueuedJobsConstants
@@ -53,7 +53,7 @@ from .protocol.command_server_pb2_grpc import (
 queued_job_payload_parser = CachedParser(queued_job_t.QueuedJobPayload)
 
 
-async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None:
+async def serve(command_queue: CommandQueue, datastore: Datastore) -> None:
     server = grpc_aio.server()
 
     class CommandServerHandler(CommandServerServicer):

uncountablepythonsdk-0.0.179/uncountable/integration/queue_runner/datastore/__init__.py

@@ -0,0 +1,11 @@
+from .datastore_postgres import DatastorePostgres
+from .datastore_sqlite import DatastoreSqlite
+from .factory import create_datastore
+from .interface import Datastore
+
+__all__: list[str] = [
+    "Datastore",
+    "DatastorePostgres",
+    "DatastoreSqlite",
+    "create_datastore",
+]

uncountablepythonsdk-0.0.179/uncountable/integration/queue_runner/datastore/datastore_postgres.py

@@ -0,0 +1,12 @@
+from sqlalchemy.engine import Engine
+
+from uncountable.integration.queue_runner.datastore.datastore_sql_base import (
+    DatastoreSqlBase,
+)
+from uncountable.integration.queue_runner.datastore.model import Base
+
+
+class DatastorePostgres(DatastoreSqlBase):
+    @classmethod
+    def setup(cls, engine: Engine) -> None:
+        Base.metadata.create_all(engine)

uncountablepythonsdk-0.0.178/uncountable/integration/queue_runner/datastore/datastore_sqlite.py → uncountablepythonsdk-0.0.179/uncountable/integration/queue_runner/datastore/datastore_sql_base.py

@@ -2,14 +2,13 @@ import datetime
 import uuid
 from datetime import UTC
 
-from sqlalchemy import delete, insert, or_, select, text, update
-from sqlalchemy.engine import Engine
+from sqlalchemy import delete, insert, or_, select, update
 
 from pkgs.argument_parser import CachedParser
 from pkgs.serialization_util import serialize_for_storage
 from uncountable.integration.db.session import DBSessionMaker
 from uncountable.integration.queue_runner.datastore.interface import Datastore
-from uncountable.integration.queue_runner.datastore.model import Base, QueuedJob
+from uncountable.integration.queue_runner.datastore.model import QueuedJob
 from uncountable.types import queued_job_t
 
 queued_job_payload_parser = CachedParser(queued_job_t.QueuedJobPayload)
@@ -17,36 +16,11 @@ queued_job_payload_parser = CachedParser(queued_job_t.QueuedJobPayload)
 MAX_QUEUE_WINDOW_DAYS = 30
 
 
-class DatastoreSqlite(Datastore):
+class DatastoreSqlBase(Datastore):
     def __init__(self, session_maker: DBSessionMaker) -> None:
         self.session_maker = session_maker
         super().__init__()
 
-    @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")
-                )
-            connection.execute(
-                text(
-                    "create index if not exists ix_queued_jobs_status on queued_jobs (status)"
-                )
-            )
-            connection.execute(
-                text(
-                    "create index if not exists ix_queued_jobs_submitted_at on queued_jobs (submitted_at)"
-                )
-            )
-
     def add_job_to_queue(
         self, job_payload: queued_job_t.QueuedJobPayload, job_ref_name: str
     ) -> queued_job_t.QueuedJob:

uncountablepythonsdk-0.0.179/uncountable/integration/queue_runner/datastore/datastore_sqlite.py

@@ -0,0 +1,34 @@
+from sqlalchemy import text
+from sqlalchemy.engine import Engine
+
+from uncountable.integration.queue_runner.datastore.datastore_sql_base import (
+    DatastoreSqlBase,
+)
+from uncountable.integration.queue_runner.datastore.model import Base
+
+
+class DatastoreSqlite(DatastoreSqlBase):
+    @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")
+                )
+            connection.execute(
+                text(
+                    "create index if not exists ix_queued_jobs_status on queued_jobs (status)"
+                )
+            )
+            connection.execute(
+                text(
+                    "create index if not exists ix_queued_jobs_submitted_at on queued_jobs (submitted_at)"
+                )
+            )

uncountablepythonsdk-0.0.179/uncountable/integration/queue_runner/datastore/factory.py

@@ -0,0 +1,24 @@
+from sqlalchemy.engine import Engine
+
+from uncountable.integration.db.session import get_session_maker
+from uncountable.integration.queue_runner.datastore.datastore_postgres import (
+    DatastorePostgres,
+)
+from uncountable.integration.queue_runner.datastore.datastore_sqlite import (
+    DatastoreSqlite,
+)
+from uncountable.integration.queue_runner.datastore.interface import Datastore
+
+
+def create_datastore(engine: Engine) -> Datastore:
+    session_maker = get_session_maker(engine)
+    dialect_name = engine.dialect.name
+    match dialect_name:
+        case "sqlite":
+            datastore: Datastore = DatastoreSqlite(session_maker)
+        case "postgresql":
+            datastore = DatastorePostgres(session_maker)
+        case _:
+            raise ValueError(f"unsupported database dialect: {dialect_name!r}")
+    datastore.setup(engine)
+    return datastore

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/datastore/interface.py

@@ -1,10 +1,16 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
 
+from sqlalchemy.engine import Engine
+
 from uncountable.types import queued_job_t
 
 
 class Datastore(ABC):
+    @classmethod
+    @abstractmethod
+    def setup(cls, engine: Engine) -> None: ...
+
     @abstractmethod
     def add_job_to_queue(
         self, job_payload: queued_job_t.QueuedJobPayload, job_ref_name: str
@@ -13,6 +19,14 @@ class Datastore(ABC):
     @abstractmethod
     def remove_job_from_queue(self, queued_job_uuid: str) -> None: ...
 
+    @abstractmethod
+    def update_job_status(
+        self, queued_job_uuid: str, status: queued_job_t.JobStatus
+    ) -> None: ...
+
+    @abstractmethod
+    def retry_job(self, queued_job_uuid: str) -> queued_job_t.QueuedJob | None: ...
+
     @abstractmethod
     def increment_num_attempts(self, queued_job_uuid: str) -> int: ...
 
@@ -38,3 +52,6 @@ class Datastore(ABC):
 
     @abstractmethod
     def get_queued_job(self, *, uuid: str) -> queued_job_t.QueuedJob | None: ...
+
+    @abstractmethod
+    def vaccuum_queued_jobs(self) -> list[str]: ...

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/datastore/model.py

@@ -21,7 +21,7 @@ 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),
+        Enum(queued_job_t.JobStatus, length=None, native_enum=False),
         default=queued_job_t.JobStatus.QUEUED,
         nullable=True,
         index=True,

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/job_scheduler.py

@@ -23,8 +23,7 @@ from uncountable.integration.queue_runner.command_server.types import (
     CommandCancelJobStatus,
     CommandVaccuumQueuedJobs,
 )
-from uncountable.integration.queue_runner.datastore import DatastoreSqlite
-from uncountable.integration.queue_runner.datastore.interface import Datastore
+from uncountable.integration.queue_runner.datastore import Datastore
 from uncountable.integration.queue_runner.worker import Worker
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.telemetry import Logger
@@ -90,9 +89,7 @@ def _start_workers(
     return job_worker_lookup
 
 
-async def start_scheduler(
-    command_queue: CommandQueue, datastore: DatastoreSqlite
-) -> None:
+async def start_scheduler(command_queue: CommandQueue, datastore: Datastore) -> None:
     logger = Logger(get_current_span())
     result_queue: ResultQueue = asyncio.Queue()
 

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/queue_runner.py

@@ -1,20 +1,16 @@
 import asyncio
 
 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 serve
 from uncountable.integration.queue_runner.command_server.types import CommandQueue
-from uncountable.integration.queue_runner.datastore import DatastoreSqlite
+from uncountable.integration.queue_runner.datastore import create_datastore
 from uncountable.integration.queue_runner.job_scheduler import start_scheduler
 
 
 async def queue_runner_loop() -> None:
     command_queue: CommandQueue = asyncio.Queue()
     engine = create_db_engine(IntegrationDBService.RUNNER)
-    session_maker = get_session_maker(engine)
-
-    datastore = DatastoreSqlite(session_maker)
-    datastore.setup(engine)
+    datastore = create_datastore(engine)
 
     command_server = asyncio.create_task(serve(command_queue, datastore))
 

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/integration/queue_runner/worker.py

@@ -21,7 +21,7 @@ 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 JobArguments
-from uncountable.integration.queue_runner.datastore.interface import Datastore
+from uncountable.integration.queue_runner.datastore import Datastore
 from uncountable.integration.queue_runner.types import ListenQueue, ResultQueue
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.telemetry import JobLogger, Logger, get_otel_tracer

{uncountablepythonsdk-0.0.178 → uncountablepythonsdk-0.0.179}/uncountable/types/entity_t.py

@@ -43,6 +43,7 @@ __all__: list[str] = [
         "comment": "Comment",
         "comment_thread": "Comment Thread",
         "condition_match": "Condition Match",
+        "condition_nickname": "Condition Nickname",
         "condition_parameter": "Condition Parameter",
         "condition_parameter_mat_family": "Condition Parameter Material Family",
         "condition_parameter_matches": "Condition Parameter Matches",
@@ -118,6 +119,7 @@ __all__: list[str] = [
         "inventory_history": "Inventory History",
         "inventory_reconciliation_action": "Inventory Reconciliation Action",
         "inventory_reconciliation_session": "Inventory Reconciliation Session",
+        "it_admin_permission": "IT Admin Permission",
         "lab_location": "Lab Location",
         "lab_request": "Lab Request",
         "license": "License",
@@ -130,6 +132,7 @@ __all__: list[str] = [
         "measurement_timeline_type": "Measurement Timeline Type",
         "milestone": "Milestone",
         "ml_job": "Batch Processing Job",
+        "monitor": "Monitor",
         "monitor_dataset": "Monitor Dataset",
         "naming_scheme": "Naming Scheme",
         "naming_counter": "Naming Counter",
@@ -230,6 +233,7 @@ __all__: list[str] = [
         "timesheet_entry": "Timesheet Entry",
         "training_module": "Training Module",
         "training_module_answer": "Training Module Answer",
+        "training_module_attempt": "Training Module Attempt",
         "training_module_block": "Training Module Block",
         "training_module_page": "Training Module Page",
         "training_module_question": "Training Module Question",
@@ -297,6 +301,7 @@ class EntityType(StrEnum):
     COMMENT = "comment"
     COMMENT_THREAD = "comment_thread"
     CONDITION_MATCH = "condition_match"
+    CONDITION_NICKNAME = "condition_nickname"
     CONDITION_PARAMETER = "condition_parameter"
     CONDITION_PARAMETER_MAT_FAMILY = "condition_parameter_mat_family"
     CONDITION_PARAMETER_MATCHES = "condition_parameter_matches"
@@ -372,6 +377,7 @@ class EntityType(StrEnum):
     INVENTORY_HISTORY = "inventory_history"
     INVENTORY_RECONCILIATION_ACTION = "inventory_reconciliation_action"
     INVENTORY_RECONCILIATION_SESSION = "inventory_reconciliation_session"
+    IT_ADMIN_PERMISSION = "it_admin_permission"
     LAB_LOCATION = "lab_location"
     LAB_REQUEST = "lab_request"
     LICENSE = "license"
@@ -384,6 +390,7 @@ class EntityType(StrEnum):
     MEASUREMENT_TIMELINE_TYPE = "measurement_timeline_type"
     MILESTONE = "milestone"
     ML_JOB = "ml_job"
+    MONITOR = "monitor"
     MONITOR_DATASET = "monitor_dataset"
     NAMING_SCHEME = "naming_scheme"
     NAMING_COUNTER = "naming_counter"
@@ -484,6 +491,7 @@ class EntityType(StrEnum):
     TIMESHEET_ENTRY = "timesheet_entry"
     TRAINING_MODULE = "training_module"
     TRAINING_MODULE_ANSWER = "training_module_answer"
+    TRAINING_MODULE_ATTEMPT = "training_module_attempt"
     TRAINING_MODULE_BLOCK = "training_module_block"
     TRAINING_MODULE_PAGE = "training_module_page"
     TRAINING_MODULE_QUESTION = "training_module_question"

uncountablepythonsdk-0.0.178/uncountable/integration/db/connect.py

@@ -1,18 +0,0 @@
-import os
-from enum import StrEnum
-
-from sqlalchemy import create_engine
-from sqlalchemy.engine.base import Engine
-
-
-class IntegrationDBService(StrEnum):
-    CRON = "cron"
-    RUNNER = "runner"
-
-
-def create_db_engine(service: IntegrationDBService) -> Engine:
-    match service:
-        case IntegrationDBService.CRON:
-            return create_engine(os.environ["UNC_CRON_SQLITE_URI"])
-        case IntegrationDBService.RUNNER:
-            return create_engine(os.environ["UNC_RUNNER_SQLITE_URI"])

uncountablepythonsdk-0.0.178/uncountable/integration/queue_runner/datastore/__init__.py

@@ -1,3 +0,0 @@
-from .datastore_sqlite import DatastoreSqlite
-
-__all__: list[str] = ["DatastoreSqlite"]