ibm-watsonx-orchestrate 1.10.1__tar.gz → 1.10.2__tar.gz

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.10.1
+Version: 1.10.2
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,8 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.10.1"
-
+__version__ = "1.10.2"
 
 
 from ibm_watsonx_orchestrate.utils.logging.logger import setup_logging

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/agent_builder/connections/types.py

@@ -165,53 +165,6 @@ class ConnectionConfiguration(BaseModel):
             raise ValueError("Connection of type 'key_value' cannot be configured at the 'member' level. Key value connections must be of type 'team'")
         return self
 
-class ConnectionCredentialsEntryLocation(str, Enum):
-    BODY = 'body'
-    HEADER = 'header',
-    QUERY = 'query'
-
-    def __str__(self):
-        return self.value
-
-class ConnectionCredentialsEntry(BaseModel):
-    key: str
-    value: str
-    location: ConnectionCredentialsEntryLocation
-
-    def __str__(self):
-        return f"<ConnectionCredentialsEntry: {self.location}:{self.key}={self.value}>"
-
-class BaseOAuthCredentials(BaseModel):
-    custom_token_query: Optional[dict] = None
-    custom_token_header: Optional[dict] = None
-    custom_token_body: Optional[dict] = None
-    custom_auth_query: Optional[dict] = None
-
-class ConnectionCredentialsCustomFields(BaseOAuthCredentials):
-    def add_field(self, entry: ConnectionCredentialsEntry, is_token:bool=True) -> None:
-        match entry.location:
-            case ConnectionCredentialsEntryLocation.HEADER:
-                if not is_token:
-                    return
-                attribute = "custom_token_header"
-            case ConnectionCredentialsEntryLocation.BODY:
-                if not is_token:
-                    return
-                attribute = "custom_token_body"
-            case ConnectionCredentialsEntryLocation.QUERY:
-                if is_token:
-                     attribute = "custom_token_query"
-                else:
-                    attribute = "custom_auth_query"
-            case _:
-                return
-        
-        fields = getattr(self, attribute)
-        if not fields:
-            setattr(self, attribute, {})
-            fields = getattr(self, attribute)
-        fields[entry.key] = entry.value
-
 class BasicAuthCredentials(BaseModel):
     username: str
     password: str
@@ -229,7 +182,7 @@ class OAuth2TokenCredentials(BaseModel):
     access_token: str
     url: Optional[str] = None
 
-class OAuth2AuthCodeCredentials(BaseOAuthCredentials):
+class OAuth2AuthCodeCredentials(BaseModel):
     client_id: str
     client_secret: str
     token_url: str
@@ -240,7 +193,7 @@ class OAuth2AuthCodeCredentials(BaseOAuthCredentials):
 #     client_id: str
 #     authorization_url: str
 
-class OAuth2PasswordCredentials(BaseOAuthCredentials):
+class OAuth2PasswordCredentials(BaseModel):
     username: str
     password: str
     client_id: str
@@ -250,7 +203,7 @@ class OAuth2PasswordCredentials(BaseOAuthCredentials):
     grant_type: str = "password"
     
 
-class OAuth2ClientCredentials(BaseOAuthCredentials):
+class OAuth2ClientCredentials(BaseModel):
     client_id: str
     client_secret: str
     token_url: str
@@ -258,7 +211,7 @@ class OAuth2ClientCredentials(BaseOAuthCredentials):
     send_via: ConnectionSendVia = ConnectionSendVia.HEADER
     grant_type: str = "client_credentials"
 
-class OAuthOnBehalfOfCredentials(BaseOAuthCredentials):
+class OAuthOnBehalfOfCredentials(BaseModel):
     client_id: str
     access_token_url: str
     grant_type: str
@@ -314,7 +267,7 @@ CONNECTION_TYPE_CREDENTIAL_MAPPING = {
     ConnectionSecurityScheme.KEY_VALUE: KeyValueConnectionCredentials,
 }
 
