UncountablePythonSDK 0.0.113__tar.gz → 0.0.115__tar.gz

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/.github/workflows/documentation.yml

@@ -11,16 +11,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
-        with:
-          python-version: '3.12'
       - uses: extractions/setup-crate@4993624604c307fbca528d28a3c8b60fa5ecc859 # v1
         with:
           repo: casey/just@0.10
       - name: Set up UV
-        uses: astral-sh/setup-uv@4db96194c378173c656ce18a155ffc14a9fc4355 # v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.7.1"
-          python-version: "3.12"
+          activate-environment: true
           enable-cache: true
       - name: Install dependencies
         run: |

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/.github/workflows/publish.yml

@@ -22,14 +22,11 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
-        with:
-          python-version: '3.12'
       - name: Set up UV
-        uses: astral-sh/setup-uv@4db96194c378173c656ce18a155ffc14a9fc4355 # v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.7.1"
-          python-version: "3.12"
+          activate-environment: true
           enable-cache: true
       - name: Install build dependencies
         run: |

uncountablepythonsdk-0.0.115/.python-version

@@ -0,0 +1 @@
+3.12.10

{uncountablepythonsdk-0.0.113/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.113
+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.113 → uncountablepythonsdk-0.0.115/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.113
+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.113 → uncountablepythonsdk-0.0.115}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .gitignore
+.python-version
 README.md
 pyproject.toml
 .github/workflows/documentation.yml
@@ -34,7 +35,9 @@ examples/set_recipe_metadata_file.py
 examples/set_recipe_output_file_sdk.py
 examples/upload_files.py
 examples/integration-server/pyproject.toml
+examples/integration-server/jobs/materials_auto/concurrent_cron.py
 examples/integration-server/jobs/materials_auto/example_cron.py
+examples/integration-server/jobs/materials_auto/example_http.py
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py
 examples/integration-server/jobs/materials_auto/example_wh.py
 examples/integration-server/jobs/materials_auto/profile.yaml
@@ -81,6 +84,7 @@ pkgs/type_spec/emit_python.py
 pkgs/type_spec/emit_typescript.py
 pkgs/type_spec/emit_typescript_util.py
 pkgs/type_spec/load_types.py
+pkgs/type_spec/non_discriminated_union_exceptions.py
 pkgs/type_spec/open_api_util.py
 pkgs/type_spec/test.py
 pkgs/type_spec/util.py
@@ -123,6 +127,8 @@ uncountable/integration/executors/__init__.py
 uncountable/integration/executors/executors.py
 uncountable/integration/executors/generic_upload_executor.py
 uncountable/integration/executors/script_executor.py
+uncountable/integration/http_server/__init__.py
+uncountable/integration/http_server/types.py
 uncountable/integration/queue_runner/__init__.py
 uncountable/integration/queue_runner/job_scheduler.py
 uncountable/integration/queue_runner/queue_runner.py
@@ -169,6 +175,8 @@ uncountable/types/entity.py
 uncountable/types/entity_t.py
 uncountable/types/experiment_groups.py
 uncountable/types/experiment_groups_t.py
+uncountable/types/exports.py
+uncountable/types/exports_t.py
 uncountable/types/field_values.py
 uncountable/types/field_values_t.py
 uncountable/types/fields.py
@@ -239,6 +247,7 @@ uncountable/types/api/entity/__init__.py
 uncountable/types/api/entity/create_entities.py
 uncountable/types/api/entity/create_entity.py
 uncountable/types/api/entity/create_or_update_entity.py
+uncountable/types/api/entity/export_entities.py
 uncountable/types/api/entity/get_entities_data.py
 uncountable/types/api/entity/grant_entity_permissions.py
 uncountable/types/api/entity/list_entities.py
@@ -292,6 +301,7 @@ uncountable/types/api/recipes/archive_recipes.py
 uncountable/types/api/recipes/associate_recipe_as_input.py
 uncountable/types/api/recipes/associate_recipe_as_lot.py
 uncountable/types/api/recipes/clear_recipe_outputs.py
+uncountable/types/api/recipes/create_mix_order.py
 uncountable/types/api/recipes/create_recipe.py
 uncountable/types/api/recipes/create_recipes.py
 uncountable/types/api/recipes/disassociate_recipe_as_input.py

uncountablepythonsdk-0.0.115/examples/integration-server/jobs/materials_auto/concurrent_cron.py

@@ -0,0 +1,11 @@
+import time
+
+from uncountable.integration.job import CronJob, JobArguments, register_job
+from uncountable.types.job_definition_t import JobResult
+
+
+@register_job
+class MyConcurrentCronJob(CronJob):
+    def run(self, args: JobArguments) -> JobResult:
+        time.sleep(10)
+        return JobResult(success=True)

uncountablepythonsdk-0.0.115/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)

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/examples/integration-server/jobs/materials_auto/profile.yaml

@@ -22,6 +22,25 @@ jobs:
         - admin:
           type: ref_name
           ref_name: admin
