UncountablePythonSDK 0.0.173.dev2__py3-none-any.whl → 0.0.175__py3-none-any.whl

docs/.flowmarkignore

@@ -0,0 +1,9 @@
+# Flowmark collapses the MyST {tab-set}/{tab-item} directives in index.md,
+# which breaks the Sphinx build. flowmark-rs 0.3.1 ignores file patterns in
+# [tool.flowmark] extend-exclude, so the exclusion lives here instead.
+# Both pattern forms are required: the anchored form applies to directory
+# walks (relative to this directory); the repo-root-relative form applies
+# when the file is passed explicitly under --force-exclude (matched against
+# the cwd-relative path, and just recipes always run from the repo root).
+/index.md
+sdk/docs/index.md

docs/integration_examples/add_file_to_folder.md

@@ -1,6 +1,7 @@
 # Add a File to a Folder
 
-This is a two-step workflow: first upload the file using `upload_files`, then place it in a target folder using `add_file_to_folder`.
+This is a two-step workflow: first upload the file using `upload_files`, then place it in a target
+folder using `add_file_to_folder`.
 
 ## Step 1: Upload the file
 
@@ -54,4 +55,3 @@ response = client.add_file_to_folder(
     folder_key=identifier_t.IdentifierKeyRefName(ref_name="root"),
 )
 ```
-

docs/integration_examples/create_ingredient.md

@@ -4,7 +4,8 @@ Use the `create_or_update_entity` method to create Ingredients.
 
 The following fields are required when creating an Ingredient:
 - `name`: The name of the Ingredient
-- `core_ingredient_ingredientMaterialFamilies`: The list of material families in which to include the Ingredient
+- `core_ingredient_ingredientMaterialFamilies`: The list of material families in which to include
+  the Ingredient
 
 The reference name of the default definition of Ingredients is `uncIngredient`
 

docs/integration_examples/upload_file.md

@@ -1,6 +1,7 @@
 # Upload Files
 
-This example demonstrates the efficient way to upload files using the External API SDK's `client.upload_files()` method.
+This example demonstrates the efficient way to upload files using the External API SDK’s
+`client.upload_files()` method.
 
 ```python
 from io import BytesIO

pkgs/type_spec/non_discriminated_union_exceptions.py

