UncountablePythonSDK 0.0.186__py3-none-any.whl → 0.0.187__py3-none-any.whl

examples/integration-server/jobs/materials_auto/example_scale_connection.py

@@ -0,0 +1,150 @@
+import asyncio
+import json
+import random
+from dataclasses import dataclass
+from decimal import Decimal
+
+from uncountable.core.client import Client
+from uncountable.integration.service import Service, ServiceArguments, register_service
+from uncountable.types import entity_t, identifier_t, listing_t, sockets_t
+from uncountable.types.base_t import ObjectId
+from uncountable.types.integration_session_t import IntegrationSessionInstrument
+from websockets.asyncio.client import connect
+
+from pkgs.serialization_util import serialize_for_api
+
+SCALE_EQUIPMENT_NAMES = [
+    "Instrument Scale One",
+    "Instrument Scale Two",
+    "Instrument Scale Three",
+]
+EQUIPMENT_ID_COLUMN_REF_NAME = "id"
+EQUIPMENT_NAME_COLUMN_REF_NAME = "name"
+SOCKET_URL = "ws://host.docker.internal:8765"
+READING_INTERVAL_SECONDS = 1.0
+
+
+@dataclass(kw_only=True)
+class InstrumentRoom:
+    equipment_name: str
+    token: str
+    room_key: str
+
+
+@dataclass(kw_only=True)
+class InstrumentReading:
+    equipment_name: str
+    value: Decimal
+
+
+def _build_equipment_column(ref_name: str) -> listing_t.ColumnIdentifierEntityRefName:
+    return listing_t.ColumnIdentifierEntityRefName(
+        entity_type=entity_t.EntityType.EQUIPMENT, ref_name=ref_name
+    )
+
+
+def _resolve_equipment_id(*, client: Client, equipment_name: str) -> ObjectId:
+    id_column = _build_equipment_column(EQUIPMENT_ID_COLUMN_REF_NAME)
+    name_column = _build_equipment_column(EQUIPMENT_NAME_COLUMN_REF_NAME)
+    results = client.fetch_listing(
+        entity_type=entity_t.EntityType.EQUIPMENT,
+        columns=[id_column],
+        filters=listing_t.FilterNodeColumnAnd(
+            filters=(
+                listing_t.FilterSpecEquals(
+                    relation=listing_t.FilterRelation.EQUALS,
+                    column=name_column,
+                    value=equipment_name,
+                ),
+            )
+        ),
+    ).results
+    if len(results) != 1:
+        raise Exception(
+            f"expected exactly one equipment named {equipment_name}, found {len(results)}"
+        )
+    equipment_id = results[0].column_values[0]
+    if not isinstance(equipment_id, int):
+        raise Exception(
+            f"expected an integer id for equipment named {equipment_name}, found {equipment_id!r}"
+        )
+    return ObjectId(equipment_id)
+
+
+@register_service
+class ScaleConnectionService(Service):
+    def run(self, args: ServiceArguments) -> None:
+        rooms = [
+            self._register_room(args=args, equipment_name=equipment_name)
+            for equipment_name in SCALE_EQUIPMENT_NAMES
+        ]
+        asyncio.run(self._stream_readings(args=args, rooms=rooms))
+
+    def _register_room(
+        self, *, args: ServiceArguments, equipment_name: str
+    ) -> InstrumentRoom:
+        equipment_id = _resolve_equipment_id(
+            client=args.client, equipment_name=equipment_name
+        )
+        registration = args.client.register_sockets_token(
+            socket_request=sockets_t.SocketRequestIntegrationSession(
+                integration_session=IntegrationSessionInstrument(
+                    equipment_key=identifier_t.IdentifierKeyId(id=equipment_id)
+                )
+            )
+        ).response
+        return InstrumentRoom(
+            equipment_name=equipment_name,
+            token=registration.token,
+            room_key=registration.room_key,
+        )
+
+    async def _stream_readings(
+        self, *, args: ServiceArguments, rooms: list[InstrumentRoom]
+    ) -> None:
+        rooms_by_name = {room.equipment_name: room for room in rooms}
+        async with connect(
+            SOCKET_URL, additional_headers={"X-UNC-EXTERNAL": "true"}
+        ) as ws:
+            for room in rooms:
+                await ws.send(
+                    json.dumps(
+                        serialize_for_api(
+                            sockets_t.JoinRoomWithTokenSocketClientMessage(
+                                token=room.token
+                            )
+                        )
+                    )
+                )
+                args.logger.log_info(f"Joined room for instrument {room.equipment_name}")
+
+            readings: asyncio.Queue[InstrumentReading] = asyncio.Queue()
+            emit_task = asyncio.create_task(
+                self._emit_readings(rooms=rooms, readings=readings)
+            )
+            try:
+                while True:
+                    reading = await readings.get()
+                    room = rooms_by_name[reading.equipment_name]
+                    await ws.send(
+                        json.dumps(
+                            serialize_for_api(
+                                sockets_t.SendInstrumentReadingClientMessage(
+                                    value=reading.value, room_key=room.room_key
+                                )
+                            )
+                        )
+                    )
+            finally:
+                emit_task.cancel()
+
+    async def _emit_readings(
+        self, *, rooms: list[InstrumentRoom], readings: asyncio.Queue[InstrumentReading]
+    ) -> None:
+        while True:
+            room = random.choice(rooms)
+            value = Decimal(str(round(random.uniform(0, 500), 2)))
+            await readings.put(
+                InstrumentReading(equipment_name=room.equipment_name, value=value)
+            )
+            await asyncio.sleep(READING_INTERVAL_SECONDS)