-class IdentityProviderCredentials(BaseOAuthCredentials):
+class IdentityProviderCredentials(BaseModel):
     idp_url: str = Field(validation_alias=AliasChoices('idp_url', 'url'), serialization_alias='idp_url')
     client_id: str
     client_secret: str
@@ -323,4 +276,4 @@ class IdentityProviderCredentials(BaseOAuthCredentials):
 
 class ExpectedCredentials(BaseModel):
     app_id: str
-    type: ConnectionType | List[ConnectionType]
+    type: ConnectionType | List[ConnectionType]

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py

@@ -1,6 +1,6 @@
 import typer
 from typing_extensions import Annotated, List
-from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionEnvironment, ConnectionPreference, ConnectionKind, ConnectionCredentialsEntry
+from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionEnvironment, ConnectionPreference, ConnectionKind
 from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller import (
     add_connection,
     remove_connection,
@@ -8,9 +8,7 @@ from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller imp
     import_connection,
     configure_connection,
     set_credentials_connection,
-    set_identity_provider_connection,
-    token_entry_connection_credentials_parse,
-    auth_entry_connection_credentials_parse
+    set_identity_provider_connection
 )
 
 connections_app = typer.Typer(no_args_is_help=True)
@@ -246,22 +244,6 @@ def set_credentials_connection_command(
             help="For key_value, a key value pair in the form '<key>=<value>'. Multiple values can be passed using `-e key1=value1 -e key2=value2`"
         )
     ] = None,
-    token_entries: Annotated[
-        List[ConnectionCredentialsEntry],
-        typer.Option(
-            '--token-entries', "-t",
-            parser=token_entry_connection_credentials_parse,
-            help="Custom field options for oauth types token request, a key value location option in the form 'location:<key>=<value>' or '<key>=<value>' with location defaulting to 'header'. Multiple values can be passed using `-t key1=value1 -t location:key2=value2`"
-        )
-    ] = None,
-    auth_entries: Annotated[
-        List[ConnectionCredentialsEntry],
-        typer.Option(
-            '--auth-entries',
-            parser=auth_entry_connection_credentials_parse,
-            help="Custom field options for oauth_auth_code_flow auth server request, a key value location option in the form 'location:<key>=<value>' or '<key>=<value>' with location defaulting to 'query'. Note only 'query' is a valid location. Multiple values can be passed using `--auth-entries key1=value1 --auth-entries location:key2=value2`"
-        )
-    ] = None,
 ):
     set_credentials_connection(
         app_id=app_id,
@@ -277,9 +259,7 @@ def set_credentials_connection_command(
         auth_url=auth_url,
         grant_type=grant_type,
         scope=scope,
-        entries=entries,
-        token_entries=token_entries,
-        auth_entries=auth_entries
+        entries=entries
     )
 
 @connections_app.command(name="set-identity-provider")
@@ -331,14 +311,6 @@ def set_identity_provider_connection_command(
             help='The grant-type of the the identity provider'
         )
     ],
-    token_entries: Annotated[
-        List[ConnectionCredentialsEntry],
-        typer.Option(
-            '--token-entries', "-t",
-            parser=token_entry_connection_credentials_parse,
-            help="Custom field options for oauth types token request, a key value location option in the form 'location:<key>=<value>' or '<key>=<value>' with location defaulting to 'header'. Multiple values can be passed using `-t key1=value1 -t location:key2=value2`"
-        )
-    ] = None,
 ):
     set_identity_provider_connection(
         app_id=app_id,
@@ -347,6 +319,5 @@ def set_identity_provider_connection_command(
         client_id=client_id,
         client_secret=client_secret,
         scope=scope,
-        grant_type=grant_type,
-        token_entries=token_entries
+        grant_type=grant_type
     )

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -27,10 +27,7 @@ from ibm_watsonx_orchestrate.agent_builder.connections.types import (
     KeyValueConnectionCredentials,
     CREDENTIALS,
     IdentityProviderCredentials,
-    OAUTH_CONNECTION_TYPES,
-    ConnectionCredentialsEntryLocation,
-    ConnectionCredentialsEntry,
-    ConnectionCredentialsCustomFields
+    OAUTH_CONNECTION_TYPES
 
 )
 
@@ -170,13 +167,6 @@ def _validate_connection_params(type: ConnectionType, **args) -> None:
             f"Missing flags --grant-type is required for type {type}"
         )
     
