jaf-py 2.6.4__py3-none-any.whl → 2.6.5__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.6.4"
+__version__ = "2.6.5"
 __all__ = [
     # Core types and functions
     "TraceId",

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
 
@@ -181,11 +180,73 @@ 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
+        
         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,

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.5",
             httpx_client=client,
         )
         self._httpx_client = client

{jaf_py-2.6.4.dist-info → jaf_py-2.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.6.4
+Version: 2.6.5
 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.5-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.dist-info → jaf_py-2.6.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jaf/__init__.py,sha256=ieEZNHk68b5MjZ39t9BhFzK19GqLV6w2TnWH8cwKPG0,8652
+jaf/__init__.py,sha256=clE4UWW2Y5bty2ataCPqnL__bVP8HGO1EBIR1VYI9ZU,8652
 jaf/cli.py,sha256=EDMMA5uX0e3TUIedLdyP3p4Qy-aXADvpht3VgJPJagU,8299
 jaf/exceptions.py,sha256=FdLIw7bdCNtBYfqRyJBkRT4Z1vWuvkzrMqFiMAzjL8Y,9158
 jaf/a2a/__init__.py,sha256=r4W-WHZNjoxR8EQ0x41_rY3fl12OH5qcSn0KycXaKKU,7752
@@ -39,7 +39,7 @@ jaf/a2a/tests/test_integration.py,sha256=hfGAtwXOfV9OXrFgS94twMbzxMQ4Vfj0KYoNT5V
 jaf/a2a/tests/test_protocol.py,sha256=3Ov9fTqznDqJLg8PqY2oy9I2Tpvwv_N0aN-rpFpAmjM,22215
 jaf/a2a/tests/test_types.py,sha256=rSUhZmOQcFrgNiEg4hDCZwypj19h6mSamVapWkrzZWc,17329
 jaf/core/__init__.py,sha256=4IqKRspv8gvgAtbmvaMvUgYZB1fSIy3vsyCXkjF8PjU,2013
-jaf/core/agent_tool.py,sha256=gZje8_gZSaWCecySg2ZBK07RcD8bc2hxHsR4z87oKJE,12075
+jaf/core/agent_tool.py,sha256=bwYQtRK9YfwPM_3s2kjp3Vl-6vR64jUlOnviqM0Z5tM,15411
 jaf/core/analytics.py,sha256=ypdhllyOThXZB-TY_eR1t1n2qrnAVN7Ljb8PaOtJft0,23267
 jaf/core/checkpoint.py,sha256=O7mfi7gFOAUgJ3zHzgJsr11uzn-BU-Vj1iKyKjcirMk,8398
 jaf/core/composition.py,sha256=Tj0-FRTVWygmAfsBLld7pnZK4nrGMMBx2YYJW_KQPoo,25393
@@ -56,7 +56,7 @@ 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=rHxzAfGVGpYk3YJKmrq3AQLW0oE3ACkiJBOwle2bLdc,15146
-jaf/core/tracing.py,sha256=gh_oAm8T7ENv7oV6-IRt9GnW-rsmWXMlLDFwr8NfeAI,59360
+jaf/core/tracing.py,sha256=p5C7l0X1Is3cNjsINiEsUv01rnUFz9Z0lh4DFWRXsUE,59360
 jaf/core/types.py,sha256=lJXlkL55devvzbc5efT5FdQ_LX3JcsMWA10Hy8Cd5Qs,37015
 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.6.4.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
-jaf_py-2.6.4.dist-info/METADATA,sha256=By3r8jZ5EwcA_-CetPgaeG2XY28pTqNBPl54uttx-a0,27743
-jaf_py-2.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jaf_py-2.6.4.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
-jaf_py-2.6.4.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
-jaf_py-2.6.4.dist-info/RECORD,,
+jaf_py-2.6.5.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
+jaf_py-2.6.5.dist-info/METADATA,sha256=sacV8SfppPc9buMj-yoaNvDqrtF7S-k9P51zRZqp6ls,27743
+jaf_py-2.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jaf_py-2.6.5.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
+jaf_py-2.6.5.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
+jaf_py-2.6.5.dist-info/RECORD,,