jaf-py 2.5.13__py3-none-any.whl → 2.6.1__py3-none-any.whl

jaf/__init__.py

@@ -201,7 +201,7 @@ def generate_run_id() -> RunId:
     return create_run_id(str(uuid.uuid4()))
 
 
-__version__ = "2.5.13"
+__version__ = "2.6.1"
 __all__ = [
     # Core types and functions
     "TraceId",

jaf/core/tools.py

@@ -224,38 +224,18 @@ def create_async_function_tool_legacy(
 
 
 def _extract_docstring_info(func):
-    """Extract description and parameter info from function docstring."""
+    """Extract description from function docstring.
+
+    Returns the entire docstring as the description since parameters are
+    extracted from the function signature, not the docstring.
+    """
     doc = inspect.getdoc(func)
     if not doc:
         return func.__name__.replace("_", " ").title(), {}
 
-    lines = doc.strip().split("\n")
-    if not lines:
-        return func.__name__.replace("_", " ").title(), {}
-
-    # First non-empty line is the description
-    description = lines[0].strip()
-
-    # Look for Args section to extract parameter descriptions
-    param_descriptions = {}
-    in_args_section = False
-
-    for line in lines[1:]:
-        line = line.strip()
-        if line.lower().startswith("args:"):
-            in_args_section = True
-            continue
-        elif line.lower().startswith(
-            ("returns:", "return:", "raises:", "raise:", "examples:", "example:")
-        ):
-            in_args_section = False
-            continue
-        elif in_args_section and line and ":" in line:
-            # Parse parameter description like "location: The location to fetch the weather for."
-            param_name, param_desc = line.split(":", 1)
-            param_descriptions[param_name.strip()] = param_desc.strip()
-
-    return description, param_descriptions
+    # Return the entire docstring as description
+    # param_descriptions is kept for backward compatibility but is not used
+    return doc.strip(), {}
 
 
 def _create_parameter_schema_from_signature(func):

jaf/core/tracing.py

@@ -407,6 +407,7 @@ class LangfuseTraceCollector:
         httpx_client: Optional[httpx.Client] = None,
         proxy: Optional[str] = None,
         timeout: Optional[int] = None,
+        include_system_prompt: bool = False,
     ):
         """Initialize Langfuse trace collector.
 
@@ -417,6 +418,7 @@ class LangfuseTraceCollector:
                   Only used if httpx_client is not provided.
                   Falls back to LANGFUSE_PROXY environment variable.
             timeout: Optional timeout in seconds for HTTP requests. Defaults to 10.
+            include_system_prompt: Whether to include system prompt in trace metadata. Defaults to False.
         """
         public_key = os.environ.get("LANGFUSE_PUBLIC_KEY")
         secret_key = os.environ.get("LANGFUSE_SECRET_KEY")
@@ -467,10 +469,11 @@ class LangfuseTraceCollector:
             public_key=public_key,
             secret_key=secret_key,
             host=host,
-            release="jaf-py-v2.5.13",
+            release="jaf-py-v2.6.1",
             httpx_client=client,
         )
         self._httpx_client = client
+        self.include_system_prompt = include_system_prompt
 
         # Detect Langfuse version (v2 has trace() method, v3 does not)
         self._is_langfuse_v3 = not hasattr(self.langfuse, "trace")
@@ -741,6 +744,17 @@ class LangfuseTraceCollector:
                                 f"[LANGFUSE DEBUG] Added to conversation history: role={role}, content_length={len(str(content))}, has_tool_calls={bool(msg_data.get('tool_calls'))}"
                             )
 
+                # Extract system prompt from context if enabled
+                system_prompt = None
+                if self.include_system_prompt and context:
+                    if isinstance(context, dict):
+                        system_prompt = context.get("system_prompt")
+                    elif hasattr(context, "system_prompt"):
+                        system_prompt = context.system_prompt
+
+                    if system_prompt:
+                        print(f"[LANGFUSE DEBUG] Extracted system_prompt: {system_prompt[:100] if isinstance(system_prompt, str) else system_prompt}...")
+
                 print(
                     f"[LANGFUSE DEBUG] Final extracted - user_query: {user_query}, user_id: {user_id}"
                 )
@@ -778,6 +792,27 @@ class LangfuseTraceCollector:
                 # Extract agent_name for tagging
                 agent_name = self._get_event_data(event, "agent_name") or "analytics_agent_jaf"
 
