UncountablePythonSDK 0.0.114__py3-none-any.whl → 0.0.115__py3-none-any.whl

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

@@ -0,0 +1,35 @@
+from dataclasses import dataclass
+
+from uncountable.integration.http_server import (
+    GenericHttpRequest,
+    GenericHttpResponse,
+)
+from uncountable.integration.job import CustomHttpJob, register_job
+from uncountable.types import job_definition_t
+
+
+@dataclass(kw_only=True)
+class ExampleWebhookPayload:
+    id: int
+    message: str
+
+
+@register_job
+class HttpExample(CustomHttpJob):
+    @staticmethod
+    def validate_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,
+        profile_meta: job_definition_t.ProfileMetadata,
+    ) -> None:
+        return None
+
+    @staticmethod
+    def handle_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,
+        profile_meta: job_definition_t.ProfileMetadata,
+    ) -> GenericHttpResponse:
+        return GenericHttpResponse(response="OK", status_code=200)

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

@@ -60,6 +60,12 @@ jobs:
     executor:
       type: script
       import_path: example_wh
+  - id: example_http
+    type: custom_http
+    name: Custom HTTP
+    executor:
+      type: script
+      import_path: example_http
   - id: example_runsheet_wh
     type: webhook
     name: Runsheet Webhook

pkgs/type_spec/ui_entry_actions/generate_ui_entry_actions.py

@@ -1,13 +1,14 @@
 import json
+import re
 from dataclasses import dataclass
 from io import StringIO
 from pathlib import Path
 from typing import assert_never
 
 from main.base.types import (
+    base_t,
     ui_entry_actions_t,
 )