+  - id: concurrent_cron_1
+    enabled: true
+    type: cron
+    name: MyConcurrentCron - 1
+    cron_spec: "* * * * *"
+    executor:
+      type: script
+      import_path: concurrent_cron
+    subqueue_name: subqueue_1
+  - id: concurrent_cron_2
+    enabled: true
+    type: cron
+    name: MyConcurrentCron - 2
+    cron_spec: "* * * * *"
+    executor:
+      type: script
+      import_path: concurrent_cron
+    subqueue_name: subqueue_2
+
 
   - id: example_wh1
     type: webhook
@@ -41,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

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/pkgs/argument_parser/argument_parser.py

@@ -170,9 +170,15 @@ def _invoke_membership_parser(
 
 def _build_parser_discriminated_union(
     context: ParserContext,
-    discriminator: str,
+    discriminator_raw: str,
     discriminator_map: dict[str, ParserFunction[T]],
 ) -> ParserFunction[T]:
+    discriminator = (
+        snake_to_camel_case(discriminator_raw)
+        if context.options.from_camel_case
+        else discriminator_raw
+    )
+
     def parse(value: typing.Any) -> typing.Any:
         if context.options.allow_direct_type and dataclasses.is_dataclass(value):
             discriminant = getattr(value, discriminator)
@@ -414,8 +420,7 @@ def _build_parser_dataclass(
     cur_parser = context.cache.get(parsed_type)
     if cur_parser is not None:
         return cur_parser
-
-    type_hints = typing.get_type_hints(parsed_type)
+    type_hints = typing.get_type_hints(parsed_type, include_extras=True)
     dc_field_parsers: list[
         tuple[
             dataclasses.Field[typing.Any],

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/pkgs/type_spec/builder.py

@@ -14,6 +14,7 @@ from typing import Any, Self
 
 from . import util
 from .cross_output_links import CrossOutputPaths
+from .non_discriminated_union_exceptions import NON_DISCRIMINATED_UNION_EXCEPTIONS
 from .util import parse_type_str, unused
 
 RawDict = dict[Any, Any]
@@ -636,6 +637,11 @@ class SpecTypeDefnUnion(SpecTypeDefn):
                 self.discriminator_map[discriminant] = sub_type
 
                 builder.pop_where()
+        elif (
+            f"{self.namespace.name}.{self.name}"
+            not in NON_DISCRIMINATED_UNION_EXCEPTIONS
+        ):
+            raise Exception(f"union requires a discriminator: {self.name}")
 
     def get_referenced_types(self) -> list[SpecType]:
         return self.types
@@ -960,8 +966,8 @@ class SpecEndpoint:
         elif isinstance(is_sdk, str):
             try:
                 is_sdk = EndpointEmitType(is_sdk)
-            except ValueError:
-                raise ValueError(f"Invalid value for is_sdk: {is_sdk}")
+            except ValueError as e:
+                raise ValueError(f"Invalid value for is_sdk: {is_sdk}") from e
 
         assert isinstance(is_sdk, EndpointEmitType)
 

uncountablepythonsdk-0.0.115/pkgs/type_spec/non_discriminated_union_exceptions.py

@@ -0,0 +1,14 @@
+NON_DISCRIMINATED_UNION_EXCEPTIONS = [
+    "generate_tool_parameters.UnionWithoutDiscrim",
+    "output_calculation_entities.ConditionParameterFilterCondition",
+    "output_parameters.AnalyticalMethodParameterOptions",
+    "output_parameters.AnalyticalMethodLinkedOptionValue",
+    "recipes_redirect.RecipesRedirectResult",
+    "value_spec.ResolvedPathAll",
+    "weighted_sum.WeightedSumEntities",
+    "workflows.WorkflowTotalDisplay",
+    "type_info.TypeFormActionConstraint",
+    "structured_loading.CompatibleFilterNode",
+    "structured_display_element.DisplayElementColumn",
+    "field_values.FieldValue",
+]

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/pkgs/type_spec/parts/base.py.prepart

@@ -58,15 +58,12 @@ def is_pure_json_value(value: ExtJsonValue) -> bool:
         return True
 
     if isinstance(value, list):
-        for item in value:
-            if not is_pure_json_value(item):
-                return False
-        return True
+        return all(is_pure_json_value(item) for item in value)
 
     if isinstance(value, dict):
-        for key, item in value.items():
-            if not is_pure_json_value(key) or not is_pure_json_value(item):
-                return False
-        return True
+        return all(
+            is_pure_json_value(key) and is_pure_json_value(item)
+            for key, item in value.items()
+        )
 
     return False

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/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,
                 })
             )

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/pkgs/type_spec/value_spec/__main__.py

@@ -104,8 +104,8 @@ def parse_function_signature(text: str) -> ParsedFunctionSignature:
 
         type_str = source.extract_type()
         ref_name = arg_group.group(1)
-        is_missing = arg_group.group(2) == "?"
-        is_repeating = arg_group.group(2) == "+"
+        # is_missing = arg_group.group(2) == "?"
+        # is_repeating = arg_group.group(2) == "+"
         type_path = parse_type_str(type_str)
 
         match arg_group.group(3):

{uncountablepythonsdk-0.0.113 → uncountablepythonsdk-0.0.115}/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"))
 
 

uncountablepythonsdk-0.0.115/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

uncountablepythonsdk-0.0.115/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