-    if type != ConnectionType.OAUTH2_AUTH_CODE and (
-        args.get('auth_entries')
-    ):
-        raise typer.BadParameter(
-            f"The flag --auth-entries is only supported by type {type}"
-        )
-    
 
 def _parse_entry(entry: str) -> dict[str,str]:
     split_entry = entry.split('=', 1)
@@ -186,19 +176,6 @@ def _parse_entry(entry: str) -> dict[str,str]:
         exit(1)
     return {split_entry[0]: split_entry[1]}
 
-def _get_oauth_custom_fields(token_entries: List[ConnectionCredentialsEntry] | None, auth_entries: List[ConnectionCredentialsEntry] | None) -> dict:
-    custom_fields = ConnectionCredentialsCustomFields()
-
-    if token_entries:
-        for entry in token_entries:
-            custom_fields.add_field(entry, is_token=True)
-    
-    if auth_entries:
-        for entry in auth_entries:
-            custom_fields.add_field(entry, is_token=False)
-    
-    return custom_fields.model_dump(exclude_none=True)
-
 def _get_credentials(type: ConnectionType, **kwargs):
     match type:
         case ConnectionType.BASIC_AUTH:
@@ -215,21 +192,18 @@ def _get_credentials(type: ConnectionType, **kwargs):
                 api_key=kwargs.get("api_key")
             )
         case ConnectionType.OAUTH2_AUTH_CODE:
-            custom_fields = _get_oauth_custom_fields(kwargs.get("token_entries"), kwargs.get("auth_entries"))
             return OAuth2AuthCodeCredentials(
                 authorization_url=kwargs.get("auth_url"),
                 client_id=kwargs.get("client_id"),
                 client_secret=kwargs.get("client_secret"),
                 token_url=kwargs.get("token_url"),
-                scope=kwargs.get("scope"),
-                **custom_fields
+                scope=kwargs.get("scope")
             )
         case ConnectionType.OAUTH2_CLIENT_CREDS:
             # using filtered args as default values will not be set if 'None' is passed, causing validation errors
             keys = ["client_id","client_secret","token_url","grant_type","send_via", "scope"]
             filtered_args = { key_name: kwargs[key_name] for key_name in keys if kwargs.get(key_name) }
-            custom_fields = _get_oauth_custom_fields(kwargs.get("token_entries"), kwargs.get("auth_entries"))
-            return OAuth2ClientCredentials(**filtered_args, **custom_fields)
+            return OAuth2ClientCredentials(**filtered_args)
         # case ConnectionType.OAUTH2_IMPLICIT:
         #     return OAuth2ImplicitCredentials(
         #         authorization_url=kwargs.get("auth_url"),
@@ -238,16 +212,13 @@ def _get_credentials(type: ConnectionType, **kwargs):
         case ConnectionType.OAUTH2_PASSWORD:
             keys = ["username", "password", "client_id","client_secret","token_url","grant_type", "scope"]
             filtered_args = { key_name: kwargs[key_name] for key_name in keys if kwargs.get(key_name) }
-            custom_fields = _get_oauth_custom_fields(kwargs.get("token_entries"), kwargs.get("auth_entries"))
-            return OAuth2PasswordCredentials(**filtered_args, **custom_fields)
+            return OAuth2PasswordCredentials(**filtered_args)
         
         case ConnectionType.OAUTH_ON_BEHALF_OF_FLOW:
