ibm-watsonx-orchestrate 1.12.0b0__py3-none-any.whl → 1.12.1__py3-none-any.whl

ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -11,7 +11,7 @@ import zipfile
 from enum import Enum
 from os import path
 from pathlib import Path
-from typing import Iterable, List
+from typing import Iterable, List, cast
 import rich
 import json
 from rich.json import JSON
@@ -25,7 +25,7 @@ from rich.panel import Panel
 
 from ibm_watsonx_orchestrate.agent_builder.tools import BaseTool, ToolSpec
 from ibm_watsonx_orchestrate.agent_builder.tools.flow_tool import create_flow_json_tool
-from ibm_watsonx_orchestrate.agent_builder.tools.langflow_tool import create_langflow_tool
+from ibm_watsonx_orchestrate.agent_builder.tools.langflow_tool import LangflowTool, create_langflow_tool
 from ibm_watsonx_orchestrate.agent_builder.tools.openapi_tool import create_openapi_json_tools_from_uri,create_openapi_json_tools_from_content
 from ibm_watsonx_orchestrate.cli.commands.models.models_controller import ModelHighlighter
 from ibm_watsonx_orchestrate.cli.commands.tools.types import RegistryType
@@ -33,7 +33,7 @@ from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller imp
 from ibm_watsonx_orchestrate.agent_builder.connections.types import  ConnectionType, ConnectionEnvironment, ConnectionPreference
 from ibm_watsonx_orchestrate.cli.config import Config, CONTEXT_SECTION_HEADER, CONTEXT_ACTIVE_ENV_OPT, \
     PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT, \
-    DEFAULT_CONFIG_FILE_CONTENT
+    DEFAULT_CONFIG_FILE_CONTENT, PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT
 from ibm_watsonx_orchestrate.agent_builder.connections import ConnectionSecurityScheme, ExpectedCredentials
 from ibm_watsonx_orchestrate.flow_builder.flows.decorators import FlowWrapper
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
@@ -56,6 +56,11 @@ DEFAULT_LANGFLOW_TOOL_REQUIREMENTS = [
     "lfx==0.1.8"
 ]
 
+DEFAULT_LANGFLOW_RUNNER_MODULES = [
+    "lfx",
+    "lfx-nightly"
+]
+
 class ToolKind(str, Enum):
     openapi = "openapi"
     python = "python"
@@ -851,15 +856,18 @@ class ToolsController:
 
                         cfg = Config()
                         registry_type = cfg.read(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT) or DEFAULT_CONFIG_FILE_CONTENT[PYTHON_REGISTRY_HEADER][PYTHON_REGISTRY_TYPE_OPT]
+                        skip_version_check = cfg.read(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT) or DEFAULT_CONFIG_FILE_CONTENT[PYTHON_REGISTRY_HEADER][PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT]
 
                         version = __version__
                         if registry_type == RegistryType.LOCAL:
+                            logger.warning(f"Using a local registry which is for development purposes only")
                             requirements.append(f"/packages/ibm_watsonx_orchestrate-0.6.0-py3-none-any.whl\n")
                         elif registry_type == RegistryType.PYPI:
-                            wheel_file = get_whl_in_registry(registry_url='https://pypi.org/simple/ibm-watsonx-orchestrate', version=version)
-                            if not wheel_file:
-                                logger.error(f"Could not find ibm-watsonx-orchestrate@{version} on https://pypi.org/project/ibm-watsonx-orchestrate")
-                                exit(1)
+                            if not skip_version_check:
+                                wheel_file = get_whl_in_registry(registry_url='https://pypi.org/simple/ibm-watsonx-orchestrate', version=version)
+                                if not wheel_file:
+                                    logger.error(f"Could not find ibm-watsonx-orchestrate@{version} on https://pypi.org/project/ibm-watsonx-orchestrate")
+                                    exit(1)
                             requirements.append(f"ibm-watsonx-orchestrate=={version}\n")
                         elif registry_type == RegistryType.TESTPYPI:
                             override_version = cfg.get(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT) or version
@@ -890,13 +898,34 @@ class ToolsController:
                         tool_path = Path(self.file)
                         zip_tool_artifacts.write(tool_path, arcname=f"{tool_path.stem}.json")
 
