trodo-python 2.22.0__py3-none-any.whl → 2.23.1__py3-none-any.whl

trodo/otel/auto_instrument.py

@@ -438,7 +438,44 @@ def _instrument(module_name: str, *preferred: str) -> None:
             )
     if cls is None:
         raise ImportError(f"no Instrumentor class exported by {module_name}")
-    cls().instrument()
+
+    instr = cls()
+
+    # An instrumentor whose target library is the wrong VERSION does not raise:
+    # OpenTelemetry logs a DependencyConflict and returns without patching
+    # anything. We would then append it to `active` and report auto-capture that
+    # is not happening -- the same lie as listing a framework whose
+    # instrumentation cannot patch the installed SDK. Ask first, and let the
+    # caller report it honestly.
+    conflict = _dependency_conflict(instr)
+    if conflict is not None:
+        raise _IncompatibleInstrumentation(str(conflict))
+
+    instr.instrument()
+
+
+class _IncompatibleInstrumentation(ImportError):
+    """The instrumentor loaded, but its target library is an unsupported version."""
+
+
+def _dependency_conflict(instr: Any) -> Any:
+    """The version conflict OpenTelemetry would hit, or None.
+
+    Returns None when we cannot tell -- an older OTel without the helper, or an
+    instrumentor that declares nothing. Falsely reporting a working setup as
+    broken is worse than the silence this replaces.
+    """
+    try:
+        from opentelemetry.instrumentation.dependencies import (  # type: ignore
+            get_dependency_conflicts,
+        )
+
+        deps = instr.instrumentation_dependencies()
+        if not deps:
+            return None
+        return get_dependency_conflicts(deps)
+    except Exception:  # noqa: BLE001
+        return None
 
 
 _INSTRUMENTORS: List[tuple[str, Callable[[], Any]]] = []