-from pkgs.argument_parser import snake_to_camel_case
 from pkgs.serialization_util import serialize_for_api
 from pkgs.type_spec import emit_typescript_util
 from pkgs.type_spec.builder import (
@@ -45,8 +46,8 @@ def ui_entry_variable_to_type_spec_type(
     match variable:
         case ui_entry_actions_t.UiEntryActionVariableString():
             return BaseTypeName.s_string
-        case ui_entry_actions_t.UiEntryActionVariableEntityFields():
-            return "entity.Entity"
+        case ui_entry_actions_t.UiEntryActionVariableSingleEntity():
+            return "ObjectId"
         case _:
             assert_never(variable)
 
@@ -157,6 +158,15 @@ def emit_entry_action_definition(
     )
 
 
+def _validate_input(input: ui_entry_actions_t.UiEntryActionVariable) -> None:
+    if "_" in input.vs_var_name:
+        raise ValueError(f"Expected camelCase for variable {input.vs_var_name}")
+    if not re.fullmatch(base_t.REF_NAME_STRICT_REGEX, input.vs_var_name):
+        raise ValueError(
+            f"Variable {input.vs_var_name} has invalid syntax. See REF_NAME_STRICT_REGEX"
+        )
+
+
 def emit_query_index(
     ctx: emit_typescript_util.EmitTypescriptContext,
     defn_infos: list[EntryActionTypeInfo],
@@ -182,6 +192,7 @@ def emit_query_index(
             "type": BaseTypeName.s_object,
             "properties": {
                 "value_spec_var": {"type": "String"},
+                "type": {"type": "ui_entry_actions.UiEntryActionDataType"},
                 "variable": {"type": "ui_entry_actions.UiEntryActionVariable"},
             },
         },
@@ -215,10 +226,12 @@ def emit_query_index(
     for scope, defn in definitions.items():
         inputs = []
         outputs = []
-        for name, input in defn.inputs.items():
+        for input in defn.inputs.values():
+            _validate_input(input)
             inputs.append(
                 serialize_for_api({
-                    "value_spec_var": snake_to_camel_case(name),
+                    "value_spec_var": input.vs_var_name,
+                    "type": input.type,
                     "variable": input,
                 })
             )

uncountable/core/environment.py

@@ -18,7 +18,7 @@ def get_server_env() -> str | None:
     return os.environ.get("UNC_SERVER_ENV")
 
 
-def get_webhook_server_port() -> int:
+def get_http_server_port() -> int:
     return int(os.environ.get("UNC_WEBHOOK_SERVER_PORT", "5001"))
 
 

uncountable/integration/http_server/__init__.py

@@ -0,0 +1,5 @@
+# CLOSED MODULE
+
+from .types import GenericHttpRequest as GenericHttpRequest
+from .types import GenericHttpResponse as GenericHttpResponse
+from .types import HttpException as HttpException

uncountable/integration/http_server/types.py

@@ -0,0 +1,67 @@
+import base64
+import functools
+from dataclasses import dataclass
+
+from flask.wrappers import Response
+
+
+class HttpException(Exception):
+    error_code: int
+    message: str
+
+    def __init__(self, *, error_code: int, message: str) -> None:
+        self.error_code = error_code
+        self.message = message
+
+    @staticmethod
+    def payload_failed_signature() -> "HttpException":
+        return HttpException(
+            error_code=401, message="webhook payload did not match signature"
+        )
+
+    @staticmethod
+    def no_signature_passed() -> "HttpException":
+        return HttpException(error_code=400, message="missing signature")
+
+    @staticmethod
+    def body_parse_error() -> "HttpException":
+        return HttpException(error_code=400, message="body parse error")
+
+    @staticmethod
+    def unknown_error() -> "HttpException":
+        return HttpException(error_code=500, message="internal server error")
+
+    @staticmethod
+    def configuration_error(
+        message: str = "internal configuration error",
+    ) -> "HttpException":
+        return HttpException(error_code=500, message=message)
+
+    def __str__(self) -> str:
+        return f"[{self.error_code}]: {self.message}"
+
+    def make_error_response(self) -> Response:
+        return Response(
+            status=self.error_code, response={"error": {"message": str(self)}}
+        )
+
+
+@dataclass(kw_only=True, frozen=True)
+class GenericHttpRequest:
+    body_base64: str
+    headers: dict[str, str]
+
+    @functools.cached_property
+    def body_bytes(self) -> bytes:
+        return base64.b64decode(self.body_base64)
+
+    @functools.cached_property
+    def body_text(self) -> str:
+        return self.body_bytes.decode()
+
+
+@dataclass(kw_only=True)
+class GenericHttpResponse:
+    response: str
+    status_code: int
+    headers: dict[str, str] | None = None

uncountable/integration/job.py

@@ -1,15 +1,43 @@
 import functools
+import hmac
 import typing
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
+import simplejson
+
 from pkgs.argument_parser import CachedParser
+from pkgs.serialization_util import serialize_for_api
 from uncountable.core.async_batch import AsyncBatchProcessor
 from uncountable.core.client import Client
+from uncountable.core.environment import get_local_admin_server_port
 from uncountable.core.file_upload import FileUpload
+from uncountable.integration.http_server import (
+    GenericHttpRequest,
+    GenericHttpResponse,
+    HttpException,
+)
+from uncountable.integration.queue_runner.command_server.command_client import (
+    send_job_queue_message,
+)
+from uncountable.integration.queue_runner.command_server.types import (
+    CommandServerException,
+)
+from uncountable.integration.secret_retrieval.retrieve_secret import retrieve_secret
 from uncountable.integration.telemetry import JobLogger
-from uncountable.types import base_t, entity_t, webhook_job_t
-from uncountable.types.job_definition_t import JobDefinition, JobResult, ProfileMetadata
+from uncountable.types import (
+    base_t,
+    entity_t,
+    job_definition_t,
+    queued_job_t,
+    webhook_job_t,
+)
+from uncountable.types.job_definition_t import (
+    HttpJobDefinitionBase,
+    JobDefinition,
+    JobResult,
+    ProfileMetadata,
+)
 
 
 @dataclass(kw_only=True)
@@ -26,9 +54,6 @@ class JobArguments:
 CronJobArguments = JobArguments
 
 
-PT = typing.TypeVar("PT")
-
-
 class Job[PT](ABC):
     _unc_job_registered: bool = False
 
@@ -63,6 +88,51 @@ class CronJob(Job):
 WPT = typing.TypeVar("WPT")
 
 
+@dataclass(kw_only=True)
+class WebhookResponse:
+    pass
+
+
+class CustomHttpJob(Job[GenericHttpRequest]):
+    @property
+    def payload_type(self) -> type[GenericHttpRequest]:
+        return GenericHttpRequest
+
+    @staticmethod
+    @abstractmethod
+    def validate_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: HttpJobDefinitionBase,
+        profile_meta: ProfileMetadata,
+    ) -> None:
+        """
+        Validate that the request is valid. If the request is invalid, raise an
+        exception.
+        """
+        ...
+
+    @staticmethod
+    @abstractmethod
+    def handle_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: HttpJobDefinitionBase,
+        profile_meta: ProfileMetadata,
+    ) -> GenericHttpResponse:
+        """
+        Handle the request synchronously. Normally this should just enqueue a job
+        and return immediately (see WebhookJob as an example).
+        """
+        ...
+
+    def run_outer(self, args: JobArguments) -> JobResult:
+        args.logger.log_warning(
+            message=f"Unexpected call to run_outer for CustomHttpJob: {args.job_definition.id}"
+        )
+        return JobResult(success=False)
+
+
 class WebhookJob[WPT](Job[webhook_job_t.WebhookEventPayload]):
     @property
     def payload_type(self) -> type[webhook_job_t.WebhookEventPayload]:
@@ -72,6 +142,60 @@ class WebhookJob[WPT](Job[webhook_job_t.WebhookEventPayload]):
     @abstractmethod
     def webhook_payload_type(self) -> type[WPT]: ...
 
+    @staticmethod
+    def validate_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,
+        profile_meta: ProfileMetadata,
+    ) -> None:
+        assert isinstance(job_definition, job_definition_t.WebhookJobDefinition)
+        signature_key = retrieve_secret(
+            profile_metadata=profile_meta,
+            secret_retrieval=job_definition.signature_key_secret,
+        )
+        passed_signature = request.headers.get("Uncountable-Webhook-Signature")
+        if passed_signature is None:
+            raise HttpException.no_signature_passed()
+
+        request_body_signature = hmac.new(
+            signature_key.encode("utf-8"), msg=request.body_bytes, digestmod="sha256"
+        ).hexdigest()
+
+        if request_body_signature != passed_signature:
+            raise HttpException.payload_failed_signature()
+
+    @staticmethod
+    def handle_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,
+        profile_meta: ProfileMetadata,  # noqa: ARG004
+    ) -> GenericHttpResponse:
+        try:
+            request_body = simplejson.loads(request.body_text)
+            webhook_payload = typing.cast(base_t.JsonValue, request_body)
+        except (simplejson.JSONDecodeError, ValueError) as e:
+            raise HttpException.body_parse_error() from e
+
+        try:
+            send_job_queue_message(
+                job_ref_name=job_definition.id,
+                payload=queued_job_t.QueuedJobPayload(
+                    invocation_context=queued_job_t.InvocationContextWebhook(
+                        webhook_payload=webhook_payload
+                    )
+                ),
+                port=get_local_admin_server_port(),
+            )
+        except CommandServerException as e:
+            raise HttpException.unknown_error() from e
+
+        return GenericHttpResponse(
+            response=simplejson.dumps(serialize_for_api(WebhookResponse())),
+            status_code=200,
+        )
+
     def run_outer(self, args: JobArguments) -> JobResult:
         webhook_body = self.get_payload(args.payload)
         inner_payload = CachedParser(self.webhook_payload_type).parse_api(

uncountable/integration/server.py

@@ -16,7 +16,7 @@ from uncountable.integration.telemetry import Logger
 from uncountable.types import base_t, job_definition_t
 from uncountable.types.job_definition_t import (
     CronJobDefinition,
-    WebhookJobDefinition,
+    HttpJobDefinitionBase,
 )
 
 _MAX_APSCHEDULER_CONCURRENT_JOBS = 1
@@ -86,7 +86,7 @@ class IntegrationServer:
                                 misfire_grace_time=None,
                                 **job_opts,
                             )