-                        requirements = DEFAULT_LANGFLOW_TOOL_REQUIREMENTS
+                        requirements = []
 
                         if self.requirements_file:
                             requirements_file_path = Path(self.requirements_file)
                             requirements.extend(
                                 get_requirement_lines(requirements_file=requirements_file_path, remove_trailing_newlines=False)
                             )
+
+                        langflowTool = cast(LangflowTool, tool)
+                        # if there are additional requriements from the langflow model, we should add it to the requirement set
+                        if langflowTool.requirements and len(langflowTool.requirements) > 0:
+                            requirements.extend(langflowTool.requirements)
+
+                        # now check if the requirements contain modules listed in DEFAULT_LANGFLOW_RUNNER_MODULES
+                        # if it is needed, we are assuming the user wants to override the default langflow module
+                        # with a specific version
+                        runner_overridden = False
+                        for r in requirements:
+                            # get the module name from the requirements
+                            module_name = r.strip().split('==')[0].split('=')[0].split('>=')[0].split('<=')[0].split('~=')[0].lower()
+                            if not module_name.startswith('#'):
+                                if module_name in DEFAULT_LANGFLOW_RUNNER_MODULES:
+                                    runner_overridden = True
+                        
+                        if not runner_overridden:
+                            # add the default runner to the top of requirement list
+                            requirements = DEFAULT_LANGFLOW_TOOL_REQUIREMENTS + list(requirements)
+
                         requirements_content = '\n'.join(requirements) + '\n'
                         zip_tool_artifacts.writestr("requirements.txt",requirements_content)  
                         zip_tool_artifacts.writestr("bundle-format", "2.0.0\n")

ibm_watsonx_orchestrate/cli/config.py

@@ -22,6 +22,7 @@ AUTH_MCSP_TOKEN_OPT = "wxo_mcsp_token"
 AUTH_MCSP_TOKEN_EXPIRY_OPT = "wxo_mcsp_token_expiry"
 CONTEXT_ACTIVE_ENV_OPT = "active_environment"
 PYTHON_REGISTRY_TYPE_OPT = "type"
+PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT = "skip_version_check"
 PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT = "test_package_version_override"
 ENV_WXO_URL_OPT = "wxo_url"
 ENV_IAM_URL_OPT = "iam_url"