examples/integration-server/jobs/materials_auto/profile.yaml

@@ -117,3 +117,8 @@ jobs:
     executor:
       type: script
       import_path: example_parse
+services:
+  - id: example_scale_connection
+    name: Example Scale Connection
+    import_path: example_scale_connection
+    enabled: true

pkgs/argument_parser/parser_inner.py

@@ -5,6 +5,7 @@ import datetime
 import math
 import types
 import typing
+from collections.abc import Mapping
 from datetime import date
 from decimal import Decimal
 from enum import Enum
@@ -140,18 +141,32 @@ def _build_parser_discriminated_union(
         else discriminator_raw
     )
 
+    accepted = ", ".join(sorted(discriminator_map))
+
     def parse(value: typing.Any) -> typing.Any:
         if context.options.allow_direct_type and dataclasses.is_dataclass(value):
             discriminant = getattr(value, discriminator)
-        else:
+        elif isinstance(value, Mapping):
             discriminant = value.get(discriminator)
+        else:
+            raise ParserError(
+                f"expected-object-for-union; found {type(value).__name__} where an "
+                f"object with {discriminator} set to one of: {accepted} was expected",
+                value=value,
+            )
         if discriminant is None:
-            raise ParserError("missing-union-discriminant")
+            raise ParserError(
+                f"missing-union-discriminant; set {discriminator} to one of: {accepted}"
+            )
         if not isinstance(discriminant, str):
             raise ParserError("union-discriminant-is-not-string", value=discriminant)
         parser = discriminator_map.get(discriminant)
         if parser is None:
-            raise ParserError("missing-type-for-union-discriminant", value=discriminant)
+            raise ParserError(
+                f"missing-type-for-union-discriminant; {discriminator} must be one of: "
+                f"{accepted}",
+                value=discriminant,
+            )
         return parser(value)
 
     return parse

pkgs/type_spec/non_discriminated_union_exceptions.py

@@ -2,8 +2,6 @@ NON_DISCRIMINATED_UNION_EXCEPTIONS = [
     "audit_log.AuditLogDataValues",
     "generate_tool_parameters.UnionWithoutDiscrim",
     "output_calculation_entities.ConditionParameterFilterCondition",
-    "output_parameters.AnalyticalMethodParameterOptions",
-    "output_parameters.AnalyticalMethodLinkedOptionValue",
     "recipes_redirect.RecipesRedirectResult",
     "value_spec.ResolvedPathAll",
     "deprecated_calculation_types.DeprecatedWeightedSumEntitiesV0",

uncountable/integration/scan_profiles.py

@@ -21,7 +21,7 @@ def load_profiles() -> list[job_definition_t.ProfileMetadata]:
         if entry.is_dir() and entry.name not in _IGNORED_PROFILE_FOLDERS
     ]
     profile_details: list[job_definition_t.ProfileMetadata] = []
-    seen_job_ids: set[str] = set()
+    seen_ids: set[str] = set()
     for profile_file in profiles:
         profile_name = profile_file.name
         try:
@@ -30,9 +30,14 @@ def load_profiles() -> list[job_definition_t.ProfileMetadata]:
                 resource="profile.yaml",
             )
             for job in definition.jobs:
-                if job.id in seen_job_ids:
-                    raise Exception(f"multiple jobs with id {job.id}")
-                seen_job_ids.add(job.id)
+                if job.id in seen_ids:
+                    raise Exception(f"multiple jobs or services with id {job.id}")
+                seen_ids.add(job.id)
+            services = definition.services if definition.services is not None else []
+            for service in services:
+                if service.id in seen_ids:
+                    raise Exception(f"multiple jobs or services with id {service.id}")
+                seen_ids.add(service.id)
 
             if definition.environments is not None:
                 for integration_env in integration_envs:
