ibm-watsonx-orchestrate 1.5.0b1__py3-none-any.whl → 1.6.0__py3-none-any.whl

ibm_watsonx_orchestrate/flow_builder/utils.py

@@ -0,0 +1,215 @@
+import importlib
+import inspect
+import re
+import logging
+
+from pydantic import BaseModel, TypeAdapter
+
+from langchain_core.utils.json_schema import dereference_refs
+from rpds import List
+import typer
+import yaml
+
+from ibm_watsonx_orchestrate.agent_builder.tools.base_tool import BaseTool
+from ibm_watsonx_orchestrate.agent_builder.tools.flow_tool import create_flow_json_tool
+from ibm_watsonx_orchestrate.agent_builder.tools.openapi_tool import OpenAPITool, create_openapi_json_tools_from_content
+from ibm_watsonx_orchestrate.agent_builder.tools.types import JsonSchemaObject, OpenApiToolBinding, ToolBinding, ToolRequestBody, ToolResponseBody, ToolSpec
+from ibm_watsonx_orchestrate.client.tools.tempus_client import TempusClient
+from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
+from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_local_dev
+
+logger = logging.getLogger(__name__)
+
+def get_valid_name(name: str) -> str:
+ 
+    return re.sub('\\W|^(?=\\d)','_', name)
+
+def _get_json_schema_obj(parameter_name: str, type_def: type[BaseModel] | ToolRequestBody | ToolResponseBody | None, openapi_decode: bool = False) -> JsonSchemaObject:
+    if not type_def or type_def is None or type_def == inspect._empty:
+        return None
+
+    if inspect.isclass(type_def) and issubclass(type_def, BaseModel):
+        schema_json = type_def.model_json_schema()
+        schema_json = dereference_refs(schema_json)
+        schema_obj = JsonSchemaObject(**schema_json)
+        if schema_obj.required is None:
+            schema_obj.required = []
+        return schema_obj
+    
+    if isinstance(type_def, ToolRequestBody) or isinstance(type_def, ToolResponseBody):
+        schema_json = type_def.model_dump()
+        schema_obj = JsonSchemaObject.model_validate(schema_json)
+
+        if openapi_decode:
+            # during tool import for openapi - we convert header, path and query parameter
+            # with a prefix "header_", "path_" and "query_".  We need to remove it.
+            if schema_obj.type == 'object':
+                # for each element in properties, we need to check the key and if it is
+                # prefixed with "header_", "path_" and "query_", we need to remove the prefix.
+                if hasattr(schema_obj, "properties"):
+                    new_properties = {}
+                    for key, value in schema_obj.properties.items():
+                        if key.startswith('header_'):
+                            new_properties[key[7:]] = value
+                        elif key.startswith('path_'):
+                            new_properties[key[5:]] = value
+                        elif key.startswith('query_'):
+                            new_properties[key[6:]] = value
+                        else:
+                            new_properties[key] = value
+                        
+                    schema_obj.properties = new_properties     
+
+                # we also need to go thru required and replace it
+                if hasattr(schema_obj, "required"):
+                    new_required = []
+                    for item in schema_obj.required:
+                        if item.startswith('header_'):
+                            new_required.append(item[7:])
+                        elif item.startswith('path_'):
+                            new_required.append(item[5:])
+                        elif item.startswith('query_'):
+                            new_required.append(item[6:])
+                        else:
+                            new_required.append(item)
+                    schema_obj.required = new_required
+
+        return schema_obj
+
+    # handle the non-obvious cases
+    schema_json = TypeAdapter(type_def).json_schema()
+    schema_json = dereference_refs(schema_json)
+    return JsonSchemaObject.model_validate(schema_json)
+
+
+def _get_tool_request_body(schema_obj: JsonSchemaObject) -> ToolRequestBody:
+    if schema_obj is None:
+        return None
+    
+    if isinstance(schema_obj, JsonSchemaObject):
+        request_obj = ToolRequestBody(type='object', properties=schema_obj.properties, required=schema_obj.required)
+        if schema_obj.model_extra:
+            request_obj.__pydantic_extra__ = schema_obj.model_extra
+
+        return request_obj
+    
+    raise ValueError(f"Invalid schema object: {schema_obj}")
+
+def _get_tool_response_body(schema_obj: JsonSchemaObject) -> ToolResponseBody:
+    if schema_obj is None:
+        return None
+    
+    if isinstance(schema_obj, JsonSchemaObject):
+        response_obj = ToolResponseBody(type=schema_obj.type)
+        if schema_obj.title:
+            response_obj.title = schema_obj.title
+        if schema_obj.description:
+            response_obj.description = schema_obj.description
+        if schema_obj.properties:
+            response_obj.properties = schema_obj.properties
+        if schema_obj.items:
+            response_obj.items = schema_obj.items
+        if schema_obj.uniqueItems:
+            response_obj.uniqueItems = schema_obj.uniqueItems
+        if schema_obj.anyOf:
+            response_obj.anyOf = schema_obj.anyOf
+        if schema_obj.required:
+            response_obj.required = schema_obj.required
+
+        if schema_obj.model_extra:
+            response_obj.__pydantic_extra__ = schema_obj.model_extra
+
+        return response_obj
+    
+    raise ValueError(f"Invalid schema object: {schema_obj}")
+
+
+async def import_flow_model(model):
+
+    if not is_local_dev():
+        raise typer.BadParameter(f"Flow tools are only supported in local environment.")
+
+    if model is None:
+        raise typer.BadParameter(f"No model provided.")
+
+    tool = create_flow_json_tool(name=model["spec"]["name"],
+                                description=model["spec"]["description"], 
+                                permission="read_only", 
+                                flow_model=model) 
+
+    client = instantiate_client(ToolClient)
+
+    tool_id = None
+    exist = False
+    existing_tools = client.get_draft_by_name(tool.__tool_spec__.name)
+    if len(existing_tools) > 1:
+        raise ValueError(f"Multiple existing tools found with name '{tool.__tool_spec__.name}'. Failed to update tool")
+
+    if len(existing_tools) > 0:
+        existing_tool = existing_tools[0]
+        exist = True
+        tool_id = existing_tool.get("id")
+
+    tool_spec = tool.__tool_spec__.model_dump(mode='json', exclude_unset=True, exclude_none=True, by_alias=True)
+    name = tool_spec['name']
+    if exist:
+        logger.info(f"Updating flow '{name}'")
+        client.update(tool_id, tool_spec)
+    else:
+        logger.info(f"Deploying flow '{name}'")
+        response = client.create(tool_spec)
+        tool_id = response["id"]
+
+    return tool_id
+
+def import_flow_support_tools():
+
+    if not is_local_dev():
+        # we can't import support tools into non-local environments yet
+        return
+
+    client = instantiate_client(TempusClient)
+
+    logger.info(f"Import 'get_flow_status' tool spec...")
+    tools = [create_flow_status_tool("i__get_flow_status_intrinsic_tool__")]
+
+    return tools
+
+# Assisted by watsonx Code Assistant
+
+def create_flow_status_tool(flow_status_tool: str, TEMPUS_ENDPOINT: str="http://wxo-tempus-runtime:9044") -> dict:
+
+    spec = ToolSpec(
+        name=flow_status_tool,
+        description="We can use the flow instance id to get the status of a flow. Only call this on explicit request by the user.",
+        permission='read_only',
+        display_name= "Get flow status"
+    )
+
+    openapi_binding = OpenApiToolBinding(
+        http_path="/flows",
+        http_method="GET",
+        security=[],
+        servers=[TEMPUS_ENDPOINT]
+    )
+    
+    spec.binding = ToolBinding(openapi=openapi_binding)
+    # Input Schema
+    properties = {
+        "query_instance_id": {
+            "type": "string",
+            "title": "instance_id",
+            "description": "Identifies the instance ID of the flow.",
+            "in": "query"
+        }
+    }
+    
+    spec.input_schema = ToolRequestBody(
+        type='object',
+        properties=properties,
+        required=[]
+    )
+    spec.output_schema = ToolResponseBody(type='array', description='Return the status of a flow instance.')
+
+    return OpenAPITool(spec=spec)
+