-            custom_fields = _get_oauth_custom_fields(kwargs.get("token_entries"), kwargs.get("auth_entries"))
             return OAuthOnBehalfOfCredentials(
                 client_id=kwargs.get("client_id"),
                 access_token_url=kwargs.get("token_url"),
-                grant_type=kwargs.get("grant_type"),
-                **custom_fields
+                grant_type=kwargs.get("grant_type")
             )
         case ConnectionType.KEY_VALUE:
             env = {}
@@ -260,23 +231,6 @@ def _get_credentials(type: ConnectionType, **kwargs):
         case _:
             raise ValueError(f"Invalid type '{type}' selected")
 
-def _connection_credentials_parse_entry(text: str, default_location: ConnectionCredentialsEntryLocation) -> ConnectionCredentialsEntry:
-    location_kv_pair = text.split(":", 1)
-    key_value = location_kv_pair[-1]
-    location = location_kv_pair[0] if len(location_kv_pair)>1 else default_location
-
-    valid_locations = [item.value for item in ConnectionCredentialsEntryLocation]
-    if location not in valid_locations:
-        raise typer.BadParameter(f"The provided location '{location}' is not in the allowed values {valid_locations}.")
-
-    key_value_pair = key_value.split('=', 1)
-    if len(key_value_pair) != 2:
-        message = f"The entry '{text}' is not in the expected form '<location>:<key>=<value>' or '<key>=<value>'"
-        raise typer.BadParameter(message)
-    key, value = key_value_pair[0], key_value_pair[1]
-    
-    return ConnectionCredentialsEntry(key=key, value=value, location=location)
-    
 
 def add_configuration(config: ConnectionConfiguration) -> None:
     client = get_connections_client()
