UncountablePythonSDK 0.0.184__tar.gz → 0.0.185__tar.gz

{uncountablepythonsdk-0.0.184/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.185}/PKG-INFO

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

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

@@ -47,6 +47,7 @@ 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_http_get.py
 examples/integration-server/jobs/materials_auto/example_instrument.py
 examples/integration-server/jobs/materials_auto/example_parse.py
 examples/integration-server/jobs/materials_auto/example_predictions.py

uncountablepythonsdk-0.0.185/examples/integration-server/jobs/materials_auto/example_http_get.py

@@ -0,0 +1,44 @@
+import json
+
+from uncountable.integration.http_server import (
+    GenericHttpRequest,
+    GenericHttpResponse,
+    HttpException,
+)
+from uncountable.integration.job import CustomHttpJob, register_job
+from uncountable.types import job_definition_t
+
+_EXPECTED_USER_ID = 1
+
+
+@register_job
+class HttpGetExample(CustomHttpJob):
+    @staticmethod
+    def validate_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,  # ruff:ignore[unused-static-method-argument]
+        profile_meta: job_definition_t.ProfileMetadata,
+    ) -> None:
+        if (
+            CustomHttpJob.get_validated_oauth_request_user_id(
+                request=request, profile_metadata=profile_meta
+            )
+            != _EXPECTED_USER_ID
+        ):
+            raise HttpException(
+                message="unauthorized; invalid oauth token", error_code=401
+            )
+
+    @staticmethod
+    def handle_request(
+        *,
+        request: GenericHttpRequest,
+        job_definition: job_definition_t.HttpJobDefinitionBase,  # ruff:ignore[unused-static-method-argument]
+        profile_meta: job_definition_t.ProfileMetadata,  # ruff:ignore[unused-static-method-argument]
+    ) -> GenericHttpResponse:
+        return GenericHttpResponse(
+            response=json.dumps(request.query_params),
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/examples/integration-server/jobs/materials_auto/profile.yaml

@@ -74,6 +74,13 @@ jobs:
     executor:
       type: script
       import_path: example_http
+  - id: example_http_get
+    type: custom_http
+    name: Custom HTTP GET
+    http_method: get
+    executor:
+      type: script
+      import_path: example_http_get
   - id: example_runsheet_wh
     type: webhook
     name: Runsheet Webhook

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/pkgs/serialization_util/serialization_helpers.py

@@ -210,8 +210,7 @@ def serialize_for_api(obj: Any) -> JsonValue:
         serialization_type == SerializationType.UNKNOWN
     ):  # performance optimization to not do function lookup
         return obj  # type: ignore