+                # Build metadata with optional system_prompt
+                metadata = {
+                    "framework": "jaf",
+                    "event_type": "run_start",
+                    "trace_id": str(trace_id),
+                    "user_query": user_query,
+                    "user_id": user_id or self._get_event_data(event, "user_id"),
+                    "agent_name": agent_name,
+                    "conversation_history": conversation_history,
+                    "tool_calls": [],
+                    "tool_results": [],
+                    "user_info": self._get_event_data(event, "context").user_info
+                    if self._get_event_data(event, "context")
+                    and hasattr(self._get_event_data(event, "context"), "user_info")
+                    else None,
+                }
+
+                # Add system_prompt to metadata if enabled and available
+                if self.include_system_prompt and system_prompt:
+                    metadata["system_prompt"] = system_prompt
+
                 # Use compatibility layer to create trace (works with both v2 and v3)
                 trace = self._create_trace(
                     trace_id=trace_id,
@@ -786,27 +821,15 @@ class LangfuseTraceCollector:
                     session_id=self._get_event_data(event, "session_id"),
                     input=trace_input,
                     tags=[agent_name],  # Add agent_name as a tag for dashboard filtering
-                    metadata={
-                        "framework": "jaf",
-                        "event_type": "run_start",
-                        "trace_id": str(trace_id),
-                        "user_query": user_query,
-                        "user_id": user_id or self._get_event_data(event, "user_id"),
-                        "agent_name": agent_name,
-                        "conversation_history": conversation_history,
-                        "tool_calls": [],
-                        "tool_results": [],
-                        "user_info": self._get_event_data(event, "context").user_info
-                        if self._get_event_data(event, "context")
-                        and hasattr(self._get_event_data(event, "context"), "user_info")
-                        else None,
-                    },
+                    metadata=metadata,
                 )
                 self.trace_spans[trace_id] = trace
-                # Store user_id, user_query, and conversation_history for later use
+                # Store user_id, user_query, conversation_history, and system_prompt for later use
                 trace._user_id = user_id or self._get_event_data(event, "user_id")
                 trace._user_query = user_query
                 trace._conversation_history = conversation_history
+                if self.include_system_prompt:
+                    trace._system_prompt = system_prompt
                 print(
                     f"[LANGFUSE] Created trace with user query: {user_query[:100] if user_query else 'None'}..."
                 )
@@ -833,6 +856,12 @@ class LangfuseTraceCollector:
                         "tool_results": self.trace_tool_results.get(trace_id, []),
                     }
 
+                    # Add system_prompt to final metadata if enabled and available
+                    if self.include_system_prompt:
+                        system_prompt = getattr(self.trace_spans[trace_id], "_system_prompt", None)
+                        if system_prompt:
+                            final_metadata["system_prompt"] = system_prompt
+
                     # End the trace with updated metadata
                     self.trace_spans[trace_id].update(output=event.data, metadata=final_metadata)
 
@@ -1198,6 +1227,7 @@ def create_composite_trace_collector(
     otel_session: Optional[Any] = None,
     proxy: Optional[str] = None,
     timeout: Optional[int] = None,
+    include_system_prompt: bool = False,
 ) -> TraceCollector:
     """Create a composite trace collector that forwards events to multiple collectors.
 
@@ -1213,6 +1243,7 @@ def create_composite_trace_collector(
                If not set, both respect standard HTTP_PROXY/HTTPS_PROXY environment variables.
         timeout: Optional timeout in seconds for HTTP requests (applies to both Langfuse and OTEL).
                 For Langfuse: Falls back to LANGFUSE_TIMEOUT environment variable (default: 10).
+        include_system_prompt: Whether to include system prompt in Langfuse trace metadata. Defaults to False.
     """
     collector_list = list(collectors)
 