@@ -40,7 +41,8 @@ DEFAULT_CONFIG_FILE_CONTENT = {
     CONTEXT_SECTION_HEADER: {CONTEXT_ACTIVE_ENV_OPT: None},
     PYTHON_REGISTRY_HEADER: {
         PYTHON_REGISTRY_TYPE_OPT: str(RegistryType.PYPI),
-        PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT: None
+        PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT: None,
+        PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT: False
     },
     ENVIRONMENTS_SECTION_HEADER: {
         PROTECTED_ENV_NAME: {

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -49,8 +49,28 @@ services:
       MAX_POOL: 60
       DEPLOYMENT_MODE: laptop
       SUFFIXLIST: ${CM_SUFFIXLIST:-[]}
+      BACKEND_BASE_URL: http://localhost:3001
+      CALLBACK_URL: http://localhost:3001/auth/oauth2/callback
     ports:
       - 3001:3001
+  
+  wxo-server-connections-ui:
+    image: ${CONNECTIONS_UI_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-connections-ui:${CONNECTIONS_UI_TAG:-latest}
+    platform: linux/amd64
+    profiles: [connections-ui]
+    environment:
+      PORT: 3412
+      WXO_CONNECTIONS_URL: http://wxo-server-connection-manager:3001
+      DEPLOYMENT_MODE: laptop 
+      WXO_URL: http://localhost:3412
+      ENV: production
+      WXO_SERVER_URL: http://localhost:4321
+      TENANT_ID: ${REACT_APP_TENANT_ID}
+      WXO_CHAT_URL: http://localhost:3000
+    ports:
+     - "3412:3412"
+    networks:
+      - default
 
   ai-gateway:
     image: ${AI_GATEWAY_REGISTRY:-us.icr.io/watson-orchestrate-private}/ai-gateway:${AI_GATEWAY_TAG:-latest}
@@ -73,6 +93,24 @@ services:
     environment:
       JWT_SECRET: ${JWT_SECRET}
       DEPLOYMENT_PLATFORM: laptop-lite
+      CALLBACK_HOST_URL: ${CALLBACK_HOST_URL:-}
+      REDIS_URL: redis://wxo-server-redis:6379/0
+    entrypoint: >
+      sh -c '
+        if [ ! -z "$$CALLBACK_HOST_URL" ]; then
+          GATEWAY_IP=$$(echo "$$CALLBACK_HOST_URL" | sed "s|http://||" | cut -d: -f1)
+          export CALL_BACK_URL="http://$$GATEWAY_IP:8989"
+          echo "Auto-configured CALL_BACK_URL: $$CALL_BACK_URL"
+        else
+          export CALL_BACK_URL="http://wxo-agent-gateway:8989"
+          echo "Using fallback CALL_BACK_URL: $$CALL_BACK_URL"
+        fi
+        if [ $$# -eq 0 ]; then
+          exec ./conditional_script.sh
+        else
+          exec "$$@"
+        fi
+      '
 
   ui:
     image: ${UI_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-chat:${UITAG:-latest}
@@ -105,6 +143,7 @@ services:
       STANDALONE: "true"
       STREAM_TIMEOUT: ${STREAM_TIMEOUT:-120000}
       WXO_VOICE_URL: http://localhost:9876/v1
+      DPS_CACHE_URL: http://localhost:18083
     command: "./StartServer.sh"
     ports:
       - "3000:4002"
@@ -127,13 +166,13 @@ services:
       AGENTS_OPS_RUNTIME_ENDPOINT: https://frontend-server:443
       DPI_WO_WDU_SERVER_ENDPOINT: https://wxo-doc-processing-service:8080
       DPI_RAG_SERVER_ENDPOINT: https://wxo-doc-processing-llm-service:8083
-      IBM_DPS_CACHE_SERVICE: https://wxo-doc-processing-cache:8080
+      IBM_DPS_CACHE_SERVICE: http://wxo-doc-processing-cache:8080
       DOCPROC_BASE_URL: http://wxo-doc-processing-infra-standalone:9080
       BUILDER_ASYNC_CALLBACK_ENDPOINT: http://wxo-builder:4025
       DOCPROC_ENABLED: ${DOCPROC_ENABLED:-false}
       IS_OBSERVABILITY_FEATURE_ENABLED: "true"
       ALLOW_INSECURE_TLS: "true"
-      ENABLE_EDIT_PROMPTS: "false"
+      ENABLE_EDIT_PROMPTS: "true"
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
       ENABLE_EMBED_SCRIPT: "true"
     command: 'npm start'
@@ -353,6 +392,10 @@ services:
       ES_HOST: http://elasticsearch:9200
       ORIGIN_HEADER: "internal"
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
+      WATSONX_SERVER: WXO
+      EVALUATION_PLATFORM: lite-local
+      AGENTOPS_BACKEND_URL: https://frontend-server:443
+      OBSERVABILITY_POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/wxo_observability
 
   wxo-server-worker:
     image: ${WORKER_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-server-conversation_controller:${WORKER_TAG:-latest}
@@ -453,6 +496,10 @@ services:
       CPD_VERIFY: ${CPD_VERIFY}
       CALLBACK_HOST_URL: ${CALLBACK_HOST_URL:-http://wxo-server:4321}
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
+      WATSONX_SERVER: WXO
+      EVALUATION_PLATFORM: lite-local
+      AGENTOPS_BACKEND_URL: https://frontend-server:443
+      OBSERVABILITY_POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/wxo_observability
   
   tools-runtime-manager:
     image: ${TRM_REGISTRY:-us.icr.io/watson-orchestrate-private}/tools-runtime-manager:${TRM_TAG:-latest}
@@ -813,6 +860,7 @@ services:
       AUTHORIZATION_URL: ${AUTHORIZATION_URL}
       WO_AUTH_TYPE: ${WO_AUTH_TYPE}
       FLOW_CALLBACK_REQUEST_RETRIES: "1"
+      DOCPROC_CACHE_SERVER_URL: http://wxo-doc-processing-cache:8080
     healthcheck:
       test: curl -k http://localhost:9044/readiness --fail
       interval: 30s
@@ -858,13 +906,13 @@ services:
       SERVICE_NAME: wxo-doc-processing-service
       LOG_LEVEL: info
       VERIFY_CLIENT_CERT: 0
-      SERVICE_URL: ${SERVICE_URL:-https://wxo-doc-processing-cache:8080}
+      SERVICE_URL: ${SERVICE_URL:-http://wxo-doc-processing-cache:8080}
       RATE_LIMITING_ENABLED: "false"
       SHOULD_CACHE_IMAGES: "false"
       HANDWRITING_ENABLED: "true"
       WDU_RUNTIME_URL: wdu-runtime:8080
       WDU_TIMEOUT_SECS: "180"
-      IBM_DPS_CACHE_SERVICE: https://wxo-doc-processing-cache:8080
+      IBM_DPS_CACHE_SERVICE: http://wxo-doc-processing-cache:8080
     profiles:
       - docproc
     depends_on:
@@ -959,6 +1007,8 @@ services:
       VERIFY_CLIENT_CERT: 1
       # S3_USE_SSL: false
       # S3_VERIFY_CERT: false
+      ISTIO_ENABLED: true
+      IS_ADK_ENV: true
     profiles:
       - docproc
     depends_on:
@@ -971,7 +1021,7 @@ services:
     # volumes:
       # - ./docker/wo_doc_processing_rag_base/etc/certs:/etc/certs
     healthcheck:
-      test: ["CMD-SHELL", "curl -fk https://localhost:8080/ping"]
+      test: ["CMD-SHELL", "curl -fk http://localhost:8080/ping"]
       interval: 30s
       timeout: 30s
       retries: 10
@@ -1030,7 +1080,7 @@ services:
       LOG_LEVEL: info
       WATSONX_API_ENDPOINT: ${WATSONX_URL:-https://us-south.ml.cloud.ibm.com}
       WXO_SERVER_BASE_URL : http://wxo-server:4321
-      IBM_DPS_CACHE_SERVICE: 'wxo-doc-processing-cache:8080'
+      IBM_DPS_CACHE_SERVICE: 'http://wxo-doc-processing-cache:8080'
     profiles:
       - docproc
     depends_on:

ibm_watsonx_orchestrate/docker/default.env

@@ -58,41 +58,44 @@ REGISTRY_URL=
 
 
 
-SERVER_TAG=09-09-2025-2164abd
+SERVER_TAG=24-09-2025-17d7c67
 SERVER_REGISTRY=
 
-WORKER_TAG=09-09-2025-2164abd
+WORKER_TAG=24-09-2025-17d7c67
 WORKER_REGISTRY=
 
 AI_GATEWAY_TAG=20-08-2025-9ed6d40
 AI_GATEWAY_REGISTRY=
 
-AGENT_GATEWAY_TAG=29-07-2025
+AGENT_GATEWAY_TAG=19-10-2025-e48ad3a
 AGENT_GATEWAY_REGISTRY=
 
 DB_REGISTRY=
 # If you build multiarch set all three of these to the same, we have a pr against main
 # to not have this separation, but we can merge it later
-DBTAG=09-09-2025-fb76647
-AMDDBTAG=09-09-2025-fb76647
-ARM64DBTAG=09-09-2025-fb76647
+DBTAG=17-09-2025-8a9aff2
+AMDDBTAG=17-09-2025-8a9aff2
+ARM64DBTAG=17-09-2025-8a9aff2
 
 UI_REGISTRY=
-UITAG=29-08-2025
+UITAG=22-09-2025-e35f498
 
 CM_REGISTRY=
-CM_TAG=24-07-2025
+CM_TAG=16-09-2025-e33b344
 
-TRM_TAG=09-09-2025-6e9d73d
+CONNECTIONS_UI_REGISTRY=
+CONNECTIONS_UI_TAG=15-09-2025-98aa9da
+
+TRM_TAG=16-09-2025-cb6b9df
 TRM_REGISTRY=
 
-TR_TAG=09-09-2025-6e9d73d
+TR_TAG=24-09-2025-a515038
 TR_REGISTRY=
 
-BUILDER_TAG=12-09-2025-e441686
+BUILDER_TAG=24-09-2025-f9b68d8
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=15-09-2025-2e8478c
+FLOW_RUNTIME_TAG=22-09-2025-0bd3f58
 FLOW_RUMTIME_REGISTRY=
 
 
@@ -118,10 +121,10 @@ LANGFLOW_IMAGE=
 WDU_TAG=2.7.0
 WDU_REGISTRY=
 
-DOCPROC_DPS_TAG=20250904-181617-287-1ca2bf1
-DOCPROC_LLMSERVICE_TAG=20250904-main-136-b94360e
-DOCPROC_CACHE_TAG=20250902-master-83-748d456
-DOCPROC_DPI_TAG=20250905-092707-286-8c6b8f92
+DOCPROC_DPS_TAG=20250910-165658-290-c566031
+DOCPROC_LLMSERVICE_TAG=20250915-main-139-7a36ad3
+DOCPROC_CACHE_TAG=20250916-master-86-454157f
+DOCPROC_DPI_TAG=20250910-214413-288-a348dfd9
 DOCPROC_REGISTRY=
 
 # END -- IMAGE REGISTRIES AND TAGS

ibm_watsonx_orchestrate/flow_builder/flows/decorators.py

@@ -8,6 +8,8 @@ import logging
 import inspect
 from typing import Callable, Optional, Sequence
 from pydantic import BaseModel
+
+from ...agent_builder.models.types import ListVirtualModel
 from ..types import extract_node_spec, UserNodeSpec, FlowSpec
 
 from .flow import FlowFactory, Flow
@@ -33,8 +35,11 @@ def flow(*args,
          description: str|None=None,
          input_schema: type[BaseModel] | None = None,
          output_schema: type[BaseModel] | None = None,
+         private_schema: type[BaseModel] | None = None,
          initiators: Sequence[str] = (),
-         schedulable: bool = False):
+         schedulable: bool = False,
+         llm_model: str|ListVirtualModel|None=None,
+         agent_conversation_memory_turns_limit: int|None=None):
     """Decorator to mark a function as a flow model builder."""
 
     def decorator(func: Callable):
@@ -59,8 +64,11 @@ def flow(*args,
                              description = node_spec.description,
                              input_schema = input_schema,
                              output_schema = output_schema,
+                             private_schema = private_schema,
                              initiators = initiators,
-                             schedulable = schedulable)
+                             schedulable = schedulable,
+                             llm_model = llm_model,
+                             agent_conversation_memory_turns_limit = agent_conversation_memory_turns_limit)
 
         # logger.info("Creating flow model: %s", a_model.spec.name)
 

ibm_watsonx_orchestrate/flow_builder/flows/flow.py

@@ -21,17 +21,18 @@ from typing_extensions import Self
 from pydantic import BaseModel, Field, SerializeAsAny, create_model, TypeAdapter
 import yaml
 from ibm_watsonx_orchestrate.agent_builder.tools.python_tool import PythonTool
+from ibm_watsonx_orchestrate.agent_builder.models.types import ListVirtualModel
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
 from ibm_watsonx_orchestrate.client.tools.tempus_client import TempusClient
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ..types import (
-    DocProcKVPSchema, Assignment, Conditions, EndNodeSpec, Expression, ForeachPolicy, ForeachSpec, LoopSpec, BranchNodeSpec, MatchPolicy, NodeIdCondition, PlainTextReadingOrder, PromptExample, PromptLLMParameters, PromptNodeSpec, TimerNodeSpec,
+    DocProcKVPSchema, Assignment, Conditions, EndNodeSpec, Expression, ForeachPolicy, ForeachSpec, LoopSpec, BranchNodeSpec, MatchPolicy, NodeIdCondition, PlainTextReadingOrder, PromptExample, PromptLLMParameters, PromptNodeSpec, ScriptNodeSpec, TimerNodeSpec,
     StartNodeSpec, ToolSpec, JsonSchemaObject, ToolRequestBody, ToolResponseBody, UserFieldKind, UserFieldOption, UserFlowSpec, UserNodeSpec, WaitPolicy,
     DocProcSpec, TextExtractionResponse, DocProcInput, DecisionsNodeSpec, DecisionsRule, DocExtSpec, File, DocumentClassificationResponse, DocClassifierSpec, DocumentProcessingCommonInput
 )
 from .constants import CURRENT_USER, START, END, ANY_USER
 from ..node import (
-    EndNode, Node, PromptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode, DecisionsNode, DocExtNode, DocClassifierNode
+    EndNode, Node, PromptNode, ScriptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode, DecisionsNode, DocExtNode, DocClassifierNode
 )
 from ..types import (
     AgentNodeSpec, extract_node_spec, FlowContext, FlowEventType, FlowEvent, FlowSpec,
@@ -84,6 +85,21 @@ class Flow(Node):
         # get Tool Client
         self._tool_client = instantiate_client(ToolClient)
 
+        # set llm_model to use for the flow if any
+        llm_model = kwargs.get("llm_model")
+        if llm_model:
+            if isinstance(llm_model, ListVirtualModel):
+                self.metadata["llm_model"] = llm_model.name
+            elif isinstance(llm_model, str):
+                self.metadata["llm_model"] = llm_model
+            else:
+                raise AssertionError(f"flow llm_model should be either a str or ListVirtualModel")
+        
+        # set agent_conversation_memory_turns_limit for the flow if any
+        agent_conversation_memory_turns_limit = kwargs.get("agent_conversation_memory_turns_limit")
+        if agent_conversation_memory_turns_limit:
+            self.metadata["agent_conversation_memory_turns_limit"] = agent_conversation_memory_turns_limit
+
     def _find_topmost_flow(self) -> Self:
         if self.parent:
             return self.parent._find_topmost_flow()
@@ -341,6 +357,41 @@ class Flow(Node):
 
         node = self._add_node(node)
         return cast(ToolNode, node)
+    
+
+    def script(
+        self,
+        script: str | None = "",
+        name: str | None = None,
+        display_name: str | None = None,
+        description: str | None = None,
+        input_schema: type[BaseModel] | None = None,
+        output_schema: type[BaseModel] | None = None,
+        input_map: DataMap = None
+    ) -> ScriptNode:
+        '''create a script node in the flow'''    
+        name = name if name is not None and name != "" else ""
+
+        input_schema_obj = _get_json_schema_obj("input", input_schema)
+        output_schema_obj = _get_json_schema_obj("output", output_schema)
+
+        script_node_spec = ScriptNodeSpec(
+                                name = name,
+                                display_name = display_name,
+                                description = description,
+                                input_schema= _get_tool_request_body(input_schema_obj),
+                                output_schema= _get_tool_response_body(output_schema_obj),
+                                output_schema_object = output_schema_obj,
+                                fn = script)
+
+        node = ScriptNode(spec=script_node_spec)
+
+        # setup input and output map
+        if input_map:
+            node.input_map = self._get_data_map(input_map)
+
+        node = self._add_node(node)
+        return cast(ScriptNode, node)
  
 
     def _add_node(self, node: Node) -> Node:
@@ -519,7 +570,9 @@ class Flow(Node):
             fields: type[BaseModel]| None = None, 
             description: str | None = None,
             input_map: DataMap = None,
-            enable_hw: bool = False) -> tuple[DocExtNode, type[BaseModel]]:
+            enable_hw: bool = False,
+            min_confidence: float = 0, # Setting a small value because htil is not supported for pro code. 
+            review_fields: List[str] = []) -> tuple[DocExtNode, type[BaseModel]]:
         
         if name is None :
             raise ValueError("name must be provided.")
@@ -544,7 +597,9 @@ class Flow(Node):
             output_schema_object = output_schema_obj,
             config=doc_ext_config,
             version=version,
-            enable_hw=enable_hw
+            enable_hw=enable_hw,
+            min_confidence=min_confidence,
+            review_fields=review_fields
         )
         node = DocExtNode(spec=task_spec)
 
@@ -609,7 +664,8 @@ class Flow(Node):
             input_map: DataMap = None,
             document_structure: bool = False,
             kvp_schemas: list[DocProcKVPSchema] = None,
-            enable_hw: bool = False) -> DocProcNode:
+            enable_hw: bool = False,
+            kvp_model_name: str | None = None) -> DocProcNode:
 
         if name is None :
             raise ValueError("name must be provided.")
@@ -635,7 +691,8 @@ class Flow(Node):
             document_structure=document_structure,
             plain_text_reading_order=plain_text_reading_order,
             enable_hw=enable_hw,
-            kvp_schemas=kvp_schemas
+            kvp_schemas=kvp_schemas,
+            kvp_model_name=kvp_model_name
         )
 
         node = DocProcNode(spec=task_spec)
@@ -1201,7 +1258,7 @@ class CompiledFlow(BaseModel):
         dumped = self.flow.to_json()
         with open(file, 'w') as f:
             if file.endswith(".yaml") or file.endswith(".yml"):
-                yaml.dump(dumped, f)
+                yaml.dump(dumped, f, allow_unicode=True)
             elif file.endswith(".json"):
                 json.dump(dumped, f, indent=2)
             else:
@@ -1223,7 +1280,10 @@ class FlowFactory(BaseModel):
                     initiators: Sequence[str]|None=None,
                     input_schema: type[BaseModel]|None=None,
                     output_schema: type[BaseModel]|None=None,
-                    schedulable: bool=False) -> Flow:
+                    private_schema: type[BaseModel]|None=None,
+                    schedulable: bool=False,
+                    llm_model: str|ListVirtualModel|None=None,
+                    agent_conversation_memory_turns_limit: int|None = None) -> Flow:
         if isinstance(name, Callable):
             flow_spec = getattr(name, "__flow_spec__", None)
             if not flow_spec:
@@ -1233,6 +1293,7 @@ class FlowFactory(BaseModel):
         input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = input_schema)
         # create input spec
         output_schema_obj = _get_json_schema_obj("output", output_schema)
+        private_schema_obj = _get_json_schema_obj("private", private_schema)
         if initiators is None:
             initiators = []
 
@@ -1244,11 +1305,12 @@ class FlowFactory(BaseModel):
             initiators=initiators,
             input_schema=_get_tool_request_body(input_schema_obj),
             output_schema=_get_tool_response_body(output_schema_obj),
+            private_schema = private_schema_obj,
             output_schema_object = output_schema_obj,
             schedulable=schedulable,
         )
 