@@ -570,15 +524,5 @@ def set_identity_provider_connection(
         logger.error(f"Cannot set Identity Provider when 'sso' is false in configuration. Please enable sso for connection '{app_id}' in environment '{environment}' and try again.")
         sys.exit(1)
 
-    custom_fields = _get_oauth_custom_fields(token_entries=kwargs.get("token_entries"), auth_entries=None)
-    idp = IdentityProviderCredentials(**kwargs, **custom_fields)
+    idp = IdentityProviderCredentials.model_validate(kwargs)
     add_identity_provider(app_id=app_id, environment=environment, idp=idp)
-
-def token_entry_connection_credentials_parse(text: str) -> ConnectionCredentialsEntry:
-    return _connection_credentials_parse_entry(text=text, default_location=ConnectionCredentialsEntryLocation.HEADER)
-    
-def auth_entry_connection_credentials_parse(text: str) -> ConnectionCredentialsEntry:
-    entry = _connection_credentials_parse_entry(text=text, default_location=ConnectionCredentialsEntryLocation.QUERY)
-    if entry.location != ConnectionCredentialsEntryLocation.QUERY:
-        raise typer.BadParameter(f"Only location '{ConnectionCredentialsEntryLocation.QUERY}' is supported for --auth-entry")
-    return entry

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -191,6 +191,9 @@ def get_default_registry_env_vars_by_dev_edition_source(default_env: dict, user_
             parsed = urlparse(wo_url)
             hostname = parsed.hostname
             
+            if not hostname or not hostname.startswith("api."):
+                raise ValueError(f"Invalid WO_INSTANCE URL: '{wo_url}'. It should starts with 'api.'")
+            
             registry_url = f"registry.{hostname[4:]}/cp/wxo-lite"
         else:
             raise ValueError(f"Unknown value for developer edition source: {source}. Must be one of ['internal', 'myibm', 'orchestrate'].")

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/cli/commands/server/types.py

@@ -1,6 +1,5 @@
 import logging
 import sys
-import uuid
 from enum import Enum
 from pydantic import BaseModel, model_validator, ConfigDict
 
@@ -44,6 +43,9 @@ class WatsonXAIEnvConfig(BaseModel):
         if not config.get("WATSONX_SPACE_ID") and not config.get("WATSONX_APIKEY"):
              raise ValueError("Missing configuration requirements 'WATSONX_SPACE_ID' and 'WATSONX_APIKEY'")
         
+        if config.get("WATSONX_SPACE_ID") and not config.get("WATSONX_APIKEY"):
+            logger.error("Cannot use env var 'WATSONX_SPACE_ID' without setting the corresponding 'WATSONX_APIKEY'")
+            sys.exit(1)
         
         if not config.get("WATSONX_SPACE_ID") and config.get("WATSONX_APIKEY"):
             logger.error("Cannot use env var 'WATSONX_APIKEY' without setting the corresponding 'WATSONX_SPACE_ID'")
@@ -52,12 +54,6 @@ class WatsonXAIEnvConfig(BaseModel):
         config["USE_SAAS_ML_TOOLS_RUNTIME"] = False
         return config
 
-def is_valid_uuid(value) -> bool:
-    try:
-        uuid.UUID(str(value))
-        return True
-    except (ValueError, TypeError, AttributeError):
-        return False
 
 class ModelGatewayEnvConfig(BaseModel):
     WO_API_KEY: str | None = None
@@ -88,10 +84,7 @@ class ModelGatewayEnvConfig(BaseModel):
         if not config.get("AUTHORIZATION_URL"):
             inferred_auth_url = AUTH_TYPE_DEFAULT_URL_MAPPING.get(auth_type)
             if not inferred_auth_url:
-                if auth_type == WoAuthType.CPD:
-                    inferred_auth_url = config.get("WO_INSTANCE") + '/icp4d-api/v1/authorize'   
-                else: 
-                    logger.error(f"No 'AUTHORIZATION_URL' found. Auth type '{auth_type}' does not support defaulting. Please set the 'AUTHORIZATION_URL' explictly")
+                logger.error(f"No 'AUTHORIZATION_URL' found. Auth type '{auth_type}' does not support defaulting. Please set the 'AUTHORIZATION_URL' explictly")
                 sys.exit(1)
             config["AUTHORIZATION_URL"] = inferred_auth_url
         
@@ -108,7 +101,6 @@ class ModelGatewayEnvConfig(BaseModel):
                 sys.exit(1)
         
         config["USE_SAAS_ML_TOOLS_RUNTIME"] = True
-        if not is_valid_uuid(config.get("WATSONX_SPACE_ID")):
-            # Fake (but valid) UUIDv4 for knowledgebase check
-            config["WATSONX_SPACE_ID"] = "aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa"
+        # Fake (but valid) UUIDv4 for knowledgebase check
+        config["WATSONX_SPACE_ID"] = "aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa"
         return config

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -62,7 +62,6 @@ services:
       WATSONX_API_KEY: ${WATSONX_APIKEY}
       WATSONX_URL: ${WATSONX_URL}
       WATSONX_SPACE_ID: ${WATSONX_SPACE_ID}
-      NODE_TLS_REJECT_UNAUTHORIZED: ${AI_GATEWAY_TLS_REJECT_UNAUTHORIZED}
 
   wxo-agent-gateway:
     image: ${AGENT_GATEWAY_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-agent-gateway:${AGENT_GATEWAY_TAG:-latest}
@@ -328,7 +327,6 @@ services:
       ENABLE_WEBHOOKS: false
       DISABLE_JSON_LOG_CELERY: true
       WXO_DEPLOYMENT_PLATFORM: saas
-      CPD_VERIFY: ${CPD_VERIFY}
       CONNECTION_MANAGER_URL: http://wxo-server-connection-manager:3001
       CHANNEL_SESSION_REDIS_URL: redis://wxo-server-redis:6379/5
       WXO_MILVUS_URI: http://wxo-milvus-standalone:19530
@@ -448,7 +446,6 @@ services:
       IBM_TELEMETRY_TRACER_ENDPOINT: http://jaeger:4318/v1/traces
       USE_IBM_TELEMETRY: ${USE_IBM_TELEMETRY:-false}
       WXO_DEPLOYMENT_PLATFORM: saas
-      CPD_VERIFY: ${CPD_VERIFY}
       CALLBACK_HOST_URL: ${CALLBACK_HOST_URL:-http://wxo-server:4321}
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
   
@@ -656,7 +653,6 @@ services:
       - WATSONX_URL=${WATSONX_URL}
       - PROXY_SERVER_URL=http://jaeger-proxy:9201
       - WXO_DEPLOYMENT_PLATFORM=saas
-      - CPD_VERIFY=${CPD_VERIFY}      
       - TENANT_API_KEY=${AGENTOPS_API_KEY}
       - TENANT_CONFIG_URL=http://wxo-server:4321
       - TENANT_DEFAULT_USERNAME=${ES_USERNAME}

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/docker/default.env

@@ -92,7 +92,7 @@ TR_REGISTRY=
 BUILDER_TAG=27-08-2025-7432aca
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=26-08-2025-3b7f19e
+FLOW_RUNTIME_TAG=18-08-2025-v3
 FLOW_RUMTIME_REGISTRY=
 
 
@@ -126,8 +126,6 @@ DOCPROC_REGISTRY=
 
 # END -- IMAGE REGISTRIES AND TAGS
 
-CPD_VERIFY=true
-AI_GATEWAY_TLS_REJECT_UNAUTHORIZED=1
 TAVILY_API_KEY=dummy_tavily_api_key
 PREFERRED_MODELS=meta-llama/llama-3-2-90b-vision-instruct,meta-llama/llama-3-405b-instruct
 INCOMPATIBLE_MODELS=flan,embedding,cross-encoder,tinytimemixers

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/flow_builder/data_map.py

@@ -12,10 +12,7 @@ class DataMap(BaseModel):
     def to_json(self) -> dict[str, Any]:
         model_spec = {}
         if self.maps and len(self.maps) > 0:
-            model_spec["maps"] = []
-            for assignment in self.maps:
-                model_spec["maps"].append(assignment.model_dump())
-        return model_spec
+            model_spec["maps"] = [assignment.model_dump() for assignment in self.maps]
 
     def add(self, line: Assignment) -> Self:
         self.maps.append(line)

{ibm_watsonx_orchestrate-1.10.1 → ibm_watsonx_orchestrate-1.10.2}/src/ibm_watsonx_orchestrate/flow_builder/flows/flow.py

@@ -25,7 +25,7 @@ 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, EndNodeSpec, Expression, ForeachPolicy, ForeachSpec, LoopSpec, BranchNodeSpec, MatchPolicy, PlainTextReadingOrder, PromptLLMParameters, PromptNodeSpec, TimerNodeSpec,
     StartNodeSpec, ToolSpec, JsonSchemaObject, ToolRequestBody, ToolResponseBody, UserFieldKind, UserFieldOption, UserFlowSpec, UserNodeSpec, WaitPolicy,
     DocProcSpec, TextExtractionResponse, DocProcInput, DecisionsNodeSpec, DecisionsRule, DocExtSpec, File, DocumentClassificationResponse, DocClassifierSpec, DocumentProcessingCommonInput
 )
@@ -64,7 +64,7 @@ class FlowEdge(BaseModel):
 
 class Flow(Node):
     '''Flow represents a flow that will be run by wxO Flow engine.'''
-    output_map: dict[str, DataMap] | None = None
+    output_map: DataMap | None = None
     nodes: dict[str, SerializeAsAny[Node]] = {}
     edges: List[FlowEdge] = []
     schemas: dict[str, JsonSchemaObject] = {}
@@ -401,7 +401,6 @@ class Flow(Node):
             display_name: str|None=None,
             system_prompt: str | list[str] | None = None,
             user_prompt: str | list[str] | None = None,
-            prompt_examples: list[PromptExample] | None = None,
             llm: str | None = None,
             llm_parameters: PromptLLMParameters | None = None,
             description: str | None = None,
@@ -423,7 +422,6 @@ class Flow(Node):
             description=description,
             system_prompt=system_prompt,
             user_prompt=user_prompt,
-            prompt_examples=prompt_examples,
             llm=llm,
             llm_parameters=llm_parameters,
             input_schema=_get_tool_request_body(input_schema_obj),
@@ -723,7 +721,7 @@ class Flow(Node):
         '''Create a single node flow with an automatic START and END node.'''
         return self.sequence(START, node, END)
 
-    def branch(self, evaluator: Union[Callable, Expression, Conditions]) -> 'Branch':
+    def branch(self, evaluator: Union[Callable, Expression]) -> "Branch":
         '''Create a BRANCH node'''
         e = evaluator
         if isinstance(evaluator, Callable):
@@ -737,19 +735,11 @@ class Flow(Node):
             # e = new_script_spec
         elif isinstance(evaluator, str):
             e = Expression(expression=evaluator)
-        elif isinstance(evaluator, list):
-            e = Conditions(conditions=evaluator)
 
         spec = BranchNodeSpec(name = "branch_" + str(self._next_sequence_id()), evaluator=e)
         branch_node = Branch(spec = spec, containing_flow=self)
         return cast(Branch, self._add_node(branch_node))
     
-    def conditions(self) -> 'Branch':
-        '''Create a Branch node with empty Conditions evaluator (if-else)'''
-        spec = BranchNodeSpec(name = "branch_" + str(self._next_sequence_id()), evaluator=Conditions(conditions=[]))
-        branch_conditions_node = Branch(spec = spec, containing_flow=self)
-        return cast(Branch, self._add_node(branch_conditions_node))
-    
     def wait_for(self, *args) -> "Wait":
         '''Wait for all incoming nodes to complete.'''
         raise ValueError("Not implemented yet.")
@@ -764,77 +754,6 @@ class Flow(Node):
             
         # return cast(Wait, self.node(wait_node))
             
-    def map_flow_output_with_variable(self, target_output_variable: str, variable: str, default_value: str = None) -> Self:
-        if self.output_map and "spec" in self.output_map:
-            maps = self.output_map["spec"].maps or []
-        else:
-            maps = []
-        
-        curr_map_metadata = {
-            "assignmentType": "variable"
-        }
-
-        target_variable = "flow.output." + target_output_variable
-        value_expression = "flow." + variable
-
-        if default_value:
-            maps.append(Assignment(target_variable=target_variable, value_expression=value_expression, default_value=default_value, metadata=curr_map_metadata))
-        else:
-            maps.append(Assignment(target_variable=target_variable, value_expression=value_expression, metadata=curr_map_metadata))
-
-        flow_output_map_spec = DataMap(maps=maps)
-
-        if self.output_map and "spec" in self.output_map:
-            self.output_map["spec"] = flow_output_map_spec
-        else:
-            self.output_map = {"spec": flow_output_map_spec}
-        return self
-    
-    def map_output(self, output_variable: str, expression: str, default_value: str = None) -> Self:
-        if self.output_map and "spec" in self.output_map:
-            maps = self.output_map["spec"].maps or []
-        else:
-            maps = []
-        
-        curr_map_metadata = {
-            "assignmentType": "pyExpression"
-        }
-
-        target_variable = "flow.output." + output_variable
-        value_expression = expression
-
-        if default_value:
-            maps.append(Assignment(target_variable=target_variable, value_expression=value_expression, default_value=default_value, metadata=curr_map_metadata))
-        else:
-            maps.append(Assignment(target_variable=target_variable, value_expression=value_expression, metadata=curr_map_metadata))
-
-        flow_output_map_spec = DataMap(maps=maps)
-
-        if self.output_map and "spec" in self.output_map:
-            self.output_map["spec"] = flow_output_map_spec
-        else:
-            self.output_map = {"spec": flow_output_map_spec}
-        return self
-    
-    def map_flow_output_with_none(self, target_output_variable: str) -> Self:
-        if self.output_map and "spec" in self.output_map:
-            maps = self.output_map["spec"].maps or []
-        else:
-            maps = []
-        
-
-        target_variable = "flow.output." + target_output_variable
-
-        maps.append(Assignment(target_variable=target_variable, value_expression=None))
-
-        flow_output_map_spec = DataMap(maps=maps)
-
-        if self.output_map and "spec" in self.output_map:
-            self.output_map["spec"] = flow_output_map_spec
-        else:
-            self.output_map = {"spec": flow_output_map_spec}
-        return self
-
 
     def foreach(self, item_schema: type[BaseModel],
                 input_schema: type[BaseModel] |None=None,
@@ -895,6 +814,8 @@ class Flow(Node):
                  input_schema: type[BaseModel] |None=None,
                  output_schema: type[BaseModel] |None=None) -> "UserFlow": # return a UserFlow object
 
+        raise ValueError("userflow is NOT supported yet and it's interface will change.")
+
         output_schema_obj = _get_json_schema_obj("output", output_schema)
         input_schema_obj = _get_json_schema_obj("input", input_schema)
 
@@ -996,11 +917,6 @@ class Flow(Node):
         for key, value in self.metadata.items():
             metadata_dict[key] = value
         flow_dict["metadata"] = metadata_dict
-
-        if self.output_map and "spec" in self.output_map:
-            flow_dict["output_map"] = {
-                "spec": self.output_map["spec"].to_json()
-            }
         return flow_dict
 
     def _get_node_id(self, node: Union[str, Node]) -> str:
@@ -1310,27 +1226,6 @@ class Branch(FlowControl):
             raise ValueError("Cannot have custom label __default__. Use default() instead.")
 
         return self._add_case(label, node)
-    
-    def condition(self, to_node: Node, expression: str="", default: bool=False) -> Self:
-        '''
-        Add a condition to this branch node. 
-
-        Parameters:
-        expression (str): The expression of this condition.
-        to_node (Node): The node to go to when expression is evaluated to true.
-        default (bool): The condition is the default (else) case.
-        '''
-
-        node_id = self.containing_flow._get_node_id(to_node)
-        if default:
-            condition = NodeIdCondition(node_id=node_id, default=default)
-        else:
-            condition = NodeIdCondition(expression=expression, node_id=node_id, default=default)
-
-        self.spec.evaluator.conditions.append(condition)
-        self.containing_flow.edge(self, to_node)
-
-        return self
 
     def default(self, node: Node) -> Self:
         '''
@@ -1550,14 +1445,13 @@ class UserFlow(Flow):
               kind: UserFieldKind = UserFieldKind.Text,
               display_name: str | None = None,
               description: str | None = None,
-              direction: str | None = None,
               default: Any | None = None,
               text: str = None, # The text used to ask question to the user, e.g. 'what is your name?'
               option: UserFieldOption | None = None,
               is_list: bool = False,
               min: Any | None = None,
               max: Any | None = None,
-              input_map: DataMap | None= None,
+              input_map: DataMap = None,
               custom: dict[str, Any] = {}) -> UserNode:
         '''create a node in the flow'''
         # create a json schema object based on the single field
@@ -1589,8 +1483,6 @@ class UserFlow(Flow):
                    description = description,
                    default = default,
                    text = text,
-                   direction = direction,
-                   input_map = input_map,
                    option = option,
                    is_list = is_list,
                    min = min,