langgraph-agent-toolkit 0.4.2__tar.gz → 0.4.4__tar.gz

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/.github/workflows/deploy.yml

@@ -5,16 +5,29 @@ on:
     branches:
       - main
   workflow_dispatch:
+    inputs:
+      deploy_enabled:
+        description: 'Enable deployment (set to "true" to deploy)'
+        required: true
+        default: "false"
+        type: choice
+        options:
+          - "false"
+          - "true"
 
 jobs:
   test:
     # Don't try to run deployment in forks and repo copies
-    if: github.repository == 'JoshuaC215/agent-service-toolkit'
+    if: github.repository == 'kryvokhyzha/langgraph-agent-toolkit'
     uses: ./.github/workflows/test.yml
 
   build:
     runs-on: ubuntu-latest
     needs: [test]
+    # Skip build if not manually triggered with deploy_enabled=true
+    if:
+      github.event_name == 'workflow_dispatch' &&
+      github.event.inputs.deploy_enabled == 'true'
 
     steps:
       - uses: actions/checkout@v4
@@ -42,6 +55,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
+    # This job will only run if build job runs and succeeds
+    if: always() && needs.build.result == 'success'
 
     steps:
       - name: Deploy to Azure Web App

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/.github/workflows/sphinx.yml

@@ -129,7 +129,7 @@ jobs:
           OBSERVABILITY_BACKEND: "none"
 
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: docs/_build/html

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.4]
+
+### Updated
+
+- Project dependencies
+
+### Fixed
+
+- Strucuted output and model factory
+
+## [0.4.3]
+
+### Updated
+
+- Project dependencies
+
 ## [0.4.2]
 
 ### Fixed

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langgraph-agent-toolkit
-Version: 0.4.2
+Version: 0.4.4
 Summary: Full toolkit for running an AI agent service built with LangGraph, FastAPI and Streamlit
 Project-URL: documentation, https://kryvokhyzha.github.io/langgraph-agent-toolkit
 Project-URL: repository, https://github.com/kryvokhyzha/langgraph-agent-toolkit
@@ -28,14 +28,14 @@ Requires-Dist: grpcio>=1.68.0
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: jinja2~=3.1.6
 Requires-Dist: jiter~=0.9.0
-Requires-Dist: joblib~=1.4.2
-Requires-Dist: langchain-community~=0.3.21
-Requires-Dist: langchain-core~=0.3.52
-Requires-Dist: langgraph-checkpoint-postgres~=2.0.19
-Requires-Dist: langgraph-checkpoint-sqlite~=2.0.6
-Requires-Dist: langgraph-cli[inmem]~=0.2.3
-Requires-Dist: langgraph-supervisor~=0.0.16
-Requires-Dist: langgraph~=0.3.30
+Requires-Dist: joblib>=1.4.2
+Requires-Dist: langchain-community~=0.3.23
+Requires-Dist: langchain-core~=0.3.59
+Requires-Dist: langgraph-checkpoint-postgres~=2.0.21
+Requires-Dist: langgraph-checkpoint-sqlite~=2.0.7
+Requires-Dist: langgraph-cli[inmem]~=0.2.8
+Requires-Dist: langgraph-supervisor~=0.0.21
+Requires-Dist: langgraph~=0.4.3
 Requires-Dist: loguru~=0.7.3
 Requires-Dist: multidict>6.3.2
 Requires-Dist: numpy~=1.26.4; python_version <= '3.12'
@@ -49,7 +49,7 @@ Requires-Dist: pyowm~=3.3.0
 Requires-Dist: python-dotenv~=1.1.0
 Requires-Dist: rootutils>=1.0.7
 Requires-Dist: setuptools>=75.6.0
-Requires-Dist: streamlit~=1.44.1
+Requires-Dist: streamlit~=1.45.0
 Requires-Dist: uvicorn~=0.34.0
 Requires-Dist: watchdog~=6.0.0
 Provides-Extra: all-backends
@@ -65,7 +65,7 @@ Requires-Dist: langchain-google-genai~=2.1.4; extra == 'all-llms'
 Requires-Dist: langchain-google-vertexai~=2.0.21; extra == 'all-llms'
 Requires-Dist: langchain-groq~=0.3.2; extra == 'all-llms'
 Requires-Dist: langchain-ollama~=0.3.2; extra == 'all-llms'
