UncountablePythonSDK 0.0.147__tar.gz → 0.0.148__tar.gz

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/.github/workflows/publish.yml

@@ -36,7 +36,7 @@ jobs:
         run: |
           export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_uncountablepythonsdk=$(git describe --tags --exact-match)
           python3 -m build
-      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: package-distributions
           path: dist/
@@ -50,7 +50,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+    - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
       with:
         name: package-distributions
         path: dist/

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.147
+Version: 0.0.148
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -30,7 +30,7 @@ Requires-Dist: pysftp==0.*
 Requires-Dist: opentelemetry-api==1.*
 Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.*
 Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.*
-Requires-Dist: opentelemetry-sdk<1.39.0
+Requires-Dist: opentelemetry-sdk>=1.39.1
 Requires-Dist: paramiko==3.*
 Requires-Dist: boto3==1.*
 Requires-Dist: flask==3.*

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.147
+Version: 0.0.148
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -30,7 +30,7 @@ Requires-Dist: pysftp==0.*
 Requires-Dist: opentelemetry-api==1.*
 Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.*
 Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.*
-Requires-Dist: opentelemetry-sdk<1.39.0
+Requires-Dist: opentelemetry-sdk>=1.39.1
 Requires-Dist: paramiko==3.*
 Requires-Dist: boto3==1.*
 Requires-Dist: flask==3.*

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/UncountablePythonSDK.egg-info/requires.txt

@@ -12,7 +12,7 @@ pysftp==0.*
 opentelemetry-api==1.*
 opentelemetry-exporter-otlp-proto-common==1.*
 opentelemetry-exporter-otlp-proto-http==1.*
-opentelemetry-sdk<1.39.0
+opentelemetry-sdk>=1.39.1
 paramiko==3.*
 boto3==1.*
 flask==3.*

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/docs/requirements.txt

@@ -1,4 +1,4 @@
-furo==2025.9.25
+furo==2025.12.19
 myst-parser==4.0.1
 sphinx-autoapi==3.6.0
 sphinx-copybutton==0.5.2

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/examples/integration-server/jobs/materials_auto/example_parse.py

@@ -96,17 +96,17 @@ class ParseExample(WebhookJob[ParsePayload]):
                     ),
                     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"),
+                        value=uploader_t.NumericHeaderData(
+                            name="file structure number",
+                            data=uploader_t.DecimalValue(value=Decimal(99)),
                         ),
                     ),
                     uploader_t.HeaderEntry(
                         type=uploader_t.StructureElementType.HEADER,
-                        value=uploader_t.NumericHeaderData(
-                            name="file structure number",
-                            data=uploader_t.DecimalValue(value=Decimal(99)),
+                        value=uploader_t.TextHeaderData(
+                            name="uploaded file name",
+                            type=uploader_t.HeaderType.TEXT_HEADER,
+                            data=uploader_t.StringValue(value=file_name),
                         ),
                     ),
                 ],

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/pkgs/type_spec/type_info/emit_type_info.py

@@ -15,6 +15,7 @@ from pkgs.serialization import OpaqueKey
 from pkgs.serialization_util import serialize_for_api, serialize_for_storage
 
 from .. import builder, util
+from ..emit_python import python_field_name
 from ..emit_typescript_util import MODIFY_NOTICE, ts_name
 from ..value_spec import convert_to_value_spec_type
 
@@ -162,6 +163,7 @@ class MapProperty:
     # We don't have typing on defaults yet, relying on emitters to check it. Limit
     # use of this field, as it'll necessarily change when adding type info
     default: PureJsonValue
+    storage_name: str | None = None
 
 
 @dataclasses.dataclass
@@ -223,7 +225,7 @@ def _build_map_all(build: builder.SpecBuilder, *, python: bool = False) -> MapAl
         map_all.namespaces[OpaqueKey(key=namespace.name)] = map_namespace
 
         for type_ in namespace.types.values():
-            map_type = _build_map_type(build, type_)
+            map_type = _build_map_type(build, type_, python=python)
             if map_type is not None:
                 map_namespace.types[OpaqueKey(key=type_.name)] = map_type
 