ibm_watsonx_orchestrate/run/connections.py

@@ -18,8 +18,8 @@ def bearer_token(app_id:str) -> BearerTokenAuthCredentials:
 def api_key_auth(app_id:str) -> APIKeyAuthCredentials:
     return get_application_connection_credentials(ConnectionType.API_KEY_AUTH, app_id=app_id)
 
-# def oauth2_auth_code(app_id:str) -> BearerTokenAuthCredentials:
-#     return get_application_connection_credentials(ConnectionType.OAUTH2_AUTH_CODE, app_id=app_id)
+def oauth2_auth_code(app_id:str) -> OAuth2TokenCredentials:
+    return get_application_connection_credentials(ConnectionType.OAUTH2_AUTH_CODE, app_id=app_id)
 
 # def oauth2_implicit(app_id:str) -> BearerTokenAuthCredentials:
 #     return get_application_connection_credentials(ConnectionType.OAUTH2_IMPLICIT, app_id=app_id)
@@ -27,8 +27,8 @@ def api_key_auth(app_id:str) -> APIKeyAuthCredentials:
 # def oauth2_password(app_id:str) -> BearerTokenAuthCredentials:
 #     return get_application_connection_credentials(ConnectionType.OAUTH2_PASSWORD, app_id=app_id)
 
-# def oauth2_client_creds(app_id:str) -> BearerTokenAuthCredentials:
-#     return get_application_connection_credentials(ConnectionType.OAUTH2_CLIENT_CREDS, app_id=app_id)
+def oauth2_client_creds(app_id:str) -> OAuth2TokenCredentials:
+    return get_application_connection_credentials(ConnectionType.OAUTH2_CLIENT_CREDS, app_id=app_id)
 
 def oauth2_on_behalf_of(app_id:str) -> OAuth2TokenCredentials:
     return get_application_connection_credentials(ConnectionType.OAUTH_ON_BEHALF_OF_FLOW, app_id=app_id)

