by-framework-langgraph 0.0.3.dev1__tar.gz → 0.0.3.dev2__tar.gz

{by_framework_langgraph-0.0.3.dev1 → by_framework_langgraph-0.0.3.dev2}/.gitignore

@@ -68,8 +68,6 @@ Thumbs.db
 .claude/settings.local.json
 .claude/settings.json
 
-core
-
 .coderfleet-uploads/
 
 .claude/skills

{by_framework_langgraph-0.0.3.dev1 → by_framework_langgraph-0.0.3.dev2}/PKG-INFO

@@ -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 → by_framework_langgraph-0.0.3.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "by-framework-langgraph"
-version = "0.0.3.dev1"
+version = "0.0.3.dev2"
 description = "LangGraph integration for by-framework"
 readme = "README.md"
 requires-python = ">=3.12"

{by_framework_langgraph-0.0.3.dev1 → by_framework_langgraph-0.0.3.dev2}/src/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 → by_framework_langgraph-0.0.3.dev2}/tests/test_adapter.py

@@ -1,7 +1,6 @@
 """Tests for adapter and worker modules."""
 
 import sys
-from contextlib import contextmanager
 from types import SimpleNamespace
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -40,7 +39,7 @@ def _make_mock_context(session_id: str = "test-session"):
             metadata={"source": "test"},
         )
     )
-    ctx._langfuse_observation = SimpleNamespace(id="obs-framework")  # pylint: disable=protected-access
+    ctx.get_trace_parent_observation_id.return_value = "obs-framework"
     return ctx
 
 
@@ -187,7 +186,7 @@ class TestAdapterRun:
     async def test_includes_langfuse_callbacks_and_parent_trace_context(
         self, monkeypatch
     ):