-Requires-Dist: langchain-openai~=0.3.12; extra == 'all-llms'
+Requires-Dist: langchain-openai~=0.3.16; extra == 'all-llms'
 Provides-Extra: all-observability
 Requires-Dist: langfuse~=2.60.3; extra == 'all-observability'
 Requires-Dist: langsmith~=0.3.31; extra == 'all-observability'
@@ -95,13 +95,13 @@ Requires-Dist: langsmith~=0.3.31; extra == 'langsmith'
 Provides-Extra: ollama
 Requires-Dist: langchain-ollama~=0.3.2; extra == 'ollama'
 Provides-Extra: openai
-Requires-Dist: langchain-openai~=0.3.12; extra == 'openai'
+Requires-Dist: langchain-openai~=0.3.16; extra == 'openai'
 Provides-Extra: uvicorn-backend
 Requires-Dist: uvicorn~=0.34.2; extra == 'uvicorn-backend'
 Description-Content-Type: text/markdown
 
 <div align="center">
-   <img alt="LangGraph Agent Toolkit Logo" src="https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/media/logo.svg?raw=true" width="300">
+   <img alt="LangGraph Agent Toolkit Logo" src="https://raw.githubusercontent.com/kryvokhyzha/langgraph-agent-toolkit/main/docs/media/logo.svg" width="300">
 </div>
 
 ---