-    r = _CONVERSION_SERIALIZATION_FUNCS[serialization_type](obj)
-    return r
+    return _CONVERSION_SERIALIZATION_FUNCS[serialization_type](obj)
 
 
 _SERIALIZATION_FUNCS_DICT: dict[

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/uncountable/integration/http_server/types.py

@@ -68,6 +68,7 @@ class HttpException(Exception):
 class GenericHttpRequest:
     body_base64: str
     headers: dict[str, str]
+    query_params: dict[str, list[str]]
 
     @functools.cached_property
     def body_bytes(self) -> bytes:

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/uncountable/integration/webhook_server/entrypoint.py

@@ -1,4 +1,5 @@
 import base64
+from typing import assert_never
 
 import flask
 from flask.typing import ResponseReturnValue
@@ -16,12 +17,31 @@ from uncountable.types import job_definition_t
 
 app = flask.Flask(__name__)
 
+HttpJobDefinition = (
+    job_definition_t.CustomHttpJobDefinition
+    | job_definition_t.WebhookJobDefinition
+    | job_definition_t.UncountableWebhookJobDefinition
+)
+
+
+def _resolve_route_http_method(job: HttpJobDefinition) -> job_definition_t.HttpMethod:
+    match job:
+        case job_definition_t.CustomHttpJobDefinition():
+            return job.http_method
+        case (
+            job_definition_t.WebhookJobDefinition()
+            | job_definition_t.UncountableWebhookJobDefinition()
+        ):
+            return job_definition_t.HttpMethod.POST
+        case _:
+            assert_never(job)
+
 
 def register_route(
     *,
     server_logger: Logger,
     profile_meta: job_definition_t.ProfileMetadata,
-    job: job_definition_t.HttpJobDefinitionBase,
+    job: HttpJobDefinition,
 ) -> None:
     route = f"/{profile_meta.name}/{job.id}"
     log_attributes = {
@@ -56,6 +76,7 @@ def register_route(
                 http_request = GenericHttpRequest(
                     body_base64=base64.b64encode(flask.request.get_data()).decode(),
                     headers=dict(flask.request.headers),
+                    query_params=flask.request.args.to_dict(flat=False),
                 )
                 job_instance.validate_request(
                     request=http_request, job_definition=job, profile_meta=profile_meta
@@ -88,7 +109,7 @@ def register_route(
         route,
         endpoint=f"handle_request_{job.id}",
         view_func=handle_request,
-        methods=["POST"],
+        methods=[_resolve_route_http_method(job).value.upper()],
     )
 
     server_logger.log_debug(
@@ -103,10 +124,21 @@ 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.HttpJobDefinitionBase):
-                register_route(
-                    server_logger=server_logger, profile_meta=profile_metadata, job=job
-                )
+            match job:
+                case job_definition_t.CronJobDefinition():
+                    continue
+                case (
+                    job_definition_t.CustomHttpJobDefinition()
+                    | job_definition_t.WebhookJobDefinition()
+                    | job_definition_t.UncountableWebhookJobDefinition()
+                ):
+                    register_route(
+                        server_logger=server_logger,
+                        profile_meta=profile_metadata,
+                        job=job,
+                    )
+                case _:
+                    assert_never(job)
 
 
 main()

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/uncountable/types/api/files/download_file.py

@@ -30,7 +30,7 @@ __all__: list[str] = [
 
 ENDPOINT_METHOD = "GET"
 ENDPOINT_PATH = "api/external/files/download_file"
-ENDPOINT_DESCRIPTION = "Download an attachment field value from an entity (e.g. a file attached to a form field) by entity + field reference, or download a text document by its ID. When querying by entity field, if the field contains a single file it is returned directly (X-File-Download-Type: raw); if multiple files are attached, they are bundled into a ZIP archive (X-File-Download-Type: archive). For downloading the binary file stored on a recipe output of type image or file, use recipes/external_download_recipe_output_file instead."
+ENDPOINT_DESCRIPTION = "Download an attachment field value from an entity (e.g. a file attached to a form field) by entity + field reference, or download a text document by its ID. When querying by entity field, if the field contains a single file it is returned directly (X-File-Download-Type: raw); if multiple files are attached, they are bundled into a ZIP archive (X-File-Download-Type: archive). For downloading the binary file stored on a recipe output of type image or file, use recipes/external_download_recipe_output_file instead. A file that has not cleared virus scanning is not returned: a file still being scanned responds with HTTP 422 indicating the scan is in progress, and a file that failed the scan responds with HTTP 422 indicating a security-scan failure."
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/uncountable/types/job_definition.py

@@ -4,6 +4,7 @@
 # DO NOT MODIFY -- This file is generated by type_spec
 # Kept only for SDK backwards compatibility
 from .job_definition_t import JobDefinitionType as JobDefinitionType
+from .job_definition_t import HttpMethod as HttpMethod
 from .job_definition_t import JobExecutorType as JobExecutorType
 from .job_definition_t import GenericUploadDataSourceType as GenericUploadDataSourceType
 from .job_definition_t import JobExecutorBase as JobExecutorBase

{uncountablepythonsdk-0.0.184 → uncountablepythonsdk-0.0.185}/uncountable/types/job_definition_t.py

@@ -27,6 +27,7 @@ __all__: list[str] = [
     "GenericUploadDataSourceSFTP",
     "GenericUploadDataSourceType",
     "HttpJobDefinitionBase",
+    "HttpMethod",
     "JobDefinition",
     "JobDefinitionBase",
     "JobDefinitionType",
@@ -53,6 +54,12 @@ class JobDefinitionType(StrEnum):
     CUSTOM_HTTP = "custom_http"
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+class HttpMethod(StrEnum):
+    GET = "get"
+    POST = "post"
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 class JobExecutorType(StrEnum):
     SCRIPT = "script"
@@ -224,6 +231,7 @@ class HttpJobDefinitionBase(JobDefinitionBase):
 @dataclasses.dataclass(slots=True, kw_only=True)
 class CustomHttpJobDefinition(HttpJobDefinitionBase):
     type: typing.Literal[JobDefinitionType.CUSTOM_HTTP] = JobDefinitionType.CUSTOM_HTTP
+    http_method: HttpMethod = HttpMethod.POST
 
 
 # DO NOT MODIFY -- This file is generated by type_spec