@@ -1229,7 +1260,7 @@ def create_composite_trace_collector(
     # Automatically add Langfuse collector if keys are configured
     if os.getenv("LANGFUSE_PUBLIC_KEY") and os.getenv("LANGFUSE_SECRET_KEY"):
         langfuse_collector = LangfuseTraceCollector(
-            httpx_client=httpx_client, proxy=proxy, timeout=timeout
+            httpx_client=httpx_client, proxy=proxy, timeout=timeout, include_system_prompt=include_system_prompt
         )
         collector_list.append(langfuse_collector)
 

{jaf_py-2.5.13.dist-info → jaf_py-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.5.13
+Version: 2.6.1
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors
@@ -82,7 +82,7 @@ Dynamic: license-file
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.5.13-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.6.1-blue.svg)](https://github.com/xynehq/jaf-py)
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)](https://www.python.org/)
 [![Docs](https://img.shields.io/badge/Docs-Live-brightgreen)](https://xynehq.github.io/jaf-py/)
 

{jaf_py-2.5.13.dist-info → jaf_py-2.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jaf/__init__.py,sha256=O4KeBTYc6q85QK9XWllFHmMRdIdnvToftYSR5L8Mljk,8653
+jaf/__init__.py,sha256=sFcfeb0oKFTS3TfOhCxV0-UnpRwvA1AAcvdD6_I_zPM,8652
 jaf/cli.py,sha256=EDMMA5uX0e3TUIedLdyP3p4Qy-aXADvpht3VgJPJagU,8299
 jaf/exceptions.py,sha256=FdLIw7bdCNtBYfqRyJBkRT4Z1vWuvkzrMqFiMAzjL8Y,9158
 jaf/a2a/__init__.py,sha256=r4W-WHZNjoxR8EQ0x41_rY3fl12OH5qcSn0KycXaKKU,7752
@@ -55,8 +55,8 @@ jaf/core/regeneration.py,sha256=TUoBs4xZtFt3xBGA0N9cMsprtRL9BdmJeX5OnyLyGiE,1916
 jaf/core/state.py,sha256=fdWDc2DQ-o_g_8E4ibg2QM0Vad_XUique3a5iYBwGZo,9516
 jaf/core/streaming.py,sha256=5ntOtJrZVCHuGsygquyCLG2J5yuSxE6DN5OM-BrQiGw,16818
 jaf/core/tool_results.py,sha256=L9U3JDQAjAH5YR7iMpSxfVky2Nxo6FYQs4WE05RATaQ,11283
-jaf/core/tools.py,sha256=qsnC1Deo1VXpheUuRox26PrrfUoOJ-ZvxkiXzko5lVQ,15856
-jaf/core/tracing.py,sha256=GL-BXEZKDRHqDHICSPWbTPoRIl014DEsSfp-LvCUnNw,55604
+jaf/core/tools.py,sha256=rHxzAfGVGpYk3YJKmrq3AQLW0oE3ACkiJBOwle2bLdc,15146
+jaf/core/tracing.py,sha256=dPX1aHBk-auHcgMHttOZjLdo7aqB6GXmFLoGb3_bSoo,57320
 jaf/core/types.py,sha256=1QolTM3IYnQArbYAZkCIfj868j9vyEZTThqw37q7EyU,35395
 jaf/core/workflows.py,sha256=0825AoD1QwEiGAs5IRlWHmaKrjurx6xF7oDJR6POBsg,25651
 jaf/memory/__init__.py,sha256=YfANOg5vUFSPVG7gpBE4_lYkV5X3_U6Yj9v1_QexfN0,1396
@@ -89,9 +89,9 @@ jaf/visualization/functional_core.py,sha256=0Xs2R8ELADKNIgokcbjuxmWwxEyCH1yXIEdG
 jaf/visualization/graphviz.py,sha256=EwWVIRv8Z7gTiO5Spvcm-z_UUQ1oWNPRgdE33ZzFwx8,11569
 jaf/visualization/imperative_shell.py,sha256=N5lWzOLMIU_iCoy3n5WCg49eec8VxV8f7JIG6_wNtVw,2506
 jaf/visualization/types.py,sha256=90G8oClsFa_APqTuMrTW6KjD0oG9I4kVur773dXNW0E,1393
-jaf_py-2.5.13.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
-jaf_py-2.5.13.dist-info/METADATA,sha256=i8bgFJtK7JNOiadUK6w4LmBeR3L0wI4kMz1sDj-FgUY,27745
-jaf_py-2.5.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jaf_py-2.5.13.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
-jaf_py-2.5.13.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
-jaf_py-2.5.13.dist-info/RECORD,,
+jaf_py-2.6.1.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
+jaf_py-2.6.1.dist-info/METADATA,sha256=_tsvDUvHWYLcfhzn2CFTGlIIn-XvLpUMiF4NaxCqCKI,27743
+jaf_py-2.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jaf_py-2.6.1.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
+jaf_py-2.6.1.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
+jaf_py-2.6.1.dist-info/RECORD,,