jaf-py 2.6.4__tar.gz → 2.6.6__tar.gz

{jaf_py-2.6.4 → jaf_py-2.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.6.4
+Version: 2.6.6
 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.6.4-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.6.6-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.6.4 → jaf_py-2.6.6}/README.md

@@ -2,7 +2,7 @@
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.6.4-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.6.6-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.6.4 → jaf_py-2.6.6}/jaf/__init__.py

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

{jaf_py-2.6.4 → jaf_py-2.6.6}/jaf/core/agent_tool.py

@@ -8,7 +8,6 @@ by other agents, enabling hierarchical agent orchestration patterns.
 import asyncio
 import json
 import inspect
-import inspect
 import contextvars
 from typing import Any, Callable, Dict, List, Optional, Union, Awaitable, TypeVar, get_type_hints
 
@@ -79,6 +78,7 @@ def create_agent_tool(
     metadata: Optional[Dict[str, Any]] = None,
     timeout: Optional[float] = None,
     preserve_session: bool = False,
+    preserve_session_id: bool = False,
 ) -> Tool[AgentToolInput, Ctx]:
     """
     Create a tool from an agent.
@@ -92,6 +92,10 @@ def create_agent_tool(
         is_enabled: Whether the tool is enabled (bool, sync function, or async function)
         metadata: Optional metadata for the tool
         timeout: Optional timeout for tool execution
+        preserve_session: When True, inherit parent's conversation_id AND memory (shared session)
+        preserve_session_id: When True, inherit ONLY parent's conversation_id for tracing (no memory).
+                            This allows subagent traces to appear together in Langfuse without
+                            loading previous invocation history. Mutually exclusive with preserve_session.
 
     Returns:
         A Tool that wraps the agent execution
@@ -181,18 +185,98 @@ def create_agent_tool(
         # Session inheritance is configurable via preserve_session.
         # - When True: inherit parent's conversation_id and memory (shared memory/session)
         # - When False: do not inherit (ephemeral, per-invocation sub-agent run)
+        #
+        # Model selection for subagents:
+        # - If subagent has its own model_config, use that model AND create appropriate provider
+        # - If subagent has no model_config, inherit parent's model_override and provider
+        # This allows subagents to run on different models than the parent agent
+        subagent_model_override = None
+        subagent_model_provider = parent_config.model_provider
+        
+        if agent.model_config and agent.model_config.name:
+            subagent_model_name = agent.model_config.name
+            # Subagent has explicit model_config - create appropriate provider for it
+            # Use model_override to force the subagent's model
+            subagent_model_override = subagent_model_name
+            
+            # Create provider based on model type
+            import os
+            if subagent_model_name.startswith("azure/"):
+                try:
+                    from jaf.providers import make_litellm_sdk_provider
+                    azure_api_key = os.getenv("AZURE_API_KEY")
+                    azure_api_base = os.getenv("AZURE_API_BASE")
+                    azure_api_version = os.getenv("AZURE_API_VERSION")
+                    subagent_model_provider = make_litellm_sdk_provider(
+                        model=subagent_model_name,
+                        api_key=azure_api_key,
+                        base_url=azure_api_base,
+                        api_version=azure_api_version,
+                    )
+                except Exception as e:
+                    # Fallback to parent provider if Azure provider creation fails
+                    subagent_model_provider = parent_config.model_provider
+            elif subagent_model_name.startswith("vertex_ai/"):
+                try:
+                    from jaf.providers import make_litellm_sdk_provider
+                    vertex_project = os.getenv("VERTEXAI_PROJECT")
+                    vertex_location = os.getenv("VERTEXAI_LOCATION")
+                    if not vertex_project or not vertex_location:
+                        raise ValueError(
+                            "VERTEXAI_PROJECT and VERTEXAI_LOCATION environment variables are required for vertex_ai/ models"
+                        )
+                    subagent_model_provider = make_litellm_sdk_provider(
+                        model=subagent_model_name,
+                        vertex_project=vertex_project,
+                        vertex_location=vertex_location,
+                    )
+                except Exception:
+                    subagent_model_provider = parent_config.model_provider
+            elif subagent_model_name.startswith("glm"):
+                try:
+                    from jaf.providers import make_litellm_provider
+                    subagent_model_provider = make_litellm_provider(
+                        base_url=os.getenv("LITELLM_BASE_URL"),
+                        api_key=os.getenv("LITELLM_KEY")
+                    )
+                except Exception:
+                    subagent_model_provider = parent_config.model_provider
+            # For other models, use parent's provider (may work or may not)
+        else:
+            # No subagent model_config - inherit from parent
+            subagent_model_override = parent_config.model_override
+            subagent_model_provider = parent_config.model_provider
+        
+        # Determine conversation_id and memory inheritance based on session preservation settings:
+        # - preserve_session=True: inherit both conversation_id AND memory (full shared session)
+        # - preserve_session_id=True: inherit ONLY conversation_id for tracing (no memory, stateless calls)
+        # - Both False: completely ephemeral sub-agent run
+        #
+        # preserve_session_id is useful when you want:
+        # 1. Subagent traces to appear together in Langfuse under the same conversation
+        # 2. But each subagent invocation to be stateless (no accumulated history from previous calls)
+        if preserve_session:
+            subagent_memory = parent_config.memory
+            subagent_conversation_id = parent_config.conversation_id
+        elif preserve_session_id:
+            subagent_memory = None  # No memory inheritance - stateless
+            subagent_conversation_id = parent_config.conversation_id  # Only for tracing
+        else:
+            subagent_memory = None
+            subagent_conversation_id = None
+        
         sub_config = RunConfig(
             agent_registry={agent.name: agent, **parent_config.agent_registry},
-            model_provider=parent_config.model_provider,
+            model_provider=subagent_model_provider,
             max_turns=max_turns or parent_config.max_turns,
-            model_override=parent_config.model_override,
+            model_override=subagent_model_override,
             initial_input_guardrails=parent_config.initial_input_guardrails,
             final_output_guardrails=parent_config.final_output_guardrails,
             on_event=parent_config.on_event,
             before_llm_call=parent_config.before_llm_call,
             after_llm_call=parent_config.after_llm_call,
-            memory=parent_config.memory if preserve_session else None,
-            conversation_id=parent_config.conversation_id if preserve_session else None,
+            memory=subagent_memory,
+            conversation_id=subagent_conversation_id,
             default_tool_timeout=parent_config.default_tool_timeout,
             prefer_streaming=parent_config.prefer_streaming,
         )

{jaf_py-2.6.4 → jaf_py-2.6.6}/jaf/core/tracing.py

@@ -469,7 +469,7 @@ class LangfuseTraceCollector:
             public_key=public_key,
             secret_key=secret_key,
             host=host,
-            release="jaf-py-v2.6.4",
+            release="jaf-py-v2.6.6",
             httpx_client=client,
         )
         self._httpx_client = client

{jaf_py-2.6.4 → jaf_py-2.6.6}/jaf/core/types.py

@@ -428,6 +428,7 @@ class Agent(Generic[Ctx, Out]):
         metadata: Optional[Dict[str, Any]] = None,
         timeout: Optional[float] = None,
         preserve_session: bool = False,
+        preserve_session_id: bool = False,
     ) -> Tool[Any, Ctx]:
         """
         Convert this agent into a tool that can be used by other agents.
@@ -440,6 +441,11 @@ class Agent(Generic[Ctx, Out]):
             is_enabled: Whether the tool is enabled (bool, sync function, or async function)
             metadata: Optional metadata for the tool
             timeout: Optional timeout for the tool execution
+            preserve_session: When True, inherit parent's conversation_id AND memory (shared session)
+            preserve_session_id: When True, inherit ONLY parent's conversation_id for tracing (no memory).
+                                This allows subagent traces to appear together in Langfuse without
+                                loading previous invocation history. Useful for stateless subagent calls
+                                that should still be grouped together in traces.
 
         Returns:
             A Tool that wraps this agent's execution
@@ -456,6 +462,7 @@ class Agent(Generic[Ctx, Out]):
             metadata=metadata,
             timeout=timeout,
             preserve_session=preserve_session,
+            preserve_session_id=preserve_session_id,
         )
 
 

{jaf_py-2.6.4 → jaf_py-2.6.6}/jaf_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.6.4
+Version: 2.6.6
 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.6.4-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.6.6-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.6.4 → jaf_py-2.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jaf-py"
-version = "2.6.4"
+version = "2.6.6"
 description = "A purely functional agent framework with immutable state and composable tools - Python implementation"
 readme = "README.md"
 license = "MIT"