fix: interaction between static args and HITL argument rewrite (#722)

Author: andreiancuta-uipath

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath-langchain"
-version = "0.9.8"
+version = "0.9.9"
 description = "Python SDK that enables developers to build and deploy LangGraph agents to the UiPath Cloud Platform"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

src/uipath_langchain/agent/react/llm_node.py

@@ -8,24 +8,22 @@
     AnyMessage,
     ToolCall,
 )
-from langchain_core.tools import BaseTool, StructuredTool
+from langchain_core.tools import BaseTool
 from pydantic import BaseModel
 from uipath.agent.react import RAISE_ERROR_TOOL
 from uipath.runtime.errors import UiPathErrorCategory
 
-from uipath_langchain.agent.tools.static_args import (
-    apply_static_argument_properties_to_schema,
-)
 from uipath_langchain.chat.handlers import get_payload_handler
 
 from ..exceptions import AgentRuntimeError, AgentRuntimeErrorCode
 from ..messages.message_utils import replace_tool_calls
+from ..tools.static_args import StaticArgsHandler
 from .constants import (
     DEFAULT_MAX_CONSECUTIVE_THINKING_MESSAGES,
     DEFAULT_MAX_LLM_MESSAGES,
 )
 from .types import FLOW_CONTROL_TOOLS, AgentGraphState