{ibm_watsonx_orchestrate-1.5.0b1.dist-info → ibm_watsonx_orchestrate-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.5.0b1
+Version: 1.6.0
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -11,6 +11,7 @@ Requires-Dist: click<8.2.0,>=8.0.0
 Requires-Dist: docstring-parser<1.0,>=0.16
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: ibm-cloud-sdk-core>=3.22.0
+Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.5
 Requires-Dist: jsonref==1.1.0
 Requires-Dist: jsonschema<5.0.0,>=4.23.0
 Requires-Dist: langchain-community<1.0.0,>=0.3.12

{ibm_watsonx_orchestrate-1.5.0b1.dist-info → ibm_watsonx_orchestrate-1.6.0.dist-info}/RECORD

@@ -1,55 +1,61 @@
-ibm_watsonx_orchestrate/__init__.py,sha256=-O_eW7OaX1sLXk-oyJB6kCDMPZdHGXzyM-omTW_94Z8,427
+ibm_watsonx_orchestrate/__init__.py,sha256=KDUTHNK8vHdTV_eRGGNbFaTC8l7NoL3dvb80vaYk8fE,425
 ibm_watsonx_orchestrate/agent_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/agent_builder/agents/__init__.py,sha256=v4G0MGh11eOCkUJP_4AMOcFgzW14oE41G3iFp7G2vvw,376
-ibm_watsonx_orchestrate/agent_builder/agents/agent.py,sha256=PcBg2dRi-IOzvl24u8fa3B0jLaM5hzgkpTS8k56L9Ag,919
+ibm_watsonx_orchestrate/agent_builder/agents/__init__.py,sha256=lmZwaiWXD4Ea19nrMwZXaqCxFMG29xNS8vUoZtK3yI4,392
+ibm_watsonx_orchestrate/agent_builder/agents/agent.py,sha256=I8ZpOKOGXAmhUIwusDmLqCUawSg74-WZFJ5IijruxAQ,932
 ibm_watsonx_orchestrate/agent_builder/agents/assistant_agent.py,sha256=U1cKr22umcWCMgI4G3r5JZXHPfWYbCbiTydH4YZy_Og,987
 ibm_watsonx_orchestrate/agent_builder/agents/external_agent.py,sha256=LQM-DfOg2ajzrEur_F-aSrqKqaX4TbeajRe9YWz6s7E,981
-ibm_watsonx_orchestrate/agent_builder/agents/types.py,sha256=1I2Z2jaRsrd-vzSGO-K_MHXkeCeValbbUvNBeSaer88,9568
-ibm_watsonx_orchestrate/agent_builder/connections/__init__.py,sha256=T7rgkNrG5wx-DfZVb7ree5hw_fCV0FbxVFxvr0bnxdw,722
+ibm_watsonx_orchestrate/agent_builder/agents/types.py,sha256=E5frrJPL7URhH6lD3QsO2heyndsBrfFWDRxXiIdH_nI,12095
+ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/__init__.py,sha256=5TXa8UqKUAlDo4hTbE5S9OPEkQhxXhPJHJC4pEe8U00,92
+ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/prompts.py,sha256=jNVF_jgz1Dmt7-RxAceAS0XWXk_fx9h3sS_fGrvZT28,941
+ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/welcome_content.py,sha256=U76wZrblSXx4qv7phcPYs3l8SiFzwZ5cJ74u8Y2iYhU,608
+ibm_watsonx_orchestrate/agent_builder/connections/__init__.py,sha256=VG45ifpp6B00-ZAGW-dIEHFh18Fx3wbyfUiDDKS74u4,718
 ibm_watsonx_orchestrate/agent_builder/connections/connections.py,sha256=DImRGTXiky1KEVxM_5RmeLom74Lej9bBD8cXafkV6FY,4501
-ibm_watsonx_orchestrate/agent_builder/connections/types.py,sha256=znSOdikTv_yIZaVDwoHwOSPu6b9hajj8miCMKOBmi2w,9280
+ibm_watsonx_orchestrate/agent_builder/connections/types.py,sha256=m4AhHW4HgHqeQEonLaPxwGsnVzSaBSg2M94HZ8zbRsk,9469
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base.py,sha256=_KuGF0RZpKpwdt31rzjlTjrhGRFz2RtLzleNkhMNX4k,1831
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base_requests.py,sha256=mRow0rf5EHeJCCsTrONeTq10jShs_yIBQjpgDY_mTrI,1641
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py,sha256=ttre2pRs_I_KBWSht60zT3dJw8twQml3m92ZkiRAoxs,7994
 ibm_watsonx_orchestrate/agent_builder/model_policies/__init__.py,sha256=alJEjlneWlGpadmvOVlDjq5wulytKOmpkq3849fhKNc,131
-ibm_watsonx_orchestrate/agent_builder/model_policies/types.py,sha256=ydDNRgMBUmd38SChwljV1zPVucvK8GiMRLdDwZqD7HM,875
+ibm_watsonx_orchestrate/agent_builder/model_policies/types.py,sha256=a6f9HP2OlZIe36k_PDRmFtefz2Ms2KBpzJ_jz8ggYbk,882
 ibm_watsonx_orchestrate/agent_builder/models/__init__.py,sha256=R5nTbyMBzahONdp5-bJFp-rbtTDnp2184k6doZqt67w,31
-ibm_watsonx_orchestrate/agent_builder/models/types.py,sha256=OJ266ta2AcO5ecvhztf0d0gCvCgbB3BliOpRYzz4LnA,9533
+ibm_watsonx_orchestrate/agent_builder/models/types.py,sha256=Zr0xHZpTVPZnaUSvlopc2iYVfKmhiqEuvaVe37HVxlw,9457
 ibm_watsonx_orchestrate/agent_builder/toolkits/base_toolkit.py,sha256=KXRPgBK-F9Qa6IYqEslkN3ANj3cmZoZQnlSiy_-iXCk,1054
 ibm_watsonx_orchestrate/agent_builder/toolkits/types.py,sha256=yY-V4Hqct91-Rs4rJ3rY9OhzKkSMdOT63o224o-U9eg,959
 ibm_watsonx_orchestrate/agent_builder/tools/__init__.py,sha256=adkYX0wgB-RKFCUBw6LPJhNVelUjUdsxipGPk2ghLns,479
 ibm_watsonx_orchestrate/agent_builder/tools/base_tool.py,sha256=unJBOJUY8DAq3T3YX5d1H5KehJUCjObAdpGLVoWIfzw,1156
-ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=kYrHyvrOQ99T8mwmX4CYjsMfSfAh0OL9SoyBN7EZbJA,14875
-ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py,sha256=TEx8XCLxjD693clU-cQ229t6Gg7IpgdF1Ht0mqE4WfE,10531
-ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=C1xfGWQuvOCwOaoZqeWxO67bs3hIlZkIizCNR4yhPoc,7567
+ibm_watsonx_orchestrate/agent_builder/tools/flow_tool.py,sha256=DJWYVmIjw1O_cbzPpwU0a_vIZGvo0mj8UsjW9zkKMlA,2589
+ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=Q2-TcUUjBAZWlhOqxfkB3yQpdxgdZAAJh0VWDh_dZPQ,16359
+ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py,sha256=qVyAe7hKLZ1V4cvqDUCpYs6JBKl9MHSr0yrri-nSceA,10600
+ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=TXxWCSddXqRL2GbjkxT4vYJcRMjWS7g22wMMrBz-Wj8,7934
 ibm_watsonx_orchestrate/agent_builder/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/agent_builder/utils/pydantic_utils.py,sha256=QEanM6FpkmntvS02whdhWx1d4v6zT_1l9ipEbfTgHs8,7623
 ibm_watsonx_orchestrate/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/cli/config.py,sha256=C_iSP6WSb5SO6cVPTueQ9lEX16gYOLXD12cKXD6w_KQ,8168
+ibm_watsonx_orchestrate/cli/config.py,sha256=BE2ze0o9vLoyrk7q9mcRek2rDL2cTsVtsSGWw4W0y6M,8212
 ibm_watsonx_orchestrate/cli/init_helper.py,sha256=Lb0bj6b8EaeBxkfGyrBBvc581ORg_S5-tHcXWQ-mBmE,1466
-ibm_watsonx_orchestrate/cli/main.py,sha256=noyKaoJzXig4gNavxNRdEe9mknBqJdt4kS5o7kDljjo,2616
+ibm_watsonx_orchestrate/cli/main.py,sha256=TyVuNC12GDxo4InaPfQ6e6Xk5bGarfSoIRAslGifUQ0,2914
 ibm_watsonx_orchestrate/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py,sha256=mblQIcwOdzTU0Au8-6b0G2OVQIe86P1nNRD2n4evO88,8354
-ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=ErI1DMJkh6b4FaYZGL4s9MSWiLCq98PFfkuHftySVjo,42520
+ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py,sha256=-UX6ypiF_XwmEwe0twVGsfnO29Xs8xPOPJ5vk8EIifo,8991
+ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=zTk3AemWOldfgKYYR1MOcT7z2JbYdgZgSsi7KxugFGw,47934
 ibm_watsonx_orchestrate/cli/commands/channels/channels_command.py,sha256=fVIFhPUTPdxsxIE10nWL-W5wvBR-BS8V8D6r__J8R98,822
 ibm_watsonx_orchestrate/cli/commands/channels/channels_controller.py,sha256=WjQxwJujvo28SsWgfJSXIpkcgniKcskJ2arL4MOz0Ys,455
 ibm_watsonx_orchestrate/cli/commands/channels/types.py,sha256=h8gA3EM7k5X08sk8T9b5siL-XL9uUE-hl_jS-0PDBHA,254
 ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_command.py,sha256=vPCr6z1n1yzGDjTlM4f3_9MiuVRzNmXbvUifm6XyQi8,1103
-ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py,sha256=9FjDIxc9-9NildYQ7mvZDZWrZ8zgPjVEXoxJs7Mx5Zc,5001
-ibm_watsonx_orchestrate/cli/commands/chat/chat_command.py,sha256=5XnL6wMw3R9CjYDxZxBFJcdPxmNBuYIkfJlVUODvCyc,1372
-ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py,sha256=_g_MbdDEJrV5qsbeamMzgOOdNh-xePhjI0s3Ci3__64,9935
-ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=x-7UESwKNGf80K4kTyLb8ZI2_jPN7x7rUy2KwH5npLw,22022
-ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py,sha256=E-9uD2mXiWzxGRnP10bZN4YIt6NfCJdUFZWGXPP-l_o,2688
-ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py,sha256=F1ef-VlYV-X97du8AlrluOhV0o50S3IBjqffk7Tw-yU,7534
-ibm_watsonx_orchestrate/cli/commands/environment/types.py,sha256=BEHkzhsXoWWZsJrK6klv7Bgt2L3FFqzjNGqSbpdoHs8,159
-ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_command.py,sha256=B-9cgqwdR6nyJdEkZHO0_-VqtM89Oy6w5P6ONKPpLgw,3089
-ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py,sha256=vLe1PV_qohLMctKl1Rajzyyhb0JfDC_XV_7vIfs_E8A,9595
+ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py,sha256=0S1ch8SwkGRtAyy7nAZEjKl92hFkIE9TU71JJ82zdjU,8128
+ibm_watsonx_orchestrate/cli/commands/chat/chat_command.py,sha256=Q9vg2Z5Fsunu6GQFY_TIsNRhUCa0SSGSPnK4jxSGK34,1581
+ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py,sha256=qgg2NbAB7g_PHPHd0ZLUm0EjyaCSPi1qpOhtyOlydcY,10151
+ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=h3iEA52Tv_9id0TBVbcm0McbiLppE4SbsdKtWT5XNyc,22177
+ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py,sha256=xwq7gdyjMtl2RYAnLAahGk2wDetr9BStt8yu7JkeBhk,3768
+ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py,sha256=bHJ26iz9EF7vvJ2dWf5fGOaddGBFme9OsPmHyNNrtpI,10182
+ibm_watsonx_orchestrate/cli/commands/environment/types.py,sha256=qKcgIUfTPJIomLor-utz4qi7YhBMpb1l2DiSvjVSgaA,175
+ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_command.py,sha256=YHaTxcQxLkuojFhNcTtYbzb_lTv_dYBuz2IHl9RXXwU,11689
+ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_controller.py,sha256=pTWyuPNHKOPCYTMlYWwoGojZBdvDrHme2EAel0l4ltk,6957
+ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_command.py,sha256=Hxj33rFEYo1Vr2bk-uRwRhNssAETtTQgWTREvC0Nxds,3348
+ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py,sha256=pbsjkBssLOTSMfh5ymgDAq9DxVdD01eAI33si0JZqS4,9631
 ibm_watsonx_orchestrate/cli/commands/login/login_command.py,sha256=xArMiojoozg7Exn6HTpbTcjDO2idZRA-y0WV-_Ic1Sk,651
-ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py,sha256=SIae_rFxc6s2Ui75Ffi6CVzRQYfu05ETuW0wd0p5crQ,7940
-ibm_watsonx_orchestrate/cli/commands/models/models_command.py,sha256=5yzlQZ3tAF-wYJpIGZxcvBhzgtudjBkllAAric02J7w,6404
-ibm_watsonx_orchestrate/cli/commands/models/models_controller.py,sha256=hsdaUCqk4ERroYfx0FCcF09nNcQaAG1eheWt1AjNGT4,18152
-ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=TWjB0SR7gOwFDMmAtwhJlHyYe2gUTZbCcMWRynbVTHQ,31973
-ibm_watsonx_orchestrate/cli/commands/server/types.py,sha256=WaaIKB8IzDdxcetkdtHbupXr4u2VDcSRdHPrxh2oQ3E,4169
+ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py,sha256=RVZfFCuPWiASkR9Mox61v5SZ1AoRxo4_g9stnbfjCkc,7994
+ibm_watsonx_orchestrate/cli/commands/models/models_command.py,sha256=xYbMHRM98TCBmnwgIOsqpfjWqD7HVirn6A4KyEgQEcE,6418
+ibm_watsonx_orchestrate/cli/commands/models/models_controller.py,sha256=BNfUoWST60x3k7yIvSbtBR3rmyTQmz9g0TDK2WOoOE4,18610
+ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=VstqSn3dzuzziwEc0VVkf1y9E3qN94mTJuCbeFO4KCY,37478
+ibm_watsonx_orchestrate/cli/commands/server/types.py,sha256=UCrgGErbSVBnOzesfjrIii4tTCuVfWemYz5AKGZX0oA,4213
 ibm_watsonx_orchestrate/cli/commands/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/settings/settings_command.py,sha256=CzXRkd-97jXyS6LtaaNtMah-aZu0919dYl-mDwzGThc,344
 ibm_watsonx_orchestrate/cli/commands/settings/observability/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,62 +63,63 @@ ibm_watsonx_orchestrate/cli/commands/settings/observability/observability_comman
 ibm_watsonx_orchestrate/cli/commands/settings/observability/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/settings/observability/langfuse/langfuse_command.py,sha256=Wa0L8E44EdxH9LdOvmnluLk_ApJVfTLauNOC1kV4W8k,6515
 ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py,sha256=e8YKUr_8CodA5fgYjUKj-Dk856foQ5Iz3I9Jld5pU_o,4193
-ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py,sha256=T7rbkbDbfKDGVi2W7zL6NmmyNkUvlE73XmrHvbR7nzY,11526
+ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py,sha256=fq48tWNbuYFjrHXyVDmJBT96tww5iMdE2iOYUjr-fUc,11563
 ibm_watsonx_orchestrate/cli/commands/tools/tools_command.py,sha256=Cuo1ZvlfsymojqbadCqdwwS0HUjaWpe2XQrV70g61_s,3943
-ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py,sha256=BIdhqGL-jAoaktOUnk4ET_AaRPLSECG2CL9--1Ns0k8,36495
+ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py,sha256=tgobereuRf6xIsP8Gh-4pWifvJ9zBdeAkMSmd4owE1M,39195
 ibm_watsonx_orchestrate/cli/commands/tools/types.py,sha256=_md0GEa_cTH17NO_moWDY_LNdFvyEFQ1UVB9_FltYiA,173
 ibm_watsonx_orchestrate/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/client/base_api_client.py,sha256=5GbL_oL9rSMIuuge-qIjuKs0Hp6U-YW1HSumqPf9J10,4501
+ibm_watsonx_orchestrate/client/base_api_client.py,sha256=NklphjtCpSFroBocOp4OiklC0iIF0JzXJjtJhUd8gZ8,4752
 ibm_watsonx_orchestrate/client/base_service_instance.py,sha256=sM_r7bln9BpgEOhaJMdFI9-je3T7GLQxLduk-in0oRY,235
 ibm_watsonx_orchestrate/client/client.py,sha256=pgYeXHe4_Makrw0gTyM343DQdrZZB8cjitFHKcbdzuc,2432
 ibm_watsonx_orchestrate/client/client_errors.py,sha256=72MKCNZbKoo2QXyY0RicLhP3r0ALRjgOEbHOHNSyOYI,11712
-ibm_watsonx_orchestrate/client/credentials.py,sha256=ksqfecJkx-XSOkpHksomdBVAKqEpuVGSk65qpfemYFQ,3638
-ibm_watsonx_orchestrate/client/local_service_instance.py,sha256=ilqbcd0R6r0w6H5tMlQf0YRFk8IjbJd9sXwT41iQ5iQ,3440
-ibm_watsonx_orchestrate/client/service_instance.py,sha256=fkxDhp8jALw2W_1BOMDYlCGgR7pxdnXms5ejre6CkMY,2969
-ibm_watsonx_orchestrate/client/utils.py,sha256=qvVDrtlzJh-7ADG4SY0Xg38_AcjDRGuG6VgyWdF4NBg,3570
-ibm_watsonx_orchestrate/client/agents/agent_client.py,sha256=CNRMrjDN2s-nOffi9E5VaAMMKDZdpIy002oESA_JY30,1931
-ibm_watsonx_orchestrate/client/agents/assistant_agent_client.py,sha256=6AA3sPhoKVH17Qaq0sPae4itjrOAsBhG6y6mt8Eq6fI,1685
-ibm_watsonx_orchestrate/client/agents/external_agent_client.py,sha256=aBGSQbLtdwBuasl58IISyNFtrCNT5KQ9Qd4wwVTLwWw,1768
+ibm_watsonx_orchestrate/client/credentials.py,sha256=gDVeeQZDdbbjJiO1EI61yx2oRgTQctxA2ZesSDHI4DA,3786
+ibm_watsonx_orchestrate/client/local_service_instance.py,sha256=gdeol7xNRVnxEMr5rui1ovqtwDfMRziHn9GIjo7-MVo,3447
+ibm_watsonx_orchestrate/client/service_instance.py,sha256=uZlsMW9LC_2GggqEjBQY09fm6uZJ-0audwzqgCyjbbQ,5277
+ibm_watsonx_orchestrate/client/utils.py,sha256=86UH5H54uTJA2kFb4dXrnGfs7hFQZ3h21ElwngZpT24,4745
+ibm_watsonx_orchestrate/client/agents/agent_client.py,sha256=v1ZqXKj3p5JeJyOLpV84UUI2LY8XPjW1ejo5yzkeiMQ,4708
+ibm_watsonx_orchestrate/client/agents/assistant_agent_client.py,sha256=1JQN0E4T_uz5V0LM-LD1ahNu2KCeFBjXAr8WCiP9mkE,1745
+ibm_watsonx_orchestrate/client/agents/external_agent_client.py,sha256=iQ44XBdC4rYfS-zFn4St1xC5y5gf5SNqKHzMNQcFDZc,1808
 ibm_watsonx_orchestrate/client/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/client/analytics/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/client/analytics/llm/analytics_llm_client.py,sha256=0YS_BCpmf5oGFawpZkJ38cuz5ArhKsZIbSydWRd194s,1340
 ibm_watsonx_orchestrate/client/connections/__init__.py,sha256=J7TOyVg38h71AlaJjlFs5fOuAXTceHvELtOJ9oz4Mvg,207
-ibm_watsonx_orchestrate/client/connections/connections_client.py,sha256=WwfwdykWByCItI14ltQVEOCXm1dnwOTW4xIlS4lbois,6820
-ibm_watsonx_orchestrate/client/connections/utils.py,sha256=9F-35qnSEVweH4ZhBkbsqcQln_kl197K3BQlpHFKRd8,2566
+ibm_watsonx_orchestrate/client/connections/connections_client.py,sha256=B6LQPwoFHg_CIXHEJBjVu6fXnRj_xVsLGsC-DhmdfSQ,8478
+ibm_watsonx_orchestrate/client/connections/utils.py,sha256=f6HsiDI6cycOqfYN6P4uZ3SQds83xlh83zTUioZPeYk,2618
 ibm_watsonx_orchestrate/client/knowledge_bases/knowledge_base_client.py,sha256=U-pG_H0I8992f0V13Li_e1dksKp54MrYX3X9bvr-09w,2181
 ibm_watsonx_orchestrate/client/model_policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/client/model_policies/model_policies_client.py,sha256=QE11XgQjoYGhCkj-HerWX7WEOnuUAgkdDbj0Ma14Ahk,2224
+ibm_watsonx_orchestrate/client/model_policies/model_policies_client.py,sha256=Ddjraesv1MRPhZebB0PdBL0zgdsoWmnYpWTUci_6XFI,2258
 ibm_watsonx_orchestrate/client/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/client/models/models_client.py,sha256=ZvP3iPgUFw_SXp41kJuzWQDsgQOF5oqJURH7dFEnPz8,2164
 ibm_watsonx_orchestrate/client/toolkit/toolkit_client.py,sha256=TLFNS39EeBD_t4Y-rX9sGp4sWBDr--mE5qVtHq8Q2hk,3121
-ibm_watsonx_orchestrate/client/tools/tempus_client.py,sha256=Q6h-ynbjU1GBYweeNORgqhsP6nvLE2sKjS7sk7VFZP0,1678
+ibm_watsonx_orchestrate/client/tools/tempus_client.py,sha256=24fKDZUOVHBW-Vj4mubnpnUmab5LgGn8u5hOVyJaozI,1804
 ibm_watsonx_orchestrate/client/tools/tool_client.py,sha256=d3i3alVwa0TCN72w9sWOrM20GCbNmnpTnqEOJVbBIFM,1994
-ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=aqfaWMiu7__6ogk0NpgkTm0nNgMHYcy90NRq2x-6Usc,26597
-ibm_watsonx_orchestrate/docker/default.env,sha256=VHU1ZkUndqaKYU3DKegTZsw-kJYWRC3SBSsbFP_zvV8,5117
+ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=W6tXCk8dDUzNsUpl6lUqpofRVDk8tnKWGD0UgGqpbck,32862
+ibm_watsonx_orchestrate/docker/default.env,sha256=rKmPF66kV0aJzsrWOcdiO0DKRIlvTxQESeuIdSAnRl0,5331
+ibm_watsonx_orchestrate/docker/proxy-config-single.yaml,sha256=WEbK4ENFuTCYhzRu_QblWp1_GMARgZnx5vReQafkIG8,308
 ibm_watsonx_orchestrate/docker/start-up.sh,sha256=LTtwHp0AidVgjohis2LXGvZnkFQStOiUAxgGABOyeUI,1811
 ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0-py3-none-any.whl,sha256=Hi3-owh5OM0Jz2ihX9nLoojnr7Ky1TV-GelyqLcewLE,2047417
 ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0.tar.gz,sha256=e5T-q7XPAtiCyQljwZp6kk3Q_4Tg6y5sijHTkscmqqQ,2025466
 ibm_watsonx_orchestrate/docker/tempus/common-config.yaml,sha256=Zo3F36F5DV4VO_vUg1RG-r4WhcukVh79J2fXhGl6j0A,22
-ibm_watsonx_orchestrate/experimental/flow_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/experimental/flow_builder/data_map.py,sha256=1brmWWFERDsNG2XGais-5-r58LKUUwBtqwdaLQIFRhE,503
-ibm_watsonx_orchestrate/experimental/flow_builder/node.py,sha256=tp_ssBOSDDi8q-ET2bP7xRPwNOLmLUgQ7v9zZZqn9SU,4090
-ibm_watsonx_orchestrate/experimental/flow_builder/types.py,sha256=SEl4v2jUJtL8hfE5T6p93B-na9_FI_WJk9AKd_TU2V0,27324
-ibm_watsonx_orchestrate/experimental/flow_builder/utils.py,sha256=XoKzocDzOuUp4q8JkCG0YHni1MkL-ddO-OviF90A4-4,4425
-ibm_watsonx_orchestrate/experimental/flow_builder/flows/__init__.py,sha256=MkPxvsXyMCd9jE6Vh70j0YEHQIKmwllPd635vmeTyeU,888
-ibm_watsonx_orchestrate/experimental/flow_builder/flows/constants.py,sha256=XXYtL5Y1OTjj3jKo2zoJiwb7FCUNu_M43fgU8w591TY,322
-ibm_watsonx_orchestrate/experimental/flow_builder/flows/decorators.py,sha256=krJHviV7rfPlW2TDveKA0XA9yrnaQeQiNpwcxg7SP4o,5441
-ibm_watsonx_orchestrate/experimental/flow_builder/flows/events.py,sha256=tfTOiBP1MbaTpe89PKeHuo96amrPKOBqYh8cU9M_YdA,2743
-ibm_watsonx_orchestrate/experimental/flow_builder/flows/flow.py,sha256=_UDDGVshez3PpJXA2t1ISjnvlrQZKO7i6vBDTUg-IFI,51186
-ibm_watsonx_orchestrate/experimental/flow_builder/resources/flow_status.openapi.yml,sha256=UkQ4FD_ZhvZuMOjrgLm7cx8zJFZD7Ri-MPCe_zktU-8,1664
+ibm_watsonx_orchestrate/flow_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ibm_watsonx_orchestrate/flow_builder/data_map.py,sha256=1brmWWFERDsNG2XGais-5-r58LKUUwBtqwdaLQIFRhE,503
+ibm_watsonx_orchestrate/flow_builder/node.py,sha256=tp_ssBOSDDi8q-ET2bP7xRPwNOLmLUgQ7v9zZZqn9SU,4090
+ibm_watsonx_orchestrate/flow_builder/types.py,sha256=KPASSlw55Dzp_8nhFdJUN0UI8_knMzLCK9epVcfP5NY,27689
+ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=6v-5Do7_R_mCX0Td5RQO4X8DBWb_HM8HbwkUyGAQOHg,8200
+ibm_watsonx_orchestrate/flow_builder/flows/__init__.py,sha256=UTwpiAlT9Wytn1kK-kgUaY6UYjLKsiaQK0ZdSbKLtM0,897
+ibm_watsonx_orchestrate/flow_builder/flows/constants.py,sha256=XXYtL5Y1OTjj3jKo2zoJiwb7FCUNu_M43fgU8w591TY,322
+ibm_watsonx_orchestrate/flow_builder/flows/decorators.py,sha256=k9-r9ly5ih5oHBqjEgrc2vfeVC4LOMKg3YVLacBDubM,2702
+ibm_watsonx_orchestrate/flow_builder/flows/events.py,sha256=bhbN3ljl-WyiJ_LzMd99IlX0QrhB_bASyHWv8mtTjvo,2978
+ibm_watsonx_orchestrate/flow_builder/flows/flow.py,sha256=1Tc8L8rGbocPVdUNk-Zp_Fi9QxGLSg22LWPewlH7GKU,51020
+ibm_watsonx_orchestrate/flow_builder/resources/flow_status.openapi.yml,sha256=UkQ4FD_ZhvZuMOjrgLm7cx8zJFZD7Ri-MPCe_zktU-8,1664
 ibm_watsonx_orchestrate/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/run/connections.py,sha256=o5TjSqxLG8zLk6UGWCcz_UdylMWZOyUT1o3i1XkL5Uc,1844
+ibm_watsonx_orchestrate/run/connections.py,sha256=K-65GXPA8GEsVmRdPfMe_LB2G9RfXQUr95wvRUOhkS4,1828
 ibm_watsonx_orchestrate/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/utils/utils.py,sha256=U7z_2iASoFiZ2zM0a_2Mc2Y-P5oOT7hOwuurzC9Z3N8,721
 ibm_watsonx_orchestrate/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/utils/logging/logger.py,sha256=FzeGnidXAjC7yHrvIaj4KZPeaBBSCniZFlwgr5yV3oA,1037
 ibm_watsonx_orchestrate/utils/logging/logging.yaml,sha256=9_TKfuFr1barnOKP0fZT5D6MhddiwsXVTFjtRbcOO5w,314
-ibm_watsonx_orchestrate-1.5.0b1.dist-info/METADATA,sha256=fK06S-FUjO--gB2U4hToj003wab9Mr34zdHLQx456WY,1372
-ibm_watsonx_orchestrate-1.5.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ibm_watsonx_orchestrate-1.5.0b1.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
-ibm_watsonx_orchestrate-1.5.0b1.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
-ibm_watsonx_orchestrate-1.5.0b1.dist-info/RECORD,,
+ibm_watsonx_orchestrate-1.6.0.dist-info/METADATA,sha256=EWjQe6HDCv96kYppOUVNh6RZFSfBanxDq8bSebg90CM,1437
+ibm_watsonx_orchestrate-1.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ibm_watsonx_orchestrate-1.6.0.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
+ibm_watsonx_orchestrate-1.6.0.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
+ibm_watsonx_orchestrate-1.6.0.dist-info/RECORD,,

ibm_watsonx_orchestrate/experimental/flow_builder/flows/decorators.py

@@ -1,144 +0,0 @@
-"""
-A set of decorators to help define different Flow constructs.
-"""
-
-import asyncio
-from functools import wraps
-import logging
-import inspect
-from typing import Callable, Optional, Sequence
-from pydantic import BaseModel
-from ..types import extract_node_spec, UserNodeSpec, FlowSpec
-
-from .flow import FlowFactory, Flow
-
-logger = logging.getLogger(__name__)
-
-
-class FlowWrapper:
-    def __init__(self, func, a_model):
-        self.func = func
-        self.a_model = a_model
-        wraps(func)(self)  # Preserve metadata
-
-    def __call__(self, *args, **kwargs):
-        result = self.func(self.a_model)
-        if not isinstance(result, Flow):
-            raise ValueError("Return value must be of type Flow")
-        return result
-    
-def user(*args, name: str|None=None, description: str|None=None, owners: Sequence[str]|None = None, message: str | None = None):
-    """Decorator to mark a function as a user node specification."""
-
-    def decorator(func: Callable):
-        node_spec = extract_node_spec(func, name, description)
-        func.__user_spec__ = UserNodeSpec(type = "user",
-                                          name = node_spec.name,
-                                          display_name = node_spec.display_name,
-                                          description = node_spec.description,
-                                          input_schema = node_spec.input_schema,
-                                          output_schema = node_spec.output_schema,
-                                          output_schema_object = node_spec.output_schema_object,
-                                          text=message,
-                                          owners=owners)
-
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            logger.error(f"User node {name} is not supported yet.")            
-            r = func(*args, **kwargs)
-            return r
-
-        return wrapper
-
-    if len(args) == 1 and callable(args[0]):
-        return decorator(args[0])
-    else:
-        return decorator
-
-
-def flow_spec(*args,
-              name: Optional[str]=None,
-              description: str|None=None,
-              initiators: Sequence[str] = ()):
-    """Decorator to mark a function as a flow specification."""
-
-    def decorator(func: Callable):
-        node_spec = extract_node_spec(func, name, description)
-        a_spec = FlowSpec(type = "flow",
-                             name = node_spec.name,
-                             display_name = node_spec.display_name,
-                             description = node_spec.description,
-                             input_schema = node_spec.input_schema,
-                             output_schema = node_spec.output_schema,
-                             output_schema_object = node_spec.output_schema_object,
-                             initiators = initiators)
-
-        # we should also check a flow is async
-        if not asyncio.iscoroutinefunction(func):
-            raise ValueError("Flow must be asynchronous.")
-
-        logger.info("Generated flow spec: %s", a_spec)
-        func.__flow_spec__ = a_spec
-
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            logger.info("Creating flow spec: %s", name)
-            r = func(*args, **kwargs)
-            logger.info("Flow spec %s returned: %s", name, r)
-            return r
-
-        return wrapper
-
-    if len(args) == 1 and callable(args[0]):
-        return decorator(args[0])
-    else:
-        return decorator
-    
-def flow(*args, 
-         name: Optional[str]=None, 
-         display_name: Optional[str]=None,
-         description: str|None=None,
-         input_schema: type[BaseModel] | None = None,
-         output_schema: type[BaseModel] | None = None,
-         initiators: Sequence[str] = ()):
-    """Decorator to mark a function as a flow model builder."""
-
-    def decorator(func: Callable):
-        """
-        Decorator that takes a function as an argument and returns a wrapper function.
-        The wrapper function takes a single argument of type Flow and calls the original function with the created flow as an argument.
-        """
-
-        sig = inspect.signature(func)
-        if len(sig.parameters) != 1:
-            raise ValueError("Only one argument is allowed")
-        param = list(sig.parameters.values())[0]
-        if param.annotation != Flow:
-            raise ValueError("Argument must be of type Flow")
-        if sig.return_annotation != Flow:
-            raise ValueError("Return value must be of type Flow")
-        
-        node_spec = extract_node_spec(func, name, description)
-        a_model = FlowFactory.create_flow(
-                             name = node_spec.name,
-                             display_name = display_name,
-                             description = node_spec.description,
-                             input_schema = input_schema,
-                             output_schema = output_schema,
-                             initiators = initiators)
-
-        # logger.info("Creating flow model: %s", a_model.spec.name)
-
-        # @wraps(func)
-        # def wrapper(*args, **kwargs):
-        #     result = func(a_model)
-        #     if not isinstance(result, Flow):
-        #         raise ValueError("Return value must be of type Flow")
-        #     return result
-
-        return FlowWrapper(func, a_model)
-
-    if len(args) == 1 and callable(args[0]):
-        return decorator(args[0])
-    else:
-        return decorator