by-framework-langgraph 0.0.3.dev1__py3-none-any.whl → 0.0.3.dev2__py3-none-any.whl

by_framework_langgraph/adapter.py

@@ -590,69 +590,47 @@ class LangGraphAdapter:
         # Always inject token accumulator — works regardless of Langfuse config.
         callbacks.append(_TokenAccumulatingCallbackHandler(self._context))
 
-        # Prefer AgentContext's callback factory so trace and parent ids align.
-        # Filter out auto-generated MagicMock attributes when tests use a mock
-        # context — real callback objects always come from a non-test module.
-        langfuse_callback_value = getattr(self._context, "langfuse_callback", None)
-        is_real_callback = langfuse_callback_value is not None and type(
-            langfuse_callback_value
-        ).__module__ not in ("unittest.mock",)
-
-        if is_real_callback:
-            handler = (
-                langfuse_callback_value()
-                if callable(langfuse_callback_value)
-                else langfuse_callback_value
-            )
-            if handler is not None:
-                callbacks.append(handler)
-                yield
-                return
-
-        # Fallback to local import if context method is missing
-        # pylint: disable=import-outside-toplevel
         try:
-            langfuse_config = import_module(
-                "by_framework_trace_langfuse"
-            ).LangfuseConfig
-            if langfuse_config.from_env() is None:
-                raise ImportError("Langfuse not configured")
-
-            callback_handler = import_module("langfuse.langchain").CallbackHandler
-            get_client = import_module("langfuse").get_client
+            build_langchain_callback = getattr(
+                import_module("by_framework_trace_langfuse"),
+                "build_langchain_callback",
+            )
         except (ImportError, AttributeError):
             yield
             return
 
-        callbacks.append(callback_handler())
-
-        framework_observation = getattr(self._context, LANGFUSE_OBSERVATION_ATTR, None)
-        if framework_observation is None:
-            yield
-            return
+        get_parent_observation_id = getattr(
+            self._context,
+            "get_trace_parent_observation_id",
+            None,
+        )
+        parent_observation_id = (
+            str(get_parent_observation_id() or "")
+            if callable(get_parent_observation_id)
+            else ""
+        )
+        if not parent_observation_id:
+            framework_observation = getattr(
+                self._context, LANGFUSE_OBSERVATION_ATTR, None
+            )
+            parent_observation_id = getattr(framework_observation, "id", "") or ""
+        if not parent_observation_id:
+            execution_id = getattr(self._context, "execution_id", "")
+            message_id = getattr(self._context, "message_id", "")
+            raw_parent_id = (
+                f"{execution_id}:worker.execute"
+                if execution_id
+                else f"{message_id}:worker.execute"
+            )
+            parent_observation_id = f"{str_to_uint64(raw_parent_id):016x}"
 
-        langfuse = get_client()
-        with langfuse.start_as_current_observation(
-            as_type="span",
-            name=self._tracing.run_name,
-            trace_context={
-                "trace_id": getattr(self._context, "trace_id", ""),
-                "parent_span_id": framework_observation.id,
-            },
-            metadata=self._default_metadata(),
-        ):
-            # Prevent the generated OTel span from being promoted to a trace root.
-            # The native LangfusePlugin sets the same attribute on its own path
-            # (via _SdkLangfuseTracer); this covers the LangGraph fallback path.
-            try:
-                from opentelemetry import trace
-
-                current_span = trace.get_current_span()
-                if current_span and hasattr(current_span, "set_attribute"):
-                    current_span.set_attribute("langfuse.internal.as_root", False)
-            except Exception:  # pylint: disable=broad-exception-caught
-                pass
-            yield
+        handler = build_langchain_callback(
+            trace_id=getattr(self._context, "trace_id", ""),
+            parent_observation_id=parent_observation_id,
+        )
+        if handler is not None:
+            callbacks.append(handler)
+        yield
 
     @staticmethod
     def _default_input_mapper(content: str) -> dict:

{by_framework_langgraph-0.0.3.dev1.dist-info → by_framework_langgraph-0.0.3.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: by-framework-langgraph
-Version: 0.0.3.dev1
+Version: 0.0.3.dev2
 Summary: LangGraph integration for by-framework
 Requires-Python: >=3.12
 Requires-Dist: by-framework>=0.2.1

{by_framework_langgraph-0.0.3.dev1.dist-info → by_framework_langgraph-0.0.3.dev2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 by_framework_langgraph/__init__.py,sha256=x08wIaK4VRnUnUD_mbBxVgI2Zf7CvwAVbr3syP2NQps,1046
 by_framework_langgraph/_utils.py,sha256=A8eQ19YqyBiMKcPIlzmwggN_mK5iQvNJPTaTmsywWsw,1605
-by_framework_langgraph/adapter.py,sha256=HNDQuGdgR9JmPnt1qQ1xa8TgaEE-Fj79wlSf9jMEkSg,27817
+by_framework_langgraph/adapter.py,sha256=b4WcK6R3B0Y7a52lIY6kMLtpp9mjXOkp4p6HcALAzbA,26689
 by_framework_langgraph/tools.py,sha256=l7LurtKKXA1Z4fyj15ffFWyWpt8drNCJ-mkGmlS7EVo,5561
 by_framework_langgraph/worker.py,sha256=wFalpBQLqFm-YzJugzAzkA3ciI9lUzxRTv4GmqVCv78,6156
-by_framework_langgraph-0.0.3.dev1.dist-info/METADATA,sha256=bzWo8izusq4vEWlBjSR_Izy8KXE2dkGnTNhxC5USX28,2334
-by_framework_langgraph-0.0.3.dev1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-by_framework_langgraph-0.0.3.dev1.dist-info/RECORD,,
+by_framework_langgraph-0.0.3.dev2.dist-info/METADATA,sha256=lzuVDa2l8CUp_af7-VnadrCq-wJgXCWJ2ldcuEwHKRw,2334
+by_framework_langgraph-0.0.3.dev2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+by_framework_langgraph-0.0.3.dev2.dist-info/RECORD,,