UncountablePythonSDK 0.0.167__tar.gz → 0.0.169__tar.gz

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/PKG-INFO

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

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

@@ -189,6 +189,8 @@ uncountable/types/chemical_structure_t.py
 uncountable/types/client_base.py
 uncountable/types/client_config.py
 uncountable/types/client_config_t.py
+uncountable/types/condition_match.py
+uncountable/types/condition_match_t.py
 uncountable/types/curves.py
 uncountable/types/curves_t.py
 uncountable/types/data.py
@@ -293,6 +295,7 @@ uncountable/types/api/chemical/__init__.py
 uncountable/types/api/chemical/convert_chemical_formats.py
 uncountable/types/api/condition_parameters/__init__.py
 uncountable/types/api/condition_parameters/upsert_condition_match.py
+uncountable/types/api/condition_parameters/upsert_condition_matches.py
 uncountable/types/api/entity/__init__.py
 uncountable/types/api/entity/create_entities.py
 uncountable/types/api/entity/create_entity.py

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/examples/integration-server/pyproject.toml

@@ -8,8 +8,8 @@ dependencies = [
   "mypy == 1.*",
   "ruff == 0.*",
   "openpyxl == 3.*",
-  "more_itertools == 10.*",
-  "types-paramiko ==4.0.0.20260322",
+  "more_itertools ==11.*",
+  "types-paramiko ==4.0.0.20260402",
   "types-openpyxl == 3.*",
   "types-pysftp == 0.*",
   "types-pytz ==2026.*",

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/pkgs/filesystem_utils/_sftp_session.py

@@ -67,6 +67,7 @@ class SFTPSession(FileSystemSession):
     def __init__(self, sftp_config: FileSystemSFTPConfig) -> None:
         super().__init__()
         self.host: str = sftp_config.ip
+        self.port: int = sftp_config.port
         self.username: str = sftp_config.username
         self.key_file: str | paramiko.PKey | None = (
             sftp_config.pem_path
@@ -81,6 +82,7 @@ class SFTPSession(FileSystemSession):
         if self.key_file is not None:
             self.connection = pysftp.Connection(
                 self.host,
+                port=self.port,
                 username=self.username,
                 private_key=self.key_file,
                 cnopts=cnopts,
@@ -88,6 +90,7 @@ class SFTPSession(FileSystemSession):
         elif self.password is not None:
             self.connection = pysftp.Connection(
                 self.host,
+                port=self.port,
                 username=self.username,
                 password=self.password,
                 cnopts=cnopts,

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/pkgs/filesystem_utils/file_type_utils.py

@@ -65,6 +65,7 @@ class FileSystemSFTPConfig:
     password: str | None = None
     valid_extensions: tuple[str] | None = None
     recursive: bool = True
+    port: int = 22
 
 
 @dataclass(kw_only=True)

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/uncountable/integration/telemetry.py

@@ -1,3 +1,4 @@
+import dataclasses
 import datetime
 import functools
 import json
@@ -30,6 +31,7 @@ from opentelemetry.sdk.trace.export import (
 )
 from opentelemetry.trace import Span, Tracer
 
+from pkgs.serialization_util import dict_fields
 from uncountable.core.environment import (
     get_otel_enabled,
     get_server_env,
@@ -229,60 +231,75 @@ class Logger:
             yield self
 
 
+@dataclasses.dataclass(frozen=True, kw_only=True, slots=True)
+class _JobResourceStats:
+    cpu_user_s: float
+    cpu_system_s: float
+    cpu_total_s: float
+    wall_time_s: float
+    current_rss_mb: float
+    peak_rss_mb: float
+
+
 class PerJobResourceTracker:
     def __init__(
         self,
         logger: "JobLogger",
+        *,
         sample_interval: float = 0.5,
         log_interval: float = 30.0,
+        bootup_delay: float = 3.0,
     ) -> None:
         self.logger = logger
         self.sample_interval = sample_interval
         self.log_interval = log_interval
+        self.bootup_delay = bootup_delay
         self._process = psutil.Process(os.getpid())
         self._stop_event = threading.Event()
         self._thread: threading.Thread | None = None
 
         self.max_rss: int = 0
         self.start_cpu_times: psutil._ntp.pcputimes | None = None
-        self.end_cpu_times: psutil._ntp.pcputimes | None = None
         self.start_wall_time: float | None = None
-        self.end_wall_time: float | None = None
 
-    def _current_stats(self) -> Attributes:
+    def _current_stats(self) -> _JobResourceStats:
         assert self.start_cpu_times is not None
         assert self.start_wall_time is not None
         current_cpu_times = self._process.cpu_times()
         cpu_user = current_cpu_times.user - self.start_cpu_times.user
         cpu_sys = current_cpu_times.system - self.start_cpu_times.system
-        cpu_total = cpu_user + cpu_sys
-        elapsed = time.monotonic() - self.start_wall_time
-        return {
-            "cpu_user_s": round(cpu_user, 3),
-            "cpu_system_s": round(cpu_sys, 3),
-            "cpu_total_s": round(cpu_total, 3),
-            "wall_time_s": round(elapsed, 3),
-            "current_rss_mb": round(self._process.memory_info().rss / (1024 * 1024), 2),
-            "peak_rss_mb": round(self.max_rss / (1024 * 1024), 2),
-        }
+        return _JobResourceStats(
+            cpu_user_s=round(cpu_user, 3),
+            cpu_system_s=round(cpu_sys, 3),
+            cpu_total_s=round(cpu_user + cpu_sys, 3),
+            wall_time_s=round(time.monotonic() - self.start_wall_time, 3),
+            current_rss_mb=round(self._process.memory_info().rss / (1024 * 1024), 2),
+            peak_rss_mb=round(self.max_rss / (1024 * 1024), 2),
+        )
+
+    def _log_stats(self, message: str) -> None:
+        self.logger.log_debug(
+            message, attributes=_cast_attributes(dict_fields(self._current_stats()))
+        )
 
     def start(self) -> None:
         self.start_cpu_times = self._process.cpu_times()
         self.start_wall_time = time.monotonic()
 
         def _monitor() -> None:
-            last_log_time = time.monotonic()
+            now = time.monotonic()
+            boot_at: float | None = now + self.bootup_delay
+            next_periodic_at = now + self.log_interval
             try:
                 while not self._stop_event.is_set():
-                    rss = self._process.memory_info().rss
-                    self.max_rss = max(self.max_rss, rss)
+                    self.max_rss = max(self.max_rss, self._process.memory_info().rss)
                     now = time.monotonic()
-                    if now - last_log_time >= self.log_interval:
-                        self.logger.log_debug(
-                            "Job resource usage (periodic)",
-                            attributes=self._current_stats(),
-                        )
-                        last_log_time = now
+                    if boot_at is not None and now >= boot_at:
+                        self._log_stats("Job resource usage (bootup)")
+                        boot_at = None
+                    if now >= next_periodic_at:
+                        self._log_stats("Job resource usage (periodic)")
+                        next_periodic_at = now + self.log_interval
                     time.sleep(self.sample_interval)
             except Exception:
                 self._stop_event.set()
@@ -294,8 +311,6 @@ class PerJobResourceTracker:
         self._stop_event.set()
         if self._thread is not None:
             self._thread.join()
-        self.end_cpu_times = self._process.cpu_times()
-        self.end_wall_time = time.monotonic()
 
     def __enter__(self) -> typing.Self:
         self.start()
@@ -308,7 +323,6 @@ class PerJobResourceTracker:
         traceback: types.TracebackType | None,
     ) -> None:
         self.stop()
-        stats = dict(self.summary())
         if isinstance(exc_value, MemoryError):
             if resource is not None:
                 limit, _ = resource.getrlimit(resource.RLIMIT_AS)
@@ -320,26 +334,7 @@ class PerJobResourceTracker:
                     ),
                 )
             return
-        self.logger.log_debug("Job resource usage summary", attributes=stats)
-        return
-
-    def summary(self) -> Attributes:
-        assert self.start_cpu_times is not None
-        assert self.end_cpu_times is not None
-        assert self.start_wall_time is not None
-        assert self.end_wall_time is not None
-
-        cpu_user = self.end_cpu_times.user - self.start_cpu_times.user
-        cpu_sys = self.end_cpu_times.system - self.start_cpu_times.system
-        cpu_total = cpu_user + cpu_sys
-        elapsed = self.end_wall_time - self.start_wall_time
-        return {
-            "cpu_user_s": round(cpu_user, 3),
-            "cpu_system_s": round(cpu_sys, 3),
-            "cpu_total_s": round(cpu_total, 3),
-            "wall_time_s": round(elapsed, 3),
-            "peak_rss_mb": round(self.max_rss / (1024 * 1024), 2),
-        }
+        self._log_stats("Job resource usage summary")
 
 
 class JobLogger(Logger):

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/uncountable/types/__init__.py

@@ -20,6 +20,7 @@ from .api.recipes import clear_recipe_outputs as clear_recipe_outputs_t
 from . import client_config_t as client_config_t
 from .api.uploader import complete_async_parse as complete_async_parse_t
 from .api.runsheet import complete_async_upload as complete_async_upload_t
+from . import condition_match_t as condition_match_t
 from .api.chemical import convert_chemical_formats as convert_chemical_formats_t
 from .api.entity import create_entities as create_entities_t
 from .api.entity import create_entity as create_entity_t
@@ -145,6 +146,7 @@ from .api.material_families import update_entity_material_families as update_ent
 from .api.outputs import update_output_condition_parameter as update_output_condition_parameter_t
 from . import uploader_t as uploader_t
 from .api.condition_parameters import upsert_condition_match as upsert_condition_match_t
+from .api.condition_parameters import upsert_condition_matches as upsert_condition_matches_t
 from .api.field_options import upsert_field_options as upsert_field_options_t
 from .api.recipes import upsert_recipe_workflow_step as upsert_recipe_workflow_step_t
 from .api.recipes import upsert_step_relationships as upsert_step_relationships_t
@@ -172,6 +174,7 @@ __all__: list[str] = [
     "client_config_t",
     "complete_async_parse_t",
     "complete_async_upload_t",
+    "condition_match_t",
     "convert_chemical_formats_t",
     "create_entities_t",
     "create_entity_t",
@@ -297,6 +300,7 @@ __all__: list[str] = [
     "update_output_condition_parameter_t",
     "uploader_t",
     "upsert_condition_match_t",
+    "upsert_condition_matches_t",
     "upsert_field_options_t",
     "upsert_recipe_workflow_step_t",
     "upsert_step_relationships_t",

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/uncountable/types/api/condition_parameters/upsert_condition_match.py

@@ -6,11 +6,12 @@ from __future__ import annotations
 import typing  # noqa: F401
 import datetime  # noqa: F401
 from decimal import Decimal  # noqa: F401
-from enum import StrEnum
 import dataclasses
 from pkgs.serialization import serial_class
+from pkgs.serialization import serial_alias_annotation
 from ... import async_batch_t
 from ... import base_t
+from ... import condition_match_t
 from ... import identifier_t
 
 __all__: list[str] = [
@@ -42,11 +43,12 @@ class ConditionParameter:
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
-class MatchType(StrEnum):
-    ALL = "all"
-    EQ = "eq"
-    EQCATEGORICAL = "eqCategorical"
-    RANGE = "range"
+MatchType = typing.Annotated[
+    condition_match_t.MatchType,
+    serial_alias_annotation(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_match.MatchType",
+    ),
+]
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.169/uncountable/types/api/condition_parameters/upsert_condition_matches.py

@@ -0,0 +1,161 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+import dataclasses
+from pkgs.serialization import serial_class
+from pkgs.serialization import serial_union_annotation
+from ... import async_batch_t
+from ... import base_t
+from ... import condition_match_t
+from ... import identifier_t
+
+__all__: list[str] = [
+    "Arguments",
+    "ConditionParameter",
+    "ConditionParameterAll",
+    "ConditionParameterEqCategorical",
+    "ConditionParameterEqNumeric",
+    "ConditionParameterRange",
+    "Data",
+    "ENDPOINT_METHOD",
+    "ENDPOINT_PATH",
+    "UpsertArgs",
+    "UpsertArgsOutputConditions",
+    "UpsertArgsParameters",
+]
+
+ENDPOINT_METHOD = "POST"
+ENDPOINT_PATH = "api/external/condition_parameters/upsert_condition_matches"
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.ConditionParameterAll",
+    parse_require={"match_type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ConditionParameterAll:
+    condition_parameter_key: identifier_t.IdentifierKey
+    allow_null: bool
+    match_type: typing.Literal[condition_match_t.MatchType.ALL] = condition_match_t.MatchType.ALL
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.ConditionParameterEqNumeric",
+    parse_require={"match_type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ConditionParameterEqNumeric:
+    condition_parameter_key: identifier_t.IdentifierKey
+    allow_null: bool
+    numeric_values: list[Decimal | None]
+    match_type: typing.Literal[condition_match_t.MatchType.EQ] = condition_match_t.MatchType.EQ
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.ConditionParameterEqCategorical",
+    parse_require={"match_type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ConditionParameterEqCategorical:
+    condition_parameter_key: identifier_t.IdentifierKey
+    allow_null: bool
+    categorical_values: list[str | None]
+    match_type: typing.Literal[condition_match_t.MatchType.EQCATEGORICAL] = condition_match_t.MatchType.EQCATEGORICAL
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.ConditionParameterRange",
+    to_string_values={"max_value", "min_value"},
+    parse_require={"match_type"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class ConditionParameterRange:
+    condition_parameter_key: identifier_t.IdentifierKey
+    allow_null: bool
+    min_value: Decimal
+    max_value: Decimal
+    match_type: typing.Literal[condition_match_t.MatchType.RANGE] = condition_match_t.MatchType.RANGE
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+ConditionParameter = typing.Annotated[
+    ConditionParameterAll | ConditionParameterEqNumeric | ConditionParameterEqCategorical | ConditionParameterRange,
+    serial_union_annotation(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.ConditionParameter",
+        discriminator="match_type",
+        discriminator_map={
+            "all": ConditionParameterAll,
+            "eq": ConditionParameterEqNumeric,
+            "eqCategorical": ConditionParameterEqCategorical,
+            "range": ConditionParameterRange,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.UpsertArgsParameters",
+    parse_require={"kind"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class UpsertArgsParameters:
+    condition_parameters: list[ConditionParameter]
+    kind: typing.Literal["condition_parameters"] = "condition_parameters"
+    name: str | None = None
+    existing_condition_match_key: identifier_t.IdentifierKey | None = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.UpsertArgsOutputConditions",
+    parse_require={"kind"},
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class UpsertArgsOutputConditions:
+    output_condition_keys: list[identifier_t.IdentifierKey]
+    kind: typing.Literal["output_conditions"] = "output_conditions"
+    name: str | None = None
+    existing_condition_match_key: identifier_t.IdentifierKey | None = None
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+UpsertArgs = typing.Annotated[
+    UpsertArgsParameters | UpsertArgsOutputConditions,
+    serial_union_annotation(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.UpsertArgs",
+        discriminator="kind",
+        discriminator_map={
+            "condition_parameters": UpsertArgsParameters,
+            "output_conditions": UpsertArgsOutputConditions,
+        },
+    ),
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.Arguments",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class Arguments:
+    upserts: list[UpsertArgs]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    named_type_path="sdk.api.condition_parameters.upsert_condition_matches.Data",
+)
+@dataclasses.dataclass(slots=base_t.ENABLE_SLOTS, kw_only=True)  # type: ignore[literal-required]
+class Data:
+    results: list[async_batch_t.AsyncBatchActionReturn]
+# DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/uncountable/types/api/inputs/create_inputs.py

@@ -43,11 +43,12 @@ class Arguments:
 class InputToCreate:
     name: str
     material_family_ids: list[base_t.ObjectId]
-    quantity_type: typing.Literal[inputs_t.IngredientQuantityType.NUMERIC] | typing.Literal[inputs_t.IngredientQuantityType.TEXT]
+    quantity_type: typing.Literal[inputs_t.IngredientQuantityType.NUMERIC] | typing.Literal[inputs_t.IngredientQuantityType.TEXT] | typing.Literal[inputs_t.IngredientQuantityType.ID] | typing.Literal[inputs_t.IngredientQuantityType.IDS]
     type: typing.Literal[inputs_t.IngredientType.INGREDIENT] | typing.Literal[inputs_t.IngredientType.PROCESS_PARAMETER]
     attributes: list[input_attributes_t.InputAttributeValue] | None = None
     category_id: base_t.ObjectId | None = None
     field_values: list[field_values_t.FieldRefNameValue] | None = None
+    id_source: str | None = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.167 → uncountablepythonsdk-0.0.169}/uncountable/types/client_base.py

@@ -120,6 +120,7 @@ import uncountable.types.api.material_families.update_entity_material_families a
 import uncountable.types.api.outputs.update_output_condition_parameter as update_output_condition_parameter_t
 from uncountable.types import uploader_t
 import uncountable.types.api.condition_parameters.upsert_condition_match as upsert_condition_match_t
+import uncountable.types.api.condition_parameters.upsert_condition_matches as upsert_condition_matches_t
 import uncountable.types.api.field_options.upsert_field_options as upsert_field_options_t
 import uncountable.types.api.recipes.upsert_recipe_workflow_step as upsert_recipe_workflow_step_t
 import uncountable.types.api.recipes.upsert_step_relationships as upsert_step_relationships_t
@@ -2457,6 +2458,26 @@ class ClientMethods(ABC):
         )
         return self.do_request(api_request=api_request, return_type=upsert_condition_match_t.Data)
 
+    def upsert_condition_matches(
+        self,
+        *,
+        upserts: list[upsert_condition_matches_t.UpsertArgs],
+        _request_options: client_config_t.RequestOptions | None = None,
+    ) -> upsert_condition_matches_t.Data:
+        """Bulk variant of upsert_condition_match. Accepts a list of upsert arguments and applies them via a single batched database round-trip per bulk operation (insert, update, delete) through the shared upsert_condition_matches helper. Returns one AsyncBatchActionReturn per input in the same order.
+
+        """
+        args = upsert_condition_matches_t.Arguments(
+            upserts=upserts,
+        )
+        api_request = APIRequest(
+            method=upsert_condition_matches_t.ENDPOINT_METHOD,
+            endpoint=upsert_condition_matches_t.ENDPOINT_PATH,
+            args=args,
+            request_options=_request_options,
+        )
+        return self.do_request(api_request=api_request, return_type=upsert_condition_matches_t.Data)
+
     def upsert_field_options(
         self,
         *,

uncountablepythonsdk-0.0.169/uncountable/types/condition_match.py

@@ -0,0 +1,7 @@
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+# DO NOT MODIFY -- This file is generated by type_spec
+# Kept only for SDK backwards compatibility
+from .condition_match_t import MatchType as MatchType
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.169/uncountable/types/condition_match_t.py

@@ -0,0 +1,22 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+from enum import StrEnum
+
+__all__: list[str] = [
+    "MatchType",
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+class MatchType(StrEnum):
+    ALL = "all"
+    EQ = "eq"
+    EQCATEGORICAL = "eqCategorical"
+    RANGE = "range"
+# DO NOT MODIFY -- This file is generated by type_spec