trodo-python 2.19.0__py3-none-any.whl → 2.21.0__py3-none-any.whl

trodo/__init__.py

@@ -41,7 +41,7 @@ Downstream microservice (join the caller's run instead of making a new one):
 
 from __future__ import annotations
 
-__version__ = "2.19.0"
+__version__ = "2.21.0"
 
 from typing import Any, Callable, Dict, List, Optional, Union
 

trodo/managers/prompt_manager.py

@@ -38,6 +38,11 @@ __all__ = [
 DEFAULT_TTL_SECONDS = 60.0
 
 
+# 404 bodies that mean "your SELECTOR is wrong", not "the prompt is gone".
+# Mirrors backend/models/prompt.js missReason -- the wire contract's error half.
+_CONFIG_ERROR_CODES = frozenset({"version_not_found", "label_not_found", "no_versions"})
+
+
 def _cache_key(name: str, version: Optional[Union[int, str]], label: Optional[str]) -> str:
     # Resolution happens server-side on every fetch; the client only caches
     # under whatever selector was asked for. So a label flip propagates within
@@ -56,10 +61,12 @@ def _to_variables(raw: Any) -> List[PromptVariable]:
             out.append(v)
         elif isinstance(v, dict) and isinstance(v.get("name"), str):
             out.append(
+                # Named fields only — a stored version may carry keys this SDK
+                # no longer models (`required`, retired in 2.20.0), and fetching
+                # one must never raise.
                 PromptVariable(
                     name=v["name"],
                     type=v.get("type") or "string",
-                    required=bool(v.get("required")),
                     default=v.get("default"),
                     description=v.get("description"),
                 )
@@ -195,7 +202,14 @@ class PromptManager:
         Availability ladder — fresh cache -> stale cache -> ``fallback`` ->
         raise. A prompt fetch is on your hot path, so a Trodo outage degrades
         rather than takes your app down. Check ``prompt.is_fallback`` to detect
-        the last rung. Pass ``cache_ttl_seconds=0`` to disable caching (handy in
+        the last rung.
+
+        The ladder is for AVAILABILITY failures only. A selector that names
+        nothing — a ``version`` or ``label`` that doesn't exist on a prompt
+        that does — is a config error in your code and raises immediately
+        (``e.code`` is ``version_not_found`` | ``label_not_found`` |
+        ``no_versions``), because being quietly handed the fallback would hide
+        the typo for as long as it ships. Pass ``cache_ttl_seconds=0`` to disable caching (handy in
         development).
 
         :raises ValueError: if *name* is empty, or both ``label`` and ``version``
@@ -222,6 +236,22 @@ class PromptManager:
             if not res or res.get("__error") or not res.get("prompt"):
                 status = res.get("status") if isinstance(res, dict) else None
                 detail = res.get("error") if isinstance(res, dict) else None
+                # The server distinguishes a selector that names nothing from a
+                # prompt that is missing. The first is a CONFIG error -- your
+                # code asks for a version or label that does not exist -- and
+                # must throw through the availability ladder below rather than
+                # be masked by stale content or the fallback.
+                if detail in _CONFIG_ERROR_CODES:
+                    if detail == "version_not_found":
+                        what = f"version {version!r} does not exist on prompt {name!r}"
+                    elif detail == "label_not_found":
+                        what = f"label {label!r} does not exist on prompt {name!r}"
+                    else:
+                        what = f"prompt {name!r} has no versions yet -- save one in the dashboard"
+                    err = LookupError(f"trodo: {what}" + (f" (HTTP {status})" if status else ""))
+                    err.code = detail  # type: ignore[attr-defined]
+                    err.prompt_config_error = True  # type: ignore[attr-defined]
+                    raise err
                 raise LookupError(
                     f"trodo: could not fetch prompt {name!r}"
                     + (f" (HTTP {status})" if status else "")
@@ -246,7 +276,12 @@ class PromptManager:
             if ttl > 0:
                 self._cache.set(key, raw, ttl)
             return _to_prompt(raw, trace_label=trace_label)
-        except Exception:
+        except Exception as e:
+            # A config error is not an outage: a typo'd label silently serving
+            # the fallback forever would hide the mistake for as long as it
+            # ships. Config errors surface.
+            if getattr(e, "prompt_config_error", False):
+                raise
             stale = self._cache.get_stale(key)
             if stale is not None:
                 return _to_prompt(stale, trace_label=trace_label)

trodo/otel/wrap_agent.py

@@ -258,6 +258,26 @@ def _mint_anon_distinct_id() -> str:
     return f"anon_{ts}_python_{uuid.uuid4()}_{rand}"
 
 
+def _tag_error_with_run(exc: object, run_id: Optional[str]) -> None:
+    """Stamp the active run's id onto an exception about to propagate.
+
+    The run IS recorded server-side when an agent raises -- status, error type,
+    full message. What was missing is the join: the exception a developer's
+    error tracker captures had no reference to the recorded run, so the two
+    could only be matched by timestamp. ``exc.trodo_run_id`` is that join.
+
+    Guarded on purpose: exceptions can use ``__slots__`` or be otherwise
+    unwritable, and a crash inside error handling is the one unforgivable
+    failure mode here.
+    """
+    if exc is None or not run_id:
+        return
+    try:
+        exc.trodo_run_id = run_id  # type: ignore[attr-defined]
+    except Exception:  # noqa: BLE001 -- slots/frozen; the run is still recorded
+        pass
+
+
 class RunHandle:
     """Handle returned by wrap_agent for setting input/output and getting run_id."""
 
@@ -600,6 +620,7 @@ class wrap_agent:
             einfo = describe_error(exc_type, exc, tb)
             error_summary = einfo["error_message"]
             error_type = einfo["error_type"]
+            _tag_error_with_run(exc, self.handle.run_id)
         elif manual_run_error:
             status = "error"
             error_summary = self.handle.error_summary
@@ -704,6 +725,7 @@ class wrap_agent:
             for k, v in self.handle.metadata.items():
                 otel_span.set_attribute(f"trodo.metadata.{k}", _serialize_attr(v))
             if exc is not None:
+                _tag_error_with_run(exc, self.handle.run_id if self.handle else None)
                 otel_span.record_exception(exc)
                 _, status_cls, status_code = get_otel_helpers()
                 if status_cls is not None and status_code is not None:

trodo/prompts/compile.py

@@ -8,6 +8,7 @@ or the prompt you tested is not the prompt you shipped.
 
 from __future__ import annotations
 
+import json
 from typing import Any, Dict, List, Optional
 
 from .template import render
@@ -26,6 +27,15 @@ class CompileError(Exception):
         self.details: List[str] = details or []
 
 
+def _q(value: Any) -> str:
+    """Format an offending value the way Node's JSON.stringify does, so the two
+    engines produce byte-identical error text. repr() was the one divergence a
+    full cross-SDK parity run found."""
+    try:
+        return json.dumps(value, ensure_ascii=False)
+    except (TypeError, ValueError):
+        return repr(value)
+
 def _coerce(value: Any, type_: str, name: str, errors: List[str]) -> Any:
     """Coerce a caller value to the declared type.
 
@@ -36,15 +46,18 @@ def _coerce(value: Any, type_: str, name: str, errors: List[str]) -> Any:
         return value
 
     if type_ == "number":
+        # _q (json.dumps), not repr: the Node engine formats the offending
+        # value with JSON.stringify, and the two engines' error text is
+        # asserted byte-identical.
         if isinstance(value, bool):
-            errors.append(f"variable '{name}': expected a number, got {value!r}")
+            errors.append(f"variable '{name}': expected a number, got {_q(value)}")
             return value
         if isinstance(value, (int, float)):
             return value
         try:
             return float(value) if "." in str(value) else int(value)
         except (TypeError, ValueError):
-            errors.append(f"variable '{name}': expected a number, got {value!r}")
+            errors.append(f"variable '{name}': expected a number, got {_q(value)}")
             return value
 
     if type_ == "boolean":
@@ -54,7 +67,7 @@ def _coerce(value: Any, type_: str, name: str, errors: List[str]) -> Any:
             return True
         if value == "false":
             return False
-        errors.append(f"variable '{name}': expected a boolean, got {value!r}")
+        errors.append(f"variable '{name}': expected a boolean, got {_q(value)}")
         return value
 
     if type_ == "string":
@@ -74,12 +87,10 @@ def build_scope(
 ) -> Dict[str, Any]:
     """Build the render scope from declarations + caller values.
 
-    Resolution order: caller value -> declared default -> required-and-absent
-    raises -> optional-and-absent renders empty.
+    Resolution order: caller value -> declared default -> empty.
 
-    `required` is enforced HERE, in your process, before the model call -- Trodo
-    only stores the declaration. A variable with a default can never fail this
-    check, because the default is itself a value.
+    A missing value never raises. The one thing this does reject is a value for
+    a variable the prompt does not declare, which is almost always a typo.
     """
     errors: List[str] = []
     scope: Dict[str, Any] = {}
@@ -104,24 +115,13 @@ def build_scope(
         has = name in values
         value = values.get(name) if has else None
 
-        # `required` asks a narrower question than default-substitution does:
-        # did the caller supply something that will actually render? None and ""
-        # both render as nothing, the very outcome the flag exists to prevent,
-        # so neither counts. (0 and False do -- they render.)
-        supplied = has and value is not None and value != ""
-
-        # Missing value -> the declared default, or empty.
+        # A missing value resolves, it never fails: the declared default, or
+        # empty. That IS the point of declaring a default -- there is no third
+        # case where the caller has to have supplied something, and adding one
+        # would turn an empty render into a crash for no gain.
         if not has or value is None:
             value = default if has_default else ([] if type_ == "messages" else "")
 
-        # A default always satisfies the requirement, so the two never both
-        # apply; the editor won't let you author both, but a hand-written
-        # declaration can.
-        required = v.get("required") if isinstance(v, dict) else getattr(v, "required", None)
-        if not supplied and required is True and not has_default:
-            errors.append(f"variable '{name}': required, but no value was provided")
-            continue
-
         scope[name] = _coerce(value, type_, name, errors)
 
     # Passing something the prompt doesn't declare is nearly always a rename

trodo/prompts/types.py

@@ -26,24 +26,18 @@ class PromptVariable:
     """A declared variable.
 
     Every competitor leaves variables undeclared and untyped — discovered by
-    regex, with no defaults and no required-ness. The declaration is what lets
-    ``compile()`` fail before the model call rather than shipping a literal
-    ``{{typo}}`` and finding out from the bill.
-
-    ``required`` is enforced by ``compile()``, which runs in YOUR process —
-    Trodo only stores the declaration. Nothing server-side rejects a call for a
-    missing variable, and nothing rejects a version for declaring one.
-
-    Marking a variable required means the caller must pass a value that will
-    actually render: an omitted key, ``None`` and ``""`` all fail, since all
-    three render as nothing (``0`` and ``False`` pass). A variable with
-    a ``default`` can never fail the check — the default is a value — so the two
-    are mutually exclusive in practice.
+    regex, and with no defaults. Knowing the declared set is what lets
+    ``compile()`` catch a value passed for a variable that doesn't exist,
+    instead of silently rendering the wrong prompt.
+
+    A missing value never fails. It resolves to the declared ``default``, or to
+    empty — that is what declaring a default is FOR. There is deliberately no
+    ``required`` flag: it would give the author a decision to get wrong and the
+    caller a crash where an empty render would do.
     """
 
     name: str
     type: str = "string"
-    required: bool = False
     default: Any = None
     description: Optional[str] = None
 

{trodo_python-2.19.0.dist-info → trodo_python-2.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.19.0
+Version: 2.21.0
 Summary: Trodo Analytics SDK for Python — server-side event tracking
 License: ISC
 Keywords: analytics,tracking,trodo,server-side

{trodo_python-2.19.0.dist-info → trodo_python-2.21.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trodo/__init__.py,sha256=n7YUScfJqdXfIUwWL-g1PekBrYfQ0A0m4kAme26rwUM,26928
+trodo/__init__.py,sha256=yv0gxvU4OpZhqck-U2YY0RZE7qRWDhD4ig4zenbMPI0,26928
 trodo/client.py,sha256=9UYaHZtWPMYdlG2xWVf77PQJ9DfFgN-zobTh60i8_Cc,22453
 trodo/types.py,sha256=eySgUvCXROG2TxtxgiU0MNr5iH0DEcduK8bmYtTKG44,3138
 trodo/user_context.py,sha256=uHCI2WYoOI3cNwdIUEuZdX4VYSu14pzm348ksn6hn_c,8195
@@ -13,7 +13,7 @@ trodo/managers/dataset_manager.py,sha256=gx0S8ujG3cbw4IskBNMdceBjDbcEh_nebwKSzEv
 trodo/managers/experiment_manager.py,sha256=V-vemLtenfSI5VIcP0HPiXzEy8AyTrRrbJVCA9Z6wjo,10579
 trodo/managers/group_manager.py,sha256=ki3Se3qEoSZfREX63oeDeBmEfZF-ISHLE8azEtLg0tM,3542
 trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8pK1E,2882
-trodo/managers/prompt_manager.py,sha256=jFHkdvDSxvvb9c53EQvBQygdDJ7X-ylNWEY_ag_SeC0,11227
+trodo/managers/prompt_manager.py,sha256=qFVHgh7PW-SlgHp62ybirdYsJBg-fcQVMTTU3jPqFvo,13435
 trodo/managers/user_manager.py,sha256=faJYX3CHrD7ulYiShV7FhThSMX9aJ3kdOgU4Qtdy5FM,2844
 trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
 trodo/otel/auto_instrument.py,sha256=Iae9A9lvh2PImE6gqnyEMXeRPRpjTxZcxx1zW2KDLac,21467
@@ -23,11 +23,11 @@ trodo/otel/processor.py,sha256=LKlXxP3BeQ7DP8SzYAgXZZOeJ6-6b7e43i19gCUC_0Y,7939
 trodo/otel/prompt_trace.py,sha256=BIrdLOpsR1_HoaCmWb_706GwZSs-UG3p76fjvX3CX3w,3391
 trodo/otel/register.py,sha256=bV_ePTfUvPugig2GZnylhzxi2QfoPWs96A9mGLPMrSQ,9387
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
-trodo/otel/wrap_agent.py,sha256=cJjrzlZNW2g6q_coLN7UR4uxn65h4u3-LNzMfE4dLVw,40999
+trodo/otel/wrap_agent.py,sha256=ipMKpdgRF5ibgjDlt2yTBPqbwb8Hq30C7o3hms0QAdU,41987
 trodo/prompts/__init__.py,sha256=yunNc8WkTSfEEkRR-NZWXAt_ZB3Ee2INRh-4RE7uHj4,806
-trodo/prompts/compile.py,sha256=ydJDI7YS3PiLzAJ4H-kmqGV-1kkUxlQrf_xtZZ7fR5g,7267
+trodo/prompts/compile.py,sha256=fAYq55LdGIvglNVCnBF3YXyM8W9raLku1M8OAzaQExE,7135
 trodo/prompts/template.py,sha256=obQiivPCR6LEdz7q1cby7uL25tYHYui4aoEaiUNqWfs,9357
-trodo/prompts/types.py,sha256=1TVGHp3vtWV1tr0l-IJfL7EKvrB8ZmQRwLvDqvbOfJ0,5007
+trodo/prompts/types.py,sha256=A24njy6qcc8QNzWEfGu28BbBr360S7A5Pw7_ObIWNS4,4684
 trodo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/queue/batch_flusher.py,sha256=4Lg6T3Urwi9U0Q4FpFGPmjDYKg4ZliCTR-ND8BJvWaY,1298
 trodo/queue/event_queue.py,sha256=EVFZrhlq_kwC3jJ2GK0wMhHISf9UzLCZNDnT_aZ2I2A,872
@@ -36,7 +36,7 @@ trodo/session/server_session.py,sha256=McsudEiq33XDq3nqxgzBcUvIjQxCMscwEuAPnYXrT
 trodo/session/session_manager.py,sha256=7ht5LeeZX1HLLfPeNV_a8NkXGbHl3up0CRtCGr3EzjQ,2995
 trodo/util/__init__.py,sha256=Z9c4rPPdKg06Kk3byKheDqksSgR4WNvS475oQ5sNljc,54
 trodo/util/lru.py,sha256=QIsM7s6J_E9ZjiXatSyReZIEeGypTAcgrPWWy8YsRa4,2465
-trodo_python-2.19.0.dist-info/METADATA,sha256=RD_p3hblnxk6pAacML6IkqzfdIqP33lD50GS1kApkW8,25308
-trodo_python-2.19.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-trodo_python-2.19.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.19.0.dist-info/RECORD,,
+trodo_python-2.21.0.dist-info/METADATA,sha256=La6v97ZyzSSTa0CeVffS53LhsUvF29mDpm6i92YO63Q,25308
+trodo_python-2.21.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+trodo_python-2.21.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.21.0.dist-info/RECORD,,