UncountablePythonSDK 0.0.168__tar.gz → 0.0.169__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.168
+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.168 → 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.168 → 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.168 → 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