UncountablePythonSDK 0.0.181__py3-none-any.whl → 0.0.183__py3-none-any.whl

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

@@ -1,4 +1,5 @@
 base_url: http://host.docker.internal:5000
+integration_server_base_url: http://localhost:5001
 auth_retrieval:
   type: basic
   api_id_secret:
@@ -60,6 +61,13 @@ jobs:
     executor:
       type: script
       import_path: example_wh
+  - id: example_unc_wh
+    type: uncountable_webhook
+    name: Uncountable Webhook
+    purpose: trigger
+    executor:
+      type: script
+      import_path: example_wh
   - id: example_http
     type: custom_http
     name: Custom HTTP

pkgs/filesystem_utils/_blob_session.py

@@ -2,7 +2,7 @@ from io import BytesIO
 from typing import Self
 
 from azure.core.credentials import AzureSasCredential
-from azure.storage.blob import BlobServiceClient, ContainerClient
+from azure.storage.blob import BlobPrefix, BlobServiceClient, ContainerClient
 
 from pkgs.filesystem_utils.file_type_utils import (
     FileObjectData,
@@ -78,6 +78,24 @@ class BlobSession(FileSystemSession):
 
         return filesystem_file_references
 
+    def list_directories(self, dir_path: FileSystemObject) -> list[FileSystemObject]:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReferenceError()
+
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to list_directories on uninitialized blob session"
+        )
+
+        prefix = _add_slash(dir_path.filepath)
+        directories: list[FileSystemObject] = []
+        for item in self.container_client.walk_blobs(
+            name_starts_with=prefix, delimiter="/"
+        ):
+            if isinstance(item, BlobPrefix):
+                directories.append(FileSystemFileReference(item.name.rstrip("/")))
+
+        return directories
+
     def download_files(
         self,
         filepaths: list[FileSystemObject],
@@ -108,6 +126,22 @@ class BlobSession(FileSystemSession):
 
         return downloaded_files
 
+    def _move_blob(self, src_name: str, dest_name: str) -> None:
+        assert self.container_client is not None, (
+            "call to _move_blob on uninitialized blob session"
+        )
+        source_blob_client = self.container_client.get_blob_client(src_name)
+        dest_blob_client = self.container_client.get_blob_client(dest_name)
+
+        source_url = (
+            f"{source_blob_client.url}?{self.config.credential.signature}"
+            if isinstance(self.config.credential, AzureSasCredential)
+            else source_blob_client.url
+        )
+
+        dest_blob_client.start_copy_from_url(source_url)
+        source_blob_client.delete_blob()
+
     def move_files(self, file_mappings: list[FileTransfer]) -> None:
         assert self.service_client is not None and self.container_client is not None, (
             "call to move_files on uninitialized blob session"
@@ -119,19 +153,25 @@ class BlobSession(FileSystemSession):
             ):
                 raise IncompatibleFileReferenceError()
 
-            source_blob_client = self.container_client.get_blob_client(
-                src_file.filepath
-            )
-            dest_blob_client = self.container_client.get_blob_client(dest_file.filepath)
+            self._move_blob(src_file.filepath, dest_file.filepath)
 
-            source_url = (
-                f"{source_blob_client.url}?{self.config.credential.signature}"
-                if isinstance(self.config.credential, AzureSasCredential)
-                else source_blob_client.url
-            )
+    def move_directory(
+        self, src_dir: FileSystemObject, dest_dir: FileSystemObject
+    ) -> None:
+        if not isinstance(src_dir, FileSystemFileReference) or not isinstance(
+            dest_dir, FileSystemFileReference
+        ):
+            raise IncompatibleFileReferenceError()
+
+        assert self.service_client is not None and self.container_client is not None, (
+            "call to move_directory on uninitialized blob session"
+        )
 
-            dest_blob_client.start_copy_from_url(source_url)
-            source_blob_client.delete_blob()
+        src_prefix = _add_slash(src_dir.filepath)
+        dest_prefix = _add_slash(dest_dir.filepath)
+        for blob in self.container_client.list_blobs(name_starts_with=src_prefix):
+            dest_name = dest_prefix + blob.name[len(src_prefix) :]
+            self._move_blob(blob.name, dest_name)
 
     def delete_files(self, filepaths: list[FileSystemObject]) -> None:
         assert self.service_client is not None and self.container_client is not None, (

pkgs/filesystem_utils/_file_share_session.py

@@ -79,6 +79,49 @@ class FileShareSession(FileSystemSession):
             dir_client, recursive=recursive, valid_extensions=valid_extensions
         )
 
+    def list_directories(self, dir_path: FileSystemObject) -> list[FileSystemObject]:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReferenceError()
+        assert self._share_client is not None, (
+            "call to list_directories on uninitialized file share session"
+        )
+        dir_client = self._share_client.get_directory_client(dir_path.filepath)
+        directories: list[FileSystemObject] = []
+        for item in dir_client.list_directories_and_files():
+            if item["is_directory"]:
+                item_path = f"{dir_client.directory_path}/{item['name']}".lstrip("/")
+                directories.append(FileSystemFileReference(filepath=item_path))
+        return directories
+
+    def create_directory(self, dir_path: FileSystemObject) -> None:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReferenceError()
+        assert self._share_client is not None, (
+            "call to create_directory on uninitialized file share session"
+        )
+        current = ""
+        for segment in dir_path.filepath.strip("/").split("/"):
+            if not segment:
+                continue
+            current = f"{current}/{segment}".lstrip("/")
+            dir_client = self._share_client.get_directory_client(current)
+            if not dir_client.exists():
+                dir_client.create_directory()
+
+    def move_directory(
+        self, src_dir: FileSystemObject, dest_dir: FileSystemObject
+    ) -> None:
+        if not isinstance(src_dir, FileSystemFileReference) or not isinstance(
+            dest_dir, FileSystemFileReference
+        ):
+            raise IncompatibleFileReferenceError()
+        assert self._share_client is not None, (
+            "call to move_directory on uninitialized file share session"
+        )
+        self._share_client.get_directory_client(src_dir.filepath).rename_directory(
+            dest_dir.filepath
+        )
+
     def download_files(self, filepaths: list[FileSystemObject]) -> list[FileObjectData]:
         assert self._share_client is not None, (
             "call to download_files on uninitialized file share session"

pkgs/filesystem_utils/_s3_session.py

@@ -86,6 +86,28 @@ class S3Session(FileSystemSession):
 
         return filesystem_references
 
+    def list_directories(self, dir_path: FileSystemObject) -> list[FileSystemObject]:
+        if not isinstance(dir_path, FileSystemFileReference):
+            raise IncompatibleFileReferenceError()
+
+        assert self.bucket is not None, (
+            "call to list_directories on uninitialized s3 session"
+        )
+
+        prefix = _add_slash(dir_path.filepath)
+        paginator = self.bucket.meta.client.get_paginator("list_objects_v2")
+
+        directories: list[FileSystemObject] = []
+        for page in paginator.paginate(
+            Bucket=self.bucket.name, Prefix=prefix, Delimiter="/"
+        ):
+            for common_prefix in page.get("CommonPrefixes", []):
+                directories.append(
+                    FileSystemFileReference(common_prefix["Prefix"].rstrip("/"))
+                )
+
+        return directories
+
     def download_files(
         self,
         filepaths: list[FileSystemObject],
@@ -115,6 +137,18 @@ class S3Session(FileSystemSession):
 
         return downloaded_files
 
+    def _move_object(self, src_key: str, dest_key: str) -> None:
+        assert self.bucket is not None, (
+            "call to _move_object on uninitialized s3 session"
+        )
+        self.bucket.Object(dest_key).copy_from(
+            CopySource={
+                "Bucket": self.bucket.name,
+                "Key": src_key,
+            }
+        )
+        self.bucket.Object(src_key).delete()
+
     def move_files(self, file_mappings: list[FileTransfer]) -> None:
         assert self.bucket is not None, "call to move_files on uninitialized s3 session"
 
@@ -123,10 +157,22 @@ class S3Session(FileSystemSession):
                 dest_file, FileSystemFileReference
             ):
                 raise IncompatibleFileReferenceError()
-            self.bucket.Object(dest_file.filepath).copy_from(
-                CopySource={
-                    "Bucket": self.bucket.name,
-                    "Key": src_file.filepath,
-                }
-            )
-            self.bucket.Object(src_file.filepath).delete()
+            self._move_object(src_file.filepath, dest_file.filepath)
+
+    def move_directory(
+        self, src_dir: FileSystemObject, dest_dir: FileSystemObject
+    ) -> None:
+        if not isinstance(src_dir, FileSystemFileReference) or not isinstance(
+            dest_dir, FileSystemFileReference
+        ):
+            raise IncompatibleFileReferenceError()
+
+        assert self.bucket is not None, (
+            "call to move_directory on uninitialized s3 session"
+        )
+
+        src_prefix = _add_slash(src_dir.filepath)
+        dest_prefix = _add_slash(dest_dir.filepath)
+        for obj in self.bucket.objects.filter(Prefix=src_prefix):
+            dest_key = dest_prefix + obj.key[len(src_prefix) :]
+            self._move_object(obj.key, dest_key)

pkgs/filesystem_utils/filesystem_session.py

@@ -32,6 +32,17 @@ class FileSystemSession(ABC):
     def delete_files(self, filepaths: list[FileSystemObject]) -> None:
         raise NotImplementedError
 
+    def list_directories(self, dir_path: FileSystemObject) -> list[FileSystemObject]:
+        raise NotImplementedError
+
+    def create_directory(self, dir_path: FileSystemObject) -> None:
+        raise NotImplementedError
+
+    def move_directory(
+        self, src_dir: FileSystemObject, dest_dir: FileSystemObject
+    ) -> None:
+        raise NotImplementedError
+
     @abstractmethod
     def __enter__(self) -> "FileSystemSession": ...
 

uncountable/core/environment.py

@@ -26,10 +26,6 @@ def get_local_admin_server_port() -> int:
     return int(os.environ.get("UNC_ADMIN_SERVER_PORT", "50051"))
 
 
-def get_integration_admin_token() -> str | None:
-    return os.environ.get("UNC_INTEGRATION_ADMIN_TOKEN")
-
-
 def get_otel_enabled() -> bool:
     return os.environ.get("UNC_OTEL_ENABLED") == "true"
 

uncountable/integration/entrypoint.py

@@ -1,11 +1,14 @@
 from uncountable.integration.db.connect import IntegrationDBService, create_db_engine
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.server import IntegrationServer
+from uncountable.integration.webhook_bootstrap import start_webhook_entity_bootstrap
 
 
 def main() -> None:
+    profiles = load_profiles()
     with IntegrationServer(create_db_engine(IntegrationDBService.CRON)) as server:
-        server.register_jobs(load_profiles())
+        start_webhook_entity_bootstrap(profiles)
+        server.register_jobs(profiles)
         server.serve_forever()
 
 

uncountable/integration/http_server/types.py

@@ -28,6 +28,10 @@ class HttpException(Exception):
     def body_parse_error() -> "HttpException":
         return HttpException(error_code=400, message="body parse error")
 
+    @staticmethod
+    def bad_request(message: str = "bad request") -> "HttpException":
+        return HttpException(error_code=400, message=message)
+
     @staticmethod
     def unauthorized() -> "HttpException":
         return HttpException(error_code=401, message="unauthorized")

uncountable/integration/job.py

@@ -27,7 +27,7 @@ from uncountable.integration.queue_runner.command_server.types import (
 from uncountable.integration.request_context import extract_request_context
 from uncountable.integration.secret_retrieval import retrieve_secret
 from uncountable.integration.telemetry import JobLogger
-from uncountable.integration.webhook_signature_key import (
+from uncountable.integration.webhook_entity import (
     webhook_signature_key_retrieval,
 )
 from uncountable.types import (

uncountable/integration/queue_runner/command_server/provision_webhook.py

@@ -3,9 +3,7 @@ from opentelemetry.trace import get_current_span
 from uncountable.integration.construct_client import construct_uncountable_client
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.telemetry import Logger
-from uncountable.integration.webhook_signature_key import (
-    bootstrap_webhook_signature_key,
-)
+from uncountable.integration.webhook_entity import create_missing_webhook_entities
 from uncountable.types import job_definition_t
 
 
@@ -17,12 +15,10 @@ def provision_webhook(*, job_id: str) -> str | None:
                 isinstance(job, job_definition_t.UncountableWebhookJobDefinition)
                 and job.id == job_id
             ):
-                client = construct_uncountable_client(profile_metadata, logger)
-                bootstrap_webhook_signature_key(
-                    client=client,
+                create_missing_webhook_entities(
+                    client=construct_uncountable_client(profile_metadata, logger),
                     profile_metadata=profile_metadata,
-                    job_id=job.id,
-                    purpose=job.purpose,
+                    jobs=[job],
                 )
                 return profile_metadata.name
     return None

uncountable/integration/webhook_bootstrap.py

@@ -0,0 +1,67 @@
+import threading
+
+from opentelemetry.trace import get_current_span
+
+from uncountable.integration.construct_client import construct_uncountable_client
+from uncountable.integration.telemetry import Logger
+from uncountable.integration.webhook_entity import create_missing_webhook_entities
+from uncountable.types import job_definition_t
+
+_BOOTSTRAP_SCOPE_NAME = "bootstrap_webhook_entities"
+_BOOTSTRAP_THREAD_NAME = "webhook-entity-bootstrap"
+
+
+def _bootstrap_profile_webhook_entities(
+    *,
+    profile_metadata: job_definition_t.ProfileMetadata,
+    jobs: list[job_definition_t.UncountableWebhookJobDefinition],
+    logger: Logger,
+) -> None:
+    created_job_ids = create_missing_webhook_entities(
+        client=construct_uncountable_client(profile_metadata, logger),
+        profile_metadata=profile_metadata,
+        jobs=jobs,
+    )
+    logger.log_debug(
+        f"bootstrapped {len(created_job_ids)} webhook entities for profile {profile_metadata.name}",
+        attributes={
+            "profile.name": profile_metadata.name,
+            "webhook.created_job_ids": created_job_ids,
+        },
+    )
+
+
+def _bootstrap_webhook_entities(
+    profiles: list[job_definition_t.ProfileMetadata],
+) -> None:
+    logger = Logger(get_current_span())
+    with logger.push_scope(_BOOTSTRAP_SCOPE_NAME):
+        for profile_metadata in profiles:
+            webhook_jobs = [
+                job
+                for job in profile_metadata.jobs
+                if isinstance(job, job_definition_t.UncountableWebhookJobDefinition)
+            ]
+            if len(webhook_jobs) == 0:
+                continue
+            try:
+                _bootstrap_profile_webhook_entities(
+                    profile_metadata=profile_metadata, jobs=webhook_jobs, logger=logger
+                )
+            except Exception as e:
+                logger.log_exception(
+                    e,
+                    message=f"failed to bootstrap webhook entities for profile {profile_metadata.name}",
+                    attributes={"profile.name": profile_metadata.name},
+                )
+
+
+def start_webhook_entity_bootstrap(
+    profiles: list[job_definition_t.ProfileMetadata],
+) -> None:
+    threading.Thread(
+        target=_bootstrap_webhook_entities,
+        args=(profiles,),
+        name=_BOOTSTRAP_THREAD_NAME,
+        daemon=True,
+    ).start()

uncountable/integration/webhook_entity.py

@@ -0,0 +1,147 @@
+import secrets
+from collections.abc import Sequence
+
+from uncountable.core.client import Client
+from uncountable.core.query.builder import QueryBuilder
+from uncountable.core.query.column import (
+    NullableColumn,
+    TextColumn,
+)
+from uncountable.core.query.row import QueryRow
+from uncountable.types import (
+    create_or_update_entities_t,
+    entity_t,
+    field_values_t,
+    identifier_t,
+    listing_t,
+)
+from uncountable.types.job_definition_t import (
+    ProfileMetadata,
+    UncountableWebhookJobDefinition,
+)
+from uncountable.types.secret_retrieval_t import SecretRetrievalEntityColumn
+
+_WEBHOOK_DEFINITION_REF_NAME = "unc_webhook_definition"
+_WEBHOOK_REF_NAME_FIELD_REF_NAME = "refName"
+_WEBHOOK_NAME_FIELD_REF_NAME = "name"
+_WEBHOOK_URL_FIELD_REF_NAME = "core_webhook_url"
+_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME = "core_webhook_signatureKey"
+_WEBHOOK_PURPOSE_FIELD_REF_NAME = "core_webhook_purpose"
+_SIGNATURE_KEY_NUM_BYTES = 32
+
+
+class _WebhookEntityQueryRow(QueryRow):
+    ref_name = TextColumn(
+        identifier=listing_t.ColumnIdentifierEntityRefName(
+            entity_type=entity_t.EntityType.WEBHOOK,
+            ref_name=_WEBHOOK_REF_NAME_FIELD_REF_NAME,
+        ),
+        nullable=NullableColumn,
+    )
+
+
+def webhook_signature_key_retrieval(*, job_id: str) -> SecretRetrievalEntityColumn:
+    return SecretRetrievalEntityColumn(
+        entity_key=identifier_t.IdentifierKeyRefName(ref_name=job_id),
+        column_identifier=listing_t.ColumnIdentifierEntityRefName(
+            entity_type=entity_t.EntityType.WEBHOOK,
+            ref_name=_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME,
+        ),
+    )
+
+
+def _resolve_webhook_url(*, profile_metadata: ProfileMetadata, job_id: str) -> str:
+    integration_server_base_url = profile_metadata.integration_server_base_url
+    if integration_server_base_url is None:
+        raise ValueError(
+            "integration_server_base_url is required to resolve the webhook entity "
+            f"for {profile_metadata.name}/{job_id}"
+        )
+    return f"{integration_server_base_url.rstrip('/')}/{profile_metadata.name}/{job_id}"
+
+
+def _fetch_existing_webhook_ref_names(
+    *, client: Client, job_ids: Sequence[str]
+) -> set[str]:
+    existing_webhooks = (
+        QueryBuilder(client=client, model=_WebhookEntityQueryRow)
+        .filter(_WebhookEntityQueryRow.ref_name.includes(tuple(job_ids)))
+        .all()
+    )
+    return {
+        webhook.ref_name
+        for webhook in existing_webhooks
+        if webhook.ref_name is not None
+    }
+
+
+def _text_field_value(
+    *, field_ref_name: str, value: str
+) -> field_values_t.FieldArgumentValue:
+    return field_values_t.FieldArgumentValue(
+        field_key=identifier_t.IdentifierKeyRefName(ref_name=field_ref_name),
+        value=field_values_t.FieldValueText(value=value),
+    )
+
+
+def _build_webhook_operation(
+    *, profile_metadata: ProfileMetadata, job: UncountableWebhookJobDefinition
+) -> create_or_update_entities_t.EntityToCreateOrUpdate:
+    # entity_key is deliberately omitted so the operation always takes the create
+    # path. Supplying a ref_name key that resolves to nothing raises not-found
+    # rather than creating the entity, and callers only pass jobs already known
+    # to have no webhook entity.
+    return create_or_update_entities_t.EntityToCreateOrUpdate(
+        field_values=[],
+        on_create_init_field_values=[
+            _text_field_value(
+                field_ref_name=_WEBHOOK_REF_NAME_FIELD_REF_NAME, value=job.id
+            ),
+            _text_field_value(
+                field_ref_name=_WEBHOOK_NAME_FIELD_REF_NAME,
+                value=f"{profile_metadata.name}/{job.id}",
+            ),
+            _text_field_value(
+                field_ref_name=_WEBHOOK_URL_FIELD_REF_NAME,
+                value=_resolve_webhook_url(
+                    profile_metadata=profile_metadata, job_id=job.id
+                ),
+            ),
+            _text_field_value(
+                field_ref_name=_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME,
+                value=secrets.token_urlsafe(_SIGNATURE_KEY_NUM_BYTES),
+            ),
+            field_values_t.FieldArgumentValue(
+                field_key=identifier_t.IdentifierKeyRefName(
+                    ref_name=_WEBHOOK_PURPOSE_FIELD_REF_NAME
+                ),
+                value=field_values_t.FieldValueFieldOption(value=job.purpose.value),
+            ),
+        ],
+    )
+
+
+def create_missing_webhook_entities(
+    *,
+    client: Client,
+    profile_metadata: ProfileMetadata,
+    jobs: Sequence[UncountableWebhookJobDefinition],
+) -> list[str]:
+    existing_ref_names = _fetch_existing_webhook_ref_names(
+        client=client, job_ids=[job.id for job in jobs]
+    )
+    missing_jobs = [job for job in jobs if job.id not in existing_ref_names]
+    if len(missing_jobs) == 0:
+        return []
+
+    client.create_or_update_entities(
+        entity_type=entity_t.EntityType.WEBHOOK,
+        definition_key=identifier_t.IdentifierKeyRefName(
+            ref_name=_WEBHOOK_DEFINITION_REF_NAME
+        ),
+        operations=[
+            _build_webhook_operation(profile_metadata=profile_metadata, job=job)
+            for job in missing_jobs
+        ],
+    )
+    return [job.id for job in missing_jobs]

uncountable/integration/webhook_server/entrypoint.py

@@ -12,7 +12,6 @@ from uncountable.integration.http_server import GenericHttpRequest, HttpExceptio
 from uncountable.integration.job import CustomHttpJob, WebhookJob
 from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.telemetry import Logger
-from uncountable.integration.webhook_server.admin_routes import register_admin_routes
 from uncountable.types import job_definition_t
 
 app = flask.Flask(__name__)
@@ -99,7 +98,6 @@ def register_route(
 
 def main() -> None:
     app.add_url_rule("/health", "health", lambda: ("OK", 200))
-    register_admin_routes(app)
 
     profiles = load_profiles()
     for profile_metadata in profiles:

uncountable/types/api/recipes/set_recipe_inputs.py

@@ -21,7 +21,7 @@ __all__: list[str] = [
 
 ENDPOINT_METHOD = "POST"
 ENDPOINT_PATH = "api/external/recipes/external_set_recipe_inputs"
-ENDPOINT_DESCRIPTION = "Sets input values for experiments. Supports numeric, text, and categorical types. Validates that the recipe step belongs to the correct recipe. Supports setting actual values, associating lots (creating them if needed), and removing inputs. Writes all values to the first workflow step when no step is specified. Fails if both a numeric and string value are provided."
+ENDPOINT_DESCRIPTION = "Sets input values for experiments. Supports numeric, text, and categorical types. Validates that the recipe step belongs to the correct recipe. Each entry edits one input on one recipe with a single operation: set the value (the actual value when set_actual_value is true, otherwise the set value), associate a lot (lot_recipe_id, created if the recipe is not already a lot), or remove the input (remove). A lot association targets the set value; combining it with set_actual_value fails. Writes all values to the first workflow step when no step is specified. Fails if both a numeric and string value are provided."
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/client_base.py

@@ -2177,7 +2177,7 @@ class ClientMethods(ABC):
         input_data: list[set_recipe_inputs_t.RecipeInputValue],
         _request_options: client_config_t.RequestOptions | None = None,
     ) -> set_recipe_inputs_t.Data:
-        """Sets input values for experiments. Supports numeric, text, and categorical types. Validates that the recipe step belongs to the correct recipe. Supports setting actual values, associating lots (creating them if needed), and removing inputs. Writes all values to the first workflow step when no step is specified. Fails if both a numeric and string value are provided.
+        """Sets input values for experiments. Supports numeric, text, and categorical types. Validates that the recipe step belongs to the correct recipe. Each entry edits one input on one recipe with a single operation: set the value (the actual value when set_actual_value is true, otherwise the set value), associate a lot (lot_recipe_id, created if the recipe is not already a lot), or remove the input (remove). A lot association targets the set value; combining it with set_actual_value fails. Writes all values to the first workflow step when no step is specified. Fails if both a numeric and string value are provided.
 
         :param input_data: The inputs to set. Must be at most 100 entries long
         """

uncountable/types/generic_upload.py

@@ -9,6 +9,7 @@ from .generic_upload_t import UploadDestinationBase as UploadDestinationBase
 from .generic_upload_t import UploadDestinationProject as UploadDestinationProject
 from .generic_upload_t import UploadDestinationMaterialFamily as UploadDestinationMaterialFamily
 from .generic_upload_t import UploadDestinationRecipe as UploadDestinationRecipe
+from .generic_upload_t import UploadDestinationAutoMatch as UploadDestinationAutoMatch
 from .generic_upload_t import UploadDestination as UploadDestination
 from .generic_upload_t import GenericUploadStrategy as GenericUploadStrategy
 # DO NOT MODIFY -- This file is generated by type_spec

uncountable/types/generic_upload_t.py

@@ -16,6 +16,7 @@ __all__: list[str] = [
     "GenericRemoteDirectoryScope",
     "GenericUploadStrategy",
     "UploadDestination",
+    "UploadDestinationAutoMatch",
     "UploadDestinationBase",
     "UploadDestinationMaterialFamily",
     "UploadDestinationProject",
@@ -47,6 +48,7 @@ class UploadDestinationType(StrEnum):
     PROJECT = "project"
     MATERIAL_FAMILY = "material_family"
     RECIPE = "recipe"
+    AUTO_MATCH = "auto_match"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -91,9 +93,19 @@ class UploadDestinationRecipe(UploadDestinationBase):
     recipe_key: identifier_t.IdentifierKey
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.generic_upload.UploadDestinationAutoMatch",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=True, kw_only=True)
+class UploadDestinationAutoMatch(UploadDestinationBase):
+    type: typing.Literal[UploadDestinationType.AUTO_MATCH] = UploadDestinationType.AUTO_MATCH
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 UploadDestination = typing.Annotated[
-    UploadDestinationProject | UploadDestinationMaterialFamily | UploadDestinationRecipe,
+    UploadDestinationProject | UploadDestinationMaterialFamily | UploadDestinationRecipe | UploadDestinationAutoMatch,
     serial_union_annotation(
     named_type_path="sdk.generic_upload.UploadDestination",
         discriminator="type",
@@ -101,6 +113,7 @@ UploadDestination = typing.Annotated[
             "project": UploadDestinationProject,
             "material_family": UploadDestinationMaterialFamily,
             "recipe": UploadDestinationRecipe,
+            "auto_match": UploadDestinationAutoMatch,
         },
     ),
 ]

{uncountablepythonsdk-0.0.181.dist-info → uncountablepythonsdk-0.0.183.dist-info}/METADATA

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

@@ -42,7 +42,7 @@ examples/integration-server/jobs/materials_auto/example_parse.py,sha256=Z3iqAUdI
 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_wh.py,sha256=PN-skP27yJwDZboWk5g5EZEc3AKfVayQLfnopjsDKJc,659
-examples/integration-server/jobs/materials_auto/profile.yaml,sha256=ywDrDRAyqiUdj_HvosNP5bXBL8mCWsvdJ1eYQd-mGYo,2369
+examples/integration-server/jobs/materials_auto/profile.yaml,sha256=N9kX-xczfgBSqnfY5qsxmjxXkBXLhMnZU1TOMWI1hfg,2587
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=cEEOAQS8UJ4Kbuo0oCVAHHhkbYCfrH6cUTTt2Mq3PmI,1445
@@ -57,15 +57,15 @@ pkgs/argument_parser/parser_inner.py,sha256=0zepgTqQm6yFp9WMlHJmWV3S9WsxzRiN_nBw
 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
-pkgs/filesystem_utils/_blob_session.py,sha256=2xcelJlME7bCNmBiTMnwycGDkwo0UtYfbGQEkCj0Ndo,5183
-pkgs/filesystem_utils/_file_share_session.py,sha256=27QmvifiwMYQ25eRVKWdr3VZDdZmBtYXTF6lhPUcld4,5155
+pkgs/filesystem_utils/_blob_session.py,sha256=pdRWflJAQux06ZZZLjbH1kic4djG8YBTiAN3fZ8nSVA,6870
+pkgs/filesystem_utils/_file_share_session.py,sha256=GyC9w762CbnvpC0ooZumZnzqrIULYOkHN7UIz3I7jXc,7131
 pkgs/filesystem_utils/_gdrive_session.py,sha256=pxZNTR5t8gJFS-HwMCZiQ-ZwCJV_ij5PWiBf1BUy9DE,11122
 pkgs/filesystem_utils/_local_session.py,sha256=FXxLn7CqmYZZib3mCGg0BuItIGwlvOIsKEJcZHfJ_iw,2359
-pkgs/filesystem_utils/_s3_session.py,sha256=jmc3UdOog_4cpnRvoqJgkzSAgBGYjmoMN92GIgUX-zw,4523
+pkgs/filesystem_utils/_s3_session.py,sha256=0MS1RXPA7wnoLKG8eDV_ONFS4f_rhA5Ey3yn65-JZ_g,6250
 pkgs/filesystem_utils/_sftp_connection.py,sha256=XeRNdfdXPjpRYiirp7GGsmQOQ4W4WMZihuDKFqy9nRE,4854
 pkgs/filesystem_utils/_sftp_session.py,sha256=62E2OWHWvtAcKjxq2g5L4cCWiXiOFwRoyQX9Hr6d3RU,4927
 pkgs/filesystem_utils/file_type_utils.py,sha256=Hf-NP1E8lKn9QAx9LH2a6Fc5jSXfmE8l0CMCtqvjyFA,2140
-pkgs/filesystem_utils/filesystem_session.py,sha256=BQ2Go8Mu9-GcnaWh2Pm4x7ugLVsres6XrOQ8RoiEpcE,1045
+pkgs/filesystem_utils/filesystem_session.py,sha256=zOddRkBZC5tsTiwquySeKTkKM5yNwW3Q_jDq9U0XcuI,1411
 pkgs/serialization/__init__.py,sha256=HWzdZ5CtMnZ-svy08eiDn6K9P_IveCjkjQ3whxPoCs4,1093
 pkgs/serialization/annotation.py,sha256=JXP2caXNoj8h_Pvx_26iarPlsaPcIqe1qssTksJiKjM,3408
 pkgs/serialization/missing_sentry.py,sha256=VCXiYs7s5MkfG8kbmwDAswdq0fL4zFRj4B2uSQzmTos,819
@@ -122,7 +122,7 @@ uncountable/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/core/__init__.py,sha256=RFv0kO6rKFf1PtBPu83hCGmxqkJamRtsgQ9_-ztw7tA,341
 uncountable/core/async_batch.py,sha256=9pYGFzVCQXt8059qFHgutweGIFPquJ5Xfq6NT5P-1K0,1206
 uncountable/core/client.py,sha256=53Voo2Y-q9iipwwJoHKb-idW41JUOeV8QeWnaLGFf48,16715
-uncountable/core/environment.py,sha256=OsUC5URj4VkYFbmZ89MF4gD3vMtIrFKKHSxljXi4oeI,1240
+uncountable/core/environment.py,sha256=Z9vu7JtnSDgQB_KKcZnjTFNyARXjRr_PDW9krwxNNAo,1132
 uncountable/core/file_upload.py,sha256=BOixJ09uWjZBTrNAlJqNvJEFvaNS2dt7eFq2rG6xP5g,5987
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/core/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -134,14 +134,15 @@ uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 uncountable/integration/cli.py,sha256=5RzlfScaZHapiXp4XoaYh0QqSenIjkEf-kyjEue1ycg,9301
 uncountable/integration/construct_client.py,sha256=9c8ZqMjyXebsptiGkJbg53_af4TLOumY1hOQtIbC15w,2229
 uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0hw,887
-uncountable/integration/entrypoint.py,sha256=BHOYPQgKvZE6HG8Rv15MkdYl8lRkvfDgv1OdLo0oQ9Q,433
-uncountable/integration/job.py,sha256=eKaRiVagBR0qKUp96jR2NZdxOGKWQbJpBrkcRWoJcXw,9194
+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/server.py,sha256=wnqpowr3xdAXfi4gCTdfFBvmQVyTro439kqrXewBauM,6002
 uncountable/integration/telemetry.py,sha256=W7z2h47Rrn7F3gF1aazbBdthNbSVi4dkQVbZFIs99-c,16155
-uncountable/integration/webhook_signature_key.py,sha256=vXlNtj0qLqZxjKDLmRvlChvLS5xoPAGmYcYcs4WIVaM,3882
+uncountable/integration/webhook_bootstrap.py,sha256=RlMsdfoWhsOX8eQCVz9XhyQLqfr0hPPwW6pdGhhmfeI,2332
+uncountable/integration/webhook_entity.py,sha256=As4x_W_zXuJ4uCAoVZwUKHPJILxP12ow0psPEv5sv9M,5220
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=-xYWcJYxwKJMBvdQJ5J0-4vwBU-m24uTBtE-VrjwgKw,1479
 uncountable/integration/db/session.py,sha256=z9kor6wy8fdHhHSmdBj9HVvDOQWvs1QM_0kisD1A06E,702
@@ -150,7 +151,7 @@ uncountable/integration/executors/executors.py,sha256=E3a0_yrQesfigDzjhUAwD7-l-o
 uncountable/integration/executors/generic_upload_executor.py,sha256=MuNzrMnAaj6PBhrfTKX6e6vyQhwoDeBrYLz96ai653k,12149
 uncountable/integration/executors/script_executor.py,sha256=hKq09fOG89OAZ1Iq7wm2OgpUz1bh7DIYdZ2yn6ySr10,881
 uncountable/integration/http_server/__init__.py,sha256=ld7hD3wOGwAbnVRBrkTUCP5zNG-kptMd4wGJyQvUWVc,170
-uncountable/integration/http_server/types.py,sha256=eCdYZdEWjdFj9JDTQvhLF3W83HkdRowgX3X_axbA6-0,2274
+uncountable/integration/http_server/types.py,sha256=9Hnt_rvrhGh0MCj1O2k2KHF81U85jURUnG6vt0boPDk,2425
 uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/queue_runner/job_process.py,sha256=OONJ7aLsE80qIJ2ABLY3HYyKI7VdpBjI_pPQ3GCC13U,2586
 uncountable/integration/queue_runner/job_runner.py,sha256=Yh9hYfEYOya3BR6ypsal3LKPKrrEb4VQwfGuh4qyU2w,6115
@@ -162,7 +163,7 @@ uncountable/integration/queue_runner/command_server/__init__.py,sha256=hMCDLWct8
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=hvioJc3XcJ4HsJmEwOFpQ2VZ56IqXHldZdR5yvWo39U,6361
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=IsM_4YfuRqr8Ev2tbk6TpfdkBWh9mOTu-8dPUijfVQ8,8581
 uncountable/integration/queue_runner/command_server/constants.py,sha256=7J9mQIAMOfV50wnwpn7HgrPFEi3Ritj6HwrGYwxGLoU,88
-uncountable/integration/queue_runner/command_server/provision_webhook.py,sha256=yPYEqCi9lDFYOeGBJgwcLS3IdfYGcaZFEYo6_8sFiS8,1102
+uncountable/integration/queue_runner/command_server/provision_webhook.py,sha256=TqH_6YjRZz8EHMKxOcCxvmK6vweR8nuY8ilWNEQoogk,1010
 uncountable/integration/queue_runner/command_server/types.py,sha256=ZNqJE6b6rfMZGdcPS-7umB_8x2a7dzTfRBsdGoCzDjY,2077
 uncountable/integration/queue_runner/command_server/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/queue_runner/command_server/protocol/command_server.proto,sha256=mvgCHAIQocdtou7e8SZmmJIBK7jIzJ2fT4yDz6Bur3c,1869
@@ -179,9 +180,7 @@ uncountable/integration/queue_runner/datastore/model.py,sha256=06_fGS0QTALEA_381
 uncountable/integration/secret_retrieval/__init__.py,sha256=sisf8cxCYcJmCXCKjEPoT2xIxm1j-Ru9iTfMVxH6NM0,171
 uncountable/integration/secret_retrieval/basic_secret.py,sha256=PfpeaEDwdi8nFlHUJnzCob9GYgGG5O_3mmcaxPPY6zI,3272
 uncountable/integration/secret_retrieval/retrieve_secret.py,sha256=c0VkCvppWKXwgxdblQuj2WhRaEGBPa7vLDoS6mlNOAQ,3919
-uncountable/integration/webhook_server/admin_auth.py,sha256=RYyK54wH5SHfzAVS4CeGgaKHeD4qAhqsvNZqkWuN34Q,1234
-uncountable/integration/webhook_server/admin_routes.py,sha256=S73fIQu7-0U8RKHqvgKIkRMzkEcaYKwplKSexWA5vIQ,1862
-uncountable/integration/webhook_server/entrypoint.py,sha256=LT0IDQtCqNoZBtzb-x6Ev96e1Xug3GRv4hn5NUbG_A4,4385
+uncountable/integration/webhook_server/entrypoint.py,sha256=_1360zLIvEVQVf8ToyK-E2fnaszGKs2HcxcZjNraADc,4268
 uncountable/types/__init__.py,sha256=7fIYhDsz995jFGK7wBXIVMzIxUJbltUmdqm9U6HA_QQ,14367
 uncountable/types/async_batch.py,sha256=yCCWrrLQfxXVqZp-KskxLBNkNmuELdz4PJjx8ULppgs,662
 uncountable/types/async_batch_processor.py,sha256=6Z1qx_H9IqLqp0rzpCtrRvw0DqQ2O5ctkEnw0yNVaV8,48727
@@ -196,7 +195,7 @@ uncountable/types/calculations.py,sha256=fApOFpgBemt_t7IVneVR0VdI3X5EOxiG6Xhzr6R
 uncountable/types/calculations_t.py,sha256=_K4MDVoxa6AgxlxPrEDBujWhEGWEhUQuE2-ZgiLg9OU,660
 uncountable/types/chemical_structure.py,sha256=ujyragaD26-QG5jgKnWhO7TN3N1V9b_04T2WhqNYxxo,281
 uncountable/types/chemical_structure_t.py,sha256=tbA7NBO-vv7Hnk3-ETxc6Pw3wqWeenBG27Y9_bdPCu4,785
-uncountable/types/client_base.py,sha256=X_1ccYzdrQHyn4tCyIGhxMlLHdoThx2lcav2tVvQE1A,138269
+uncountable/types/client_base.py,sha256=eM3WCohb2OESAE6OoV7MMWbXV4S6vGMZrEC0Bw4wXGU,138517
 uncountable/types/client_config.py,sha256=M7FZ0m_lGmBsIYcMn8pm92DdoVzrLpzd8sH6DqTQLKo,456
 uncountable/types/client_config_t.py,sha256=-YNp-zFvk5OL6_WGwGSx30ToK2bGIOh0kv_HN7KcCys,1796
 uncountable/types/condition_match.py,sha256=ekDzij7-e1PtVwIslSjD1T9fuBIDr5c_7QPdaasiGJw,262
@@ -217,8 +216,8 @@ uncountable/types/field_values.py,sha256=iG4TvITLnlz023GuhFrlDwXB7oov5DPpAs_FBaM
 uncountable/types/field_values_t.py,sha256=jfvHmnMLnPz_q6bjdJvWi204uKN2F_KtIzXrfU701Jg,9096
 uncountable/types/fields.py,sha256=M0_ZZr0QdNLXkdHAGo5mfU90kEtHedCSKrcod-FG30Y,245
 uncountable/types/fields_t.py,sha256=MbV4S0hX137FZLe-fXEMRuTo53wjdy1TxodtJmjXbiI,656
-uncountable/types/generic_upload.py,sha256=bNep2nT0fbKAlJaGvHWPmuvfX5KtS8kgTqTh8FQk1NA,858
-uncountable/types/generic_upload_t.py,sha256=prMriVeukeiJa5gWfIOHuFad9rz_18FiOtlNjhb2WZ0,3828
+uncountable/types/generic_upload.py,sha256=XhPnQDxsCqQec3lfq9Afs9t8lzQmVJYmY97Bg5CxvTE,945
+uncountable/types/generic_upload_t.py,sha256=MAsNFqfcsbdCEsFkB4dQx7k7WyW0jX683e18eHVeGUo,4346
 uncountable/types/id_source.py,sha256=sBlDfUwHQ7bGWMschSD_aPQL7LVnCPiV2RAlPLXrAqk,546
 uncountable/types/id_source_t.py,sha256=KhOK1wXgVgbRy1vSdEdbwyz9z4prWRcAx8hOJyjCvyQ,1886
 uncountable/types/identifier.py,sha256=J-ptCFE0_R0bBAvrYp-gvHk8H9Qq9rhbmeyXgwb9nos,482
@@ -411,7 +410,7 @@ uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=IYm4DA7RN8gvx
 uncountable/types/api/recipes/get_recipes_data.py,sha256=B_rYOq7TfHVi4pyFN6r5zi5QDzMXhRDw2thlldwO0wQ,8859
 uncountable/types/api/recipes/lock_recipes.py,sha256=Ez5oWRwq_n16RHli56uaEURGrRYxyIS2VLOJEUQ9kaY,1885
 uncountable/types/api/recipes/remove_recipe_from_project.py,sha256=h1I3cLUb_zZ3QjpK7IKPT_1gTDPTPbGWg0OJN_rUn6o,1186
-uncountable/types/api/recipes/set_recipe_inputs.py,sha256=2NhVAfkIjVTtUKeV1aPLb42wP6XZBerbYKJ_K_HH3kA,2040
+uncountable/types/api/recipes/set_recipe_inputs.py,sha256=Qf3Ny6EkUKZ2QmRba8-K4AfpKHTwGexlxyzCOCjIQsM,2288
 uncountable/types/api/recipes/set_recipe_metadata.py,sha256=8BT03B4LC5bAJ7lu5LSxdAML5Q58Rejagpm_EVuJUYk,1356
 uncountable/types/api/recipes/set_recipe_output_annotations.py,sha256=058uueGk-0ILboQy29nnj_jTD6suROEXuXuYsoAib2w,3823
 uncountable/types/api/recipes/set_recipe_output_file.py,sha256=Jv6zkjvIxWM8o9RiX5p2SRkw1UJt9pzYC-KgG0BZoVY,1915
@@ -434,7 +433,7 @@ uncountable/types/api/uploader/complete_async_parse.py,sha256=Os1HAubxTlbut6Gylj
 uncountable/types/api/uploader/invoke_uploader.py,sha256=QU1KmAFgGHSWskZEKfaAww8rCj-hVNP0i4kMQE3x3Fc,1822
 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.181.dist-info/METADATA,sha256=3K5y5CfPXJkAFZQvtT-N4ziTKT3hNqTUovVVjbaucfg,2211
-uncountablepythonsdk-0.0.181.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-uncountablepythonsdk-0.0.181.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.181.dist-info/RECORD,,
+uncountablepythonsdk-0.0.183.dist-info/METADATA,sha256=eX9guGMbvzFEFaLPrwMk5yJxSz8FW0_LUJz9tJ01hto,2211
+uncountablepythonsdk-0.0.183.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+uncountablepythonsdk-0.0.183.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.183.dist-info/RECORD,,

uncountable/integration/webhook_server/admin_auth.py

@@ -1,38 +0,0 @@
-import functools
-import hmac
-from collections.abc import Callable
-
-import flask
-from flask.typing import ResponseReturnValue
-from uncountable.core.environment import get_integration_admin_token
-from uncountable.integration.http_server import HttpException
-
-_BEARER_PREFIX = "Bearer "
-
-
-def _extract_bearer_token(authorization_header: str | None) -> str | None:
-    if authorization_header is None:
-        return None
-    if not authorization_header.startswith(_BEARER_PREFIX):
-        return None
-    return authorization_header[len(_BEARER_PREFIX) :]
-
-
-def require_admin_auth(
-    view: Callable[..., ResponseReturnValue],
-) -> Callable[..., ResponseReturnValue]:
-    @functools.wraps(view)
-    def wrapper(*args: object, **kwargs: object) -> ResponseReturnValue:
-        admin_token = get_integration_admin_token()
-        if admin_token is None:
-            raise HttpException.service_unavailable()
-        provided_token = _extract_bearer_token(
-            flask.request.headers.get("Authorization")
-        )
-        if provided_token is None or not hmac.compare_digest(
-            provided_token, admin_token
-        ):
-            raise HttpException.unauthorized()
-        return view(*args, **kwargs)
-
-    return wrapper

uncountable/integration/webhook_server/admin_routes.py

@@ -1,49 +0,0 @@
-import flask
-from flask.typing import ResponseReturnValue
-from opentelemetry.trace import get_current_span
-from uncountable.core.environment import get_local_admin_server_port
-from uncountable.integration.http_server import HttpException
-from uncountable.integration.queue_runner.command_server.command_client import (
-    check_health,
-)
-from uncountable.integration.queue_runner.command_server.types import (
-    CommandServerException,
-)
-from uncountable.integration.telemetry import Logger
-from uncountable.integration.webhook_server.admin_auth import require_admin_auth
-
-_ADMIN_HEALTH_ROUTE = "/admin/health"
-
-
-def register_admin_routes(app: flask.Flask) -> None:
-    server_logger = Logger(get_current_span())
-
-    @require_admin_auth
-    def handle_admin_health() -> ResponseReturnValue:
-        healthy = check_health(port=get_local_admin_server_port())
-        return flask.jsonify({"healthy": healthy})
-
-    def admin_health() -> ResponseReturnValue:
-        with server_logger.push_scope(_ADMIN_HEALTH_ROUTE):
-            try:
-                return handle_admin_health()
-            except HttpException as e:
-                return e.make_error_response()
-            except CommandServerException as e:
-                server_logger.log_exception(
-                    e,
-                    message="admin health check could not reach the command server",
-                )
-                return HttpException.bad_gateway().make_error_response()
-            except Exception as e:
-                server_logger.log_exception(
-                    e, message=f"unexpected error on GET {_ADMIN_HEALTH_ROUTE}"
-                )
-                return HttpException.unknown_error().make_error_response()
-
-    app.add_url_rule(
-        _ADMIN_HEALTH_ROUTE,
-        endpoint="admin_health",
-        view_func=admin_health,
-        methods=["GET"],
-    )

uncountable/integration/webhook_signature_key.py

@@ -1,110 +0,0 @@
-import secrets
-
-from uncountable.core.client import Client
-from uncountable.core.query.builder import QueryBuilder
-from uncountable.core.query.column import (
-    NonNullableColumn,
-    TextColumn,
-)
-from uncountable.core.query.row import QueryRow
-from uncountable.types import (
-    entity_t,
-    field_values_t,
-    identifier_t,
-    listing_t,
-    webhook_t,
-)
-from uncountable.types.job_definition_t import ProfileMetadata
-from uncountable.types.secret_retrieval_t import SecretRetrievalEntityColumn
-
-_WEBHOOK_DEFINITION_REF_NAME = "unc_webhook_definition"
-_WEBHOOK_REF_NAME_FIELD_REF_NAME = "refName"
-_WEBHOOK_NAME_FIELD_REF_NAME = "name"
-_WEBHOOK_URL_FIELD_REF_NAME = "core_webhook_url"
-_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME = "core_webhook_signatureKey"
-_WEBHOOK_PURPOSE_FIELD_REF_NAME = "core_webhook_purpose"
-
-
-class _WebhookEntityQueryRow(QueryRow):
-    ref_name = TextColumn(
-        identifier=listing_t.ColumnIdentifierEntityRefName(
-            entity_type=entity_t.EntityType.WEBHOOK,
-            ref_name=_WEBHOOK_REF_NAME_FIELD_REF_NAME,
-        ),
-        nullable=NonNullableColumn,
-    )
-    signature_key = TextColumn(
-        identifier=listing_t.ColumnIdentifierEntityRefName(
-            entity_type=entity_t.EntityType.WEBHOOK,
-            ref_name=_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME,
-        ),
-        nullable=NonNullableColumn,
-    )
-
-
-def webhook_signature_key_retrieval(*, job_id: str) -> SecretRetrievalEntityColumn:
-    return SecretRetrievalEntityColumn(
-        entity_key=identifier_t.IdentifierKeyRefName(ref_name=job_id),
-        column_identifier=listing_t.ColumnIdentifierEntityRefName(
-            entity_type=entity_t.EntityType.WEBHOOK,
-            ref_name=_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME,
-        ),
-    )
-
-
-def _resolve_webhook_url(*, profile_metadata: ProfileMetadata, job_id: str) -> str:
-    integration_server_base_url = profile_metadata.integration_server_base_url
-    if integration_server_base_url is None:
-        raise ValueError(
-            "integration_server_base_url is required to resolve the webhook entity "
-            f"for {profile_metadata.name}/{job_id}"
-        )
-    return f"{integration_server_base_url.rstrip('/')}/{profile_metadata.name}/{job_id}"
-
-
-def bootstrap_webhook_signature_key(
-    *,
-    client: Client,
-    profile_metadata: ProfileMetadata,
-    job_id: str,
-    purpose: webhook_t.WebhookPurpose,
-) -> str:
-    existing_webhook = (
-        QueryBuilder(client=client, model=_WebhookEntityQueryRow)
-        .filter(_WebhookEntityQueryRow.ref_name == job_id)
-        .one_or_none()
-    )
-    if existing_webhook is not None:
-        return existing_webhook.signature_key
-
-    webhook_url = _resolve_webhook_url(profile_metadata=profile_metadata, job_id=job_id)
-    signature_key = secrets.token_urlsafe(32)
-    client.create_entity(
-        entity_type=entity_t.EntityType.WEBHOOK,
-        definition_key=identifier_t.IdentifierKeyRefName(
-            ref_name=_WEBHOOK_DEFINITION_REF_NAME
-        ),
-        field_values=[
-            field_values_t.FieldRefNameValue(
-                field_ref_name=_WEBHOOK_REF_NAME_FIELD_REF_NAME,
-                value=job_id,
-            ),
-            field_values_t.FieldRefNameValue(
-                field_ref_name=_WEBHOOK_NAME_FIELD_REF_NAME,
-                value=f"{profile_metadata.name}/{job_id}",
-            ),
-            field_values_t.FieldRefNameValue(
-                field_ref_name=_WEBHOOK_URL_FIELD_REF_NAME,
-                value=webhook_url,
-            ),
-            field_values_t.FieldRefNameValue(
-                field_ref_name=_WEBHOOK_SIGNATURE_KEY_FIELD_REF_NAME,
-                value=signature_key,
-            ),
-            field_values_t.FieldRefNameValue(
-                field_ref_name=_WEBHOOK_PURPOSE_FIELD_REF_NAME,
-                value=purpose.value,
-            ),
-        ],
-    )
-    return signature_key