-                    case WebhookJobDefinition():
+                    case HttpJobDefinitionBase():
                         pass
                     case _:
                         assert_never(job_defn)

uncountable/integration/telemetry.py

@@ -177,7 +177,7 @@ class JobLogger(Logger):
                 patched_attributes["job.definition.cron_spec"] = (
                     self.job_definition.cron_spec
                 )
-            case job_definition_t.WebhookJobDefinition():
+            case job_definition_t.HttpJobDefinitionBase():
                 pass
             case _:
                 assert_never(self.job_definition)

uncountable/integration/webhook_server/entrypoint.py

@@ -1,146 +1,71 @@
-import hmac
-import typing
-from dataclasses import dataclass
+import base64
 
 import flask
-import simplejson
 from flask.typing import ResponseReturnValue
-from flask.wrappers import Response
 from opentelemetry.trace import get_current_span
 from uncountable.core.environment import (
-    get_local_admin_server_port,
+    get_http_server_port,
     get_server_env,
-    get_webhook_server_port,
-)
-from uncountable.integration.queue_runner.command_server.command_client import (
-    send_job_queue_message,
-)
-from uncountable.integration.queue_runner.command_server.types import (
-    CommandServerException,
 )
+from uncountable.integration.executors.script_executor import resolve_script_executor
+from uncountable.integration.http_server import GenericHttpRequest, HttpException
+from uncountable.integration.job import CustomHttpJob, WebhookJob
 from uncountable.integration.scan_profiles import load_profiles
-from uncountable.integration.secret_retrieval.retrieve_secret import retrieve_secret
 from uncountable.integration.telemetry import Logger
-from uncountable.types import base_t, job_definition_t, queued_job_t, webhook_job_t
-
-from pkgs.argument_parser import CachedParser
+from uncountable.types import job_definition_t
 
 app = flask.Flask(__name__)
 
 
-@dataclass(kw_only=True)
-class WebhookResponse:
-    pass
-
-
-webhook_payload_parser = CachedParser(webhook_job_t.WebhookEventBody)
-
-
-class WebhookException(BaseException):
-    error_code: int
-    message: str
-
-    def __init__(self, *, error_code: int, message: str) -> None:
-        self.error_code = error_code
-        self.message = message
-
-    @staticmethod
-    def payload_failed_signature() -> "WebhookException":
-        return WebhookException(
-            error_code=401, message="webhook payload did not match signature"
-        )
-
-    @staticmethod
-    def no_signature_passed() -> "WebhookException":
-        return WebhookException(error_code=400, message="missing signature")
-
-    @staticmethod
-    def body_parse_error() -> "WebhookException":
-        return WebhookException(error_code=400, message="body parse error")
-
-    @staticmethod
-    def unknown_error() -> "WebhookException":
-        return WebhookException(error_code=500, message="internal server error")
-
-    def __str__(self) -> str:
-        return f"[{self.error_code}]: {self.message}"
-
-    def make_error_response(self) -> Response:
-        return Response(
-            status=self.error_code, response={"error": {"message": str(self)}}
-        )
-
-
-def _parse_webhook_payload(
-    *, raw_request_body: bytes, signature_key: str, passed_signature: str
-) -> base_t.JsonValue:
-    request_body_signature = hmac.new(
-        signature_key.encode("utf-8"), msg=raw_request_body, digestmod="sha256"
-    ).hexdigest()
-
-    if request_body_signature != passed_signature:
-        raise WebhookException.payload_failed_signature()
-
-    try:
-        request_body = simplejson.loads(raw_request_body.decode())
-        return typing.cast(base_t.JsonValue, request_body)
-    except (simplejson.JSONDecodeError, ValueError) as e:
-        raise WebhookException.body_parse_error() from e
-
-
 def register_route(
     *,
     server_logger: Logger,
     profile_meta: job_definition_t.ProfileMetadata,
-    job: job_definition_t.WebhookJobDefinition,
+    job: job_definition_t.HttpJobDefinitionBase,
 ) -> None:
     route = f"/{profile_meta.name}/{job.id}"
 
-    def handle_webhook() -> ResponseReturnValue:
+    def handle_request() -> ResponseReturnValue:
         with server_logger.push_scope(route):
             try:
-                signature_key = retrieve_secret(
-                    profile_metadata=profile_meta,
-                    secret_retrieval=job.signature_key_secret,
+                if not isinstance(job.executor, job_definition_t.JobExecutorScript):
+                    raise HttpException.configuration_error(
+                        message="[internal] http job must use a script executor"
+                    )
+                job_instance = resolve_script_executor(
+                    executor=job.executor, profile_metadata=profile_meta
                 )
-
-                passed_signature = flask.request.headers.get(
-                    "Uncountable-Webhook-Signature"
+                if not isinstance(job_instance, (CustomHttpJob, WebhookJob)):
+                    raise HttpException.configuration_error(
+                        message="[internal] http job must descend from CustomHttpJob"
+                    )
+                http_request = GenericHttpRequest(
+                    body_base64=base64.b64encode(flask.request.get_data()).decode(),
+                    headers=dict(flask.request.headers),
                 )
-                if passed_signature is None:
-                    raise WebhookException.no_signature_passed()
-
-                webhook_payload = _parse_webhook_payload(
-                    raw_request_body=flask.request.data,
-                    signature_key=signature_key,
-                    passed_signature=passed_signature,
+                job_instance.validate_request(
+                    request=http_request, job_definition=job, profile_meta=profile_meta
+                )
+                http_response = job_instance.handle_request(
+                    request=http_request, job_definition=job, profile_meta=profile_meta
                 )
 
-                try:
-                    send_job_queue_message(
-                        job_ref_name=job.id,
-                        payload=queued_job_t.QueuedJobPayload(
-                            invocation_context=queued_job_t.InvocationContextWebhook(
-                                webhook_payload=webhook_payload
-                            )
-                        ),
-                        port=get_local_admin_server_port(),
-                    )
-                except CommandServerException as e:
-                    raise WebhookException.unknown_error() from e
-
-                return flask.jsonify(WebhookResponse())
-            except WebhookException as e:
+                return flask.make_response(
+                    http_response.response,
+                    http_response.status_code,
+                    http_response.headers,
+                )
+            except HttpException as e:
                 server_logger.log_exception(e)
                 return e.make_error_response()
             except Exception as e:
                 server_logger.log_exception(e)
-                return WebhookException.unknown_error().make_error_response()
+                return HttpException.unknown_error().make_error_response()
 
     app.add_url_rule(
         route,
-        endpoint=f"handle_webhook_{job.id}",
-        view_func=handle_webhook,
+        endpoint=f"handle_request_{job.id}",
+        view_func=handle_request,
         methods=["POST"],
     )
 
@@ -152,7 +77,7 @@ def main() -> None:
     for profile_metadata in profiles:
         server_logger = Logger(get_current_span())
         for job in profile_metadata.jobs:
-            if isinstance(job, job_definition_t.WebhookJobDefinition):
+            if isinstance(job, job_definition_t.HttpJobDefinitionBase):
                 register_route(
                     server_logger=server_logger, profile_meta=profile_metadata, job=job
                 )
@@ -164,7 +89,7 @@ main()
 if __name__ == "__main__":
     app.run(
         host="0.0.0.0",
-        port=get_webhook_server_port(),
+        port=get_http_server_port(),
         debug=get_server_env() == "playground",
         exclude_patterns=[],
     )

uncountable/types/api/entity/lookup_entity.py

@@ -21,6 +21,7 @@ __all__: list[str] = [
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
+    "LookupEntityCompositeFieldValues",
     "LookupEntityFieldValue",
     "LookupEntityQuery",
     "LookupEntityQueryBase",
@@ -35,6 +36,7 @@ ENDPOINT_PATH = "api/external/entity/lookup_entity"
 # DO NOT MODIFY -- This file is generated by type_spec
 class LookupEntityQueryType(StrEnum):
     FIELD_VALUE = "field_value"
+    COMPOSITE_FIELD_VALUES = "composite_field_values"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -69,14 +71,26 @@ class LookupEntityFieldValue:
     value: LookupFieldArgumentValue
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.entity.lookup_entity.LookupEntityCompositeFieldValues",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class LookupEntityCompositeFieldValues:
+    type: typing.Literal[LookupEntityQueryType.COMPOSITE_FIELD_VALUES] = LookupEntityQueryType.COMPOSITE_FIELD_VALUES
+    values: list[LookupFieldArgumentValue]
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 LookupEntityQuery = typing.Annotated[
-    typing.Union[LookupEntityFieldValue],
+    LookupEntityFieldValue | LookupEntityCompositeFieldValues,
     serial_union_annotation(
     named_type_path="sdk.api.entity.lookup_entity.LookupEntityQuery",
         discriminator="type",
         discriminator_map={
             "field_value": LookupEntityFieldValue,
+            "composite_field_values": LookupEntityCompositeFieldValues,
         },
     ),
 ]

uncountable/types/client_base.py

@@ -22,6 +22,7 @@ import uncountable.types.api.chemical.convert_chemical_formats as convert_chemic
 import uncountable.types.api.entity.create_entities as create_entities_t
 import uncountable.types.api.entity.create_entity as create_entity_t
 import uncountable.types.api.inputs.create_inputs as create_inputs_t
+import uncountable.types.api.recipes.create_mix_order as create_mix_order_t
 import uncountable.types.api.entity.create_or_update_entity as create_or_update_entity_t
 import uncountable.types.api.recipes.create_recipe as create_recipe_t
 import uncountable.types.api.recipe_links.create_recipe_link as create_recipe_link_t
@@ -31,6 +32,8 @@ import uncountable.types.api.recipes.edit_recipe_inputs as edit_recipe_inputs_t
 from uncountable.types import entity_t
 import uncountable.types.api.batch.execute_batch as execute_batch_t
 import uncountable.types.api.batch.execute_batch_load_async as execute_batch_load_async_t
+import uncountable.types.api.entity.export_entities as export_entities_t
+from uncountable.types import exports_t
 from uncountable.types import field_values_t
 from uncountable.types import generic_upload_t
 import uncountable.types.api.recipes.get_column_calculation_values as get_column_calculation_values_t
@@ -382,6 +385,26 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=create_inputs_t.Data)
 
+    def create_mix_order(
+        self,
+        *,
+        recipe_key: identifier_t.IdentifierKey,
+        recipe_workflow_step_identifier: recipe_workflow_steps_t.RecipeWorkflowStepIdentifier,
+    ) -> create_mix_order_t.Data:
+        """Creates mix order on a recipe workflow step
+
+        """
+        args = create_mix_order_t.Arguments(
+            recipe_key=recipe_key,
+            recipe_workflow_step_identifier=recipe_workflow_step_identifier,
+        )
+        api_request = APIRequest(
+            method=create_mix_order_t.ENDPOINT_METHOD,
+            endpoint=create_mix_order_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=create_mix_order_t.Data)
+
     def create_or_update_entity(
         self,
         *,
@@ -576,6 +599,32 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=execute_batch_load_async_t.Data)
 
+    def export_entities(
+        self,
+        *,
+        config_key: identifier_t.IdentifierKey,
+        type: exports_t.ExportType = exports_t.ExportType.EXCEL,
+        client_timezone: exports_t.ListingExportUserTimezone | None = None,
+        limit: int | None = None,
+    ) -> export_entities_t.Data:
+        """Uses a structured loading configuration to export entities in the system. This endpoint is asynchronous, and returns the job ID that can be used to query the status of the export.
+
+        :param config_key: The configuration reference for the listing config
+        :param limit: The number of data points to return. If not filled in, all filtered entities will be included in the export.
+        """
+        args = export_entities_t.Arguments(
+            config_key=config_key,
+            client_timezone=client_timezone,
+            limit=limit,
+            type=type,
+        )
+        api_request = APIRequest(
+            method=export_entities_t.ENDPOINT_METHOD,
+            endpoint=export_entities_t.ENDPOINT_PATH,
+            args=args,
+        )
+        return self.do_request(api_request=api_request, return_type=export_entities_t.Data)
+
     def get_column_calculation_values(
         self,
         *,

uncountable/types/entity_t.py

@@ -131,6 +131,7 @@ __all__: list[str] = [
         "recipe_audit_log": "Experiment Audit Log",
         "recipe_calculation": "Recipe Calculation",
         "recipe_check": "Experiment Check",
+        "recipe_component_witness": "Recipe Component Witness",
         "recipe_export": "Recipe Export",
         "recipe_goal": "Experiment Goal",
         "recipe_ingredient": "Recipe Ingredient",
@@ -312,6 +313,7 @@ class EntityType(StrEnum):
     RECIPE_AUDIT_LOG = "recipe_audit_log"
     RECIPE_CALCULATION = "recipe_calculation"
     RECIPE_CHECK = "recipe_check"
+    RECIPE_COMPONENT_WITNESS = "recipe_component_witness"
     RECIPE_EXPORT = "recipe_export"
     RECIPE_GOAL = "recipe_goal"
     RECIPE_INGREDIENT = "recipe_ingredient"

uncountable/types/integration_server_t.py

@@ -23,6 +23,8 @@ __all__: list[str] = [
 # DO NOT MODIFY -- This file is generated by type_spec
 class IntegrationEnvironment(StrEnum):
     LOCAL = "local"
+    DEV = "dev"
+    TEST = "test"
     PROD = "prod"
 
 

uncountable/types/job_definition.py

@@ -18,6 +18,8 @@ from .job_definition_t import JobExecutor as JobExecutor
 from .job_definition_t import JobLoggingSettings as JobLoggingSettings
 from .job_definition_t import JobDefinitionBase as JobDefinitionBase
 from .job_definition_t import CronJobDefinition as CronJobDefinition
+from .job_definition_t import HttpJobDefinitionBase as HttpJobDefinitionBase
+from .job_definition_t import CustomHttpJobDefinition as CustomHttpJobDefinition
 from .job_definition_t import WebhookJobDefinition as WebhookJobDefinition
 from .job_definition_t import JobDefinition as JobDefinition
 from .job_definition_t import ProfileDefinition as ProfileDefinition

uncountable/types/job_definition_t.py

@@ -20,11 +20,13 @@ from . import secret_retrieval_t
 
 __all__: list[str] = [
     "CronJobDefinition",
+    "CustomHttpJobDefinition",
     "GenericUploadDataSource",
     "GenericUploadDataSourceBase",
     "GenericUploadDataSourceS3",
     "GenericUploadDataSourceSFTP",
     "GenericUploadDataSourceType",
+    "HttpJobDefinitionBase",
     "JobDefinition",
     "JobDefinitionBase",
     "JobDefinitionType",
@@ -46,6 +48,7 @@ __all__: list[str] = [
 class JobDefinitionType(StrEnum):
     CRON = "cron"
     WEBHOOK = "webhook"
+    CUSTOM_HTTP = "custom_http"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -201,25 +204,45 @@ class CronJobDefinition(JobDefinitionBase):
     cron_spec: str
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.job_definition.HttpJobDefinitionBase",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class HttpJobDefinitionBase(JobDefinitionBase):
+    pass
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.job_definition.CustomHttpJobDefinition",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class CustomHttpJobDefinition(HttpJobDefinitionBase):
+    type: typing.Literal[JobDefinitionType.CUSTOM_HTTP] = JobDefinitionType.CUSTOM_HTTP
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 @serial_class(
     named_type_path="sdk.job_definition.WebhookJobDefinition",
     parse_require={"type"},
 )
 @dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
-class WebhookJobDefinition(JobDefinitionBase):
+class WebhookJobDefinition(HttpJobDefinitionBase):
     type: typing.Literal[JobDefinitionType.WEBHOOK] = JobDefinitionType.WEBHOOK
     signature_key_secret: secret_retrieval_t.SecretRetrieval
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
 JobDefinition = typing.Annotated[
-    CronJobDefinition | WebhookJobDefinition,
+    CronJobDefinition | CustomHttpJobDefinition | WebhookJobDefinition,
     serial_union_annotation(
     named_type_path="sdk.job_definition.JobDefinition",
         discriminator="type",
         discriminator_map={
             "cron": CronJobDefinition,
+            "custom_http": CustomHttpJobDefinition,
             "webhook": WebhookJobDefinition,
         },
     ),

{uncountablepythonsdk-0.0.114.dist-info → uncountablepythonsdk-0.0.115.dist-info}/METADATA

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

@@ -26,9 +26,10 @@ examples/upload_files.py,sha256=qMaSvMSdTMPOOP55y1AwEurc0SOdZAMvEydlqJPsGpg,432
 examples/integration-server/pyproject.toml,sha256=i4Px7I__asDvP4WlAd2PncfRRQ-U4t5xp0tqT9YYs3s,9149
 examples/integration-server/jobs/materials_auto/concurrent_cron.py,sha256=xsK3H9ZEaniedC2nJUB0rqOcFI8y-ojfl_nLSJb9AMM,312
 examples/integration-server/jobs/materials_auto/example_cron.py,sha256=7VVQ-UJsq3DbGpN3XPnorRVZYo-vCwbfSU3VVDluIzA,699
+examples/integration-server/jobs/materials_auto/example_http.py,sha256=h97_IBC5EQiAUA4A5xyPpgFIqPTZWKIhMpmVAgVZEBE,941
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py,sha256=_wILTnbzzLf9zrcQb_KQKytxxcya1ej6MqQnoUSS4fA,1180
 examples/integration-server/jobs/materials_auto/example_wh.py,sha256=PN-skP27yJwDZboWk5g5EZEc3AKfVayQLfnopjsDKJc,659
-examples/integration-server/jobs/materials_auto/profile.yaml,sha256=T9Q4Oh-BVHCoxAIY_Po4TWeEQNrXJ-d9w8tr3voYkM0,1555
+examples/integration-server/jobs/materials_auto/profile.yaml,sha256=MNKRn09iaiNF8dxOZ7Y6558UW6aCZ-9l9hQAwzYN8zs,1685
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=VWUOOtJ-ueRF2lkIJzgQe4xhBKR9IPkgf9vY28nF35s,870
@@ -84,7 +85,7 @@ pkgs/type_spec/parts/base.ts.prepart,sha256=2FJJvpg2olCcavxj0nbYWdwKl6KeScour2Jj
 pkgs/type_spec/type_info/__main__.py,sha256=TLNvCHGcmaj_8Sj5bAQNpuNaaw2dpDzoFDWZds0V4Qo,1002
 pkgs/type_spec/type_info/emit_type_info.py,sha256=xRjZiwDDii4Bq8yVfcgE8YFechoKAcGmYXBk3Dq-K-s,15387
 pkgs/type_spec/ui_entry_actions/__init__.py,sha256=WiHE_BexOEZWbkkbD7EnFau1aMLNmfgQywG9PTQNCkw,135
-pkgs/type_spec/ui_entry_actions/generate_ui_entry_actions.py,sha256=iVjThgDpfkuqeq0LENaCRrrGkWQ6kMIhVa-yZWXSflM,8981
+pkgs/type_spec/ui_entry_actions/generate_ui_entry_actions.py,sha256=IPBdVfJReLLGVaZOkb0QYGGrm73JqMXuAGSbeoBVbDg,9477
 pkgs/type_spec/value_spec/__init__.py,sha256=Z-grlcZtxAfEXhPHsK0nD7PFLGsv4eqvunaPN7_TA84,83
 pkgs/type_spec/value_spec/__main__.py,sha256=oM5lcV6Hv_03okjtfWn2fzSHsarFVa9ArU_g02XnQJw,8879
 pkgs/type_spec/value_spec/convert_type.py,sha256=OvP7dwUMHXNHVXWYT4jkaYJ96S3a2SnFuC_iMdYVB7s,2927
@@ -95,7 +96,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=nzUkHIVbYQmMUEBJhQdLzRC70eeYOACEbKSRY4w0Jlw,13367
-uncountable/core/environment.py,sha256=6cc-nUvUIbJMI0OSEg3dWI-iNgSYhCdUKKn607Z3QpM,1040
+uncountable/core/environment.py,sha256=4gdJB0ZhRxKlqSKLaE4vUvEUGZ5fy8IAwXcGDRdYt7E,1037
 uncountable/core/file_upload.py,sha256=bgvXk9vfF5qlhy2NAUcEEG7Q7i-c1wr2HrpaWD7HldU,4516
 uncountable/core/types.py,sha256=s2CjqYJpsmbC7xMwxxT7kJ_V9bwokrjjWVVjpMcQpKI,333
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,11 +104,11 @@ uncountable/integration/cli.py,sha256=h3RE0l1SdjkveOKeY2amlmrJppK4HEQJXk8VG9UJRW
 uncountable/integration/construct_client.py,sha256=I53mGcdS88hba3HFwgXmWQaTd1d5u0jWNSwyc_vlVsQ,1937
 uncountable/integration/cron.py,sha256=6eH-kIs3sdYPCyb62_L2M7U_uQTdMTdwY5hreEJb0hw,887
 uncountable/integration/entrypoint.py,sha256=BHOYPQgKvZE6HG8Rv15MkdYl8lRkvfDgv1OdLo0oQ9Q,433
-uncountable/integration/job.py,sha256=lRQhOfm8kRlUnT1BMQRMZ49n1IzOup5VRH0AiZ2AFo4,3214
+uncountable/integration/job.py,sha256=X8mNoy01Q6h26eNuPi50XwV6YLgaqYCGWt2PFDEddZU,7111
 uncountable/integration/scan_profiles.py,sha256=RHBmPc5E10YZzf4cmglwrn2yAy0jHBhQ-P_GlAk2TeU,2919
 uncountable/integration/scheduler.py,sha256=t75ANJN21DElUFvEdtgueTluF7y17jTtBDDF8f3NRDM,4812
-uncountable/integration/server.py,sha256=m_DYRosGbHuPhygM32Xo-jRBl_oaUhOYsBBD1qwwKh4,4697
-uncountable/integration/telemetry.py,sha256=jeeycEnGcW0Fk-f7JI5d-k8Ih4FLoNBCxvSJlJ98wwU,7418
+uncountable/integration/server.py,sha256=lL9zmzqkQRf7V1fBT20SvIy-7ryz5hFf7DF4QX4pj1E,4699
+uncountable/integration/telemetry.py,sha256=VunRaMC9ykPaxUE_s6SarQieKrGNtTSyAr9omc315OI,7419
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=mE3bdV0huclH2iT_dXCQdRL4LkjIuf_myAR64RTWXEs,498
 uncountable/integration/db/session.py,sha256=96cGQXpe6IugBTdSsjdP0S5yhJ6toSmbVB6qhc3FJzE,693
@@ -115,6 +116,8 @@ uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 uncountable/integration/executors/executors.py,sha256=Kzisp1eKufGCWrHIw4mmAj-l1UQ2oJsJR7I-_mksnVs,5441
 uncountable/integration/executors/generic_upload_executor.py,sha256=z0HfvuBR1wUbRpMVxJQ5Jlzbdk8G7YmAGENmze85Tr8,12076
 uncountable/integration/executors/script_executor.py,sha256=BBQ9f0l7uH2hgKf60jtm-pONzwk-EeOhM2qBAbv_URo,846
+uncountable/integration/http_server/__init__.py,sha256=WY2HMcL0UCAGYv8y6Pz-j0azbDGXwubFF21EH_zNPkc,189
+uncountable/integration/http_server/types.py,sha256=zVXXN8FPstrF9qFduwQBtxPG8I4AOK41nXAnxrtSgxw,1832
 uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/queue_runner/job_scheduler.py,sha256=lLP3R8RVE_4CJ9D-AsJSsZVciKCISsvgUMRs4tIZZpE,6557
 uncountable/integration/queue_runner/queue_runner.py,sha256=0BmYu5zHdothTevGsB-nXg6MBd1UD-WkP3h1WCKMdQg,710
@@ -135,7 +138,7 @@ uncountable/integration/queue_runner/datastore/interface.py,sha256=j4D-zVvLq-48V
 uncountable/integration/queue_runner/datastore/model.py,sha256=8-RI5A2yPZVGBLWINVmMd6VOl_oHtqGtnaNXcapAChw,577
 uncountable/integration/secret_retrieval/__init__.py,sha256=3QXVj35w8rRMxVvmmsViFYDi3lcb3g70incfalOEm6o,87
 uncountable/integration/secret_retrieval/retrieve_secret.py,sha256=LBEf18KHtXZxg-ZZ80stJ1vW39AWf0CQllP6pNu3Eq8,2994
-uncountable/integration/webhook_server/entrypoint.py,sha256=yQWQq_k3kbJkSsEEt6k22YwhXekezJZfV0rnn-hP-Yo,5516
+uncountable/integration/webhook_server/entrypoint.py,sha256=NQawXl_JCRojdVniS5RF7dobQQKW_Wy03bwy-uXknuA,3441
 uncountable/types/__init__.py,sha256=eqeDMCXTr9Mwo10RSGMa4znfu_7TVp_0gYJxPKmLCfQ,9990
 uncountable/types/async_batch.py,sha256=yCCWrrLQfxXVqZp-KskxLBNkNmuELdz4PJjx8ULppgs,662
 uncountable/types/async_batch_processor.py,sha256=Y8rp-GtuhwUBg18yb5T7bQpb48vsQpACGrvaIiFYLrU,21765
@@ -150,7 +153,7 @@ uncountable/types/calculations.py,sha256=fApOFpgBemt_t7IVneVR0VdI3X5EOxiG6Xhzr6R
 uncountable/types/calculations_t.py,sha256=pl-lhjyDQuj11Sf9g1-0BsSkN7Ez8UxDp8-KMQ_3enM,709
 uncountable/types/chemical_structure.py,sha256=ujyragaD26-QG5jgKnWhO7TN3N1V9b_04T2WhqNYxxo,281
 uncountable/types/chemical_structure_t.py,sha256=VFFyits_vx4t5L2euu_qFiSpsGJjURkDPr3ISnr3nPc,855
-uncountable/types/client_base.py,sha256=4Aq_o11-T_HpZ5-6-y4TP8-Uj4xP0Hv99yvvqLCwl7I,73993
+uncountable/types/client_base.py,sha256=m4AI0E4ET-FFmewHicW1t2oayraIhS_VYMuyTCnOk1g,76085
 uncountable/types/client_config.py,sha256=qLpHt4O_B098CyN6qQajoxZ2zjZ1DILXLUEGyyGP0TQ,280
 uncountable/types/client_config_t.py,sha256=yTFIYAitMrcc4oV9J-HADODS_Hwi45z-piz7rr7QT04,781
 uncountable/types/curves.py,sha256=QyEyC20jsG-LGKVx6miiF-w70vKMwNkILFBDIJ5Ok9g,345
@@ -158,7 +161,7 @@ uncountable/types/curves_t.py,sha256=DxYepdC3QKKR7mepOOBoyarNcFZQdUa5ZYH-hwCY3BI
 uncountable/types/data.py,sha256=u2isf4XEug3Eu-xSIoqGaCQmW2dFaKBHCkP_WKYwwBc,500
 uncountable/types/data_t.py,sha256=vFoypK_WMGfN28r1sSlDYHZNUdBQC0XCN7-_Mlo4FJk,2832
 uncountable/types/entity.py,sha256=Zclk1LYcRaYrMDhqyCjMSLEg0fE6_q8LHvV22Qvscgs,566
-uncountable/types/entity_t.py,sha256=tyRdNrRCcWRyOO_dXEUa6G7KTHLCMJWBueK5cIBSx34,20166
+uncountable/types/entity_t.py,sha256=I_dJ08Wd7NsVFkZx3p9-VAARx8nCkLJCtY--hv0zR8c,20288
 uncountable/types/experiment_groups.py,sha256=qUpFOx1AKgzaT_4khCOv5Xs6jwiQGbvHH-GUh3v1nv4,288
 uncountable/types/experiment_groups_t.py,sha256=29Ct-WPejpYMuGfnFfOoosU9iSfjzxpabpBX6oTPFUA,761
 uncountable/types/exports.py,sha256=VMmxUO2PpV1Y63hZ2AnVor4H-B6aswJ7YpSru_u89lU,334
@@ -178,9 +181,9 @@ uncountable/types/input_attributes_t.py,sha256=8NJQeq_8MkUNn5BlDx34opp3eeZl8Sw1n
 uncountable/types/inputs.py,sha256=3ghg39_oiLF5HqWF_wNwYv4HMR1lrKLfeRLn5ptIGw4,446
 uncountable/types/inputs_t.py,sha256=eSVA7LNgLI3ja83GJm4sA9KhPICVV4zj2Dd4OhbuY9g,2158
 uncountable/types/integration_server.py,sha256=VonA8h8TGnVBiss5W8-K82lA01JQa7TLk0ubFo8iiBQ,364
-uncountable/types/integration_server_t.py,sha256=QAwAB-rlfYh14ZzfVUQd-Bfky3LkPcsSEBhRH3UGvZE,1270
-uncountable/types/job_definition.py,sha256=6BkLZrmTfIYh45XFGZ5HOYveued0YXvl17YTlXblXjw,1646
-uncountable/types/job_definition_t.py,sha256=6ZJ9rlqXwbOB-G_U8YoWUDPvPak6_11kV2qT2jx8t9Q,8688
+uncountable/types/integration_server_t.py,sha256=pgtoyuW6QvGRawidJZFB-WnOdwCE4OIoJAvGfussZKU,1304
+uncountable/types/job_definition.py,sha256=hYp5jPYLLYm3NKEqzQrQfXL0Ms5KgEQGTON13YWSPYk,1804
+uncountable/types/job_definition_t.py,sha256=E4IQvcYF3VDHbwRlvopy8y-HNAyEMZpwy7jkmp74fgQ,9563
 uncountable/types/outputs.py,sha256=I6zP2WHXg_jXgMqmuEJuJOlsjKjQGHjfs1JOwW9YxBM,260
 uncountable/types/outputs_t.py,sha256=atsOkBBgnMeCgPaKPidk9eNouWVnynSrMI_ZbqxRJeY,795
 uncountable/types/overrides.py,sha256=fOvj8P9K9ul8fnTwA--l140EWHuc1BFq8tXgtBkYld4,410
@@ -238,7 +241,7 @@ uncountable/types/api/entity/get_entities_data.py,sha256=hu0UfkU4PTyv3_CBZ7YmR8L
 uncountable/types/api/entity/grant_entity_permissions.py,sha256=4CvVIMvpdok8K1Bh6wMlwuUmoeP_-nL9y2GCEM6uAhY,1536
 uncountable/types/api/entity/list_entities.py,sha256=LLc_QRH2LI7qPamxwF8DAPJCnfDo1Nw_0VGNDl6CMXI,2139
 uncountable/types/api/entity/lock_entity.py,sha256=nwkjtF89ZWV6_1cLe8R47-G542b8i3FvBIjauOJlObE,1311
-uncountable/types/api/entity/lookup_entity.py,sha256=zwCpQRtAiJoDH9gUlGL1fmHhUEW-PTL_jMMBNDfWOjk,3232
+uncountable/types/api/entity/lookup_entity.py,sha256=NIDdYl0iscueC68tfZ1lKp5vTq2NMDYtQ3cG6o2tBaI,3905
 uncountable/types/api/entity/resolve_entity_ids.py,sha256=2FyZxTjPHwCzCg92JjH-akcbPu2d9L14Oh6hRVkKDxA,1523
 uncountable/types/api/entity/set_entity_field_values.py,sha256=oiNjAfdMvuFaLbppEaGejzr7Br6XB2D11WaXVCyx8c4,1324
 uncountable/types/api/entity/set_values.py,sha256=7pG15cAos1gem7-HtEMJ4AXisopXrzWsiuqiqh8AzQc,1249
@@ -315,7 +318,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=dgDX_sRWSJ36UuzMZhG25oHV1HIOUKYY2G3fjKugZrw,1204
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=Bj7Dq4A90k00suacwk3bLA_dCb2aovS1kAbVam2AQnM,1395
-uncountablepythonsdk-0.0.114.dist-info/METADATA,sha256=58rVRRIi9Ru8HTpgr8TOE5xNOxwkKfkDlbM7-i1Ptd8,2143
-uncountablepythonsdk-0.0.114.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-uncountablepythonsdk-0.0.114.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.114.dist-info/RECORD,,
+uncountablepythonsdk-0.0.115.dist-info/METADATA,sha256=-CVaJt1Lh0NBrGUWB8G7L3jEsniPCdVd_1un50_IUQo,2143
+uncountablepythonsdk-0.0.115.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+uncountablepythonsdk-0.0.115.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.115.dist-info/RECORD,,