-from .utils import count_consecutive_thinking_messages, extract_input_data_from_state
+from .utils import count_consecutive_thinking_messages
 
 
 def _filter_control_flow_tool_calls(
@@ -81,6 +79,7 @@ def create_llm_node(
     """
     bindable_tools = list(tools) if tools else []
     payload_handler = get_payload_handler(model)
+    static_args_handler = StaticArgsHandler()
 
     async def llm_node(state: StateT):
         messages: list[AnyMessage] = state.messages
@@ -93,8 +92,8 @@ async def llm_node(state: StateT):
                 category=UiPathErrorCategory.USER,
             )
 
-        static_schema_tools = _apply_tool_argument_properties(
-            bindable_tools, state, input_schema
+        static_schema_tools = static_args_handler.initialize(
+            bindable_tools, state, input_schema or type(state)
         )
         current_tool_choice: Literal["auto", "any"] = tool_choice
         if current_tool_choice == "auto" and (
@@ -131,22 +130,7 @@ async def llm_node(state: StateT):
             if len(filtered_tool_calls) != len(response.tool_calls):
                 response = replace_tool_calls(response, filtered_tool_calls)
 
+        static_args_handler.apply_to_response(response.tool_calls)
         return {"messages": [response]}
 
     return llm_node
-
-
-def _apply_tool_argument_properties(
-    tools: list[BaseTool],
-    state: StateT,
-    input_schema: type[InputT] | None = None,
-) -> list[BaseTool]:
-    """Apply dynamic schema modifications to tools based on their argument_properties."""
-
-    agent_input = extract_input_data_from_state(state, input_schema or type(state))
-    return [
-        apply_static_argument_properties_to_schema(tool, agent_input)
-        if isinstance(tool, StructuredTool)
-        else tool
-        for tool in tools
-    ]

src/uipath_langchain/agent/tools/context_tool.py

@@ -2,7 +2,7 @@
 
 import logging
 import uuid
-from typing import Any, Optional, cast
+from typing import Any, Optional
 
 from jsonpath_ng import parse  # type: ignore[import-untyped]
 from langchain_core.documents import Document
@@ -40,17 +40,13 @@
 from uipath_langchain.agent.tools.internal_tools.schema_utils import (
     BATCH_TRANSFORM_OUTPUT_SCHEMA,
 )
-from uipath_langchain.agent.tools.static_args import (
-    ArgumentPropertiesMixin,
-    handle_static_args,
-)
+from uipath_langchain.agent.tools.tool_node import ToolWrapperReturnType
 from uipath_langchain.retrievers import ContextGroundingRetriever
 
 from .structured_tool_with_argument_properties import (
     StructuredToolWithArgumentProperties,
 )
 from .structured_tool_with_output_type import StructuredToolWithOutputType
-from .tool_node import ToolWrapperReturnType
 from .utils import sanitize_tool_name
 
 logger = logging.getLogger(__name__)
@@ -251,9 +247,6 @@ async def context_semantic_search_wrapper(
             call: ToolCall,
             state: AgentGraphState,
         ) -> ToolWrapperReturnType:
-            call["args"] = handle_static_args(
-                cast(ArgumentPropertiesMixin, tool), state, call["args"]
-            )
             nonlocal _resolved_arg_folder_prefix
             _resolved_arg_folder_prefix = _resolve_folder_path_prefix_from_state(
                 resource, dict(state)
@@ -379,9 +372,6 @@ async def context_deep_rag_wrapper(
         state: AgentGraphState,
     ) -> ToolWrapperReturnType:
         nonlocal _resolved_arg_folder_prefix
-        call["args"] = handle_static_args(
-            cast(ArgumentPropertiesMixin, tool), state, call["args"]
-        )
         _resolved_arg_folder_prefix = _resolve_folder_path_prefix_from_state(
             resource, dict(state)
         )
@@ -533,9 +523,6 @@ async def context_batch_transform_wrapper(
         call: ToolCall,
         state: AgentGraphState,
     ) -> ToolWrapperReturnType:
-        call["args"] = handle_static_args(
-            cast(ArgumentPropertiesMixin, tool), state, call["args"]
-        )
         nonlocal _resolved_arg_folder_prefix
         _resolved_arg_folder_prefix = _resolve_folder_path_prefix_from_state(
             resource, dict(state)
@@ -557,7 +544,7 @@ async def context_batch_transform_wrapper(
             "output_schema": output_model,
         },
     )
-    tool.set_tool_wrappers(awrapper=context_batch_transform_wrapper)
+    tool.set_tool_wrappers(awrapper=job_attachment_wrapper)
     return tool
 
 

src/uipath_langchain/agent/tools/escalation_tool.py

@@ -23,9 +23,6 @@
 from uipath_langchain._utils import get_execution_folder_path
 from uipath_langchain._utils.durable_interrupt import durable_interrupt
 from uipath_langchain.agent.react.jsonschema_pydantic_converter import create_model
-from uipath_langchain.agent.tools.static_args import (
-    handle_static_args,
-)
 from uipath_langchain.agent.tools.structured_tool_with_argument_properties import (
     StructuredToolWithArgumentProperties,
 )
@@ -261,7 +258,6 @@ async def escalation_wrapper(
         tool.metadata["_call_id"] = call.get("id")
         tool.metadata["_call_args"] = dict(call.get("args", {}))
 
-        call["args"] = handle_static_args(resource, state, call["args"])
         result = await tool.ainvoke(call["args"])
 
         if result["action"] == EscalationAction.END:

src/uipath_langchain/agent/tools/integration_tool.py

@@ -2,10 +2,8 @@
 
 import copy
 import re
-from typing import Any, cast
+from typing import Any
 
-from langchain.tools import BaseTool
-from langchain_core.messages import ToolCall
 from langchain_core.tools import StructuredTool
 from uipath.agent.models.agent import (
     AgentIntegrationToolParameter,
@@ -26,16 +24,8 @@
     raise_for_enriched,
 )
 from uipath_langchain.agent.react.jsonschema_pydantic_converter import create_model
-from uipath_langchain.agent.react.types import AgentGraphState
-from uipath_langchain.agent.tools.static_args import (
-    ArgumentPropertiesMixin,
-    handle_static_args,
-)
-from uipath_langchain.agent.tools.tool_node import (
-    ToolWrapperReturnType,
-)
 
-from .schema_editing import strip_matching_enums
+from .schema_editing import strip_enum
 from .structured_tool_with_argument_properties import (
     StructuredToolWithArgumentProperties,
 )
@@ -149,15 +139,14 @@ def _is_param_name_to_jsonpath(param_name: str) -> str:
     return "$" + "".join(parts)
 
 
-def strip_template_enums_from_schema(
+def strip_enums_from_schema(
     schema: dict[str, Any],
     parameters: list[AgentIntegrationToolParameter],
 ) -> dict[str, Any]:
-    """Remove {{template}} enum values only from argument-variant parameter fields.
+    """Remove enum constraints from fields in the schema that were configured with static args.
 
-    For each parameter with fieldVariant 'argument', navigates the schema to the
-    corresponding field (supporting nested objects, arrays, and $ref resolution)
-    and strips enum values matching the {{...}} pattern.
+    We strip them so that the tool's args_schema does not enforce them at
+    validation time; we add our own enum constraints only visible to the LLM.
 
     The function deep-copies the schema so the original is never mutated.
 
@@ -166,17 +155,14 @@ def strip_template_enums_from_schema(
         parameters: List of integration tool parameters from resource.properties.
 
     Returns:
-        A cleaned copy of the schema with template enum values removed
-        only from argument-variant fields.
+        A cleaned copy of the schema with enum constraints removed
+        from configured fields.
     """
     schema = copy.deepcopy(schema)
 
     for param in parameters:
-        if param.field_variant != "argument":
-            continue
-
         segments = _param_name_to_segments(param.name)
-        strip_matching_enums(schema, segments, _TEMPLATE_PATTERN)
+        strip_enum(schema, segments)
 
     return schema
 
@@ -309,7 +295,7 @@ def create_integration_tool(
 
     activity_metadata = convert_to_activity_metadata(resource)
 
-    cleaned_input_schema = strip_template_enums_from_schema(
+    cleaned_input_schema = strip_enums_from_schema(
         resource.input_schema, resource.properties.parameters
     )
     input_model = create_model(cleaned_input_schema)
@@ -351,16 +337,6 @@ async def integration_tool_fn(**kwargs: Any):
 
         return result
 
-    async def integration_tool_wrapper(
-        tool: BaseTool,
-        call: ToolCall,
-        state: AgentGraphState,
-    ) -> ToolWrapperReturnType:
-        call["args"] = handle_static_args(
-            cast(ArgumentPropertiesMixin, tool), state, call["args"]
-        )
-        return await tool.ainvoke(call)
-
     tool = StructuredToolWithArgumentProperties(
         name=tool_name,
         description=resource.description,
@@ -375,6 +351,5 @@ async def integration_tool_wrapper(
         },
         argument_properties=argument_properties,
     )
-    tool.set_tool_wrappers(awrapper=integration_tool_wrapper)
 
     return tool

src/uipath_langchain/agent/tools/internal_tools/analyze_files_tool.py

@@ -11,9 +11,8 @@
     HumanMessage,
     SystemMessage,
 )
-from langchain_core.messages.tool import ToolCall
 from langchain_core.runnables.config import var_child_runnable_config
-from langchain_core.tools import BaseTool, StructuredTool
+from langchain_core.tools import StructuredTool
 from uipath.agent.models.agent import (
     AgentInternalToolResourceConfig,
 )
@@ -27,12 +26,9 @@
 )
 from uipath_langchain.agent.multimodal import FileInfo, build_file_content_block
 from uipath_langchain.agent.react.jsonschema_pydantic_converter import create_model
-from uipath_langchain.agent.react.types import AgentGraphState
-from uipath_langchain.agent.tools.static_args import handle_static_args
 from uipath_langchain.agent.tools.structured_tool_with_argument_properties import (
     StructuredToolWithArgumentProperties,
 )
-from uipath_langchain.agent.tools.tool_node import ToolWrapperReturnType
 from uipath_langchain.agent.tools.utils import sanitize_tool_name
 from uipath_langchain.chat.helpers import (
     append_content_blocks_to_message,
@@ -107,14 +103,6 @@ async def tool_fn(**kwargs: Any):
 
     job_attachment_wrapper = get_job_attachment_wrapper(output_type=output_model)
 
-    async def analyze_file_tool_wrapper(
-        tool: BaseTool,
-        call: ToolCall,
-        state: AgentGraphState,
-    ) -> ToolWrapperReturnType:
-        call["args"] = handle_static_args(resource, state, call["args"])
-        return await job_attachment_wrapper(tool, call, state)
-
     tool = StructuredToolWithArgumentProperties(
         name=tool_name,
         description=resource.description,
@@ -129,7 +117,7 @@ async def analyze_file_tool_wrapper(
             "output_schema": output_model,
         },
     )
-    tool.set_tool_wrappers(awrapper=analyze_file_tool_wrapper)
+    tool.set_tool_wrappers(awrapper=job_attachment_wrapper)
     return tool
 
 

src/uipath_langchain/agent/tools/internal_tools/batch_transform_tool.py

@@ -4,8 +4,7 @@
 from typing import Any
 
 from langchain_core.language_models import BaseChatModel
-from langchain_core.messages.tool import ToolCall
-from langchain_core.tools import BaseTool, StructuredTool
+from langchain_core.tools import StructuredTool
 from uipath.agent.models.agent import (
     AgentInternalBatchTransformToolProperties,
     AgentInternalToolResourceConfig,
@@ -32,16 +31,13 @@
 )
 from uipath_langchain.agent.exceptions import AgentStartupError, AgentStartupErrorCode
 from uipath_langchain.agent.react.jsonschema_pydantic_converter import create_model
-from uipath_langchain.agent.react.types import AgentGraphState
 from uipath_langchain.agent.tools.internal_tools.schema_utils import (
     BATCH_TRANSFORM_OUTPUT_SCHEMA,
     add_query_field_to_schema,
 )
-from uipath_langchain.agent.tools.static_args import handle_static_args
 from uipath_langchain.agent.tools.structured_tool_with_argument_properties import (
     StructuredToolWithArgumentProperties,
 )
-from uipath_langchain.agent.tools.tool_node import ToolWrapperReturnType
 from uipath_langchain.agent.tools.utils import sanitize_tool_name
 
 
@@ -195,14 +191,6 @@ async def upload_result_attachment():
 
     job_attachment_wrapper = get_job_attachment_wrapper(output_type=output_model)
 
-    async def batch_transform_tool_wrapper(
-        tool: BaseTool,
-        call: ToolCall,
-        state: AgentGraphState,
-    ) -> ToolWrapperReturnType:
-        call["args"] = handle_static_args(resource, state, call["args"])
-        return await job_attachment_wrapper(tool, call, state)
-
     tool = StructuredToolWithArgumentProperties(
         name=tool_name,
         description=resource.description,
@@ -224,5 +212,5 @@ async def batch_transform_tool_wrapper(
             **({"static_query": static_query} if is_query_static else {}),
         },
     )
-    tool.set_tool_wrappers(awrapper=batch_transform_tool_wrapper)
+    tool.set_tool_wrappers(awrapper=job_attachment_wrapper)
     return tool