@@ -384,7 +386,7 @@ def _validate_type_ext_info(
 
 
 def _build_map_type(
-    build: builder.SpecBuilder, stype: builder.SpecTypeDefn
+    build: builder.SpecBuilder, stype: builder.SpecTypeDefn, python: bool = False
 ) -> MapType | None:
     # limited support for now
     if (
@@ -420,6 +422,10 @@ def _build_map_type(
                     desc=parts.desc,
                     default=prop.default,
                 )
+                if python:
+                    map_property.storage_name = python_field_name(
+                        prop.name, prop.name_case
+                    )
                 map_type.properties[OpaqueKey(key=prop.name)] = map_property
 
         return map_type

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "opentelemetry-api==1.*",
     "opentelemetry-exporter-otlp-proto-common==1.*",
     "opentelemetry-exporter-otlp-proto-http==1.*",
-    "opentelemetry-sdk < 1.39.0",
+    "opentelemetry-sdk >= 1.39.1",
     "paramiko ==3.*",
     "boto3 == 1.*",
     "flask == 3.*",

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/uncountable/integration/executors/executors.py

@@ -91,8 +91,9 @@ def execute_job(
 ) -> job_definition_t.JobResult:
     with args.logger.push_scope(job_definition.name) as job_logger:
         job = resolve_executor(job_definition.executor, profile_metadata)
+        job_location = f"{job.__class__.__module__}.{job.__class__.__name__}"
 
-        job_logger.log_info(f"Started running job at `{job.__class__}`..")
+        job_logger.log_info(f"Starting job: `{job_location}`")
 
         run_entity: entity_t.Entity | None = None
         try:
@@ -125,7 +126,7 @@ def execute_job(
 
         submitted_batch_job_ids = args.batch_processor.get_submitted_job_ids()
         job_logger.log_info(
-            "completed job",
+            f"Completed job: `{job_location}` (success={result.success})",
             attributes={
                 "submitted_batch_job_ids": submitted_batch_job_ids,
                 "success": result.success,

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/uncountable/integration/telemetry.py

@@ -12,13 +12,14 @@ from typing import Generator, assert_never, cast
 
 import psutil
 from opentelemetry import _logs, trace
+from opentelemetry._logs import Logger as OTELLogger
+from opentelemetry._logs import LogRecord
 from opentelemetry.context import get_current
 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,
+    ReadableLogRecord,
 )
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, ConsoleLogExporter
 from opentelemetry.sdk.resources import Attributes, Resource
@@ -49,7 +50,7 @@ def _cast_attributes(attributes: dict[str, base_t.JsonValue]) -> Attributes:
     return cast(Attributes, attributes)
 
 
-def one_line_formatter(record: LogRecord) -> str:
+def one_line_formatter(record: ReadableLogRecord) -> str:
     json_data = record.to_json()
     return json.dumps(json.loads(json_data), separators=(",", ":")) + "\n"
 
@@ -112,9 +113,11 @@ def _get_severity_number(severity: LogSeverity) -> _logs.SeverityNumber:
 
 class Logger:
     current_span: Span
+    _bound_attributes: dict[str, base_t.JsonValue]
 
     def __init__(self, base_span: Span) -> None:
         self.current_span = base_span
+        self._bound_attributes = {}
 
     @property
     def current_span_id(self) -> int:
@@ -131,7 +134,10 @@ class Logger:
         message: str | None = None,
         severity: LogSeverity | None = None,
     ) -> Attributes:
-        patched_attributes = {**(attributes if attributes is not None else {})}
+        patched_attributes = {
+            **self._bound_attributes,
+            **(attributes if attributes is not None else {}),
+        }
         if message is not None:
             patched_attributes["message"] = message
         elif "body" in patched_attributes:
@@ -144,7 +150,7 @@ class Logger:
         ):
             patched_attributes["status"] = patched_attributes["severity_text"].lower()
 
-        return patched_attributes
+        return _cast_attributes(patched_attributes)
 
     def _emit_log(
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
@@ -159,10 +165,12 @@ class Logger:
             ),
             context=get_current(),
             severity_number=_get_severity_number(severity),
-            resource=get_otel_resource(),
         )
         otel_logger.emit(log_record)
 
+    def bind(self, *, attributes: Attributes) -> None:
+        self._bound_attributes.update(attributes)
+
     def log_info(self, message: str, *, attributes: Attributes | None = None) -> None:
         self._emit_log(
             message=message, severity=LogSeverity.INFO, attributes=attributes
@@ -195,7 +203,7 @@ class Logger:
         self.current_span.record_exception(
             exception=exception, attributes=patched_attributes
         )
-        log_message = f"error: {message}\nexception: {exception}{traceback_str}"
+        log_message = f"{message}\nexception: {exception}{traceback_str}"
         self._emit_log(
             message=log_message, severity=severity, attributes=patched_attributes
         )

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/uncountable/types/api/notebooks/add_notebook_content.py

@@ -16,11 +16,16 @@ from ... import identifier_t
 
 __all__: list[str] = [
     "Arguments",
+    "ChemicalStructureSourceType",
     "Data",
     "ENDPOINT_METHOD",
     "ENDPOINT_PATH",
     "InputContent",
+    "InputContentChemicalStructure",
+    "InputContentEquation",
+    "InputContentFiles",
     "InputContentTable",
+    "InputContentTextHtml",
     "InputContentTextMarkdown",
     "InputContentType",
     "Location",
@@ -30,6 +35,7 @@ __all__: list[str] = [
     "TableCellContent",
     "TableCellContentText",
     "TableCellContentType",
+    "TableCellStyle",
 ]
 
 ENDPOINT_METHOD = "POST"
@@ -73,12 +79,89 @@ Location = typing.Annotated[
 @serial_string_enum(
     labels={
         "text_markdown": "Text Markdown",
+        "text_html": "Text HTML",
         "table": "Table",
+        "chemical_structure": "Chemical Structure",
+        "files": "Files",
+        "equation": "Equation",
     },
 )
 class InputContentType(StrEnum):
     TEXT_MARKDOWN = "text_markdown"
+    TEXT_HTML = "text_html"
     TABLE = "table"
+    CHEMICAL_STRUCTURE = "chemical_structure"
+    FILES = "files"
+    EQUATION = "equation"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.notebooks.add_notebook_content.InputContentTextHtml",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class InputContentTextHtml:
+    type: typing.Literal[InputContentType.TEXT_HTML] = InputContentType.TEXT_HTML
+    text_html: str
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.notebooks.add_notebook_content.InputContentEquation",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class InputContentEquation:
+    type: typing.Literal[InputContentType.EQUATION] = InputContentType.EQUATION
+    equation: str
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.notebooks.add_notebook_content.InputContentFiles",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class InputContentFiles:
+    type: typing.Literal[InputContentType.FILES] = InputContentType.FILES
+    file_ids: list[base_t.ObjectId]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_string_enum(
+    labels={
+        "smiles": "SMILES",
+        "ketcher": "Ketcher",
+    },
+)
+class ChemicalStructureSourceType(StrEnum):
+    SMILES = "smiles"
+    KETCHER = "ketcher"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.notebooks.add_notebook_content.InputContentChemicalStructure",
+    parse_require={"type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class InputContentChemicalStructure:
+    type: typing.Literal[InputContentType.CHEMICAL_STRUCTURE] = InputContentType.CHEMICAL_STRUCTURE
+    structure_format: ChemicalStructureSourceType
+    structure_data: str
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.notebooks.add_notebook_content.TableCellStyle",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class TableCellStyle:
+    background_color: str | None = None
+    bold: bool | None = None
+    italic: bool | None = None
+    underline: bool | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -122,6 +205,7 @@ TableCellContent = typing.Annotated[
 @dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
 class TableCell:
     content: TableCellContent
+    style: TableCellStyle | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -148,13 +232,17 @@ class InputContentTextMarkdown:
 
 # DO NOT MODIFY -- This file is generated by type_spec
 InputContent = typing.Annotated[
-    InputContentTextMarkdown | InputContentTable,
+    InputContentTextMarkdown | InputContentTextHtml | InputContentTable | InputContentChemicalStructure | InputContentFiles | InputContentEquation,
     serial_union_annotation(
     named_type_path="sdk.api.notebooks.add_notebook_content.InputContent",
         discriminator="type",
         discriminator_map={
             "text_markdown": InputContentTextMarkdown,
+            "text_html": InputContentTextHtml,
             "table": InputContentTable,
+            "chemical_structure": InputContentChemicalStructure,
+            "files": InputContentFiles,
+            "equation": InputContentEquation,
         },
     ),
 ]

{uncountablepythonsdk-0.0.147 → uncountablepythonsdk-0.0.148}/uncountable/types/entity_t.py

@@ -72,6 +72,7 @@ __all__: list[str] = [
         "equipment": "Equipment",
         "equipment_maintenance": "Equipment Maintenance",
         "equipment_type": "Equipment Type",
+        "external_ai_model": "External Ai Model",
         "experiment_group": "Experiment Group",
         "experiment_group_member": "Experiment Group Member",
         "experiment_group_type": "Experiment Group Type",
@@ -183,6 +184,7 @@ __all__: list[str] = [
         "safety_data_sheet": "Safety Data Sheet",
         "scheduled_notification": "Scheduled Notification",
         "scratch_pad": "Scratch Pad",
+        "signing_config": "Signing Config",
         "specs": "Spec",
         "save": "Save",
         "split_template": "Test Method",
@@ -239,6 +241,7 @@ __all__: list[str] = [
         "uploader": "Uploader",
         "uploader_event": "Uploader Event",
         "calculation_material_family": "Calculation Material Family",
+        "recipe_total_units": "Recipe Total Units",
     },
 )
 class EntityType(StrEnum):
@@ -287,6 +290,7 @@ class EntityType(StrEnum):
     EQUIPMENT = "equipment"
     EQUIPMENT_MAINTENANCE = "equipment_maintenance"
     EQUIPMENT_TYPE = "equipment_type"
+    EXTERNAL_AI_MODEL = "external_ai_model"
     EXPERIMENT_GROUP = "experiment_group"
     EXPERIMENT_GROUP_MEMBER = "experiment_group_member"
     EXPERIMENT_GROUP_TYPE = "experiment_group_type"
@@ -398,6 +402,7 @@ class EntityType(StrEnum):
     SAFETY_DATA_SHEET = "safety_data_sheet"
     SCHEDULED_NOTIFICATION = "scheduled_notification"
     SCRATCH_PAD = "scratch_pad"
+    SIGNING_CONFIG = "signing_config"
     SPECS = "specs"
     SAVE = "save"
     SPLIT_TEMPLATE = "split_template"
@@ -454,6 +459,7 @@ class EntityType(StrEnum):
     UPLOADER = "uploader"
     UPLOADER_EVENT = "uploader_event"
     CALCULATION_MATERIAL_FAMILY = "calculation_material_family"
+    RECIPE_TOTAL_UNITS = "recipe_total_units"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec