UncountablePythonSDK 0.0.127__tar.gz → 0.0.128__tar.gz

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/PKG-INFO

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

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

@@ -43,6 +43,7 @@ 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_instrument.py
+examples/integration-server/jobs/materials_auto/example_parse.py
 examples/integration-server/jobs/materials_auto/example_predictions.py
 examples/integration-server/jobs/materials_auto/example_runsheet_wh.py
 examples/integration-server/jobs/materials_auto/example_wh.py

uncountablepythonsdk-0.0.128/examples/integration-server/jobs/materials_auto/example_parse.py

@@ -0,0 +1,87 @@
+from dataclasses import dataclass
+
+from uncountable.integration.job import JobArguments, WebhookJob, register_job
+from uncountable.types import (
+    base_t,
+    generic_upload_t,
+    identifier_t,
+    job_definition_t,
+    uploader_t,
+)
+
+
+@dataclass(kw_only=True)
+class ParsePayload:
+    async_job_id: base_t.ObjectId
+
+
+@register_job
+class ParseExample(WebhookJob[ParsePayload]):
+    def run(
+        self, args: JobArguments, payload: ParsePayload
+    ) -> job_definition_t.JobResult:
+        dummy_parsed_file_data: list[uploader_t.ParsedFileData] = [
+            uploader_t.ParsedFileData(
+                file_name="my_file_to_upload.xlsx",
+                file_structures=[
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column1",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value1"),
+                                uploader_t.StringValue(value="value4"),
+                                uploader_t.StringValue(value="value7"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column2",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value2"),
+                                uploader_t.StringValue(value="value5"),
+                                uploader_t.StringValue(value="value8"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.DataChannel(
+                        type=uploader_t.StructureElementType.CHANNEL,
+                        channel=uploader_t.TextChannelData(
+                            name="column3",
+                            type=uploader_t.ChannelType.TEXT_CHANNEL,
+                            data=[
+                                uploader_t.StringValue(value="value3"),
+                                uploader_t.StringValue(value="value6"),
+                                uploader_t.StringValue(value="value9"),
+                            ],
+                        ),
+                    ),
+                    uploader_t.HeaderEntry(
+                        type=uploader_t.StructureElementType.HEADER,
+                        value=uploader_t.TextHeaderData(
+                            name="file_source",
+                            type=uploader_t.HeaderType.TEXT_HEADER,
+                            data=uploader_t.StringValue(value="my_file_to_upload.xlsx"),
+                        ),
+                    ),
+                ],
+            )
+        ]
+
+        args.client.complete_async_parse(
+            parsed_file_data=dummy_parsed_file_data,
+            async_job_key=identifier_t.IdentifierKeyId(id=payload.async_job_id),
+            upload_destination=generic_upload_t.UploadDestinationRecipe(
+                recipe_key=identifier_t.IdentifierKeyId(id=1)
+            ),
+        )
+
+        return job_definition_t.JobResult(success=True)
+
+    @property
+    def webhook_payload_type(self) -> type:
+        return ParsePayload

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/examples/integration-server/jobs/materials_auto/example_runsheet_wh.py

@@ -2,7 +2,7 @@ from io import BytesIO
 
 from uncountable.core.file_upload import DataFileUpload, FileUpload
 from uncountable.integration.job import JobArguments, RunsheetWebhookJob, register_job
-from uncountable.types import entity_t
+from uncountable.types import webhook_job_t
 
 
 @register_job
@@ -11,8 +11,9 @@ class StandardRunsheetGenerator(RunsheetWebhookJob):
         self,
         *,
         args: JobArguments,
-        entities: list[entity_t.Entity],
+        payload: webhook_job_t.RunsheetWebhookPayload,
     ) -> FileUpload:
+        entities = payload.entities
         args.logger.log_info(f"Generating runsheet for {len(entities)} entities")
 
         content = []

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/examples/integration-server/jobs/materials_auto/profile.yaml

@@ -93,3 +93,12 @@ jobs:
     executor:
       type: script
       import_path: example_predictions
+  - id: example_parse
+    type: webhook
+    name: Webhook Parse
+    signature_key_secret:
+      type: env
+      env_key: WH_PARSE_SIGNATURE_KEY
+    executor:
+      type: script
+      import_path: example_parse

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/uncountable/integration/job.py

@@ -28,7 +28,6 @@ from uncountable.integration.secret_retrieval.retrieve_secret import retrieve_se
 from uncountable.integration.telemetry import JobLogger
 from uncountable.types import (
     base_t,
-    entity_t,
     job_definition_t,
     queued_job_t,
     webhook_job_t,
@@ -255,13 +254,13 @@ class RunsheetWebhookJob(WebhookJob[webhook_job_t.RunsheetWebhookPayload]):
         self,
         *,
         args: JobArguments,
-        entities: list[entity_t.Entity],
+        payload: webhook_job_t.RunsheetWebhookPayload,
     ) -> FileUpload: ...
 
     def run(
         self, args: JobArguments, payload: webhook_job_t.RunsheetWebhookPayload
     ) -> JobResult:
-        runsheet = self.build_runsheet(args=args, entities=payload.entities)
+        runsheet = self.build_runsheet(args=args, payload=payload)
 
         files = args.client.upload_files(file_uploads=[runsheet])
         args.client.complete_async_upload(

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/uncountable/integration/telemetry.py

@@ -12,7 +12,10 @@ from opentelemetry import _logs, trace
 from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.sdk._logs import Logger as OTELLogger
-from opentelemetry.sdk._logs import LoggerProvider, LogRecord
+from opentelemetry.sdk._logs import (
+    LoggerProvider,
+    LogRecord,
+)
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, ConsoleLogExporter
 from opentelemetry.sdk.resources import Attributes, Resource
 from opentelemetry.sdk.trace import TracerProvider
@@ -95,8 +98,27 @@ class Logger:
     def current_trace_id(self) -> int | None:
         return self.current_span.get_span_context().trace_id
 
-    def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
-        return attributes or {}
+    def _patch_attributes(
+        self,
+        attributes: Attributes | None,
+        *,
+        message: str | None = None,
+        severity: LogSeverity | None = None,
+    ) -> Attributes:
+        patched_attributes = {**(attributes if attributes is not None else {})}
+        if message is not None:
+            patched_attributes["message"] = message
+        elif "body" in patched_attributes:
+            patched_attributes["message"] = patched_attributes["body"]
+
+        if severity is not None:
+            patched_attributes["status"] = severity.lower()
+        elif "severity_text" in patched_attributes and isinstance(
+            patched_attributes["severity_text"], str
+        ):
+            patched_attributes["status"] = patched_attributes["severity_text"].lower()
+
+        return patched_attributes
 
     def _emit_log(
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
@@ -106,7 +128,9 @@ class Logger:
             body=message,
             severity_text=severity,
             timestamp=time.time_ns(),
-            attributes=self._patch_attributes(attributes),
+            attributes=self._patch_attributes(
+                message=message, severity=severity, attributes=attributes
+            ),
             span_id=self.current_span_id,
             trace_id=self.current_trace_id,
             trace_flags=DEFAULT_TRACE_OPTIONS,
@@ -140,7 +164,9 @@ class Logger:
         attributes: Attributes | None = None,
     ) -> None:
         traceback_str = "".join(traceback.format_exception(exception))
-        patched_attributes = self._patch_attributes(attributes)
+        patched_attributes = self._patch_attributes(
+            message=message, severity=LogSeverity.ERROR, attributes=attributes
+        )
         self.current_span.record_exception(
             exception=exception, attributes=patched_attributes
         )
@@ -171,9 +197,17 @@ class JobLogger(Logger):
         self.job_definition = job_definition
         super().__init__(base_span)
 
-    def _patch_attributes(self, attributes: Attributes | None) -> Attributes:
+    def _patch_attributes(
+        self,
+        attributes: Attributes | None,
+        *,
+        message: str | None = None,
+        severity: LogSeverity | None = None,
+    ) -> Attributes:
         patched_attributes: dict[str, base_t.JsonValue] = {
-            **(attributes if attributes is not None else {})
+            **super()._patch_attributes(
+                attributes=attributes, message=message, severity=severity
+            )
         }
         patched_attributes["profile.name"] = self.profile_metadata.name
         patched_attributes["profile.base_url"] = self.profile_metadata.base_url

{uncountablepythonsdk-0.0.127 → uncountablepythonsdk-0.0.128}/uncountable/types/client_base.py

@@ -537,7 +537,7 @@ class ClientMethods(ABC):
         recipe_definitions: list[create_recipes_t.CreateRecipeDefinition],
         project_id: base_t.ObjectId | None = None,
     ) -> create_recipes_t.Data:
-        """Sets inputs values for an experiment. Values set can be numeric, text or categorical types in the Uncountable system
+        """Creates recipes in Uncountable, optionally with metadata values, and returns the resulting ids in corresponding order
 
         :param material_family_id: The identifier of the material family to create the recipes in
         :param project_id: The identifier of the project to create the recipes in