@@ -42,6 +47,7 @@ def load_profiles() -> list[job_definition_t.ProfileMetadata]:
                             job_definition_t.ProfileMetadata(
                                 name=profile_name,
                                 jobs=definition.jobs,
+                                services=services,
                                 base_url=environment_config.base_url,
                                 integration_server_base_url=environment_config.integration_server_base_url,
                                 app_base_url=environment_config.app_base_url,
@@ -58,6 +64,7 @@ def load_profiles() -> list[job_definition_t.ProfileMetadata]:
                     job_definition_t.ProfileMetadata(
                         name=profile_name,
                         jobs=definition.jobs,
+                        services=services,
                         base_url=definition.base_url,
                         integration_server_base_url=definition.integration_server_base_url,
                         app_base_url=definition.app_base_url,

uncountable/integration/scheduler.py

@@ -19,6 +19,12 @@ from uncountable.integration.queue_runner.command_server import (
 )
 from uncountable.integration.queue_runner.queue_runner import start_queue_runner
 from uncountable.integration.queue_runner.types import RESTART_EXIT_CODE
+from uncountable.integration.scan_profiles import load_profiles
+from uncountable.integration.service_runner import (
+    ServiceToStart,
+    run_service,
+    select_enabled_services,
+)
 from uncountable.integration.telemetry import Logger
 
 SHUTDOWN_TIMEOUT_SECS = 30
@@ -32,9 +38,30 @@ class ProcessName(StrEnum):
     UWSGI = "uwsgi"
 
 
+@dataclass(frozen=True, kw_only=True)
+class CoreProcessKey:
+    name: ProcessName
+
+    @property
+    def label(self) -> str:
+        return self.name
+
+
+@dataclass(frozen=True, kw_only=True)
+class ServiceProcessKey:
+    service_id: str
+
+    @property
+    def label(self) -> str:
+        return f"service:{self.service_id}"
+
+
+ProcessKey = CoreProcessKey | ServiceProcessKey
+
+
 @dataclass(kw_only=True)
 class ProcessInfo:
-    name: ProcessName
+    key: ProcessKey
     process: AnyProcess
 
     @property
@@ -77,16 +104,17 @@ def _wait_for_process(
     start = time.time()
     while time.time() - start < timeout_secs:
         if not proc_info.is_alive:
-            logger.log_debug(f"{proc_info.name} shut down successfully")
+            logger.log_debug(f"{proc_info.key.label} shut down successfully")
             return True
         time.sleep(1)
     return False
 
 
-def handle_shutdown(logger: Logger, processes: dict[ProcessName, ProcessInfo]) -> None:
+def handle_shutdown(logger: Logger, processes: dict[ProcessKey, ProcessInfo]) -> None:
     logger.log_debug("received shutdown command, shutting down sub-processes")
 
-    cron = processes.get(ProcessName.CRON_SERVER)
+    cron_key = CoreProcessKey(name=ProcessName.CRON_SERVER)
+    cron = processes.get(cron_key)
     if cron is not None and cron.is_alive:
         logger.log_debug("stopping cron_server first to prevent new job submissions")
         cron.process.terminate()
@@ -94,7 +122,7 @@ def handle_shutdown(logger: Logger, processes: dict[ProcessName, ProcessInfo]) -
             logger.log_warning("cron_server did not stop in time, killing")
             cron.process.kill()
 
-    remaining = [p for name, p in processes.items() if name != ProcessName.CRON_SERVER]
+    remaining = [p for key, p in processes.items() if key != cron_key]
     for proc_info in remaining:
         if proc_info.is_alive:
             proc_info.process.terminate()
@@ -106,70 +134,62 @@ def handle_shutdown(logger: Logger, processes: dict[ProcessName, ProcessInfo]) -
     ):
         logger.log_debug(
             "waiting for sub-processes to shut down",
-            attributes={"still_living_processes": [p.name for p in still_living]},
+            attributes={"still_living_processes": [p.key.label for p in still_living]},
         )
         still_living = [p for p in still_living if p.is_alive]
         time.sleep(1)
 
     for proc_info in still_living:
         logger.log_warning(
-            f"{proc_info.name} failed to shut down after {SHUTDOWN_TIMEOUT_SECS} seconds, forcefully terminating"
+            f"{proc_info.key.label} failed to shut down after {SHUTDOWN_TIMEOUT_SECS} seconds, forcefully terminating"
         )
         proc_info.process.kill()
 
 
-def restart_process(
-    logger: Logger, proc_info: ProcessInfo, processes: dict[ProcessName, ProcessInfo]
-) -> None:
-    logger.log_error(
-        f"process {proc_info.name} shut down unexpectedly - exit code {proc_info.exitcode}. Restarting..."
-    )
-
-    match proc_info.name:
-        case ProcessName.QUEUE_RUNNER:
-            queue_proc = multiprocessing.Process(target=start_queue_runner)
-            queue_proc.start()
-            new_info = ProcessInfo(name=ProcessName.QUEUE_RUNNER, process=queue_proc)
-            processes[ProcessName.QUEUE_RUNNER] = new_info
-            try:
-                _wait_queue_runner_online()
-                logger.log_debug("queue runner restarted successfully")
-            except Exception as e:
-                logger.log_exception(e)
-                logger.log_error(
-                    "queue runner failed to restart, shutting down scheduler"
-                )
-                handle_shutdown(logger, processes)
-                sys.exit(1)
+class DeadProcessOutcome(StrEnum):
+    RESTART_REQUESTED = "restart_requested"
+    RESTART_AFTER_CRASH = "restart_after_crash"
+    SHUTDOWN_ALL = "shutdown_all"
 
-        case ProcessName.CRON_SERVER:
-            cron_proc = multiprocessing.Process(target=cron_target)
-            cron_proc.start()
-            new_info = ProcessInfo(name=ProcessName.CRON_SERVER, process=cron_proc)
-            processes[ProcessName.CRON_SERVER] = new_info
-            logger.log_debug("cron server restarted successfully")
 
-        case ProcessName.UWSGI:
-            uwsgi_proc: AnyProcess = subprocess.Popen(["uwsgi", "--die-on-term"])
-            new_info = ProcessInfo(name=ProcessName.UWSGI, process=uwsgi_proc)
-            processes[ProcessName.UWSGI] = new_info
-            logger.log_debug("uwsgi restarted successfully")
+def classify_dead_process(key: ProcessKey, exitcode: int | None) -> DeadProcessOutcome:
+    if exitcode == RESTART_EXIT_CODE:
+        return DeadProcessOutcome.RESTART_REQUESTED
+    match key:
+        case ServiceProcessKey():
+            return DeadProcessOutcome.RESTART_AFTER_CRASH
+        case CoreProcessKey():
+            return DeadProcessOutcome.SHUTDOWN_ALL
+        case _:
+            assert_never(key)
 
 
 def check_process_alarms(
-    logger: Logger, processes: dict[ProcessName, ProcessInfo]
+    logger: Logger, processes: dict[ProcessKey, ProcessInfo]
 ) -> ProcessAlarm | None:
     for proc_info in processes.values():
-        if not proc_info.is_alive:
-            if proc_info.exitcode == RESTART_EXIT_CODE:
+        if proc_info.is_alive:
+            continue
+        outcome = classify_dead_process(proc_info.key, proc_info.exitcode)
+        match outcome:
+            case DeadProcessOutcome.RESTART_REQUESTED:
                 logger.log_warning(
-                    f"process {proc_info.name} requested restart! restarting"
+                    f"process {proc_info.key.label} requested restart! restarting"
                 )
-                return ProcessAlarmRestart(process=proc_info)
-            logger.log_error(
-                f"process {proc_info.name} shut down unexpectedly! shutting down scheduler; exit code is {proc_info.exitcode}"
-            )
-            return ProcessAlarmShutdownAll()
+            case DeadProcessOutcome.RESTART_AFTER_CRASH:
+                logger.log_error(
+                    f"process {proc_info.key.label} exited unexpectedly with exit "
+                    f"code {proc_info.exitcode}; cleaning up and restarting"
+                )
+            case DeadProcessOutcome.SHUTDOWN_ALL:
+                logger.log_error(
+                    f"process {proc_info.key.label} shut down unexpectedly! shutting "
+                    f"down scheduler; exit code is {proc_info.exitcode}"
+                )
+                return ProcessAlarmShutdownAll()
+            case _:
+                assert_never(outcome)
+        return ProcessAlarmRestart(process=proc_info)
     return None
 
 
@@ -194,20 +214,20 @@ def _wait_queue_runner_online() -> None:
 
 def main() -> None:
     logger = Logger(get_current_span())
-    processes: dict[ProcessName, ProcessInfo] = {}
+    processes: dict[ProcessKey, ProcessInfo] = {}
 
     multiprocessing.set_start_method("forkserver")
 
     def add_process(process: ProcessInfo) -> None:
-        processes[process.name] = process
-        logger.log_debug(f"started process {process.name}")
+        processes[process.key] = process
+        logger.log_debug(f"started process {process.key.label}")
 
     def _start_queue_runner() -> None:
         runner_process = multiprocessing.Process(target=start_queue_runner)
         runner_process.start()
         add_process(
             ProcessInfo(
-                name=ProcessName.QUEUE_RUNNER,
+                key=CoreProcessKey(name=ProcessName.QUEUE_RUNNER),
                 process=runner_process,
             )
         )
@@ -219,17 +239,46 @@ def main() -> None:
             handle_shutdown(logger, processes=processes)
             return
 
+    def _start_service(service_to_start: ServiceToStart) -> None:
+        service_process = multiprocessing.Process(
+            target=run_service,
+            kwargs={
+                "service": service_to_start.service,
+                "profile_metadata": service_to_start.profile_metadata,
+            },
+        )
+        service_process.start()
+        add_process(
+            ProcessInfo(
+                key=ServiceProcessKey(service_id=service_to_start.service.id),
+                process=service_process,
+            )
+        )
+
     _start_queue_runner()
 
     cron_process = multiprocessing.Process(target=cron_target)
     cron_process.start()
-    add_process(ProcessInfo(name=ProcessName.CRON_SERVER, process=cron_process))
+    add_process(
+        ProcessInfo(
+            key=CoreProcessKey(name=ProcessName.CRON_SERVER), process=cron_process
+        )
+    )
 
     uwsgi_process = subprocess.Popen([
         "uwsgi",
         "--die-on-term",
     ])
-    add_process(ProcessInfo(name=ProcessName.UWSGI, process=uwsgi_process))
+    add_process(
+        ProcessInfo(key=CoreProcessKey(name=ProcessName.UWSGI), process=uwsgi_process)
+    )
+
+    services_by_id: dict[str, ServiceToStart] = {
+        service_to_start.service.id: service_to_start
+        for service_to_start in select_enabled_services(load_profiles())
+    }
+    for service_to_start in services_by_id.values():
+        _start_service(service_to_start)
 
     shutdown_requested = False
 
@@ -244,16 +293,25 @@ def main() -> None:
             process_alarm = check_process_alarms(logger, processes=processes)
             match process_alarm:
                 case ProcessAlarmRestart():
-                    match process_alarm.process.name:
-                        case ProcessName.QUEUE_RUNNER:
-                            del processes[ProcessName.QUEUE_RUNNER]
-                            _start_queue_runner()
-                        case ProcessName.CRON_SERVER | ProcessName.UWSGI:
-                            raise NotImplementedError(
-                                f"restarting {process_alarm.process.name} not yet implemented"
-                            )
+                    match process_alarm.process.key:
+                        case CoreProcessKey() as core_key:
+                            match core_key.name:
+                                case ProcessName.QUEUE_RUNNER:
+                                    del processes[
+                                        CoreProcessKey(name=ProcessName.QUEUE_RUNNER)
+                                    ]
+                                    _start_queue_runner()
+                                case ProcessName.CRON_SERVER | ProcessName.UWSGI:
+                                    raise NotImplementedError(
+                                        f"restarting {core_key.label} not yet implemented"
+                                    )
+                                case _:
+                                    assert_never(core_key.name)
+                        case ServiceProcessKey() as service_key:
+                            del processes[service_key]
+                            _start_service(services_by_id[service_key.service_id])
                         case _:
-                            assert_never(process_alarm.process.name)
+                            assert_never(process_alarm.process.key)
                 case ProcessAlarmShutdownAll():
                     handle_shutdown(logger, processes)
                     sys.exit(1)

uncountable/integration/service.py

@@ -0,0 +1,74 @@
+import importlib
+import inspect
+import os
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+
+from uncountable.core.client import Client
+from uncountable.integration.telemetry import Logger
+from uncountable.types.job_definition_t import (
+    IntegrationService,
+    ProfileMetadata,
+)
+
+__all__ = [
+    "Service",
+    "ServiceArguments",
+    "register_service",
+    "resolve_service",
+    "resolve_service_class",
+]
+
+
+@dataclass(kw_only=True)
+class ServiceArguments:
+    service_definition: IntegrationService
+    profile_metadata: ProfileMetadata
+    client: Client
+    logger: Logger
+
+
+class Service(ABC):
+    _unc_service_registered: bool = False
+
+    @abstractmethod
+    def run(self, args: ServiceArguments) -> None: ...
+
+
+def register_service[ST: type[Service]](cls: ST) -> ST:
+    if not (isinstance(cls, type) and issubclass(cls, Service)):
+        raise TypeError(
+            f"@register_service can only be applied to Service subclasses, got {cls}"
+        )
+    cls._unc_service_registered = True
+    return cls
+
+
+def resolve_service_class(
+    service: IntegrationService, profile_metadata: ProfileMetadata
+) -> type[Service]:
+    service_module_path = ".".join([
+        os.environ["UNC_PROFILES_MODULE"],
+        profile_metadata.name,
+        service.import_path,
+    ])
+    service_module = importlib.import_module(service_module_path)
+    found_services: list[type[Service]] = []
+    for _, service_class in inspect.getmembers(service_module, inspect.isclass):
+        if (
+            service_class.__module__ == service_module.__name__
+            and getattr(service_class, "_unc_service_registered", False)
+            and issubclass(service_class, Service)
+        ):
+            found_services.append(service_class)
+    assert len(found_services) == 1, (
+        f"expected exactly one registered service class in {service.import_path}, found {len(found_services)}"
+    )
+    return found_services[0]
+
+
+def resolve_service(
+    service: IntegrationService, profile_metadata: ProfileMetadata
+) -> Service:
+    service_class = resolve_service_class(service, profile_metadata)
+    return service_class()

uncountable/integration/service_runner.py

@@ -0,0 +1,44 @@
+from dataclasses import dataclass
+
+from uncountable.integration.construct_client import construct_uncountable_client
+from uncountable.integration.service import ServiceArguments, resolve_service
+from uncountable.integration.telemetry import Logger, get_otel_tracer
+from uncountable.types.job_definition_t import IntegrationService, ProfileMetadata
+
+
+@dataclass(kw_only=True)
+class ServiceToStart:
+    profile_metadata: ProfileMetadata
+    service: IntegrationService
+
+
+def select_enabled_services(
+    profiles: list[ProfileMetadata],
+) -> list[ServiceToStart]:
+    return [
+        ServiceToStart(profile_metadata=profile_metadata, service=service)
+        for profile_metadata in profiles
+        for service in profile_metadata.services
+        if service.enabled
+    ]
+
+
+def run_service(
+    *, service: IntegrationService, profile_metadata: ProfileMetadata
+) -> None:
+    with get_otel_tracer().start_as_current_span(
+        name=f"run_service: {service.id}"
+    ) as span:
+        logger = Logger(span)
+        client = construct_uncountable_client(
+            profile_meta=profile_metadata, logger=logger
+        )
+        service_instance = resolve_service(service, profile_metadata)
+        service_instance.run(
+            ServiceArguments(
+                service_definition=service,
+                profile_metadata=profile_metadata,
+                client=client,
+                logger=logger,
+            )
+        )

uncountable/types/entity_t.py

@@ -28,6 +28,7 @@ __all__: list[str] = [
 @serial_string_enum(
     labels={
         "agent_memory": "Agent Memory",
+        "agent_persona": "Agent Persona",
         "aggregated_data_view": "Aggregated Data View",
         "analytical_method": "Analytical Method",
         "analytical_method_category": "Analytical Method Category",
@@ -64,6 +65,7 @@ __all__: list[str] = [
         "dataset_binding": "Dataset Binding",
         "default_permissions_new_project": "Default Permissions New Project",
         "document": "Document",
+        "document_mapping": "Document Mapping",
         "document_version": "Document Version",
         "doe_run": "Suggest Experiments",
         "draft_entity": "Draft Entity",
@@ -214,6 +216,7 @@ __all__: list[str] = [
         "regional_entity_group": "Regional Entity Group",
         "regulation": "Regulation",
         "regulation_cas": "Regulation CAS",
+        "regulation_source": "Regulation Source",
         "regulation_override": "Regulation Override",
         "regulation_product_category": "Regulation Product Category",
         "supplemental_regulation_ingredient": "Supplemental Regulation Ingredient",
@@ -310,6 +313,7 @@ __all__: list[str] = [
 )
 class EntityType(StrEnum):
     AGENT_MEMORY = "agent_memory"
+    AGENT_PERSONA = "agent_persona"
     AGGREGATED_DATA_VIEW = "aggregated_data_view"
     ANALYTICAL_METHOD = "analytical_method"
     ANALYTICAL_METHOD_CATEGORY = "analytical_method_category"
@@ -346,6 +350,7 @@ class EntityType(StrEnum):
     DATASET_BINDING = "dataset_binding"
     DEFAULT_PERMISSIONS_NEW_PROJECT = "default_permissions_new_project"
     DOCUMENT = "document"
+    DOCUMENT_MAPPING = "document_mapping"
     DOCUMENT_VERSION = "document_version"
     DOE_RUN = "doe_run"
     DRAFT_ENTITY = "draft_entity"
@@ -496,6 +501,7 @@ class EntityType(StrEnum):
     REGIONAL_ENTITY_GROUP = "regional_entity_group"
     REGULATION = "regulation"
     REGULATION_CAS = "regulation_cas"
+    REGULATION_SOURCE = "regulation_source"
     REGULATION_OVERRIDE = "regulation_override"
     REGULATION_PRODUCT_CATEGORY = "regulation_product_category"
     SUPPLEMENTAL_REGULATION_INGREDIENT = "supplemental_regulation_ingredient"

uncountable/types/job_definition.py

@@ -24,6 +24,7 @@ from .job_definition_t import CustomHttpJobDefinition as CustomHttpJobDefinition
 from .job_definition_t import WebhookJobDefinition as WebhookJobDefinition
 from .job_definition_t import UncountableWebhookJobDefinition as UncountableWebhookJobDefinition
 from .job_definition_t import JobDefinition as JobDefinition
+from .job_definition_t import IntegrationService as IntegrationService
 from .job_definition_t import ProfileDefinition as ProfileDefinition
 from .job_definition_t import ProfileMetadata as ProfileMetadata
 from .job_definition_t import JobResult as JobResult

uncountable/types/job_definition_t.py

@@ -28,6 +28,7 @@ __all__: list[str] = [
     "GenericUploadDataSourceType",
     "HttpJobDefinitionBase",
     "HttpMethod",
+    "IntegrationService",
     "JobDefinition",
     "JobDefinitionBase",
     "JobDefinitionType",
@@ -272,6 +273,18 @@ JobDefinition = typing.Annotated[
 ]
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.job_definition.IntegrationService",
+)
+@dataclasses.dataclass(slots=True, kw_only=True)
+class IntegrationService:
+    id: str
+    name: str
+    import_path: str
+    enabled: bool = True
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.job_definition.ProfileDefinition",
@@ -285,6 +298,7 @@ class ProfileDefinition:
     app_base_url: str | None = None
     client_options: client_config_t.ClientConfigOptions | None = None
     environments: dict[integration_server_t.IntegrationEnvironment, integration_server_t.EnvironmentConfig] | None = None
+    services: list[IntegrationService] | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -299,6 +313,7 @@ class ProfileMetadata:
     auth_retrieval: auth_retrieval_t.AuthRetrieval
     client_options: client_config_t.ClientConfigOptions | None
     jobs: list[JobDefinition]
+    services: list[IntegrationService]
     integration_server_base_url: str | None = None
 
 

{uncountablepythonsdk-0.0.186.dist-info → uncountablepythonsdk-0.0.187.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.186
+Version: 0.0.187
 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.186.dist-info → uncountablepythonsdk-0.0.187.dist-info}/RECORD

@@ -42,8 +42,9 @@ examples/integration-server/jobs/materials_auto/example_instrument.py,sha256=XWy
 examples/integration-server/jobs/materials_auto/example_parse.py,sha256=Z3iqAUdI5ya07VS3XayjK8brKuAyaqXlImJMJIUHz_4,8660
 examples/integration-server/jobs/materials_auto/example_predictions.py,sha256=5fO4rqRa80_968A1uVZn2TlMOUib54A8rumGW02sIMM,2112
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py,sha256=7FWDz3QpueVcf83fPrwGSqxs9pX06iKcQFte_vz3dC8,2944
+examples/integration-server/jobs/materials_auto/example_scale_connection.py,sha256=mz_FPxHPjIawIzJM2vvD_r78p_ZCYg8Mn8OpbphcwMU,5349
 examples/integration-server/jobs/materials_auto/example_wh.py,sha256=PN-skP27yJwDZboWk5g5EZEc3AKfVayQLfnopjsDKJc,659
-examples/integration-server/jobs/materials_auto/profile.yaml,sha256=qEgEunAcmuIIVsGCvNZ1sFJPfrefonN5r9BLTt5DIFg,2750
+examples/integration-server/jobs/materials_auto/profile.yaml,sha256=Oga4GypqV4cBXwnOg7vGqDiu0Ha9KvRi555gBowzOI0,2888
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=cEEOAQS8UJ4Kbuo0oCVAHHhkbYCfrH6cUTTt2Mq3PmI,1445
@@ -54,7 +55,7 @@ pkgs/argument_parser/parser_builder.py,sha256=phtGw0dYTu1_9RrysZ4oNrkuHyodCbL9x6
 pkgs/argument_parser/parser_cache.py,sha256=VEJVJsMLgDsVNsRledh78VNxHAshJ1nDWvsgpDocFGs,863
 pkgs/argument_parser/parser_error.py,sha256=2DuYW-vQL4F1V_NEr-WW_ZdBPmH7L_uJiOuv7KhMLXw,2732
 pkgs/argument_parser/parser_function_type.py,sha256=xmsg0YVseYbUx52qC9vP-_m9F_HehtDHo84kFjI1gV4,125
-pkgs/argument_parser/parser_inner.py,sha256=0zepgTqQm6yFp9WMlHJmWV3S9WsxzRiN_nBwNfun23A,24937
+pkgs/argument_parser/parser_inner.py,sha256=zO7Q-AfdbxLrwt0rRqytXtDVvij9sPmh-6_T6Te5elk,25499
 pkgs/argument_parser/parser_options.py,sha256=NAwNZSIH8EjyfJXJSxbn4kYmF3K7D3HuOedlSjjsF28,1332
 pkgs/argument_parser/type_predicates.py,sha256=CkQexiseN05XDz4e34K3gIOlER5LG5Ke8u0UHK4gC04,1157
 pkgs/filesystem_utils/__init__.py,sha256=b8NblpFX4rwyRSY3d8GGJRk9x3ET5jpsxDz0M2VnGlw,2071
@@ -99,7 +100,7 @@ pkgs/type_spec/emit_scss.py,sha256=6psmBAJyu7cvfQAIvIIMk2U6VFG_xeWy1Ea4afv0XyM,1
 pkgs/type_spec/emit_typescript.py,sha256=Qu9f1Yv_wc449KHcBGO58hatbzvPvgMbZ11jferi3oY,11567
 pkgs/type_spec/emit_typescript_util.py,sha256=dRiOm38M4DR5NtvJyaEoGXE8Zzrfnae6yuDC76OzCeU,14915
 pkgs/type_spec/load_types.py,sha256=k5hWxFvhj8aT_9vAwtkjn9OdudQFK9IIUzZI7-Gpx2Y,5277
-pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=zfYHKhmq3Q7g6vB4tkno8pZj_F8enbSn_CjCJgJAu80,676
+pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=jgQ4Naz8A6FbhgfR3c9SI4IMvkkft0MT6CyQXWu9RB0,559
 pkgs/type_spec/open_api_util.py,sha256=LX6ny4xNOWXQO3qWVM8elrSDTqWsj_7jFplax2POShE,7992
 pkgs/type_spec/test.py,sha256=uXzUwMaHCShfTeilfAYZDV03mgF2z-ZHA_W5STp_0Ts,501
 pkgs/type_spec/util.py,sha256=Yc7QTZDjlu4ndOu3BwxLy5gRwG2mhnXN_s-iY9SYnIo,4834
@@ -138,9 +139,11 @@ uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0
 uncountable/integration/entrypoint.py,sha256=seXMXxUPjBLzpP6UAB6fRVodkgGea6vnl2oy4FWvCyE,591
 uncountable/integration/job.py,sha256=Jeiiwvk-T3TxNYpesGbyTuQirw8gX1qQlmCIZ7r7Wuc,9187
 uncountable/integration/request_context.py,sha256=N_FJJxqvfUJ0yV9h3I3vFTGNJiDfyLYObczcYa44pw8,999
-uncountable/integration/scan_profiles.py,sha256=86CQgrQ-zXl3p41ERazzbzhTIIjIh_BprWVfYTSHHE4,3259
-uncountable/integration/scheduler.py,sha256=Z_CL2a-kOAJFpMWzFKtuvRz4AlCIRYbxWdN8fpM0RSQ,9150
+uncountable/integration/scan_profiles.py,sha256=Fl8vr2jhW9BmnatLHZSvMnruUUXYgnXVVlbftYetY9g,3647
+uncountable/integration/scheduler.py,sha256=YonK5CCA-eEIP5jjO-osIGPVwgTtVg9m_GNDp-B6-es,10706
 uncountable/integration/server.py,sha256=wnqpowr3xdAXfi4gCTdfFBvmQVyTro439kqrXewBauM,6002
+uncountable/integration/service.py,sha256=i3GSrNu7QzMfK1jOIKLdJQCM5Tzp9eF5nfWldj6Cx-M,2144
+uncountable/integration/service_runner.py,sha256=u9J90fh4CA9nluvfuTUaF6MhCJc2VKMD4Ahmk2x6Hzc,1435
 uncountable/integration/telemetry.py,sha256=W7z2h47Rrn7F3gF1aazbBdthNbSVi4dkQVbZFIs99-c,16155
 uncountable/integration/webhook_bootstrap.py,sha256=RlMsdfoWhsOX8eQCVz9XhyQLqfr0hPPwW6pdGhhmfeI,2332
 uncountable/integration/webhook_entity.py,sha256=As4x_W_zXuJ4uCAoVZwUKHPJILxP12ow0psPEv5sv9M,5220
@@ -208,7 +211,7 @@ uncountable/types/data_t.py,sha256=U_dIh5GcyaJlkrHEI4Qf4TOo1uJX07PYO70sYzzKtTo,2
 uncountable/types/dataset_measurements.py,sha256=CVwWePUC02B_R_UB86yfNBwnclR-5xpZaiCs2jWtu2A,512
 uncountable/types/dataset_measurements_t.py,sha256=iVwh-3Z23aXmPJcUJ3s9axPeOs627DElE_dhfj_PRlQ,1711
 uncountable/types/entity.py,sha256=Zclk1LYcRaYrMDhqyCjMSLEg0fE6_q8LHvV22Qvscgs,566
-uncountable/types/entity_t.py,sha256=sccVJH4AlvKklczgWaO3oE91Sam1ILgJpbtkOkhxVmM,30672
+uncountable/types/entity_t.py,sha256=c-3qBHq9-bWoo1g0ghcg8v6q5OXPwwEmE7iEH5oDif8,30934
 uncountable/types/experiment_groups.py,sha256=qUpFOx1AKgzaT_4khCOv5Xs6jwiQGbvHH-GUh3v1nv4,288
 uncountable/types/experiment_groups_t.py,sha256=QjZBdjnbsD1D-VpPSSV6hBg-Q7mujjKvYtdMewtXNVU,712
 uncountable/types/exports.py,sha256=VMmxUO2PpV1Y63hZ2AnVor4H-B6aswJ7YpSru_u89lU,334
@@ -233,8 +236,8 @@ uncountable/types/integration_session.py,sha256=MVTtZa04INF4L8PxPjqz3l1Lse6Hze3I
 uncountable/types/integration_session_t.py,sha256=Nnes-u2RzvZYsybQsNhtBfbA3d2W_nuDjAS_mU6L6yM,1801
 uncountable/types/integrations.py,sha256=0fOhtbLIOl9w1GP9J3PTagRU8mjOKV48JNLLH3SJQP0,472
 uncountable/types/integrations_t.py,sha256=ZWwEP13mIkSiljSHN2p05XCwRgT2bdADs-8hiVQTs3I,1752
-uncountable/types/job_definition.py,sha256=s6hjlxlJgAyD9aDjV0EdAMc0zW91XCD8h7VBX9I9bIE,1956
-uncountable/types/job_definition_t.py,sha256=bGBvhDi0CIRmeKC5jGw5bb-LDBG53czZaZlYbgo5tuQ,9832
+uncountable/types/job_definition.py,sha256=trVrCb3CHCl5zO-brA9sJonv41EITDBwK2Cy-274FUM,2027
+uncountable/types/job_definition_t.py,sha256=zsQMsNjp_l6JN0zuRJ-hz54gHbQpc56kMsr1p-6xySg,10232
 uncountable/types/listing.py,sha256=U-0-opI0Wgxzmwp4y0qhyT26aK_BjaqdlFVpjud-ryk,2838
 uncountable/types/listing_t.py,sha256=z0hpUlburpIrVA5KcO1TRjkyAGGuAHvpHt5Fo6cAqIc,17521
 uncountable/types/ml_reports.py,sha256=qhZ36pbFLOcoET3D_K2DiNx59bjp8WyurbCrWPsZTrM,757
@@ -435,7 +438,7 @@ uncountable/types/api/uploader/complete_async_parse.py,sha256=Os1HAubxTlbut6Gylj
 uncountable/types/api/uploader/invoke_uploader.py,sha256=cmy7zl3AMF_AH5PCAB67rBeTE6JIcaUqPzm2NS4k_AE,1907
 uncountable/types/api/user/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/user/get_current_user_info.py,sha256=BT7bGp5SOHz3XdKWhhdZ6acnInafT2PgdJ-H4YH3W7c,1181
-uncountablepythonsdk-0.0.186.dist-info/METADATA,sha256=0oNUdR1xQijFWUrNokwwcoC6Zh4S-tqL2US-qv23lrM,2211
-uncountablepythonsdk-0.0.186.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-uncountablepythonsdk-0.0.186.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.186.dist-info/RECORD,,
+uncountablepythonsdk-0.0.187.dist-info/METADATA,sha256=9o2-KrSVgmr2N07XLPaYD7ucwbKJOCcp3iWowNMiIqk,2211
+uncountablepythonsdk-0.0.187.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+uncountablepythonsdk-0.0.187.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.187.dist-info/RECORD,,