@@ -111,7 +111,7 @@ Description-Content-Type: text/markdown
 |            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | CI/Testing | [![build status](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/test.yml/badge.svg)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/test.yml) [![docs status](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/sphinx.yml/badge.svg)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/sphinx.yml) [![codecov](https://codecov.io/gh/kryvokhyzha/langgraph-agent-toolkit/graph/badge.svg?token=OHSACTNSWZ)](https://codecov.io/gh/kryvokhyzha/langgraph-agent-toolkit) |
-| Package    | [![PyPI version](https://img.shields.io/pypi/v/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![PyPI Downloads](https://img.shields.io/pypi/dm/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fkryvokhyzha%2Flanggraph-agent-toolkit%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/pyproject.toml)           |
+| Package    | [![PyPI version](https://img.shields.io/pypi/v/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![PyPI Downloads](https://img.shields.io/pypi/dm/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fkryvokhyzha%2Flanggraph-agent-toolkit%2Fmain%2Fpyproject.toml)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/pyproject.toml)                          |
 | Meta       | [![Code style: ruff](https://img.shields.io/badge/code%20style-ruff-000000.svg)](https://github.com/astral-sh/ruff) [![GitHub License](https://img.shields.io/github/license/kryvokhyzha/langgraph-agent-toolkit)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/LICENSE)                                                                                                                                                                                                                                                                               |
 
 <!-- [![Streamlit App](https://static.streamlit.io/badges/streamlit_badge_black_red.svg)](https://langgraph-agent-toolkit.streamlit.app/) -->
@@ -213,7 +213,7 @@ For detailed installation instructions and available extras, see the
 
 ## 🏗️ Architecture
 
-<img src="https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/media/agent_architecture.png?raw=true" width="800">
+<img src="https://raw.githubusercontent.com/kryvokhyzha/langgraph-agent-toolkit/main/docs/media/agent_architecture.png" width="800">
 
 <a name="key-features"></a>
 
@@ -284,11 +284,13 @@ Docker setup, using the AgentClient, and local development, see the
 
 ## 📚 Documentation
 
-Full documentation is available in the `docs/` directory and includes:
+Full documentation is available at
+[GitHub repository](https://github.com/kryvokhyzha/langgraph-agent-toolkit/tree/main/docs/)
+and includes:
 
-- [Installation Guide](docs/installation.rst)
-- [Environment Setup](docs/environment_setup.rst)
-- [Usage Guide](docs/usage.rst)
+- [Installation Guide](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/installation.rst)
+- [Environment Setup](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/environment_setup.rst)
+- [Usage Guide](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/usage.rst)
 
 <a name="useful-resources"></a>
 
@@ -297,6 +299,9 @@ Full documentation is available in the `docs/` directory and includes:
 - [LangGraph documentation](https://langchain-ai.github.io/langgraph/concepts/low_level/#multiple-schemas)
 - [LangGraph Memory Concept](https://langchain-ai.github.io/langgraph/concepts/memory/)
 - [LangGraph Memory Persistence](https://langchain-ai.github.io/langgraph/concepts/persistence/#memory)
+- [LangGraph 101 - blueprints](https://github.com/langchain-ai/langgraph-101)
+- [LangGraph - Examples](https://github.com/langchain-ai/langgraph/tree/main/examples)
+- [Complex data extraction with function calling](https://langchain-ai.github.io/langgraph/tutorials/extraction/retries/)
 - [How to edit graph state](https://langchain-ai.github.io/langgraph/how-tos/human_in_the_loop/edit-graph-state/)
 - [How to create tools in Langchain](https://python.langchain.com/docs/how_to/custom_tools/)
 - [Simple Serverless FastAPI with AWS Lambda](https://www.deadbear.io/simple-serverless-fastapi-with-aws-lambda/)

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-   <img alt="LangGraph Agent Toolkit Logo" src="https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/media/logo.svg?raw=true" width="300">
+   <img alt="LangGraph Agent Toolkit Logo" src="https://raw.githubusercontent.com/kryvokhyzha/langgraph-agent-toolkit/main/docs/media/logo.svg" width="300">
 </div>
 
 ---
@@ -9,7 +9,7 @@
 |            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | CI/Testing | [![build status](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/test.yml/badge.svg)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/test.yml) [![docs status](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/sphinx.yml/badge.svg)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/actions/workflows/sphinx.yml) [![codecov](https://codecov.io/gh/kryvokhyzha/langgraph-agent-toolkit/graph/badge.svg?token=OHSACTNSWZ)](https://codecov.io/gh/kryvokhyzha/langgraph-agent-toolkit) |
-| Package    | [![PyPI version](https://img.shields.io/pypi/v/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![PyPI Downloads](https://img.shields.io/pypi/dm/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fkryvokhyzha%2Flanggraph-agent-toolkit%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/pyproject.toml)           |
+| Package    | [![PyPI version](https://img.shields.io/pypi/v/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![PyPI Downloads](https://img.shields.io/pypi/dm/langgraph-agent-toolkit.svg)](https://pypi.org/project/langgraph-agent-toolkit/) [![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fkryvokhyzha%2Flanggraph-agent-toolkit%2Fmain%2Fpyproject.toml)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/pyproject.toml)                          |
 | Meta       | [![Code style: ruff](https://img.shields.io/badge/code%20style-ruff-000000.svg)](https://github.com/astral-sh/ruff) [![GitHub License](https://img.shields.io/github/license/kryvokhyzha/langgraph-agent-toolkit)](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/LICENSE)                                                                                                                                                                                                                                                                               |
 
 <!-- [![Streamlit App](https://static.streamlit.io/badges/streamlit_badge_black_red.svg)](https://langgraph-agent-toolkit.streamlit.app/) -->
@@ -111,7 +111,7 @@ For detailed installation instructions and available extras, see the
 
 ## 🏗️ Architecture
 
-<img src="https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/media/agent_architecture.png?raw=true" width="800">
+<img src="https://raw.githubusercontent.com/kryvokhyzha/langgraph-agent-toolkit/main/docs/media/agent_architecture.png" width="800">
 
 <a name="key-features"></a>
 
@@ -182,11 +182,13 @@ Docker setup, using the AgentClient, and local development, see the
 
 ## 📚 Documentation
 
-Full documentation is available in the `docs/` directory and includes:
+Full documentation is available at
+[GitHub repository](https://github.com/kryvokhyzha/langgraph-agent-toolkit/tree/main/docs/)
+and includes:
 
-- [Installation Guide](docs/installation.rst)
-- [Environment Setup](docs/environment_setup.rst)
-- [Usage Guide](docs/usage.rst)
+- [Installation Guide](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/installation.rst)
+- [Environment Setup](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/environment_setup.rst)
+- [Usage Guide](https://github.com/kryvokhyzha/langgraph-agent-toolkit/blob/main/docs/usage.rst)
 
 <a name="useful-resources"></a>
 
@@ -195,6 +197,9 @@ Full documentation is available in the `docs/` directory and includes:
 - [LangGraph documentation](https://langchain-ai.github.io/langgraph/concepts/low_level/#multiple-schemas)
 - [LangGraph Memory Concept](https://langchain-ai.github.io/langgraph/concepts/memory/)
 - [LangGraph Memory Persistence](https://langchain-ai.github.io/langgraph/concepts/persistence/#memory)
+- [LangGraph 101 - blueprints](https://github.com/langchain-ai/langgraph-101)
+- [LangGraph - Examples](https://github.com/langchain-ai/langgraph/tree/main/examples)
+- [Complex data extraction with function calling](https://langchain-ai.github.io/langgraph/tutorials/extraction/retries/)
 - [How to edit graph state](https://langchain-ai.github.io/langgraph/how-tos/human_in_the_loop/edit-graph-state/)
 - [How to create tools in Langchain](https://python.langchain.com/docs/how_to/custom_tools/)
 - [Simple Serverless FastAPI with AWS Lambda](https://www.deadbear.io/simple-serverless-fastapi-with-aws-lambda/)

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/agents/blueprints/react_so/agent.py

@@ -5,7 +5,10 @@ from pydantic import BaseModel, Field
 from langgraph_agent_toolkit.agents.agent import Agent
 from langgraph_agent_toolkit.agents.components.creators.create_react_agent import create_react_agent
 from langgraph_agent_toolkit.agents.components.tools import add, multiply
-from langgraph_agent_toolkit.agents.components.utils import AgentStateWithRemainingSteps, pre_model_hook_standard
+from langgraph_agent_toolkit.agents.components.utils import (
+    AgentStateWithStructuredResponseAndRemainingSteps,
+    pre_model_hook_standard,
+)
 from langgraph_agent_toolkit.core import settings
 from langgraph_agent_toolkit.core.models.factory import ModelFactory
 from langgraph_agent_toolkit.schema.models import ModelProvider
@@ -37,8 +40,8 @@ react_agent_so = Agent(
             "You can also ask clarifying questions to the user. "
         ),
         pre_model_hook=pre_model_hook_standard,
-        response_format=ResponseSchema,
-        state_schema=AgentStateWithRemainingSteps,
+        # response_format=ResponseSchema,
+        state_schema=AgentStateWithStructuredResponseAndRemainingSteps,
         checkpointer=MemorySaver(),
         immediate_step_threshold=5,
     ),

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/agents/components/creators/create_react_agent.py

@@ -10,6 +10,7 @@ from typing import (
     get_type_hints,
 )
 
+from langchain.chat_models.base import _ConfigurableModel
 from langchain_core.language_models import (
     BaseChatModel,
     LanguageModelInput,
@@ -24,16 +25,17 @@ from langchain_core.messages import (
 )
 from langchain_core.runnables import (
     Runnable,
+    RunnableBinding,
     RunnableConfig,
+    RunnableSequence,
 )
 from langchain_core.tools import BaseTool
-from langgraph.graph import END, StateGraph
+from langgraph.graph import END, START, StateGraph
 from langgraph.graph.graph import CompiledGraph
 from langgraph.prebuilt.chat_agent_executor import (
     AgentState,
     AgentStateWithStructuredResponse,
     StructuredResponseSchema,
-    _get_model,
     _get_prompt_runnable,
     _get_state_value,
     _should_bind_tools,
@@ -45,6 +47,30 @@ from langgraph.types import Checkpointer, Send
 from langgraph.utils.runnable import RunnableCallable, RunnableLike
 from pydantic import BaseModel
 
+from langgraph_agent_toolkit.agents.components.utils import default_pre_model_hook
+
+
+def _get_model(model: LanguageModelLike, config: RunnableConfig) -> BaseChatModel:
+    """Get the underlying model from a RunnableBinding or return the model itself."""
+    if isinstance(model, _ConfigurableModel):
+        return model._model(config)
+
+    if isinstance(model, RunnableSequence):
+        model = next(
+            (step for step in model.steps if isinstance(step, (RunnableBinding, BaseChatModel))),
+            model,
+        )
+
+    if isinstance(model, RunnableBinding):
+        model = model.bound
+
+    if not isinstance(model, BaseChatModel):
+        raise TypeError(
+            f"Expected `model` to be a ChatModel or RunnableBinding (e.g. model.bind_tools(...)), got {type(model)}"
+        )
+
+    return model
+
 
 def create_react_agent(
     model: Union[str, LanguageModelLike],
@@ -64,8 +90,8 @@ def create_react_agent(
     debug: bool = False,
     version: Literal["v1", "v2"] = "v1",
     name: Optional[str] = None,
-    immediate_step_threshold: int = 5,  # New parameter for customizing when to use immediate generation
-    immediate_generation_prompt: Optional[str] = None,  # New parameter for customizing the immediate generation prompt
+    immediate_step_threshold: int = 5,
+    immediate_generation_prompt: Optional[str] = None,
 ) -> CompiledGraph:
     """Create a graph that works with a chat model that utilizes tool calling with an additional router.
 
@@ -230,7 +256,7 @@ def create_react_agent(
         prompt_with_instruction = [immediate_prompt] + list(messages)
 
         # Use the model directly without tool calling capabilities
-        base_model = _get_model(model)
+        base_model = _get_model(model, config)
         response = cast(AIMessage, base_model.invoke(prompt_with_instruction, config))
         response.name = name
 
@@ -248,7 +274,7 @@ def create_react_agent(
         messages = _get_state_value(state, "messages")
         prompt_with_instruction = [immediate_prompt] + list(messages)
 
-        base_model = _get_model(model)
+        base_model = _get_model(model, config)
         # Fix: Use ainvoke instead of invoke for async function
         response = cast(AIMessage, await base_model.ainvoke(prompt_with_instruction, config))
         response.name = name
@@ -292,7 +318,7 @@ def create_react_agent(
             system_prompt, structured_response_schema = response_format
             messages = [SystemMessage(content=system_prompt)] + list(messages)
 
-        model_with_structured_output = _get_model(model).with_structured_output(
+        model_with_structured_output = _get_model(model, config).with_structured_output(
             cast(StructuredResponseSchema, structured_response_schema)
         )
         response = model_with_structured_output.invoke(messages, config)
@@ -305,12 +331,16 @@ def create_react_agent(
             system_prompt, structured_response_schema = response_format
             messages = [SystemMessage(content=system_prompt)] + list(messages)
 
-        model_with_structured_output = _get_model(model).with_structured_output(
+        model_with_structured_output = _get_model(model, config).with_structured_output(
             cast(StructuredResponseSchema, structured_response_schema)
         )
         response = await model_with_structured_output.ainvoke(messages, config)
         return {"structured_response": response}
 
+    # Use default_pre_model_hook if pre_model_hook is None
+    if pre_model_hook is None:
+        pre_model_hook = default_pre_model_hook
+
     if not tool_calling_enabled:
         # Define a new graph
         workflow = StateGraph(state_schema, config_schema=config_schema)
@@ -328,16 +358,14 @@ def create_react_agent(
             input=input_schema,
         )
 
-        # Set up routing structure
-        if pre_model_hook is not None:
-            workflow.add_node("pre_model_hook", pre_model_hook)
-            # Route pre_model_hook directly to either agent or immediate_generation based on condition
-            workflow.add_conditional_edges("pre_model_hook", router_condition, ["agent", "immediate_generation"])
-            entrypoint = "pre_model_hook"
-        else:
-            # If no pre_model_hook, use START as the conditional router
-            workflow.add_conditional_edges("START", router_condition, ["agent", "immediate_generation"])
-            entrypoint = "START"
+        # Always add pre_model_hook
+        workflow.add_node("pre_model_hook", pre_model_hook)
+
+        # Route pre_model_hook directly to either agent or immediate_generation based on condition
+        workflow.add_conditional_edges("pre_model_hook", router_condition, ["agent", "immediate_generation"])
+
+        # Always set START as entry point
+        workflow.add_edge(START, "pre_model_hook")
 
         # Connect both agent and immediate_generation to END or structured response
         if response_format is not None:
@@ -352,8 +380,6 @@ def create_react_agent(
             workflow.add_edge("agent", END)
             workflow.add_edge("immediate_generation", END)
 
-        workflow.set_entry_point(entrypoint)
-
         return workflow.compile(
             checkpointer=checkpointer,
             store=store,
@@ -379,10 +405,7 @@ def create_react_agent(
             if version == "v1":
                 return "tools"
             elif version == "v2":
-                tool_calls = [
-                    tool_node.inject_tool_args(call, state, store)  # type: ignore[arg-type]
-                    for call in last_message.tool_calls
-                ]
+                tool_calls = [tool_node.inject_tool_args(call, state, store) for call in last_message.tool_calls]
                 return [Send("tools", [tool_call]) for tool_call in tool_calls]
 
     # Define a new graph
@@ -395,19 +418,14 @@ def create_react_agent(
     )
     workflow.add_node("tools", tool_node)
 
-    # Set up the routing structure
-    if pre_model_hook is not None:
-        workflow.add_node("pre_model_hook", pre_model_hook)
-        # Route pre_model_hook directly to either agent or immediate_generation based on condition
-        workflow.add_conditional_edges("pre_model_hook", router_condition, ["agent", "immediate_generation"])
-        entrypoint = "pre_model_hook"
-    else:
-        # If no pre_model_hook, use START as the conditional router
-        workflow.add_conditional_edges("START", router_condition, ["agent", "immediate_generation"])
-        entrypoint = "START"
+    # Always add pre_model_hook node
+    workflow.add_node("pre_model_hook", pre_model_hook)
+
+    # Route pre_model_hook to either agent or immediate_generation based on condition
+    workflow.add_conditional_edges("pre_model_hook", router_condition, ["agent", "immediate_generation"])
 
-    # Set the entrypoint
-    workflow.set_entry_point(entrypoint)
+    # Set START as the entry point and route to pre_model_hook
+    workflow.add_edge(START, "pre_model_hook")
 
     # Add structured output node if response_format is provided
     if response_format is not None:
@@ -436,21 +454,14 @@ def create_react_agent(
             if m.name in should_return_direct:
                 return END
 
-        # After tools, go back to the conditional routing - either pre_model_hook or router_condition
-        return "pre_model_hook" if pre_model_hook is not None else "START"
+        # After tools, always go to pre_model_hook
+        return "pre_model_hook"
 
     if should_return_direct:
-        destinations = []
-        if pre_model_hook is not None:
-            destinations.append("pre_model_hook")
-        else:
-            destinations.append("START")
-
-        destinations.append(END)
-        workflow.add_conditional_edges("tools", route_tool_responses, destinations)
+        workflow.add_conditional_edges("tools", route_tool_responses, ["pre_model_hook", END])
     else:
-        # After tools, go back to the conditional routing
-        workflow.add_edge("tools", "pre_model_hook" if pre_model_hook is not None else "START")
+        # After tools, always go to pre_model_hook
+        workflow.add_edge("tools", "pre_model_hook")
 
     # Finally, we compile it!
     return workflow.compile(

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/agents/components/utils.py

@@ -3,7 +3,7 @@ from typing import TypeVar
 from langchain_core.messages.utils import trim_messages
 from langchain_core.runnables import RunnableConfig
 from langgraph.managed.is_last_step import RemainingSteps
-from langgraph.prebuilt.chat_agent_executor import AgentState
+from langgraph.prebuilt.chat_agent_executor import AgentState, AgentStateWithStructuredResponse
 
 from langgraph_agent_toolkit.helper.constants import DEFAULT_MAX_MESSAGE_HISTORY_LENGTH
 
@@ -15,6 +15,10 @@ class AgentStateWithRemainingSteps(AgentState):
     remaining_steps: RemainingSteps
 
 
+class AgentStateWithStructuredResponseAndRemainingSteps(AgentStateWithStructuredResponse):
+    remaining_steps: RemainingSteps
+
+
 def pre_model_hook_standard(state: T, config: RunnableConfig):
     # https://langchain-ai.github.io/langgraph/how-tos/create-react-agent-manage-message-history/
     # if last message is a human message, trim the messages to only include human messages
@@ -40,3 +44,7 @@ def pre_model_hook_standard(state: T, config: RunnableConfig):
         )
 
     return {"llm_input_messages": updated_messages}
+
+
+def default_pre_model_hook(state: T, config: RunnableConfig) -> T:
+    return state

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/core/models/factory.py

@@ -13,6 +13,7 @@ from typing import (
 
 from langchain.chat_models.base import _ConfigurableModel, _init_chat_model_helper
 from langchain_core.language_models import BaseChatModel
+from langchain_core.runnables import Runnable, RunnableConfig
 from typing_extensions import TypeAlias
 
 from langgraph_agent_toolkit.core.models import ChatOpenAIPatched, FakeToolModel
@@ -27,11 +28,20 @@ from langgraph_agent_toolkit.schema.models import ModelProvider
 ModelT: TypeAlias = FakeToolModel | _ConfigurableModel | BaseChatModel
 
 
+class _ConfigurableModelCustom(_ConfigurableModel):
+    def _model(self, config: Optional[RunnableConfig] = None) -> Runnable:
+        params = {**self._default_config, **self._model_params(config)}
+        model = ModelFactory._init_chat_model_helper(**params)
+        for name, args, kwargs in self._queued_declarative_operations:
+            model = getattr(model, name)(*args, **kwargs)
+        return model
+
+
 class ModelFactory:
     """Factory for creating model instances."""
 
     @staticmethod
-    def __init_chat_model_helper(model: str, *, model_provider: Optional[str] = None, **kwargs: Any) -> BaseChatModel:
+    def _init_chat_model_helper(model: str, *, model_provider: Optional[str] = None, **kwargs: Any) -> BaseChatModel:
         if model_provider == "openai":
             return ChatOpenAIPatched(model_name=model, **kwargs)
         else:
@@ -58,13 +68,13 @@ class ModelFactory:
             )
 
         if not configurable_fields:
-            return ModelFactory.__init_chat_model_helper(cast(str, model), model_provider=model_provider, **kwargs)
+            return ModelFactory._init_chat_model_helper(cast(str, model), model_provider=model_provider, **kwargs)
         else:
             if model:
                 kwargs["model"] = model
             if model_provider:
                 kwargs["model_provider"] = model_provider
-            return _ConfigurableModel(
+            return _ConfigurableModelCustom(
                 default_config=kwargs,
                 config_prefix=config_prefix,
                 configurable_fields=configurable_fields,
@@ -97,7 +107,7 @@ class ModelFactory:
             ValueError: If the requested model is not supported
 
         """  # noqa: E501
-        _configurable_fields = configurable_fields or DEFAULT_CONFIGURABLE_FIELDS
+        _configurable_fields = DEFAULT_CONFIGURABLE_FIELDS if configurable_fields is None else configurable_fields
         _config_prefix = config_prefix or DEFAULT_CONFIG_PREFIX
         _model_parameter_values = model_parameter_values or DEFAULT_MODEL_PARAMETER_VALUES
 

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/core/settings.py

@@ -76,6 +76,7 @@ class Settings(BaseSettings):
     AGENT_PATHS: list[str] = [
         "langgraph_agent_toolkit.agents.blueprints.react.agent:react_agent",
         "langgraph_agent_toolkit.agents.blueprints.chatbot.agent:chatbot_agent",
+        "langgraph_agent_toolkit.agents.blueprints.react_so.agent:react_agent_so",
     ]
 
     LANGCHAIN_TRACING_V2: bool = False

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/run_agent.py

@@ -2,12 +2,19 @@ import asyncio
 import random
 from uuid import UUID
 
+import rootutils
 from dotenv import find_dotenv, load_dotenv
 from langchain_core.runnables import RunnableConfig
 from langfuse.callback import CallbackHandler
 
 
-load_dotenv(find_dotenv(), override=True)
+_ = rootutils.setup_root(
+    search_from=__file__,
+    indicator=".project-root",
+    pythonpath=True,
+    dotenv=False,
+)
+load_dotenv(find_dotenv(".local.env"), override=True)
 
 from langgraph_agent_toolkit.agents.agent_executor import AgentExecutor
 from langgraph_agent_toolkit.core.settings import settings
@@ -47,7 +54,7 @@ async def main() -> None:
         ),
     )
     logger.info(result.keys())
-    logger.info(result)
+    # logger.info(result)
 
     try:
         result["messages"][-1].pretty_print()

{langgraph_agent_toolkit-0.4.2 → langgraph_agent_toolkit-0.4.4}/langgraph_agent_toolkit/run_service.py

@@ -24,6 +24,7 @@ def run_service(
         custom_settings=dict(
             AGENT_PATHS=[
                 "langgraph_agent_toolkit.agents.blueprints.react.agent:react_agent",
+                "langgraph_agent_toolkit.agents.blueprints.react_so.agent:react_agent_so",
                 "langgraph_agent_toolkit.agents.blueprints.supervisor_agent.agent:supervisor_agent",
                 "langgraph_agent_toolkit.agents.blueprints.chatbot.agent:chatbot_agent",
             ]