-        """Verify adapter wires Langfuse callback handler into LangGraph config."""
+        """Verify adapter gets Langfuse callback from the trace provider package."""
         ctx = _make_mock_context()
         graph = MagicMock()
         graph.ainvoke = AsyncMock(
@@ -197,45 +196,18 @@ class TestAdapterRun:
         snapshot.next = ()
         graph.get_state.return_value = snapshot
 
-        observation_calls: list[dict] = []
-        callback_instances: list[object] = []
+        callback_handler = object()
+        callback_calls: list[dict[str, str]] = []
 
-        @contextmanager
-        def fake_observation_scope(**kwargs):
-            observation_calls.append(kwargs)
-            yield SimpleNamespace(id="obs-langgraph")
+        def fake_build_langchain_callback(**kwargs):
+            callback_calls.append(kwargs)
+            return callback_handler
 
-        class FakeCallbackHandler:  # pylint: disable=too-few-public-methods
-            """Minimal callback handler stub for adapter config assertions."""
-
-            def __init__(self):
-                callback_instances.append(self)
-
-        fake_langfuse_client = SimpleNamespace(
-            start_as_current_observation=fake_observation_scope
-        )
-
-        monkeypatch.setitem(
-            sys.modules,
-            "langfuse",
-            SimpleNamespace(get_client=MagicMock(return_value=fake_langfuse_client)),
-        )
-        monkeypatch.setitem(
-            sys.modules,
-            "langfuse.langchain",
-            SimpleNamespace(CallbackHandler=FakeCallbackHandler),
-        )
         monkeypatch.setitem(
             sys.modules,
             "by_framework_trace_langfuse",
-            SimpleNamespace(LangfuseConfig=MagicMock()),
+            SimpleNamespace(build_langchain_callback=fake_build_langchain_callback),
         )
-        sys.modules[
-            "by_framework_trace_langfuse"
-        ].LangfuseConfig.from_env.return_value = object()
-        monkeypatch.setenv("LANGFUSE_SECRET_KEY", "sk-test")
-        monkeypatch.setenv("LANGFUSE_PUBLIC_KEY", "pk-test")
-        monkeypatch.setenv("LANGFUSE_BASE_URL", "http://localhost:3000")
 
         adapter = LangGraphAdapter(graph, ctx, stream=False)
 
@@ -255,25 +227,26 @@ class TestAdapterRun:
         assert config["metadata"]["by_framework_message_id"] == "msg-ctx"
         assert config["metadata"]["langgraph_thread_id"] == "test-session"
         # Callbacks list includes the Langfuse handler(s) plus the token accumulator.
-        assert all(cb in config["callbacks"] for cb in callback_instances)
+        assert callback_handler in config["callbacks"]
         assert any(
             type(cb).__name__ == "_TokenAccumulatingCallbackHandler"
             for cb in config["callbacks"]
         )
-        assert len(observation_calls) == 1
-        assert observation_calls[0]["trace_context"] == {
-            "trace_id": "trace-ctx",
-            "parent_span_id": "obs-framework",
-        }
-        assert observation_calls[0]["name"] == "planner:langgraph"
+        assert callback_calls == [
+            {
+                "trace_id": "trace-ctx",
+                "parent_observation_id": "obs-framework",
+            }
+        ]
 
     @pytest.mark.asyncio
-    async def test_uses_context_langfuse_callback_property(self):
-        """Verify AgentContext.langfuse_callback property is used directly."""
-        handler = object()
+    async def test_skips_langfuse_callback_when_provider_package_missing(
+        self, monkeypatch
+    ):
+        """LangGraph stays provider-agnostic when trace-langfuse is not installed."""
 
         # pylint: disable=too-few-public-methods,missing-class-docstring,missing-function-docstring
-        class ContextWithCallbackProperty:
+        class ContextWithoutProvider:
             session_id = "test-session"
             trace_id = "trace-ctx"
             message_id = "msg-ctx"
@@ -291,11 +264,15 @@ class TestAdapterRun:
             def __init__(self):
                 self.emit_chunk = AsyncMock()
 
-            @property
-            def langfuse_callback(self):
-                return handler
+        def fake_import_module(name):
+            if name == "by_framework_trace_langfuse":
+                raise ImportError(name)
+            raise AssertionError(f"unexpected import: {name}")
 
-        ctx = ContextWithCallbackProperty()
+        monkeypatch.setattr(
+            "by_framework_langgraph.adapter.import_module", fake_import_module
+        )
+        ctx = ContextWithoutProvider()
         graph = MagicMock()
         graph.ainvoke = AsyncMock(
             return_value={"messages": [MagicMock(content="hello")]}
@@ -310,7 +287,6 @@ class TestAdapterRun:
         assert result == "hello"
         _, kwargs = graph.ainvoke.call_args
         callbacks = kwargs["config"]["callbacks"]
-        assert handler in callbacks
         assert any(
             type(cb).__name__ == "_TokenAccumulatingCallbackHandler" for cb in callbacks
         )
@@ -335,11 +311,8 @@ class TestAdapterRun:
         monkeypatch.setitem(
             sys.modules,
             "by_framework_trace_langfuse",
-            SimpleNamespace(LangfuseConfig=MagicMock()),
+            SimpleNamespace(build_langchain_callback=MagicMock(return_value=None)),
         )
-        sys.modules[
-            "by_framework_trace_langfuse"
-        ].LangfuseConfig.from_env.return_value = None
 
         adapter = LangGraphAdapter(graph, ctx, stream=False)
 
@@ -382,11 +355,8 @@ class TestAdapterRun:
         monkeypatch.setitem(
             sys.modules,
             "by_framework_trace_langfuse",
-            SimpleNamespace(LangfuseConfig=MagicMock()),
+            SimpleNamespace(build_langchain_callback=MagicMock(return_value=None)),
         )
-        sys.modules[
-            "by_framework_trace_langfuse"
-        ].LangfuseConfig.from_env.return_value = None
 
         adapter = LangGraphAdapter(graph, ctx, stream=False)
 
@@ -530,7 +500,6 @@ class TestTokenAccumulatingCallbackHandler:
     def test_callback_injected_in_tracing_scope(self):
         """_langfuse_callback_manager injects _TokenAccumulatingCallbackHandler."""
         ctx = MagicMock()
-        ctx.langfuse_callback = None
         graph = MagicMock()
         adapter = LangGraphAdapter(graph=graph, context=ctx)