@@ -6,7 +6,7 @@ NON_DISCRIMINATED_UNION_EXCEPTIONS = [
     "output_parameters.AnalyticalMethodLinkedOptionValue",
     "recipes_redirect.RecipesRedirectResult",
     "value_spec.ResolvedPathAll",
-    "weighted_sum.WeightedSumEntitiesOld",
+    "deprecated_calculation_types.DeprecatedWeightedSumEntitiesV0",
     "workflows.WorkflowTotalDisplay",
     "type_info.TypeFormActionConstraint",
     "structured_loading.CompatibleFilterNode",

uncountable/integration/queue_runner/worker.py

@@ -135,7 +135,9 @@ def _get_cgroup_memory_limit_bytes() -> int | None:
 def run_queued_job(
     queued_job: queued_job_t.QueuedJob,
 ) -> job_definition_t.JobResult:
-    with get_otel_tracer().start_as_current_span(name="run_queued_job") as span:
+    with get_otel_tracer().start_as_current_span(
+        name=f"run_queued_job: {queued_job.job_ref_name}"
+    ) as span:
         if resource is not None:
             cgroup_limit = _get_cgroup_memory_limit_bytes()
             if cgroup_limit is not None:

uncountable/integration/telemetry.py

@@ -15,7 +15,6 @@ from typing import Generator, assert_never, cast
 import psutil
 from opentelemetry import _logs, trace
 from opentelemetry._logs import Logger as OTELLogger, LogRecord
-from opentelemetry.context import get_current
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.sdk._logs import (
     LoggerProvider,
@@ -52,8 +51,15 @@ def _cast_attributes(attributes: dict[str, base_t.JsonValue]) -> Attributes:
 
 
 def one_line_formatter(record: ReadableLogRecord) -> str:
-    json_data = record.to_json()
-    return json.dumps(json.loads(json_data), separators=(",", ":")) + "\n"
+    payload = json.loads(record.to_json())
+
+    trace_id = record.log_record.trace_id
+    span_id = record.log_record.span_id
+    if trace_id:
+        payload["dd.trace_id"] = trace.format_trace_id(trace_id)
+    if span_id:
+        payload["dd.span_id"] = str(span_id)
+    return json.dumps(payload, separators=(",", ":")) + "\n"
 
 
 @functools.cache
@@ -114,22 +120,28 @@ def _get_severity_number(severity: LogSeverity) -> _logs.SeverityNumber:
 
 
 class Logger:
-    current_span: Span
+    base_span: Span
     _bound_attributes: dict[str, base_t.JsonValue]
     _scope_attributes_stack: list[dict[str, base_t.JsonValue]]
 
     def __init__(self, base_span: Span) -> None:
-        self.current_span = base_span
+        self.base_span = base_span
         self._bound_attributes = {}
         self._scope_attributes_stack = []
 
     @property
-    def current_span_id(self) -> int:
-        return self.current_span.get_span_context().span_id
+    def base_span_id(self) -> int:
+        return self.base_span.get_span_context().span_id
 
     @property
-    def current_trace_id(self) -> int | None:
-        return self.current_span.get_span_context().trace_id
+    def trace_id(self) -> int | None:
+        return self.base_span.get_span_context().trace_id
+
+    def _current_span_with_fallback(self) -> Span:
+        active_span = trace.get_current_span()
+        if active_span.get_span_context().is_valid:
+            return active_span
+        return self.base_span
 
     def _patch_attributes(
         self,
@@ -163,6 +175,7 @@ class Logger:
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
     ) -> None:
         otel_logger = get_otel_logger()
+
         log_record = LogRecord(
             body=message,
             severity_text=severity,
@@ -170,7 +183,7 @@ class Logger:
             attributes=self._patch_attributes(
                 message=message, severity=severity, attributes=attributes
             ),
-            context=get_current(),
+            context=trace.set_span_in_context(self._current_span_with_fallback()),
             severity_number=_get_severity_number(severity),
         )
         otel_logger.emit(log_record)
@@ -218,7 +231,7 @@ class Logger:
         patched_attributes = self._patch_attributes(
             message=message, severity=severity, attributes=attributes
         )
-        self.current_span.record_exception(
+        self._current_span_with_fallback().record_exception(
             exception=exception, attributes=patched_attributes
         )
         log_message = f"{message}\nexception: {exception}{traceback_str}"

uncountable/types/api/recipes/get_recipes_data.py

@@ -154,6 +154,7 @@ class RecipeStep:
     name: str | None
     recipe_step_id: base_t.ObjectId
     recipe_step_number: int
+    display_mix_order_number: int | None = None
     instructions: str | None = None
 
 

{uncountablepythonsdk-0.0.173.dev2.dist-info → uncountablepythonsdk-0.0.175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.173.dev2
+Version: 0.0.175
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -53,7 +53,8 @@ Requires-Dist: pytest-xdist==3.*; extra == "test"
 # Uncountable Python SDK
 
 ## Documentation
-[https://uncountableinc.github.io/uncountable-python-sdk/](https://uncountableinc.github.io/uncountable-python-sdk/)
+
+https://uncountableinc.github.io/uncountable-python-sdk/
 
 ## Installation
 
@@ -62,4 +63,3 @@ Install from PyPI:
 ```console
 pip install UncountablePythonSDK
 ```
-

{uncountablepythonsdk-0.0.173.dev2.dist-info → uncountablepythonsdk-0.0.175.dist-info}/RECORD

@@ -1,13 +1,14 @@
+docs/.flowmarkignore,sha256=gmJziQDpI3zbfHFgM73BE9iaLn04Oqya_7QCjJ749o8,548
 docs/.gitignore,sha256=_ebkZUcwfvfnGEJ95rfj1lxoBNd6EE9ZvtOc7FsbfFE,7
 docs/conf.py,sha256=Ky-_Y76T7pwN2aBG-dSF79Av70e7ASgcOXEdQ1qyor4,3542
 docs/index.md,sha256=g4Yi5831fEkywYkkcFohYLkKzSI91SOZF7DxKsm9zgI,3193
 docs/justfile,sha256=WymCEQ6W2A8Ak79iUPmecmuaUNN2htb7STUrz5K7ELE,273
 docs/requirements.txt,sha256=8aqtVaNV4AlzUZ7nAM8kxOF1ccAcujhQ_ayU9Whksf8,172
-docs/integration_examples/add_file_to_folder.md,sha256=-8mSReDFaPyDQeAkWyY0x5oFR_NkF81K6PpMKmhNMXY,1557
-docs/integration_examples/create_ingredient.md,sha256=bzTQ943YhINxa3HQylEA26rbAsjr6HvvN_HkVkrzUeA,1547
+docs/integration_examples/add_file_to_folder.md,sha256=ZCv8miP7ZlPjor-ZGDwy2oucyopqMPa3aXlmOEfbX10,1556
+docs/integration_examples/create_ingredient.md,sha256=ufzAzPyGaDr9rCBDMGQAE8xahsCMkVfG8VLs1pb3qr0,1549
 docs/integration_examples/create_output.md,sha256=aDn2TjzKgY-HnxnvgsZS578cvajmHpF1y2HKkHfdtd4,2104
 docs/integration_examples/index.md,sha256=V0vJKMIqDadsSRW0wkUa4CQ2cq5RUWM4gMlPHz_18t4,104
-docs/integration_examples/upload_file.md,sha256=UdDoJasJQkI36iHjLKCFoAfDV4sxzmpg9TqzrfzQbWs,909
+docs/integration_examples/upload_file.md,sha256=eWtWTRnuV6EvhnnagnJ2o0RF9XkPWzX4izIqDWt1NZg,911
 docs/static/logo_blue.png,sha256=SyYpMTVhhBbhF5Wl8lWaVwz-_p1MIR6dW6bVhufQRME,46708
 docs/static/favicons/android-chrome-192x192.png,sha256=XoF-AhD55JlSBDGsEPJKfT_VeXT-awhwKyZnxLhrwvk,1369
 docs/static/favicons/android-chrome-512x512.png,sha256=1S4xwY9YtJQ5ifFsZ-DOzssoyBYs0t9uwdOUmYx0Xso,3888
@@ -94,7 +95,7 @@ pkgs/type_spec/emit_python.py,sha256=zQXAw-vPbv-YCic5qXCebW5LhXTo9sUqwJ3d9aG48w4
 pkgs/type_spec/emit_typescript.py,sha256=Qu9f1Yv_wc449KHcBGO58hatbzvPvgMbZ11jferi3oY,11567
 pkgs/type_spec/emit_typescript_util.py,sha256=fNPgSMf3jA66_STGqN4cuH0rH3CvGLc3TKQIEdHxGYA,13558
 pkgs/type_spec/load_types.py,sha256=1a8-AGVfpZTOiB8G-JW_1NhMZLg_SINaaKH6l2IrbW8,5045
-pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=vkKyTESIc0-FENhxenLiFDAvxxBTQNlWLqh-3tAFvus,651
+pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=zfYHKhmq3Q7g6vB4tkno8pZj_F8enbSn_CjCJgJAu80,676
 pkgs/type_spec/open_api_util.py,sha256=LX6ny4xNOWXQO3qWVM8elrSDTqWsj_7jFplax2POShE,7992
 pkgs/type_spec/test.py,sha256=4ueujBq-pEgnX3Z69HyPmD-bullFXmpixcpVzfOkhP4,489
 pkgs/type_spec/util.py,sha256=S_SGTJU192x-wIbngVUTvXhQENMbBfxluigLmnItGI8,4848
@@ -136,7 +137,7 @@ uncountable/integration/request_context.py,sha256=N_FJJxqvfUJ0yV9h3I3vFTGNJiDfyL
 uncountable/integration/scan_profiles.py,sha256=iTpzYKBHarlhYG6CKYtyAmQ7vUhEUbj2icGVHell8AU,3059
 uncountable/integration/scheduler.py,sha256=BajQ4txvgEBw8S9x1P0eGm-uBkKp_oecJK65SQd2hNw,8477
 uncountable/integration/server.py,sha256=P4RRGwU9jMselHPWbU6GxhRLgVtN7Ydcxr18sFn2zI8,5778
-uncountable/integration/telemetry.py,sha256=PjhwT55KSYuswQS5rqNDYFIU2MWDqNXHF42gKp5kQBs,15534
+uncountable/integration/telemetry.py,sha256=7IWhCxchtVYJwwwFYduwnMEUdxO8srx2RnocLzcQmtg,15965
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=mE3bdV0huclH2iT_dXCQdRL4LkjIuf_myAR64RTWXEs,498
 uncountable/integration/db/session.py,sha256=96cGQXpe6IugBTdSsjdP0S5yhJ6toSmbVB6qhc3FJzE,693
@@ -150,7 +151,7 @@ uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 uncountable/integration/queue_runner/job_scheduler.py,sha256=MrQLYB4UqkUXKRPDHTqc6C6ZlQ3i8Cy-qopnqZQZbWE,9897
 uncountable/integration/queue_runner/queue_runner.py,sha256=N4sUXmlGzVquybiJ7NQZavCJOBGrxBj6k7mb-TITaN0,1139
 uncountable/integration/queue_runner/types.py,sha256=8HS6KnYMS_vc5XHeMpg0BFAQC-5P3QLzd-aDYDMMt3E,244
-uncountable/integration/queue_runner/worker.py,sha256=YU1qRGCYF7vrEcsV4zGnNslYGc6XM9WMCpoATtXB_g0,7314
+uncountable/integration/queue_runner/worker.py,sha256=mAA-NAxjMH3q1pooIbCzNBN6pIPAlSOn4eO1UITayeQ,7356
 uncountable/integration/queue_runner/command_server/__init__.py,sha256=hMCDLWct8zW4B2a9BaIAsMhtaEgFlxONjeow-6nf6dg,675
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=Gb-BdCXa6YSSHHN-SbLvtcSf5CgDUJ3cUWQevmb1o4g,5682
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=Q9tYkJXfjq1yNIUwDmHIDdX70HVOaTWtZLMDhWN5C0k,7867
@@ -384,7 +385,7 @@ uncountable/types/api/recipes/get_recipe_calculations.py,sha256=Nx00qf4rOfe8bNUN
 uncountable/types/api/recipes/get_recipe_links.py,sha256=ousQ2zrAmNg7rIxT4kwD5FlOmG0XMnVVPNFn3V7vePU,1484
 uncountable/types/api/recipes/get_recipe_names.py,sha256=rv3-Dv0gy_Ylo6c_irKco0GdKP5_QHHQdOh67qkSCMY,1511
 uncountable/types/api/recipes/get_recipe_output_metadata.py,sha256=IYm4DA7RN8gvxkhA5dfBInpH0h-TOGGrMpWwDmJbYsw,2045
-uncountable/types/api/recipes/get_recipes_data.py,sha256=-FIV2dOP1qAib4LoIKcn4mkdsC8EGKZdPZYO3p9HHQw,8670
+uncountable/types/api/recipes/get_recipes_data.py,sha256=BKHOa2_oXzm-UP14czZSwS8crZqc1MXSzoKRdtT55Sg,8718
 uncountable/types/api/recipes/lock_recipes.py,sha256=Ez5oWRwq_n16RHli56uaEURGrRYxyIS2VLOJEUQ9kaY,1885
 uncountable/types/api/recipes/remove_recipe_from_project.py,sha256=h1I3cLUb_zZ3QjpK7IKPT_1gTDPTPbGWg0OJN_rUn6o,1186
 uncountable/types/api/recipes/set_recipe_inputs.py,sha256=2NhVAfkIjVTtUKeV1aPLb42wP6XZBerbYKJ_K_HH3kA,2040
@@ -408,7 +409,7 @@ uncountable/types/api/uploader/complete_async_parse.py,sha256=Os1HAubxTlbut6Gylj
 uncountable/types/api/uploader/invoke_uploader.py,sha256=QU1KmAFgGHSWskZEKfaAww8rCj-hVNP0i4kMQE3x3Fc,1822
 uncountable/types/api/user/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/user/get_current_user_info.py,sha256=BT7bGp5SOHz3XdKWhhdZ6acnInafT2PgdJ-H4YH3W7c,1181
-uncountablepythonsdk-0.0.173.dev2.dist-info/METADATA,sha256=Qsqk-cRXZaJOR1FhuzNn41TKnWaXrbAjJvbynm4IOQA,2237
-uncountablepythonsdk-0.0.173.dev2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-uncountablepythonsdk-0.0.173.dev2.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.173.dev2.dist-info/RECORD,,
+uncountablepythonsdk-0.0.175.dist-info/METADATA,sha256=8pwGUT8NIoJ_bP3Y6TAOUjk8LSX_pDlAotlZC6UB4h0,2172
+uncountablepythonsdk-0.0.175.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+uncountablepythonsdk-0.0.175.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.175.dist-info/RECORD,,