-        return Flow(spec = flow_spec)
+        return Flow(spec = flow_spec, llm_model=llm_model, agent_conversation_memory_turns_limit=agent_conversation_memory_turns_limit)
 
 
 class FlowControl(Node):

ibm_watsonx_orchestrate/flow_builder/node.py

@@ -6,7 +6,7 @@ import yaml
 from pydantic import BaseModel, Field, SerializeAsAny, create_model
 from enum import Enum
 
-from .types import Assignment, DocExtConfigField, EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, TimerNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec, \
+from .types import Assignment, DocExtConfigField, EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, ScriptNodeSpec, TimerNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec, \
                     DocExtSpec, DocExtConfig, DocClassifierSpec, DecisionsNodeSpec, DocClassifierConfig
 
 from .data_map import DataMap
@@ -23,7 +23,7 @@ class Node(BaseModel):
                                       exclude_unset=True, exclude_none=True, by_alias=True)
         with open(file, 'w', encoding="utf-8") as f:
             if file.endswith('.yaml') or file.endswith('.yml'):
-                yaml.dump(dumped, f)
+                yaml.dump(dumped, f, allow_unicode=True)
             elif file.endswith('.json'):
                 json.dump(dumped, f, indent=2)
             else:
@@ -132,6 +132,18 @@ class ToolNode(Node):
 
     def get_spec(self) -> ToolNodeSpec:
         return cast(ToolNodeSpec, self.spec)
+    
+
+class ScriptNode(Node):
+    def __repr__(self):
+        return f"ScriptNode(name='{self.spec.name}', description='{self.spec.description}')"
+
+    def get_spec(self) -> ScriptNodeSpec:
+        return cast(ScriptNodeSpec, self.spec)
+    
+    def updateScript(self, script: str):
+        '''Update the script of a script node'''
+        self.spec.fn = script
 
 class UserNode(Node):
     def __repr__(self):