@@ -556,6 +593,17 @@ def enable_auto_instrument(
         try:
             register()
             active.append(name)
+        except _IncompatibleInstrumentation as e:
+            # Loud, because this is the case where everything LOOKS installed:
+            # the package is present, the import worked, and no spans will ever
+            # appear. Silence here is what costs people an afternoon.
+            _warn_once(
+                f"version-{name}",
+                f"auto-instrument: {name} will NOT be auto-captured and is not "
+                f"reported as active -- {e}. Wrap the call with trodo.llm(...) "
+                f"to capture it, or pin the library to a supported version.",
+            )
+            continue
         except Exception:
             continue
     return active

trodo/prompts/compile.py

@@ -36,6 +36,36 @@ def _q(value: Any) -> str:
     except (TypeError, ValueError):
         return repr(value)
 
+def _js_string(value: Any) -> str:
+    """JavaScript ``String()`` semantics, byte-for-byte.
+
+    A non-string passed for a string-typed variable is a caller type mismatch,
+    but all three engines must agree on what it renders as -- the backend
+    reference (which powers the playground) and the Node SDK both go through
+    JS ``String()``, so ``True`` must render ``true``, ``3.0`` must render
+    ``3``, a list joins with commas, and a dict renders the infamous
+    ``[object Object]``. The JSON rendering callers actually want lives on the
+    ``json`` variable type, where all three engines already emit compact JSON.
+    """
+    if value is None:
+        return ""
+    if isinstance(value, bool):
+        return "true" if value else "false"
+    if isinstance(value, float) and value.is_integer() and abs(value) < 1e21:
+        return str(int(value))
+    if isinstance(value, (int, float)):
+        return str(value)
+    if isinstance(value, str):
+        return value
+    if isinstance(value, (list, tuple)):
+        # Array.prototype.toString: elements joined by ',', null/undefined
+        # rendering empty, recursively.
+        return ",".join(_js_string(x) for x in value)
+    if isinstance(value, dict):
+        return "[object Object]"
+    return str(value)
+
+
 def _coerce(value: Any, type_: str, name: str, errors: List[str]) -> Any:
     """Coerce a caller value to the declared type.
 
@@ -71,7 +101,7 @@ def _coerce(value: Any, type_: str, name: str, errors: List[str]) -> Any:
         return value
 
     if type_ == "string":
-        return value if isinstance(value, str) else str(value)
+        return value if isinstance(value, str) else _js_string(value)
 
     if type_ == "messages":
         if not isinstance(value, list):
@@ -119,7 +149,13 @@ def build_scope(
         # 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:
+        #
+        # The default applies to an ABSENT key only. An explicit ``None`` is a
+        # value -- "render this empty" -- exactly as ``null`` is in the backend
+        # reference engine and the Node SDK. This engine used to substitute the
+        # default for an explicit ``None``, so the same call rendered different
+        # text in Python than everywhere else, including the playground.
+        if not has:
             value = default if has_default else ([] if type_ == "messages" else "")
 
         scope[name] = _coerce(value, type_, name, errors)

trodo/prompts/template.py

@@ -159,6 +159,21 @@ def _lookup(path: str, scopes: Sequence[Any]) -> Tuple[bool, Any]:
     return False, None
 
 
+def _jsonable(value):
+    """Normalise for JSON.stringify parity: JS has one number type, so a float
+    that is a whole number must serialise as ``1`` and not ``1.0`` -- at any
+    depth. Everything else passes through untouched."""
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, float) and value.is_integer() and abs(value) < 1e21:
+        return int(value)
+    if isinstance(value, dict):
+        return {k: _jsonable(v) for k, v in value.items()}
+    if isinstance(value, (list, tuple)):
+        return [_jsonable(v) for v in value]
+    return value
+
+
 def _stringify(value: Any) -> str:
     if value is None:
         return ""
@@ -173,7 +188,7 @@ def _stringify(value: Any) -> str:
             return str(int(value))
         return str(value)
     try:
-        return json.dumps(value, separators=(",", ":"))
+        return json.dumps(_jsonable(value), separators=(",", ":"), ensure_ascii=False)
     except (TypeError, ValueError):
         return str(value)
 

{trodo_python-2.22.0.dist-info → trodo_python-2.23.1.dist-info}/METADATA

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

{trodo_python-2.22.0.dist-info → trodo_python-2.23.1.dist-info}/RECORD

@@ -16,7 +16,7 @@ trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8p
 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=kcfajnmaVuX_giLYBr2P7GiWk-lzZt-iniY8rJEALYw,21819
+trodo/otel/auto_instrument.py,sha256=dA7IZ9cTSNTFK-oVwkYL2OwfTH3wDKM4iKXtPvZoK-Y,23800
 trodo/otel/context.py,sha256=Jd0aTc0Q-1dM5kXXinhZD8YtnpdKgvneNiODyboVGKY,1418
 trodo/otel/helpers.py,sha256=XOMWcgZHaq5SQbkFxDaXPE4CDFjn01xjJmJ1vIxvwpw,20730
 trodo/otel/processor.py,sha256=LKlXxP3BeQ7DP8SzYAgXZZOeJ6-6b7e43i19gCUC_0Y,7939
@@ -25,8 +25,8 @@ trodo/otel/register.py,sha256=bV_ePTfUvPugig2GZnylhzxi2QfoPWs96A9mGLPMrSQ,9387
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
 trodo/otel/wrap_agent.py,sha256=Izty1jxF4ANVqS72L0CR9jmMuW372AApaEO_0LC5Thw,43860
 trodo/prompts/__init__.py,sha256=yunNc8WkTSfEEkRR-NZWXAt_ZB3Ee2INRh-4RE7uHj4,806
-trodo/prompts/compile.py,sha256=fAYq55LdGIvglNVCnBF3YXyM8W9raLku1M8OAzaQExE,7135
-trodo/prompts/template.py,sha256=obQiivPCR6LEdz7q1cby7uL25tYHYui4aoEaiUNqWfs,9357
+trodo/prompts/compile.py,sha256=XoKDKz6Yaofhrk-87AVW-SnwbiXLvfp161AL2bAFzNY,8802
+trodo/prompts/template.py,sha256=eGO2ZVNOw6JK7Ffj1UCYDMJFYyX5qQW2POlmFJSQpAo,9975
 trodo/prompts/types.py,sha256=OYpaLi1H9pJjeq0gsJo8eb-bWoF8rw2u_7pdukudtqo,5258
 trodo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/queue/batch_flusher.py,sha256=4Lg6T3Urwi9U0Q4FpFGPmjDYKg4ZliCTR-ND8BJvWaY,1298
@@ -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.22.0.dist-info/METADATA,sha256=RmvsK5vGdIvPBMeZqjANQygwnolV11Hb4006GzI6Xcg,25308
-trodo_python-2.22.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-trodo_python-2.22.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.22.0.dist-info/RECORD,,
+trodo_python-2.23.1.dist-info/METADATA,sha256=WDaY32vkP94_NzHjeE38-nnxCaUS3bGRYa5YgCA3qYI,25308
+trodo_python-2.23.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+trodo_python-2.23.1.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.23.1.dist-info/RECORD,,