From 3cf2b9992de8b49da1d01bd0eae30b9f7b89e6c3 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:43:08 +0000
Subject: [PATCH 01/30] feat: Function calling

---
 src/writer/workflows_blocks/setstate.py   |  1 +
 src/writer/workflows_blocks/writerchat.py | 79 +++++++++++++++++++++--
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/writer/workflows_blocks/setstate.py b/src/writer/workflows_blocks/setstate.py
index f354ee4b..389c8a22 100644
--- a/src/writer/workflows_blocks/setstate.py
+++ b/src/writer/workflows_blocks/setstate.py
@@ -45,6 +45,7 @@ def run(self):
             element = self._get_field("element")
             value = self._get_field("value")
             self.evaluator.set_state(element, self.instance_path, value, base_context=self.execution_env)
+            self.result = value
             self.outcome = "success"
         except BaseException as e:
             self.outcome = "error"
diff --git a/src/writer/workflows_blocks/writerchat.py b/src/writer/workflows_blocks/writerchat.py
index 7e8c8ff9..21d33816 100644
--- a/src/writer/workflows_blocks/writerchat.py
+++ b/src/writer/workflows_blocks/writerchat.py
@@ -1,9 +1,33 @@
 from writer.abstract import register_abstract_template
 from writer.ss_types import AbstractTemplate
 from writer.workflows_blocks.blocks import WorkflowBlock
+import logging
+
+logging.basicConfig(level=logging.DEBUG)
 
 DEFAULT_MODEL = "palmyra-x-004"
 
+function_tools_init = """{
+  "estimate_customer_risk": {
+    "parameters": {
+      "time": {"type": "float", "description": "How many months they've been a customer for"},
+      "transactions": {"type": "float", "description": "How many transactions they've performed"}
+    }
+  },
+  "get_employee_info": {
+    "parameters": {
+      "id": {"type": "float", "description": "Id of the employee"},
+    }
+  }
+
+}"""
+
+def get_latitude_and_longitude(city):
+    return "lat: 52.40692, lon: 16.92993"
+
+def get_weather(latitude, longitude):
+    return "37c"
+
 class WriterChat(WorkflowBlock):
 
     @classmethod
@@ -30,9 +54,18 @@ def register(cls, type: str):
                         "name": "Temperature",
                         "type": "Number",
                         "default": "0.7"
+                    },
+                    "functionTools": {
+                        "name": "Function tools",
+                        "type": "Object",
+                        "default": "{}",
+                        "init": function_tools_init
                     }
                 },
                 "outs": {
+                    "$dynamic": {
+                        "field": "functionTools"
+                    },
                     "success": {
                         "name": "Success",
                         "description": "If the function doesn't raise an Exception.",
@@ -47,6 +80,14 @@ def register(cls, type: str):
             }
         ))
 
+    def run_branch(self, outcome: str, **args):
+        print(f"Executing {outcome} with args {repr(args)}")
+        if outcome == "$dynamic_get_employee_info":
+            if args.get("employee_id") == 4:
+                return "The name of the employee is Jackson Koko and they're 35 years old they're manager of internal affairs"
+            else:
+                return "The name of the employee is Williams Bernard and they're 40 years old they're manager of public relations"
+
     def run(self):
         try:
             import writer.ai
@@ -55,6 +96,29 @@ def run(self):
             temperature = float(self._get_field("temperature", False, "0.7"))
             model_id = self._get_field("modelId", False, default_field_value=DEFAULT_MODEL)
             config = { "temperature": temperature, "model": model_id}
+            function_tools_raw = self._get_field("functionTools", True)
+            tools = []
+
+            for tool_name, tool_raw in function_tools_raw.items():
+                # callable = None
+                # if tool_name == "get_weather":
+                #     callable = get_weather
+                # elif tool_name == "get_latitude_and_longitude":
+                #     callable = get_latitude_and_longitude
+                # else:
+                #     raise ValueError("unrecognised")
+                tool = writer.ai.FunctionTool(
+                    type="function",
+                    name=tool_name,
+                    # callable=callable,
+                    callable=lambda **args: self.run_branch(f"$dynamic_{tool_name}", **args),
+                    parameters=tool_raw.get("parameters")
+                )
+                tr = repr(tool_raw.get("parameters"))
+                print(f"appended {tool_name} {tr}")
+                tools.append(tool)
+
+            # print(repr(tools))
 
             conversation = self.evaluator.evaluate_expression(conversation_state_element, self.instance_path, self.execution_env)
 
@@ -62,15 +126,16 @@ def run(self):
                 conversation = writer.ai.Conversation(config=config)
                 self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)
 
-            # for chunk in conversation.stream_complete():
-            #     if chunk.get("content") is None:
-            #         chunk["content"] = ""
-            #     conversation += chunk
+            for chunk in conversation.stream_complete(tools=tools):
+                if chunk.get("content") is None:
+                    chunk["content"] = ""
+                conversation += chunk
+                self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)
 
-            msg = conversation.complete()
-            conversation += msg
+            # msg = conversation.complete(tools=tools)
+            # conversation += msg
             self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)            
-            self.result = msg
+            # self.result = msg
             self.outcome = "success"
         except BaseException as e:
             self.outcome = "error"

From c98c121dd32fb8a28dc38ecf221f2c03d83abe2e Mon Sep 17 00:00:00 2001
From: mmikita95 <hello@mmikita.me>
Date: Wed, 16 Oct 2024 15:17:47 +0400
Subject: [PATCH 02/30] fix: switch to `create_function_call` function due to
 lack of default `type`

---
 docs/framework/ai-module.mdx | 10 +++++--
 src/writer/ai.py             | 53 ++++++++++++++++++++++++++++++------
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/docs/framework/ai-module.mdx b/docs/framework/ai-module.mdx
index 857d6147..4754f572 100644
--- a/docs/framework/ai-module.mdx
+++ b/docs/framework/ai-module.mdx
@@ -173,13 +173,13 @@ Framework allows you to register Python functions that can be called automatical
 
 Function tools are defined using either a Python class or a JSON configuration.
 ```python
-from writer.ai import FunctionTool
+from writer.ai import create_function_tool
 
 # Define a function tool with Python callable
 def calculate_interest(principal: float, rate: float, time: float):
     return principal * rate * time
 
-tool = FunctionTool(
+tool = create_function_tool(
     name="calculate_interest",
     callable=calculate_interest,
     parameters={
@@ -217,6 +217,12 @@ Function tools require the following properties:
 
 When a conversation involves a tool (either a graph or a function), Framework automatically handles the requests from LLM to use the tools during interactions. If the tool needs multiple steps (for example, querying data and processing it), Framework will handle those steps recursively, calling functions as needed until the final result is returned.
 
+By default, to prevent endless recursion, Framework will only handle 3 consecutive tool calls. You can expand it in case it doesn't suit your case – both `complete()` and `stream_complete()` accept a `max_tool_depth` parameter, which configures the maximum allowed recursion depth:
+
+```python
+response = conversation.complete(tools=tool, max_tool_depth=7)
+```
+
 ### Providing a Tool or a List of Tools
 
 You can pass either a single tool or a list of tools to the `complete()` or `stream_complete()` methods. The tools can be a combination of FunctionTool, Graph, or JSON-defined tools.
diff --git a/src/writer/ai.py b/src/writer/ai.py
index f304fa67..f01cd67c 100644
--- a/src/writer/ai.py
+++ b/src/writer/ai.py
@@ -90,9 +90,26 @@ class GraphTool(Tool):
 class FunctionTool(Tool):
     callable: Callable
     name: str
+    description: Optional[str]
     parameters: Dict[str, Dict[str, str]]
 
 
+def create_function_tool(
+    callable: Callable,
+    name: str,
+    parameters: Optional[Dict[str, Dict[str, str]]],
+    description: Optional[str] = None
+) -> FunctionTool:
+    parameters = parameters or {}
+    return FunctionTool(
+        type="function",
+        callable=callable,
+        name=name,
+        description=description,
+        parameters=parameters
+    )
+
+
 logger = logging.Logger(__name__, level=logging.DEBUG)
 
 
@@ -1190,7 +1207,7 @@ def _execute_function_tool_call(self, index: int) -> dict:
                     "role": "tool",
                     "name": function_name,
                     "tool_call_id": tool_call_id,
-                    "content": f"{function_name}: {func_result}"
+                    "content": f"{func_result}"
                 }
 
                 return follow_up_message
@@ -1223,7 +1240,18 @@ def _process_tool_call(self, index, tool_call_id, tool_call_name, tool_call_argu
 
         # Accumulate arguments across chunks
         if tool_call_arguments is not None:
-            self._ongoing_tool_calls[index]["arguments"] += tool_call_arguments
+            if (
+                tool_call_arguments.startswith("{")
+                and tool_call_arguments.endswith("}")
+            ):
+                # For cases when LLM "bugs" and returns
+                # the whole arguments string as a last chunk
+                fixed_chunk = tool_call_arguments.rsplit("{")[-1]
+                self._ongoing_tool_calls[index]["arguments"] = \
+                    "{" + fixed_chunk
+            else:
+                # Process normally
+                self._ongoing_tool_calls[index]["arguments"] += tool_call_arguments
 
         # Check if we have all necessary data to execute the function
         if (
@@ -1271,9 +1299,10 @@ def _process_response_data(
             passed_messages: List[WriterAIMessage],
             request_model: str,
             request_data: ChatOptions,
-            depth=1
+            depth=1,
+            max_depth=3
             ) -> 'Conversation.Message':
-        if depth > 3:
+        if depth > max_depth:
             raise RuntimeError("Reached maximum depth when processing response data tool calls.")
         for entry in response_data.choices:
             message = entry.message
@@ -1322,9 +1351,10 @@ def _process_stream_response(
             request_model: str,
             request_data: ChatOptions,
             depth=1,
+            max_depth=3,
             flag_chunks=False
     ) -> Generator[dict, None, None]:
-        if depth > 3:
+        if depth > max_depth:
             raise RuntimeError("Reached maximum depth when processing response data tool calls.")
         # We avoid flagging first chunk
         # to trigger creating a message
@@ -1361,6 +1391,7 @@ def _process_stream_response(
                             request_model=request_model,
                             request_data=request_data,
                             depth=depth+1,
+                            max_depth=max_depth,
                             flag_chunks=True
                         )
                     finally:
@@ -1384,7 +1415,8 @@ def complete(
                     FunctionTool,
                     List[Union[Graph, GraphTool, FunctionTool]]
                     ]  # can be an instance of tool or a list of instances
-                ] = None
+                ] = None,
+            max_tool_depth: int = 3,
             ) -> 'Conversation.Message':
         """
         Processes the conversation with the current messages and additional data to generate a response.
@@ -1421,7 +1453,8 @@ def complete(
             response_data,
             passed_messages=passed_messages,
             request_model=request_model,
-            request_data=request_data
+            request_data=request_data,
+            max_depth=max_tool_depth
             )
 
     def stream_complete(
@@ -1434,7 +1467,8 @@ def stream_complete(
                     FunctionTool,
                     List[Union[Graph, GraphTool, FunctionTool]]
                     ]  # can be an instance of tool or a list of instances
-                ] = None
+                ] = None,
+            max_tool_depth: int = 3
             ) -> Generator[dict, None, None]:
         """
         Initiates a stream to receive chunks of the model's reply.
@@ -1474,7 +1508,8 @@ def stream_complete(
             response=response,
             passed_messages=passed_messages,
             request_model=request_model,
-            request_data=request_data
+            request_data=request_data,
+            max_depth=max_tool_depth
         )
 
         response.close()

From 8113e175b3bf8cb3a58f72057ecd220530281e17 Mon Sep 17 00:00:00 2001
From: mmikita95 <hello@mmikita.me>
Date: Wed, 16 Oct 2024 16:30:35 +0400
Subject: [PATCH 03/30] fix: optimized clearing registry and tool calls pool

---
 src/writer/ai.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/writer/ai.py b/src/writer/ai.py
index f01cd67c..eba5d976 100644
--- a/src/writer/ai.py
+++ b/src/writer/ai.py
@@ -896,6 +896,9 @@ def _clear_callable_registry(self):
         self._callable_registry = {}
 
     def _clear_ongoing_tool_calls(self):
+        """
+        Clear ongoing tool calls after they've been processed
+        """
         self._ongoing_tool_calls = {}
 
     def _clear_tool_calls_helpers(self):
@@ -1328,11 +1331,10 @@ def _process_response_data(
                     )
                     logger.debug(f"Received response – {follow_up_response}")
 
-                    # Clear buffer and callable registry for the completed tool call
-                    self._clear_tool_calls_helpers()
-
                     # Call the function recursively to either process a new tool call
                     # or return the message if no tool calls are requested
+
+                    self._clear_ongoing_tool_calls()
                     return self._process_response_data(
                         follow_up_response,
                         passed_messages=passed_messages,
@@ -1382,9 +1384,8 @@ def _process_stream_response(
                         )
                     )
 
-                    # Clear buffer and callable registry for the completed tool call
                     try:
-                        self._clear_tool_calls_helpers()
+                        self._clear_ongoing_tool_calls()
                         yield from self._process_stream_response(
                             response=follow_up_response,
                             passed_messages=passed_messages,
@@ -1449,7 +1450,7 @@ def complete(
                 )
             )
 
-        return self._process_response_data(
+        response = self._process_response_data(
             response_data,
             passed_messages=passed_messages,
             request_model=request_model,
@@ -1457,6 +1458,11 @@ def complete(
             max_depth=max_tool_depth
             )
 
+        # Clear buffer and callable registry for the completed tool call
+        self._clear_tool_calls_helpers()
+
+        return response
+
     def stream_complete(
             self,
             config: Optional['ChatOptions'] = None,
@@ -1512,6 +1518,8 @@ def stream_complete(
             max_depth=max_tool_depth
         )
 
+        # Clear buffer and callable registry for the completed tool call
+        self._clear_tool_calls_helpers()
         response.close()
 
     @property

From 4a5013d4092af5c07c8bcd87d581dba5a66916ac Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:40:49 +0000
Subject: [PATCH 04/30] feat: Function calling support

---
 src/writer/workflows.py                   | 31 +++++---
 src/writer/workflows_blocks/blocks.py     | 11 +++
 src/writer/workflows_blocks/writerchat.py | 86 ++++++++++++-----------
 3 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/src/writer/workflows.py b/src/writer/workflows.py
index 51075267..5283c911 100644
--- a/src/writer/workflows.py
+++ b/src/writer/workflows.py
@@ -1,4 +1,3 @@
-import logging
 from typing import Dict, List, Literal, Tuple
 
 import writer.core
@@ -22,9 +21,10 @@ def run_workflow_by_key(session, workflow_key: str, execution_env: Dict):
 
 def run_workflow(session, component_id: str, execution_env: Dict):
     execution: Dict[str, WorkflowBlock] = {}
+    nodes = _get_workflow_nodes(component_id)
     try:
-        for node in _get_terminal_nodes(component_id):
-            _run_node(node, execution, session, execution_env)
+        for node in get_terminal_nodes(nodes):
+            run_node(node, nodes, execution, session, execution_env)
     except BaseException as e:
         _generate_run_log(session, execution, "error")
         raise e
@@ -43,16 +43,14 @@ def _generate_run_log(session: "writer.core.WriterSession", execution: Dict[str,
     state.add_log_entry(entry_type, "Workflow execution", msg, workflow_execution=exec_log)
 
 
-def _get_terminal_nodes(component_id):
-    nodes = _get_workflow_nodes(component_id)
+def get_terminal_nodes(nodes):
     return [node for node in nodes if not node.outs]
 
-def _get_node_dependencies(target_node: "Component"):
+def _get_node_dependencies(target_node: "Component", nodes: List["Component"]):
     dependencies:List[Tuple] = []
     parent_id = target_node.parentId
     if not parent_id:
-        return dependencies
-    nodes = _get_workflow_nodes(parent_id)
+        return []
     for node in nodes:
         if not node.outs:
             continue
@@ -64,6 +62,16 @@ def _get_node_dependencies(target_node: "Component"):
     return dependencies
     
 
+def get_branch_nodes(root_node_id: "Component"):
+    root_node = writer.core.base_component_tree.get_component(root_node_id)
+    branch_nodes = [root_node]
+    if not root_node.outs:
+        return branch_nodes
+    for out in root_node.outs:
+        branch_nodes += get_branch_nodes(out.get("toNodeId"))
+    return branch_nodes
+
+
 def _is_outcome_managed(target_node: "Component", target_out_id: str):
     if not target_node.outs:
         return False
@@ -72,11 +80,12 @@ def _is_outcome_managed(target_node: "Component", target_out_id: str):
             return True
     return False
 
-def _run_node(target_node: "Component", execution: Dict, session: "writer.core.WriterSession", execution_env: Dict):
+
+def run_node(target_node: "Component", nodes: List["Component"], execution: Dict, session: "writer.core.WriterSession", execution_env: Dict):
     tool_class = writer.workflows_blocks.blocks.block_map.get(target_node.type)
     if not tool_class:
         raise RuntimeError(f"Couldn't find tool for {target_node.type}.")
-    dependencies = _get_node_dependencies(target_node)
+    dependencies = _get_node_dependencies(target_node, nodes)
 
     tool = execution.get(target_node.id)
     if tool:
@@ -85,7 +94,7 @@ def _run_node(target_node: "Component", execution: Dict, session: "writer.core.W
     result = None
     matched_dependencies = 0
     for node, out_id in dependencies:
-        tool = _run_node(node, execution, session, execution_env)
+        tool = run_node(node, nodes, execution, session, execution_env)
         if not tool:
             continue
         if tool.outcome == out_id:
diff --git a/src/writer/workflows_blocks/blocks.py b/src/writer/workflows_blocks/blocks.py
index b844532c..767e67af 100644
--- a/src/writer/workflows_blocks/blocks.py
+++ b/src/writer/workflows_blocks/blocks.py
@@ -23,6 +23,17 @@ def __init__(self, component: "writer.core_ui.Component", execution: Dict, sessi
         self.evaluator = writer.core.Evaluator(session.session_state, session.session_component_tree)
         self.instance_path: InstancePath = [{"componentId": self.component.id, "instanceNumber": 0}]
 
+    def _get_nodes_at_outcome(self, target_outcome: str):
+        outs = self.component.outs
+        nodes = []
+        if not outs:
+            return nodes
+        for out in outs:
+            if out.get("outId") == target_outcome:
+                component_id = out.get("toNodeId")
+                nodes.append(writer.core.base_component_tree.get_component(component_id))
+        return nodes
+
     def _get_field(self, field_key: str, as_json=False, default_field_value=None):
         if default_field_value is None:
             if as_json:
diff --git a/src/writer/workflows_blocks/writerchat.py b/src/writer/workflows_blocks/writerchat.py
index 21d33816..e531c1e2 100644
--- a/src/writer/workflows_blocks/writerchat.py
+++ b/src/writer/workflows_blocks/writerchat.py
@@ -1,19 +1,11 @@
+import writer.workflows
 from writer.abstract import register_abstract_template
 from writer.ss_types import AbstractTemplate
 from writer.workflows_blocks.blocks import WorkflowBlock
-import logging
-
-logging.basicConfig(level=logging.DEBUG)
 
 DEFAULT_MODEL = "palmyra-x-004"
 
 function_tools_init = """{
-  "estimate_customer_risk": {
-    "parameters": {
-      "time": {"type": "float", "description": "How many months they've been a customer for"},
-      "transactions": {"type": "float", "description": "How many transactions they've performed"}
-    }
-  },
   "get_employee_info": {
     "parameters": {
       "id": {"type": "float", "description": "Id of the employee"},
@@ -22,12 +14,6 @@
 
 }"""
 
-def get_latitude_and_longitude(city):
-    return "lat: 52.40692, lon: 16.92993"
-
-def get_weather(latitude, longitude):
-    return "37c"
-
 class WriterChat(WorkflowBlock):
 
     @classmethod
@@ -81,12 +67,24 @@ def register(cls, type: str):
         ))
 
     def run_branch(self, outcome: str, **args):
-        print(f"Executing {outcome} with args {repr(args)}")
-        if outcome == "$dynamic_get_employee_info":
-            if args.get("employee_id") == 4:
-                return "The name of the employee is Jackson Koko and they're 35 years old they're manager of internal affairs"
-            else:
-                return "The name of the employee is Williams Bernard and they're 40 years old they're manager of public relations"
+        branch_root_nodes = self._get_nodes_at_outcome(outcome)
+        result = None
+        for branch_root_node in branch_root_nodes:
+            branch_nodes = writer.workflows.get_branch_nodes(branch_root_node.id)
+
+            terminal_nodes = writer.workflows.get_terminal_nodes(branch_nodes)
+
+            for terminal_node in terminal_nodes:
+                tool = writer.workflows.run_node(terminal_node, branch_nodes, self.execution, self.session, self.execution_env | args)
+                if tool:
+                    result = tool.result
+
+        return repr(result)
+
+    def _make_callable(self, tool_name: str):
+        def callable(**args):
+            return self.run_branch(f"$dynamic_{tool_name}", **args)
+        return callable
 
     def run(self):
         try:
@@ -100,25 +98,19 @@ def run(self):
             tools = []
 
             for tool_name, tool_raw in function_tools_raw.items():
-                # callable = None
-                # if tool_name == "get_weather":
-                #     callable = get_weather
-                # elif tool_name == "get_latitude_and_longitude":
-                #     callable = get_latitude_and_longitude
-                # else:
-                #     raise ValueError("unrecognised")
                 tool = writer.ai.FunctionTool(
                     type="function",
                     name=tool_name,
-                    # callable=callable,
-                    callable=lambda **args: self.run_branch(f"$dynamic_{tool_name}", **args),
+                    description=tool_raw.get("description"),
+                    callable=self._make_callable(tool_name),
                     parameters=tool_raw.get("parameters")
                 )
-                tr = repr(tool_raw.get("parameters"))
-                print(f"appended {tool_name} {tr}")
                 tools.append(tool)
 
-            # print(repr(tools))
+            # tools.append({
+            #     "type": "graph",
+            #     "graph_ids": ["ddf83cb3-da4e-4bbd-b721-19a62c8f0ef8"]
+            # })
 
             conversation = self.evaluator.evaluate_expression(conversation_state_element, self.instance_path, self.execution_env)
 
@@ -126,16 +118,28 @@ def run(self):
                 conversation = writer.ai.Conversation(config=config)
                 self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)
 
-            for chunk in conversation.stream_complete(tools=tools):
-                if chunk.get("content") is None:
-                    chunk["content"] = ""
-                conversation += chunk
-                self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)
+            # msg = ""
+            # for chunk in conversation.stream_complete(tools=tools):
+            #     if chunk.get("content") is None:
+            #         chunk["content"] = ""
+            #     msg += chunk.get("content")
+            #     conversation += chunk
+            #     self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)
+
+            msg = None
+            try:
+                msg = conversation.complete(tools=tools)
+            except BaseException as e:
+                msg = {
+                    "role": "assistant",
+                    "content": "Couldn't process the request."
+                }
+                raise e
+            finally:
+                conversation += msg
 
-            # msg = conversation.complete(tools=tools)
-            # conversation += msg
             self.evaluator.set_state(conversation_state_element, self.instance_path, conversation, base_context=self.execution_env)            
-            # self.result = msg
+            self.result = msg
             self.outcome = "success"
         except BaseException as e:
             self.outcome = "error"

From 9728f0ed42a06ed6a9e39b4a3cb4bba69b545604 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:35:35 +0000
Subject: [PATCH 05/30] feat: Function calling support

---
 src/writer/workflows.py                    | 16 +++++---
 src/writer/workflows_blocks/__init__.py    |  4 +-
 src/writer/workflows_blocks/blocks.py      |  1 +
 src/writer/workflows_blocks/returnvalue.py | 47 ++++++++++++++++++++++
 src/writer/workflows_blocks/writerchat.py  |  8 ++--
 5 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/writer/workflows_blocks/returnvalue.py

diff --git a/src/writer/workflows.py b/src/writer/workflows.py
index 5283c911..a11881c9 100644
--- a/src/writer/workflows.py
+++ b/src/writer/workflows.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Literal, Tuple
+from typing import Any, Dict, List, Literal, Optional, Tuple
 
 import writer.core
 import writer.workflows_blocks
@@ -22,23 +22,27 @@ def run_workflow_by_key(session, workflow_key: str, execution_env: Dict):
 def run_workflow(session, component_id: str, execution_env: Dict):
     execution: Dict[str, WorkflowBlock] = {}
     nodes = _get_workflow_nodes(component_id)
+    return_value = None
     try:
         for node in get_terminal_nodes(nodes):
-            run_node(node, nodes, execution, session, execution_env)
+            tool = run_node(node, nodes, execution, session, execution_env)
+        for component_id, tool in execution.items():
+            if tool and tool.return_value:
+                return_value = tool.return_value
     except BaseException as e:
         _generate_run_log(session, execution, "error")
         raise e
     else:
-        _generate_run_log(session, execution, "info")
+        _generate_run_log(session, execution, "info", return_value)
 
-def _generate_run_log(session: "writer.core.WriterSession", execution: Dict[str, WorkflowBlock], entry_type: Literal["info", "error"]):
-    msg = ""
+def _generate_run_log(session: "writer.core.WriterSession", execution: Dict[str, WorkflowBlock], entry_type: Literal["info", "error"], return_value: Optional[Any] = None):
     exec_log = []
     for component_id, tool in execution.items():
         exec_log.append({
             "componentId": component_id,
-            "outcome": tool.outcome
+            "outcome": tool.outcome + repr(tool.return_value) + repr(tool.result)
         })
+    msg = f"Execution finished with value {repr(return_value)}"
     state = session.session_state
     state.add_log_entry(entry_type, "Workflow execution", msg, workflow_execution=exec_log)
 
diff --git a/src/writer/workflows_blocks/__init__.py b/src/writer/workflows_blocks/__init__.py
index 4a933d4b..84cd448f 100644
--- a/src/writer/workflows_blocks/__init__.py
+++ b/src/writer/workflows_blocks/__init__.py
@@ -11,6 +11,7 @@
 from writer.workflows_blocks.writerclassification import WriterClassification
 from writer.workflows_blocks.writercompletion import WriterCompletion
 from writer.workflows_blocks.writernocodeapp import WriterNoCodeApp
+from writer.workflows_blocks.returnvalue import ReturnValue
 
 SetState.register("workflows_setstate")
 WriterClassification.register("workflows_writerclassification")
@@ -24,4 +25,5 @@
 WriterAddChatMessage.register("workflows_writeraddchatmessage")
 ParseJSON.register("workflows_parsejson")
 CallEventHandler.register("workflows_calleventhandler")
-AddToStateList.register("workflows_addtostatelist")
\ No newline at end of file
+AddToStateList.register("workflows_addtostatelist")
+ReturnValue.register("workflows_returnvalue")
\ No newline at end of file
diff --git a/src/writer/workflows_blocks/blocks.py b/src/writer/workflows_blocks/blocks.py
index 767e67af..87acb9dd 100644
--- a/src/writer/workflows_blocks/blocks.py
+++ b/src/writer/workflows_blocks/blocks.py
@@ -20,6 +20,7 @@ def __init__(self, component: "writer.core_ui.Component", execution: Dict, sessi
         self.session = session
         self.execution_env = execution_env
         self.result = None
+        self.return_value = None
         self.evaluator = writer.core.Evaluator(session.session_state, session.session_component_tree)
         self.instance_path: InstancePath = [{"componentId": self.component.id, "instanceNumber": 0}]
 
diff --git a/src/writer/workflows_blocks/returnvalue.py b/src/writer/workflows_blocks/returnvalue.py
new file mode 100644
index 00000000..8f8932e5
--- /dev/null
+++ b/src/writer/workflows_blocks/returnvalue.py
@@ -0,0 +1,47 @@
+import writer.workflows
+from writer.abstract import register_abstract_template
+from writer.ss_types import AbstractTemplate
+from writer.workflows_blocks.blocks import WorkflowBlock
+
+class ReturnValue(WorkflowBlock):
+
+    @classmethod
+    def register(cls, type: str):
+        super(ReturnValue, cls).register(type)
+        register_abstract_template(type, AbstractTemplate(
+            baseType="workflows_node",
+            writer={
+                "name": "Return value",
+                "description": "Returns a value from a workflow or sub-workflow.",
+                "category": "Writer",
+                "fields": {
+                    "value": {
+                        "name": "Value",
+                        "type": "Text",
+                        "control": "Textarea"
+                    },
+                },
+                "outs": {
+                    "success": {
+                        "name": "Success",
+                        "description": "If the function doesn't raise an Exception.",
+                        "style": "success",
+                    },
+                    "error": {
+                        "name": "Error",
+                        "description": "If the function raises an Exception.",
+                        "style": "error",
+                    },
+                },
+            }
+        ))
+
+    def run(self):
+        try:
+            value = self._get_field("value")
+            self.result = value
+            self.return_value = value
+            self.outcome = "success"
+        except BaseException as e:
+            self.outcome = "error"
+            raise e
\ No newline at end of file
diff --git a/src/writer/workflows_blocks/writerchat.py b/src/writer/workflows_blocks/writerchat.py
index e531c1e2..730b9ffb 100644
--- a/src/writer/workflows_blocks/writerchat.py
+++ b/src/writer/workflows_blocks/writerchat.py
@@ -68,7 +68,7 @@ def register(cls, type: str):
 
     def run_branch(self, outcome: str, **args):
         branch_root_nodes = self._get_nodes_at_outcome(outcome)
-        result = None
+        return_value = None
         for branch_root_node in branch_root_nodes:
             branch_nodes = writer.workflows.get_branch_nodes(branch_root_node.id)
 
@@ -76,10 +76,10 @@ def run_branch(self, outcome: str, **args):
 
             for terminal_node in terminal_nodes:
                 tool = writer.workflows.run_node(terminal_node, branch_nodes, self.execution, self.session, self.execution_env | args)
-                if tool:
-                    result = tool.result
+                if tool and tool.return_value:
+                    return_value = tool.return_value
 
-        return repr(result)
+        return repr(return_value)
 
     def _make_callable(self, tool_name: str):
         def callable(**args):

From 48759f2cb1e28e975dae403a2dba2c6a0377cd0a Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:35:59 +0000
Subject: [PATCH 06/30] feat: Tools field

---
 src/ui/src/builder/BuilderFieldsTools.vue | 40 +++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/ui/src/builder/BuilderFieldsTools.vue

diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
new file mode 100644
index 00000000..8ce6e3a6
--- /dev/null
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -0,0 +1,40 @@
+<template>
+	<div class="BuilderFieldsTools" :data-automation-key="props.fieldKey">
+		Tools
+	</div>
+</template>
+
+<script setup lang="ts">
+import { toRefs, inject, computed } from "vue";
+import { Component, FieldControl } from "@/writerTypes";
+import { useComponentActions } from "./useComponentActions";
+import injectionKeys from "../injectionKeys";
+
+const wf = inject(injectionKeys.core);
+const ssbm = inject(injectionKeys.builderManager);
+const { setContentValue } = useComponentActions(wf, ssbm);
+
+const props = defineProps<{
+	componentId: Component["id"];
+	fieldKey: string;
+}>();
+const { componentId, fieldKey } = toRefs(props);
+const component = computed(() => wf.getComponentById(componentId.value));
+
+const handleInput = (ev: Event) => {
+	setContentValue(
+		component.value.id,
+		fieldKey.value,
+		(ev.target as HTMLInputElement).value,
+	);
+};
+</script>
+
+<style>
+.BuilderFieldsTool {
+}
+</style>
+
+<style scoped>
+@import "./sharedStyles.css";
+</style>

From 2ad1a757f5d084bc3b2588e7bc12f37c2d960d11 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:36:51 +0000
Subject: [PATCH 07/30] fix: Copy paste for workflows

---
 src/ui/src/builder/useComponentActions.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/ui/src/builder/useComponentActions.ts b/src/ui/src/builder/useComponentActions.ts
index 3c3294f3..a7382bbd 100644
--- a/src/ui/src/builder/useComponentActions.ts
+++ b/src/ui/src/builder/useComponentActions.ts
@@ -489,6 +489,11 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 					if (nc.parentId == c.id) {
 						nc.parentId = newId;
 					}
+					nc.outs?.forEach((out) => {
+						if (out.toNodeId == c.id) {
+							out.toNodeId = newId;
+						}
+					});
 				});
 			c.id = newId;
 		});
@@ -524,6 +529,15 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 		if (clipboard === null) return;
 		const { operation, jsonSubtree } = clipboard;
 		const subtree = JSON.parse(jsonSubtree);
+
+		const rootComponent = subtree[0];
+		if (
+			typeof rootComponent.outs !== "undefined" &&
+			rootComponent.parentId !== targetParentId
+		) {
+			rootComponent.outs = [];
+		}
+
 		if (operation == ClipboardOperation.Cut)
 			return pasteCutComponent(targetParentId, subtree);
 		if (operation == ClipboardOperation.Copy)
@@ -541,6 +555,7 @@ export function useComponentActions(wf: Core, ssbm: BuilderManager) {
 
 		ssbm.setClipboard(null);
 		const rootComponent = subtree[0];
+
 		rootComponent.parentId = targetParentId;
 		rootComponent.position = getNextInsertionPosition(
 			targetParentId,

From 8bd9ba137934b659bcdbded6f4e825447868ceed Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:39:35 +0000
Subject: [PATCH 08/30] chore: Refactor, improved connection interaction

---
 .../workflows/WorkflowsWorkflow.vue           | 287 ++++++++++++++----
 .../workflows/abstract/WorkflowsNode.vue      |  21 +-
 2 files changed, 247 insertions(+), 61 deletions(-)

diff --git a/src/ui/src/components/workflows/WorkflowsWorkflow.vue b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
index 5c28dbe7..450bf6f2 100644
--- a/src/ui/src/components/workflows/WorkflowsWorkflow.vue
+++ b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
@@ -2,11 +2,13 @@
 	<div
 		ref="rootEl"
 		class="WorkflowsWorkflow"
+		:data-writer-unselectable="isUnselectable"
 		@click="handleClick"
 		@dragover="handleDragover"
 		@drop="handleDrop"
-		@drag="handleDrag"
-		@dragstart="handleDragstart"
+		@mousemove="handleMousemove"
+		@mousedown="handleMousedown"
+		@mouseup="handleMouseup"
 	>
 		<div ref="nodeContainerEl" class="nodeContainer">
 			<svg>
@@ -18,26 +20,36 @@
 					:is-engaged="
 						selectedArrow == arrowId ||
 						wfbm.getSelectedId() == arrow.fromNodeId ||
-						wfbm.getSelectedId() == arrow.out.toNodeId
+						wfbm.getSelectedId() == arrow.toNodeId
 					"
 					@click="handleArrowClick($event, arrowId)"
 					@delete="handleDeleteClick($event, arrow)"
 				></WorkflowArrow>
+				<WorkflowArrow
+					v-if="activeConnection?.liveArrow"
+					key="liveArrow"
+					:arrow="activeConnection.liveArrow"
+					:is-selected="false"
+					:is-engaged="true"
+				></WorkflowArrow>
 			</svg>
 			<template v-for="node in nodes" :key="node.id">
 				<component
 					:is="renderProxiedComponent(node.id)"
-					:data-writer-unselectable="isUnselectable"
 					:style="{
 						top: `${node.y - renderOffset.y}px`,
 						left: `${node.x - renderOffset.x}px`,
+						'border-color':
+							activeConnection?.liveArrow?.toNodeId == node.id
+								? activeConnection?.liveArrow?.color
+								: undefined,
 					}"
-					@drag="(ev: DragEvent) => handleNodeDrag(ev, node.id)"
-					@dragstart="(ev: DragEvent) => handleNodeDragStart(ev)"
-					@dragend="handleNodeDragend"
-					@click="(ev: MouseEvent) => handleNodeClick(ev, node.id)"
-					@out-select="
-						(outId: string) => handleNodeOutSelect(node.id, outId)
+					@mousedown.stop="
+						(ev: MouseEvent) => handleNodeMousedown(ev, node.id)
+					"
+					@out-mousedown="
+						(outId: string) =>
+							handleNodeOutMousedown(node.id, outId)
 					"
 				></component>
 			</template>
@@ -92,8 +104,9 @@ export type WorkflowArrowData = {
 	y2: number;
 	color: string;
 	fromNodeId: Component["id"];
-	out: Component["outs"][number];
-	isEngaged: boolean;
+	fromOutId: Component["outs"][number]["outId"];
+	toNodeId?: Component["id"];
+	isEngaged?: boolean;
 };
 </script>
 <script setup lang="ts">
@@ -124,51 +137,51 @@ const { createAndInsertComponent, addOut, removeOut, changeCoordinates } =
 	useComponentActions(wf, wfbm);
 const { getComponentInfoFromDrag } = useDragDropComponent(wf);
 
-const activeNodeOut: Ref<{
-	fromComponentId: string;
-	outId: string;
+const activeConnection: Ref<{
+	fromNodeId: Component["id"];
+	fromOutId: Component["outs"][number]["outId"];
+	liveArrow?: WorkflowArrowData;
+} | null> = ref(null);
+
+const activeNodeMove: Ref<{
+	nodeId: Component["id"];
+	offset: { x: number; y: number };
+	isPerfected: boolean;
+} | null> = ref(null);
+
+const activeCanvasMove: Ref<{
+	offset: { x: number; y: number };
+	isPerfected: boolean;
 } | null> = ref(null);
 
 function refreshArrows() {
 	const a = [];
-	const canvasCBR = rootEl.value?.getBoundingClientRect();
-	if (!canvasCBR) {
-		return;
-	}
-
-	const arrowSlot: Record<Component["id"], number> = {};
 
 	nodes.value
 		.filter((node) => node.outs?.length > 0)
 		.forEach((node) => {
 			const fromNodeId = node.id;
 			node.outs.forEach((out) => {
-				const fromEl = document.querySelector(
-					`[data-writer-id="${fromNodeId}"] [data-writer-socket-id="${out.outId}"]`,
+				a.push(
+					calculateArrow(
+						fromNodeId,
+						out.outId,
+						undefined,
+						out.toNodeId,
+					),
 				);
-				const toEl = document.querySelector(
-					`[data-writer-id="${out.toNodeId}"]`,
-				);
-				if (!fromEl || !toEl) return;
-				const fromCBR = fromEl.getBoundingClientRect();
-				const toCBR = toEl.getBoundingClientRect();
-
-				a.push({
-					x1: fromCBR.x - canvasCBR.x + fromCBR.width / 2,
-					y1: fromCBR.y - canvasCBR.y + fromCBR.height / 2,
-					x2: toCBR.x - canvasCBR.x,
-					y2: toCBR.y - canvasCBR.y + toCBR.height / 2,
-					color: getComputedStyle(fromEl).backgroundColor,
-					fromNodeId,
-					out,
-				});
 			});
 		});
 	arrows.value = a;
 }
 
 const isUnselectable = computed(() => {
-	if (activeNodeOut.value === null) return null;
+	if (
+		activeConnection.value === null &&
+		!activeNodeMove.value?.isPerfected &&
+		!activeCanvasMove.value?.isPerfected
+	)
+		return null;
 	return true;
 });
 
@@ -192,10 +205,28 @@ async function handleRun() {
 	);
 }
 
-function handleNodeOutSelect(componentId: Component["id"], outId: string) {
-	activeNodeOut.value = {
-		fromComponentId: componentId,
-		outId,
+function handleNodeMousedown(ev: MouseEvent, nodeId: Component["id"]) {
+	clearActiveOperations();
+	const nodeEl = document.querySelector(`[data-writer-id="${nodeId}"]`);
+	const nodeCBR = nodeEl.getBoundingClientRect();
+
+	activeNodeMove.value = {
+		nodeId,
+		offset: {
+			x: ev.pageX - nodeCBR.x,
+			y: ev.pageY - nodeCBR.y,
+		},
+		isPerfected: false,
+	};
+}
+
+function handleNodeOutMousedown(
+	fromNodeId: Component["id"],
+	fromOutId: string,
+) {
+	activeConnection.value = {
+		fromNodeId,
+		fromOutId,
 	};
 }
 
@@ -231,7 +262,7 @@ function handleDragover(ev: DragEvent) {
 	ev.stopPropagation();
 }
 
-function getAdjustedCoordinates(ev: DragEvent) {
+function getAdjustedCoordinates(ev: MouseEvent) {
 	const canvasCBR = rootEl.value.getBoundingClientRect();
 	const x = ev.pageX - canvasCBR.x + renderOffset.value.x;
 	const y = ev.pageY - canvasCBR.y + renderOffset.value.y;
@@ -264,7 +295,12 @@ function handleArrowClick(ev: MouseEvent, arrowId: number) {
 }
 
 async function handleDeleteClick(ev: MouseEvent, arrow: WorkflowArrowData) {
-	removeOut(arrow.fromNodeId, arrow.out);
+	if (!arrow.toNodeId) return;
+	const out = {
+		outId: arrow.fromOutId,
+		toNodeId: arrow.toNodeId,
+	};
+	removeOut(arrow.fromNodeId, out);
 }
 
 function handleNodeDragStart(ev: DragEvent) {
@@ -300,20 +336,159 @@ function handleNodeDrag(ev: DragEvent, componentId: Component["id"]) {
 	}, 200);
 }
 
-function handleNodeDragend(ev: DragEvent) {
-	ev.preventDefault();
+function calculateArrow(
+	fromNodeId: Component["id"],
+	fromOutId: string,
+	toCoordinates?: { x: number; y: number },
+	toNodeId?: Component["id"],
+): WorkflowArrowData {
+	let x1: number, y1: number, x2: number, y2: number;
+	const canvasCBR = rootEl.value?.getBoundingClientRect();
+	if (!canvasCBR) {
+		return;
+	}
+	x2 = toCoordinates?.x - canvasCBR.x;
+	y2 = toCoordinates?.y - canvasCBR.y;
+	const fromEl = document.querySelector(
+		`[data-writer-id="${fromNodeId}"] [data-writer-socket-id="${fromOutId}"]`,
+	);
+	if (!fromEl) return;
+	const fromCBR = fromEl.getBoundingClientRect();
+	x1 = fromCBR.x - canvasCBR.x + fromCBR.width / 2;
+	y1 = fromCBR.y - canvasCBR.y + fromCBR.height / 2;
+	if (!fromEl) return;
+	if (typeof toNodeId !== "undefined") {
+		const toEl = document.querySelector(`[data-writer-id="${toNodeId}"]`);
+		const toCBR = toEl.getBoundingClientRect();
+		x2 = toCBR.x - canvasCBR.x;
+		y2 = toCBR.y - canvasCBR.y + toCBR.height / 2;
+	}
+
+	return {
+		x1,
+		y1,
+		x2,
+		y2,
+		color: getComputedStyle(fromEl).backgroundColor,
+		fromNodeId,
+		fromOutId,
+		toNodeId,
+	};
 }
 
-async function handleNodeClick(ev: MouseEvent, componentId: Component["id"]) {
-	if (!activeNodeOut.value) return;
-	if (activeNodeOut.value.fromComponentId == componentId) return;
+function getHoveredNodeId(ev: MouseEvent) {
+	const targetEl = ev.target as HTMLElement;
+	const toNodeEl = targetEl.closest(
+		".WorkflowsWorkflow [data-writer-id]",
+	) as HTMLElement;
+	return toNodeEl?.dataset.writerId;
+}
 
-	addOut(activeNodeOut.value.fromComponentId, {
-		toNodeId: componentId,
-		outId: activeNodeOut.value.outId,
-	});
+function refreshLiveArrow(ev: MouseEvent) {
+	let toCoordinates: { x: number; y: number }, toNodeId: Component["id"];
+
+	toNodeId = getHoveredNodeId(ev);
+	if (typeof toNodeId == "undefined") {
+		toCoordinates = { x: ev.pageX, y: ev.pageY };
+	}
+	const { fromNodeId, fromOutId } = activeConnection.value;
+	if (toNodeId == fromNodeId) return;
+
+	activeConnection.value.liveArrow = calculateArrow(
+		fromNodeId,
+		fromOutId,
+		toCoordinates,
+		toNodeId,
+	);
+}
+
+function clearActiveOperations() {
+	activeCanvasMove.value = null;
+	activeConnection.value = null;
+	activeNodeMove.value = null;
+}
+
+function moveNode(ev: MouseEvent) {
+	const { nodeId, offset } = activeNodeMove.value;
+	activeNodeMove.value.isPerfected = true;
+	const component = wf.getComponentById(nodeId);
+	const { x, y } = getAdjustedCoordinates(ev);
 
-	activeNodeOut.value = null;
+	const newX = x - offset.x;
+	const newY = y - offset.y;
+
+	if (component.x == newX && component.y == newY) return;
+
+	component.x = newX;
+	component.y = newY;
+}
+
+async function moveCanvas(ev: MouseEvent) {
+	const canvasCBR = rootEl.value.getBoundingClientRect();
+	const x = ev.pageX - canvasCBR.x;
+	const y = ev.pageY - canvasCBR.y;
+	const { x: prevX, y: prevY } = activeCanvasMove.value.offset;
+	activeCanvasMove.value.isPerfected = true;
+
+	renderOffset.value = {
+		x: Math.max(0, renderOffset.value.x + (prevX - x) * 1),
+		y: Math.max(0, renderOffset.value.y + (prevY - y) * 1),
+	};
+	activeCanvasMove.value.offset = { x, y };
+	await nextTick();
+	refreshArrows();
+}
+
+function handleMousemove(ev: MouseEvent) {
+	if (ev.buttons != 1) return;
+
+	if (activeConnection.value) {
+		refreshLiveArrow(ev);
+		return;
+	}
+	if (activeNodeMove.value) {
+		moveNode(ev);
+		return;
+	}
+	if (activeCanvasMove.value) {
+		moveCanvas(ev);
+		return;
+	}
+}
+
+function handleMousedown(ev: MouseEvent) {
+	clearActiveOperations();
+	if (ev.buttons != 1) return;
+
+	const canvasCBR = rootEl.value.getBoundingClientRect();
+	const x = ev.pageX - canvasCBR.x;
+	const y = ev.pageY - canvasCBR.y;
+
+	activeCanvasMove.value = {
+		offset: { x, y },
+		isPerfected: false,
+	};
+}
+
+async function handleMouseup(ev: MouseEvent) {
+	if (activeConnection.value === null) {
+		return;
+	}
+	const hoveredId = getHoveredNodeId(ev);
+	if (!hoveredId) {
+		activeConnection.value = null;
+		return;
+	}
+	const { fromNodeId, fromOutId } = activeConnection.value;
+	if (fromNodeId == hoveredId) {
+		activeConnection.value = null;
+		return;
+	}
+
+	addOut(activeConnection.value.fromNodeId, {
+		toNodeId: hoveredId,
+		outId: fromOutId,
+	});
 }
 
 async function createNode(type: string, x: number, y: number) {
diff --git a/src/ui/src/components/workflows/abstract/WorkflowsNode.vue b/src/ui/src/components/workflows/abstract/WorkflowsNode.vue
index 25b9eea2..41112edc 100644
--- a/src/ui/src/components/workflows/abstract/WorkflowsNode.vue
+++ b/src/ui/src/components/workflows/abstract/WorkflowsNode.vue
@@ -21,8 +21,9 @@
 					:class="out.style"
 					:data-writer-socket-id="outId"
 					:data-writer-unselectable="true"
-					@click.capture="
-						(ev: DragEvent) => handleOutClick(ev, outId)
+					@click.capture.stop
+					@mousedown.capture="
+						(ev: DragEvent) => handleOutMousedown(ev, outId)
 					"
 				></div>
 			</div>
@@ -50,7 +51,7 @@ import { computed, inject, watch } from "vue";
 import { Component } from "@/writerTypes";
 import injectionKeys from "@/injectionKeys";
 
-const emit = defineEmits(["outSelect", "engaged"]);
+const emit = defineEmits(["outMousedown", "engaged"]);
 const wf = inject(injectionKeys.core);
 const wfbm = inject(injectionKeys.builderManager);
 const componentId = inject(injectionKeys.componentId);
@@ -92,9 +93,14 @@ const dynamicOuts = computed(() => {
 	return processedOuts;
 });
 
-function handleOutClick(ev: DragEvent, outId: string) {
+function handleOutMousedown(ev: DragEvent, outId: string) {
 	ev.stopPropagation();
-	emit("outSelect", outId);
+	emit("outMousedown", outId);
+}
+
+function handleOutMouseup(ev: DragEvent, outId: string) {
+	ev.stopPropagation();
+	emit("outMouseup", outId);
 }
 
 watch(isEngaged, () => {
@@ -110,6 +116,11 @@ watch(isEngaged, () => {
 	width: 240px;
 	position: absolute;
 	box-shadow: 0px 2px 0px 0px #f3f3f3;
+	user-select: none;
+}
+
+.WorkflowsNode:not(.selected) {
+	transition: border-color 0.2s ease-in-out;
 }
 
 .WorkflowsNode:hover {

From 1133753b7bc0c556232fa09479b5bac8061524ff Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:39:50 +0000
Subject: [PATCH 09/30] chore: Add border color transition

---
 src/ui/src/components/workflows/base/WorkflowArrow.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ui/src/components/workflows/base/WorkflowArrow.vue b/src/ui/src/components/workflows/base/WorkflowArrow.vue
index a672821c..eaa5f033 100644
--- a/src/ui/src/components/workflows/base/WorkflowArrow.vue
+++ b/src/ui/src/components/workflows/base/WorkflowArrow.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed } from "vue";
 import { type WorkflowArrowData } from "../WorkflowsWorkflow.vue";
 
 const PROTRUSION_LENGTH = 30;
@@ -105,8 +105,13 @@ function handleDeleteClick() {
 <style scoped>
 @import "@/renderer/sharedStyles.css";
 
+.WorkflowArrow {
+	filter: saturate(100%);
+	transition: 0.2s filter ease-in-out;
+}
+
 .WorkflowArrow:not(.engaged):not(:hover) {
-	filter: grayscale();
+	filter: saturate(0%);
 }
 
 g {

From b2c9d2c005dc7c93187d2fc43feb5ffec83ebee1 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:40:29 +0000
Subject: [PATCH 10/30] feat: Make workflow components not draggable

---
 src/ui/src/renderer/ComponentProxy.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui/src/renderer/ComponentProxy.vue b/src/ui/src/renderer/ComponentProxy.vue
index 99c0bd5d..9563628b 100644
--- a/src/ui/src/renderer/ComponentProxy.vue
+++ b/src/ui/src/renderer/ComponentProxy.vue
@@ -52,7 +52,9 @@ export default {
 				isBeingEdited.value &&
 				!component.value.isCodeManaged &&
 				component.value.type !== "root" &&
-				component.value.type !== "workflows_root",
+				component.value.type !== "workflows_root" &&
+				wf.getComponentDefinition(component.value.type)?.toolkit !==
+					"workflows",
 		);
 
 		const isParentSuitable = (parentId, childType) => {

From 59ccc1ce304fdbd3407ecc130325757528e713c1 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:58:39 +0000
Subject: [PATCH 11/30] feat: Added tools

---
 src/ui/src/writerTypes.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ui/src/writerTypes.ts b/src/ui/src/writerTypes.ts
index 242b5e73..8704f659 100644
--- a/src/ui/src/writerTypes.ts
+++ b/src/ui/src/writerTypes.ts
@@ -125,11 +125,13 @@ export const enum FieldType {
 	HAlign = "Align (H)",
 	VAlign = "Align (V)",
 	Padding = "Padding",
+	Tools = "Tools",
 }
 
 export const enum FieldCategory {
 	General = "General",
 	Style = "Style",
+	Tools = "Tools",
 }
 
 /**

From 4fbc4e6bfe10e99f4be26c78ac0b8ee4529d117a Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:59:10 +0000
Subject: [PATCH 12/30] chore: Expanded settings width

---
 src/ui/src/builder/BuilderApp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/src/builder/BuilderApp.vue b/src/ui/src/builder/BuilderApp.vue
index fee3e0d2..414cefef 100644
--- a/src/ui/src/builder/BuilderApp.vue
+++ b/src/ui/src/builder/BuilderApp.vue
@@ -320,7 +320,7 @@ onMounted(() => {
 	--builderSubtleHighlightColorSolid: #f2f2f2;
 	--builderDisabledColor: rgb(180, 180, 180);
 	--builderSidebarWidth: max(265px, 27vh);
-	--builderSettingsWidth: max(265px, 27vh);
+	--builderSettingsWidth: max(265px, 27vh, 400px);
 	--builderActionOngoingColor: #333333;
 	--builderTopBarHeight: 48px;
 	--builderWarningTextColor: white;

From 2cb590038573c89cca5e7af6cb105697c5a9a7cf Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:59:40 +0000
Subject: [PATCH 13/30] feat: Embedded code editor component

---
 .../src/builder/BuilderEmbeddedCodeEditor.vue | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 src/ui/src/builder/BuilderEmbeddedCodeEditor.vue

diff --git a/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
new file mode 100644
index 00000000..acfa97d0
--- /dev/null
+++ b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
@@ -0,0 +1,82 @@
+<template>
+	<div ref="builderEditor" class="BuilderEmbeddedCodeEditor">
+		<div ref="editorContainer" class="editorContainer"></div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import * as monaco from "monaco-editor";
+import "./builderEditorWorker";
+import { inject, onMounted, onUnmounted, Ref, ref, toRefs, watch } from "vue";
+import injectionKeys from "../injectionKeys";
+
+const wf = inject(injectionKeys.core);
+const wfbm = inject(injectionKeys.builderManager);
+
+const builderEditor: Ref<HTMLElement> = ref(null);
+const editorContainer: Ref<HTMLElement> = ref(null);
+let editor: monaco.editor.IStandaloneCodeEditor = null;
+
+// const editorCode = editor.getValue();
+
+// <input
+//     :value="props.modelValue"
+//     @input="emit('update:modelValue', ($event.target as HTMLInputElement).value)"
+//   />
+
+const props = defineProps<{
+	modelValue: string;
+}>();
+
+const { modelValue } = toRefs(props);
+
+const emit = defineEmits(["update:modelValue"]);
+
+// watch(modelValue, (newCode) => {
+//     const currentCode =
+// 	editor.setValue(newCode);
+// });
+
+onMounted(() => {
+	const targetEl = editorContainer.value;
+	editor = monaco.editor.create(targetEl, {
+		value: modelValue.value,
+		language: "json",
+		minimap: {
+			enabled: false,
+		},
+		lineNumbers: "off",
+		scrollbar: {
+			vertical: "auto",
+			horizontal: "auto",
+		},
+		fontSize: 12,
+		folding: false,
+		// theme: "",
+	});
+	editor.getModel().onDidChangeContent(() => {
+		const newCode = editor.getValue();
+		emit("update:modelValue", newCode);
+	});
+	window.addEventListener("resize", updateDimensions.bind(this));
+});
+
+function updateDimensions() {
+	editor.layout();
+}
+
+onUnmounted(() => {
+	window.removeEventListener("resize", updateDimensions.bind(this));
+});
+</script>
+
+<style scoped>
+@import "./sharedStyles.css";
+
+.BuilderEditor {
+}
+
+.editorContainer {
+	height: 200px;
+}
+</style>

From 2b94f3841d04381b6739ca2c2e4ce483c0640d36 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:59:53 +0000
Subject: [PATCH 14/30] chore: Tool field

---
 src/ui/src/builder/BuilderFieldsTools.vue | 260 +++++++++++++++++++++-
 1 file changed, 251 insertions(+), 9 deletions(-)

diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
index 8ce6e3a6..67ab803e 100644
--- a/src/ui/src/builder/BuilderFieldsTools.vue
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -1,19 +1,120 @@
 <template>
-	<div class="BuilderFieldsTools" :data-automation-key="props.fieldKey">
-		Tools
+	<div
+		class="BuilderFieldsTools colorTransformer"
+		:data-automation-key="props.fieldKey"
+	>
+		<div class="tools">
+			<div
+				v-for="(tool, toolName) in tools"
+				:key="toolName"
+				class="tool"
+				@click="editTool(toolName)"
+			>
+				<div class="toolName">{{ toolName }}</div>
+				<button class="delete" @click.stop="deleteTool(toolName)">
+					<i class="material-symbols-outlined">delete</i>
+				</button>
+			</div>
+		</div>
+
+		<WdsButton
+			variant="builder"
+			size="small"
+			@click="resetAndShowToolFormModal"
+		>
+			<i class="material-symbols-outlined">add</i>
+			Add tool</WdsButton
+		>
+		<BuilderModal
+			v-if="toolForm.isShown"
+			:close-action="customHandlerModalCloseAction"
+			icon="add"
+			modal-title="Add tool"
+		>
+			<WdsDropdownInput v-model="toolForm.type">
+				<option value="function">Function</option>
+				<option value="graph">Knowledge graph</option>
+			</WdsDropdownInput>
+			<WdsTextInput v-model="toolForm.name"></WdsTextInput>
+			<template v-if="toolForm.type == 'function'">
+				<BuilderEmbeddedCodeEditor
+					v-model="toolForm.code"
+				></BuilderEmbeddedCodeEditor>
+			</template>
+			<template v-if="toolForm.type == 'graph'">
+				<WdsTextInput v-model="toolForm.graphId"></WdsTextInput>
+			</template>
+			<div>
+				<WdsButton variant="builder" @click="saveToolForm"
+					>Save</WdsButton
+				>
+			</div>
+		</BuilderModal>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { toRefs, inject, computed } from "vue";
+import { toRefs, inject, computed, ref, Ref, ComputedRef } from "vue";
 import { Component, FieldControl } from "@/writerTypes";
 import { useComponentActions } from "./useComponentActions";
 import injectionKeys from "../injectionKeys";
+import WdsButton from "@/wds/WdsButton.vue";
+import BuilderModal, { ModalAction } from "./BuilderModal.vue";
+import WdsTextareaInput from "@/wds/WdsTextareaInput.vue";
+import WdsTextInput from "@/wds/WdsTextInput.vue";
+import WdsDropdownInput from "@/wds/WdsDropdownInput.vue";
+import BuilderEmbeddedCodeEditor from "./BuilderEmbeddedCodeEditor.vue";
+
+type FunctionTool = {
+	type: "function";
+	description: string;
+	parameters: Record<
+		string,
+		{
+			type: string;
+			description: string;
+		}
+	>;
+};
+
+type GraphTool = {
+	type: "graph";
+	graph_ids: string[];
+};
+
+type Tool = FunctionTool | GraphTool;
+
+type ToolForm = {
+	isShown: boolean;
+	type: "function" | "graph";
+	name: string;
+	code: string;
+	graphId: string;
+};
 
 const wf = inject(injectionKeys.core);
 const ssbm = inject(injectionKeys.builderManager);
 const { setContentValue } = useComponentActions(wf, ssbm);
 
+const initFunctionToolCode = `
+{
+	"description": "An example tool",
+	"parameters": {
+		"city": string
+	}
+}
+`.trim();
+
+const toolFormInitValue = {
+	isShown: false,
+	type: "function" as "function" | "graph",
+	name: "new_tool",
+	code: initFunctionToolCode,
+	graphId: "999-999",
+};
+
+const toolForm: Ref<ToolForm> = ref(toolFormInitValue);
+
 const props = defineProps<{
 	componentId: Component["id"];
 	fieldKey: string;
@@ -21,18 +122,159 @@ const props = defineProps<{
 const { componentId, fieldKey } = toRefs(props);
 const component = computed(() => wf.getComponentById(componentId.value));
 
-const handleInput = (ev: Event) => {
-	setContentValue(
-		component.value.id,
-		fieldKey.value,
-		(ev.target as HTMLInputElement).value,
-	);
+const tools: ComputedRef<Record<string, Tool>> = computed(() => {
+	let value = {};
+	try {
+		value = JSON.parse(component.value.content[fieldKey.value]);
+	} catch {
+		value = {};
+	}
+	return value;
+});
+
+function resetAndShowToolFormModal() {
+	toolForm.value = {
+		...toolFormInitValue,
+		isShown: true,
+	};
+}
+
+function getToolFromForm(): Tool {
+	const { type, code, graphId } = toolForm.value;
+	if (type == "function") {
+		return {
+			...JSON.parse(code),
+			type,
+		};
+	}
+	if (type == "graph") {
+		return {
+			type,
+			graph_ids: [graphId],
+		};
+	}
+	throw "Unexpected tool type.";
+}
+
+function validateToolForm(form: ToolForm): string[] {
+	let errors = [];
+	const { name } = form;
+	if (!name) {
+		errors.push("The name cannot be empty.");
+	}
+	if (Object.keys(tools.value).includes(name)) {
+		errors.push("An existing tool with the specified name already exists.");
+	}
+	return errors;
+}
+
+function saveToolForm() {
+	const formErrors = validateToolForm(toolForm.value);
+	if (formErrors.length > 0) {
+		formErrors.forEach(alert);
+		return;
+	}
+	let toolFromForm: ReturnType<typeof getToolFromForm>;
+	try {
+		toolFromForm = getToolFromForm();
+	} catch {
+		alert("Incorrect tool definition");
+		return;
+	}
+	const newFieldValue = JSON.stringify({
+		...tools.value,
+		[toolForm.value.name]: toolFromForm,
+	});
+	setContentValue(component.value.id, fieldKey.value, newFieldValue);
+	toolForm.value.isShown = false;
+}
+
+function getFormFromToolEntry(toolName: string, tool: Tool): ToolForm {
+	const { type } = tool;
+	if (type == "function") {
+		return {
+			isShown: true,
+			type: "function",
+			name: toolName,
+			graphId: "",
+			code: JSON.stringify(tool, undefined, 2),
+		};
+	}
+	if (type == "graph") {
+		return {
+			isShown: true,
+			type: "graph",
+			name: toolName,
+			graphId: tool.graph_ids?.[0],
+			code: "",
+		};
+	}
+	throw "Unexpected tool type;";
+}
+
+function editTool(toolName: string) {
+	const tool = tools.value?.[toolName];
+	if (!tool) return;
+	toolForm.value = getFormFromToolEntry(toolName, tool);
+}
+
+function deleteTool(toolName: string) {
+	const newFieldValue = JSON.stringify({
+		...tools.value,
+		[toolName]: undefined,
+	});
+	setContentValue(component.value.id, fieldKey.value, newFieldValue);
+}
+
+const customHandlerModalCloseAction: ModalAction = {
+	desc: "Close",
+	fn: () => {
+		toolForm.value.isShown = false;
+	},
 };
 </script>
 
 <style>
+@import "@/renderer/colorTransformations.css";
+
 .BuilderFieldsTool {
 }
+
+.tools {
+	margin-bottom: 8px;
+}
+
+.tool {
+	display: flex;
+	align-items: center;
+	min-height: 38px;
+	padding-top: 4px;
+	margin-top: 4px;
+	cursor: pointer;
+}
+
+.tool:not(:first-of-type) {
+	border-top: 1px solid var(--builderSeparatorColor);
+}
+
+.tool .toolName {
+	flex: 1 0 auto;
+}
+
+.tool .delete {
+	display: none;
+	background: var(--builderBackgroundColor);
+	padding: 2px 4px 2px 4px;
+	font-size: 1.1rem;
+}
+
+.tool:hover .delete {
+	display: block;
+}
+
+.addToolTextarea {
+	font-family: monospace;
+}
 </style>
 
 <style scoped>

From 45048dc79e24e9992d28a3ba4b1adb8135170436 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:00:11 +0000
Subject: [PATCH 15/30] fix: Added real time, replaced placeholder

---
 src/ui/src/builder/BuilderLogWorkflowExecution.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/ui/src/builder/BuilderLogWorkflowExecution.vue b/src/ui/src/builder/BuilderLogWorkflowExecution.vue
index 43e0c4f2..048db2f0 100644
--- a/src/ui/src/builder/BuilderLogWorkflowExecution.vue
+++ b/src/ui/src/builder/BuilderLogWorkflowExecution.vue
@@ -16,7 +16,7 @@
 						entry.outcome
 					}}
 				</td>
-				<td>1s</td>
+				<td>{{ formatExecutionTime(entry.executionTimeInSeconds) }}</td>
 			</tr>
 		</table>
 	</div>
@@ -55,6 +55,16 @@ async function selectBlock(componentId: Component["id"]) {
 	await nextTick();
 	wfbm.setSelection(componentId, undefined, "log");
 }
+
+function formatExecutionTime(timeInSeconds: number): string {
+	if (timeInSeconds < 0) {
+		return "N/A";
+	}
+	if (timeInSeconds < 0.1) {
+		return "< 0.1s";
+	}
+	return `${timeInSeconds.toFixed(2)}s`;
+}
 </script>
 
 <style scoped>

From ab306f2d699b25969c30fdd42c81b53828fc55d5 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:00:32 +0000
Subject: [PATCH 16/30] chore: Add tool field and category

---
 .../src/builder/BuilderSettingsProperties.vue | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/ui/src/builder/BuilderSettingsProperties.vue b/src/ui/src/builder/BuilderSettingsProperties.vue
index 3564afb2..3739ef62 100644
--- a/src/ui/src/builder/BuilderSettingsProperties.vue
+++ b/src/ui/src/builder/BuilderSettingsProperties.vue
@@ -26,10 +26,11 @@
 					:key="fieldKey"
 				>
 					<div class="fieldWrapper">
-						<div class="name">
+						<div v-if="propertyCategory != 'Tools'" class="name">
 							{{ fieldValue.name ?? fieldKey
 							}}<span class="type"> : {{ fieldValue.type }}</span>
 						</div>
+
 						<BuilderFieldsColor
 							v-if="fieldValue.type == FieldType.Color"
 							class="content"
@@ -107,6 +108,13 @@
 							:component-id="selectedComponent.id"
 						></BuilderFieldsPadding>
 
+						<BuilderFieldsTools
+							v-if="fieldValue.type == FieldType.Tools"
+							:field-key="fieldKey"
+							:component-id="selectedComponent.id"
+						>
+						</BuilderFieldsTools>
+
 						<div v-if="fieldValue.desc" class="desc">
 							{{ fieldValue.desc }}
 						</div>
@@ -130,6 +138,7 @@ import BuilderFieldsPadding from "./BuilderFieldsPadding.vue";
 import BuilderFieldsShadow from "./BuilderFieldsShadow.vue";
 import BuilderFieldsText from "./BuilderFieldsText.vue";
 import BuilderFieldsWidth from "./BuilderFieldsWidth.vue";
+import BuilderFieldsTools from "./BuilderFieldsTools.vue";
 
 const wf = inject(injectionKeys.core);
 const ssbm = inject(injectionKeys.builderManager);
@@ -148,7 +157,11 @@ const fields = computed(() => {
 	return definition.fields;
 });
 
-const fieldCategories = [FieldCategory.General, FieldCategory.Style];
+const fieldCategories = [
+	FieldCategory.General,
+	FieldCategory.Style,
+	FieldCategory.Tools,
+];
 
 const fieldsByCategory = computed(() => {
 	const entries = Object.entries(fields.value);
@@ -161,6 +174,9 @@ const fieldsByCategory = computed(() => {
 		[FieldCategory.Style]: entries.filter(
 			([_, fieldValue]) => fieldValue.category == FieldCategory.Style,
 		),
+		[FieldCategory.Tools]: entries.filter(
+			([_, fieldValue]) => fieldValue.category == FieldCategory.Tools,
+		),
 	};
 	return result;
 });

From 4f29fe5b3b956acea82e0d923537df806c240ba9 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:00:43 +0000
Subject: [PATCH 17/30] chore: Added execution time

---
 src/ui/src/builder/builderManager.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/src/builder/builderManager.ts b/src/ui/src/builder/builderManager.ts
index 6be0ac36..6113b9b3 100644
--- a/src/ui/src/builder/builderManager.ts
+++ b/src/ui/src/builder/builderManager.ts
@@ -21,6 +21,7 @@ const MAX_LOG_ENTRIES = 100;
 export type WorkflowExecutionLog = {
 	componentId: Component["id"];
 	outcome: string;
+	executionTimeInSeconds: number;
 	component?: Component;
 	componentDef?: WriterComponentDefinition;
 }[];

From 3e9d5c3eb56233bcc80c8fb990af33f6041260c3 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:02:49 +0000
Subject: [PATCH 18/30] chore: Added time measurement

---
 src/writer/workflows.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/writer/workflows.py b/src/writer/workflows.py
index a11881c9..839d9ccc 100644
--- a/src/writer/workflows.py
+++ b/src/writer/workflows.py
@@ -1,5 +1,6 @@
 from typing import Any, Dict, List, Literal, Optional, Tuple
 
+import time
 import writer.core
 import writer.workflows_blocks
 from writer.core_ui import Component
@@ -40,7 +41,9 @@ def _generate_run_log(session: "writer.core.WriterSession", execution: Dict[str,
     for component_id, tool in execution.items():
         exec_log.append({
             "componentId": component_id,
-            "outcome": tool.outcome + repr(tool.return_value) + repr(tool.result)
+            "outcome": tool.outcome,
+            # "outcome": tool.outcome + repr(tool.return_value) + repr(tool.result),
+            "executionTimeInSeconds": tool.execution_time_in_seconds 
         })
     msg = f"Execution finished with value {repr(return_value)}"
     state = session.session_state
@@ -111,7 +114,9 @@ def run_node(target_node: "Component", nodes: List["Component"], execution: Dict
     tool = tool_class(target_node, execution, session, execution_env | {"result": result})
     
     try:
+        start_time = time.time()
         tool.run()
+        tool.execution_time_in_seconds = time.time() - start_time
     except BaseException as e:
         if tool and not tool.result:
             tool.result = repr(e)

From ca564e12413944f568ec65198df8ab1557e77752 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:03:16 +0000
Subject: [PATCH 19/30] chore: Time measurement

---
 src/writer/workflows_blocks/blocks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/writer/workflows_blocks/blocks.py b/src/writer/workflows_blocks/blocks.py
index 87acb9dd..4904a2d8 100644
--- a/src/writer/workflows_blocks/blocks.py
+++ b/src/writer/workflows_blocks/blocks.py
@@ -17,6 +17,7 @@ def __init__(self, component: "writer.core_ui.Component", execution: Dict, sessi
         self.outcome = None
         self.component = component
         self.execution = execution
+        self.execution_time_in_seconds = -1
         self.session = session
         self.execution_env = execution_env
         self.result = None

From ea5a48cc4dd708c1bdb87946b1625b046360e8d2 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:03:50 +0000
Subject: [PATCH 20/30] feat: Tools field

---
 src/writer/workflows_blocks/writerchat.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/writer/workflows_blocks/writerchat.py b/src/writer/workflows_blocks/writerchat.py
index 730b9ffb..eed2a931 100644
--- a/src/writer/workflows_blocks/writerchat.py
+++ b/src/writer/workflows_blocks/writerchat.py
@@ -46,6 +46,12 @@ def register(cls, type: str):
                         "type": "Object",
                         "default": "{}",
                         "init": function_tools_init
+                    },
+                    "tools": {
+                        "name": "Tools",
+                        "type": "Tools",
+                        "default": "{}",
+                        "category": "Tools"
                     }
                 },
                 "outs": {
@@ -107,11 +113,6 @@ def run(self):
                 )
                 tools.append(tool)
 
-            # tools.append({
-            #     "type": "graph",
-            #     "graph_ids": ["ddf83cb3-da4e-4bbd-b721-19a62c8f0ef8"]
-            # })
-
             conversation = self.evaluator.evaluate_expression(conversation_state_element, self.instance_path, self.execution_env)
 
             if not conversation:

From c2044a278407a664af6a56d98671fba3eb347b87 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:15:09 +0000
Subject: [PATCH 21/30] fix: Mypy/linting fixes

---
 src/writer/workflows.py                    |  6 ++++--
 src/writer/workflows_blocks/__init__.py    |  2 +-
 src/writer/workflows_blocks/blocks.py      | 11 +++++++----
 src/writer/workflows_blocks/returnvalue.py |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/writer/workflows.py b/src/writer/workflows.py
index 839d9ccc..5fdf5c54 100644
--- a/src/writer/workflows.py
+++ b/src/writer/workflows.py
@@ -1,6 +1,6 @@
+import time
 from typing import Any, Dict, List, Literal, Optional, Tuple
 
-import time
 import writer.core
 import writer.workflows_blocks
 from writer.core_ui import Component
@@ -69,8 +69,10 @@ def _get_node_dependencies(target_node: "Component", nodes: List["Component"]):
     return dependencies
     
 
-def get_branch_nodes(root_node_id: "Component"):
+def get_branch_nodes(root_node_id: str):
     root_node = writer.core.base_component_tree.get_component(root_node_id)
+    if not root_node:
+        return []
     branch_nodes = [root_node]
     if not root_node.outs:
         return branch_nodes
diff --git a/src/writer/workflows_blocks/__init__.py b/src/writer/workflows_blocks/__init__.py
index 84cd448f..4d7a693a 100644
--- a/src/writer/workflows_blocks/__init__.py
+++ b/src/writer/workflows_blocks/__init__.py
@@ -4,6 +4,7 @@
 from writer.workflows_blocks.httprequest import HTTPRequest
 from writer.workflows_blocks.logmessage import LogMessage
 from writer.workflows_blocks.parsejson import ParseJSON
+from writer.workflows_blocks.returnvalue import ReturnValue
 from writer.workflows_blocks.runworkflow import RunWorkflow
 from writer.workflows_blocks.setstate import SetState
 from writer.workflows_blocks.writeraddchatmessage import WriterAddChatMessage
@@ -11,7 +12,6 @@
 from writer.workflows_blocks.writerclassification import WriterClassification
 from writer.workflows_blocks.writercompletion import WriterCompletion
 from writer.workflows_blocks.writernocodeapp import WriterNoCodeApp
-from writer.workflows_blocks.returnvalue import ReturnValue
 
 SetState.register("workflows_setstate")
 WriterClassification.register("workflows_writerclassification")
diff --git a/src/writer/workflows_blocks/blocks.py b/src/writer/workflows_blocks/blocks.py
index 4904a2d8..3f7023d0 100644
--- a/src/writer/workflows_blocks/blocks.py
+++ b/src/writer/workflows_blocks/blocks.py
@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, List
 
 import writer.core
 import writer.core_ui
@@ -17,7 +17,7 @@ def __init__(self, component: "writer.core_ui.Component", execution: Dict, sessi
         self.outcome = None
         self.component = component
         self.execution = execution
-        self.execution_time_in_seconds = -1
+        self.execution_time_in_seconds = -1.0
         self.session = session
         self.execution_env = execution_env
         self.result = None
@@ -27,13 +27,16 @@ def __init__(self, component: "writer.core_ui.Component", execution: Dict, sessi
 
     def _get_nodes_at_outcome(self, target_outcome: str):
         outs = self.component.outs
-        nodes = []
+        nodes:List["writer.core_ui.Component"] = []
         if not outs:
             return nodes
         for out in outs:
             if out.get("outId") == target_outcome:
                 component_id = out.get("toNodeId")
-                nodes.append(writer.core.base_component_tree.get_component(component_id))
+                component = writer.core.base_component_tree.get_component(component_id)
+                if not component:
+                    continue
+                nodes.append(component)
         return nodes
 
     def _get_field(self, field_key: str, as_json=False, default_field_value=None):
diff --git a/src/writer/workflows_blocks/returnvalue.py b/src/writer/workflows_blocks/returnvalue.py
index 8f8932e5..89a048cc 100644
--- a/src/writer/workflows_blocks/returnvalue.py
+++ b/src/writer/workflows_blocks/returnvalue.py
@@ -3,6 +3,7 @@
 from writer.ss_types import AbstractTemplate
 from writer.workflows_blocks.blocks import WorkflowBlock
 
+
 class ReturnValue(WorkflowBlock):
 
     @classmethod

From fd91113cbff07cbfb028ed58a7c06be5f577ff70 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:45:35 +0000
Subject: [PATCH 22/30] fix: Sync definitions of renderProxiedComponent

---
 .../src/components/core/other/CoreReuse.vue   | 21 +------------------
 src/ui/src/injectionKeys.ts                   |  3 ++-
 src/ui/src/renderer/ComponentProxy.vue        |  4 ++--
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/ui/src/components/core/other/CoreReuse.vue b/src/ui/src/components/core/other/CoreReuse.vue
index 80a84dd7..af43e616 100644
--- a/src/ui/src/components/core/other/CoreReuse.vue
+++ b/src/ui/src/components/core/other/CoreReuse.vue
@@ -42,12 +42,10 @@ const shouldRender = ref(true);
 const proxyType = computed(
 	() => wf.getComponentById(fields.proxyId.value)?.type,
 );
-const parentType = computed(() => wf.getComponentById(parentId)?.type);
 
 const proxyDefinition = computed(() =>
 	proxyType.value ? wf.getComponentDefinition(proxyType.value) : null,
 );
-const parentDef = computed(() => wf.getComponentDefinition(parentType.value));
 
 function renderError(message: string, cls: string) {
 	shouldRender.value = props.contextSlot === "default";
@@ -58,20 +56,6 @@ function renderError(message: string, cls: string) {
 	);
 }
 
-function isAllowedChildType(type) {
-	return (
-		parentDef.value.allowedChildrenTypes?.includes(type) ||
-		parentDef.value.allowedChildrenTypes?.includes("*")
-	);
-}
-
-function isAllowedParentType(type) {
-	return (
-		!proxyDefinition.value.allowedParentTypes ||
-		proxyDefinition.value.allowedParentTypes?.includes(type)
-	);
-}
-
 function render() {
 	if (!fields.proxyId.value) {
 		return renderError("No component selected to reuse", "empty");
@@ -83,10 +67,7 @@ function render() {
 		);
 	}
 
-	if (
-		!isAllowedChildType(proxyType.value) ||
-		!isAllowedParentType(parentType.value)
-	) {
+	if (!wf.getContainableTypes(parentId).includes(proxyType.value)) {
 		return renderError(
 			`The component cannot be reused here.`,
 			"invalid-context",
diff --git a/src/ui/src/injectionKeys.ts b/src/ui/src/injectionKeys.ts
index 2c3bb243..532ff960 100644
--- a/src/ui/src/injectionKeys.ts
+++ b/src/ui/src/injectionKeys.ts
@@ -20,7 +20,8 @@ export default {
 	renderProxiedComponent: Symbol() as InjectionKey<
 		(
 			componentId: Component["id"],
-			instanceNumber?: InstancePathItem["instanceNumber"],
+			instanceNumber: InstancePathItem["instanceNumber"],
+			ext?: { class?: string[]; contextSlot?: string },
 		) => VNode
 	>,
 	instancePath: Symbol() as InjectionKey<InstancePath>,
diff --git a/src/ui/src/renderer/ComponentProxy.vue b/src/ui/src/renderer/ComponentProxy.vue
index 43191dd6..7620162c 100644
--- a/src/ui/src/renderer/ComponentProxy.vue
+++ b/src/ui/src/renderer/ComponentProxy.vue
@@ -79,7 +79,7 @@ export default {
 		const renderProxiedComponent = (
 			componentId: Component["id"],
 			instanceNumber: InstancePathItem["instanceNumber"] = 0,
-			ext: { class?: string; contextSlot?: string } = {},
+			ext?: { class?: string[]; contextSlot?: string },
 		): VNode => {
 			const vnode = h(ComponentProxy, {
 				componentId,
@@ -92,7 +92,7 @@ export default {
 					},
 				],
 				instanceData: [...instanceData, ref(null)],
-				...ext,
+				...(ext ?? {}),
 			});
 			return vnode;
 		};

From 55e5b146996657611ae6bb14e5d166ba3a2a5a14 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:45:56 +0000
Subject: [PATCH 23/30] chore: Added instance number

---
 src/ui/src/components/workflows/WorkflowsWorkflow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/src/components/workflows/WorkflowsWorkflow.vue b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
index 3f992504..f3cea916 100644
--- a/src/ui/src/components/workflows/WorkflowsWorkflow.vue
+++ b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
@@ -35,7 +35,7 @@
 			</svg>
 			<template v-for="node in nodes" :key="node.id">
 				<component
-					:is="renderProxiedComponent(node.id)"
+					:is="renderProxiedComponent(node.id, 0)"
 					:style="{
 						top: `${node.y - renderOffset.y}px`,
 						left: `${node.x - renderOffset.x}px`,

From 3b6648731f7b5604e48185e0b7e39cb5918dc60f Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Mon, 28 Oct 2024 14:23:06 +0000
Subject: [PATCH 24/30] chore: Shrink settings width

---
 src/ui/src/builder/BuilderApp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/src/builder/BuilderApp.vue b/src/ui/src/builder/BuilderApp.vue
index 414cefef..fee3e0d2 100644
--- a/src/ui/src/builder/BuilderApp.vue
+++ b/src/ui/src/builder/BuilderApp.vue
@@ -320,7 +320,7 @@ onMounted(() => {
 	--builderSubtleHighlightColorSolid: #f2f2f2;
 	--builderDisabledColor: rgb(180, 180, 180);
 	--builderSidebarWidth: max(265px, 27vh);
-	--builderSettingsWidth: max(265px, 27vh, 400px);
+	--builderSettingsWidth: max(265px, 27vh);
 	--builderActionOngoingColor: #333333;
 	--builderTopBarHeight: 48px;
 	--builderWarningTextColor: white;

From 0345c5bc9226590ff3b8d9834cabe1cc105579fa Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:33:08 +0100
Subject: [PATCH 25/30] Update src/ui/src/builder/BuilderEmbeddedCodeEditor.vue

Co-authored-by: Alexandre Rousseau <alexandre@rsseau.fr>
---
 src/ui/src/builder/BuilderEmbeddedCodeEditor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
index acfa97d0..36a17b77 100644
--- a/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
+++ b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
@@ -66,6 +66,7 @@ function updateDimensions() {
 }
 
 onUnmounted(() => {
+    editor.dispose();
 	window.removeEventListener("resize", updateDimensions.bind(this));
 });
 </script>

From 0022cc07f14894762dda7b705f52b9a9c73c9034 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:33:36 +0100
Subject: [PATCH 26/30] Update src/ui/src/builder/BuilderFieldsTools.vue

Co-authored-by: Alexandre Rousseau <alexandre@rsseau.fr>
---
 src/ui/src/builder/BuilderFieldsTools.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
index 67ab803e..300c2c22 100644
--- a/src/ui/src/builder/BuilderFieldsTools.vue
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -122,14 +122,12 @@ const props = defineProps<{
 const { componentId, fieldKey } = toRefs(props);
 const component = computed(() => wf.getComponentById(componentId.value));
 
-const tools: ComputedRef<Record<string, Tool>> = computed(() => {
-	let value = {};
+const tools = computed<Record<string, Tool>>(() => {
 	try {
-		value = JSON.parse(component.value.content[fieldKey.value]);
+		return JSON.parse(component.value.content[fieldKey.value]);
 	} catch {
-		value = {};
+		return {};
 	}
-	return value;
 });
 
 function resetAndShowToolFormModal() {

From f4e78dd19a5d1be0d157e244598cdc7b7492c796 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:55:19 +0100
Subject: [PATCH 27/30] Revert "Update
 src/ui/src/builder/BuilderFieldsTools.vue"

This reverts commit 0022cc07f14894762dda7b705f52b9a9c73c9034.
---
 src/ui/src/builder/BuilderFieldsTools.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
index 300c2c22..67ab803e 100644
--- a/src/ui/src/builder/BuilderFieldsTools.vue
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -122,12 +122,14 @@ const props = defineProps<{
 const { componentId, fieldKey } = toRefs(props);
 const component = computed(() => wf.getComponentById(componentId.value));
 
-const tools = computed<Record<string, Tool>>(() => {
+const tools: ComputedRef<Record<string, Tool>> = computed(() => {
+	let value = {};
 	try {
-		return JSON.parse(component.value.content[fieldKey.value]);
+		value = JSON.parse(component.value.content[fieldKey.value]);
 	} catch {
-		return {};
+		value = {};
 	}
+	return value;
 });
 
 function resetAndShowToolFormModal() {

From 9d324c5ed6d7b09706663038b9154394628fb929 Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:57:29 +0000
Subject: [PATCH 28/30] feat: Support tools field

---
 src/ui/src/builder/BuilderApp.vue             |  4 +-
 src/ui/src/builder/BuilderFieldsTools.vue     | 43 ++++++++++--------
 .../workflows/WorkflowsWorkflow.vue           | 18 ++++----
 src/ui/src/renderer/useEvaluator.ts           |  2 +-
 src/writer/workflows_blocks/writerchat.py     | 45 +++++++++----------
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/ui/src/builder/BuilderApp.vue b/src/ui/src/builder/BuilderApp.vue
index fee3e0d2..eab0913c 100644
--- a/src/ui/src/builder/BuilderApp.vue
+++ b/src/ui/src/builder/BuilderApp.vue
@@ -319,8 +319,8 @@ onMounted(() => {
 	--builderSubtleHighlightColor: rgba(0, 0, 0, 0.05);
 	--builderSubtleHighlightColorSolid: #f2f2f2;
 	--builderDisabledColor: rgb(180, 180, 180);
-	--builderSidebarWidth: max(265px, 27vh);
-	--builderSettingsWidth: max(265px, 27vh);
+	--builderSidebarWidth: 265px;
+	--builderSettingsWidth: 265px;
 	--builderActionOngoingColor: #333333;
 	--builderTopBarHeight: 48px;
 	--builderWarningTextColor: white;
diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
index 67ab803e..326e23ec 100644
--- a/src/ui/src/builder/BuilderFieldsTools.vue
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -17,11 +17,7 @@
 			</div>
 		</div>
 
-		<WdsButton
-			variant="builder"
-			size="small"
-			@click="resetAndShowToolFormModal"
-		>
+		<WdsButton size="small" @click="resetAndShowToolFormModal">
 			<i class="material-symbols-outlined">add</i>
 			Add tool</WdsButton
 		>
@@ -45,16 +41,14 @@
 				<WdsTextInput v-model="toolForm.graphId"></WdsTextInput>
 			</template>
 			<div>
-				<WdsButton variant="builder" @click="saveToolForm"
-					>Save</WdsButton
-				>
+				<WdsButton @click="saveToolForm">Save</WdsButton>
 			</div>
 		</BuilderModal>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { toRefs, inject, computed, ref, Ref, ComputedRef } from "vue";
+import { toRefs, inject, computed, ref, Ref } from "vue";
 import { Component, FieldControl } from "@/writerTypes";
 import { useComponentActions } from "./useComponentActions";
 import injectionKeys from "../injectionKeys";
@@ -87,6 +81,7 @@ type Tool = FunctionTool | GraphTool;
 type ToolForm = {
 	isShown: boolean;
 	type: "function" | "graph";
+	originalName?: string;
 	name: string;
 	code: string;
 	graphId: string;
@@ -98,10 +93,10 @@ const { setContentValue } = useComponentActions(wf, ssbm);
 
 const initFunctionToolCode = `
 {
-	"description": "An example tool",
-	"parameters": {
-		"city": string
-	}
+	"description": "Gets info for an employee, given an employee id",
+    "parameters": {
+      "id": {"type": "string", "description": "Id of the employee"}
+    }
 }
 `.trim();
 
@@ -122,7 +117,7 @@ const props = defineProps<{
 const { componentId, fieldKey } = toRefs(props);
 const component = computed(() => wf.getComponentById(componentId.value));
 
-const tools: ComputedRef<Record<string, Tool>> = computed(() => {
+const tools = computed<Record<string, Tool>>(() => {
 	let value = {};
 	try {
 		value = JSON.parse(component.value.content[fieldKey.value]);
@@ -158,11 +153,14 @@ function getToolFromForm(): Tool {
 
 function validateToolForm(form: ToolForm): string[] {
 	let errors = [];
-	const { name } = form;
+	const { originalName, name } = form;
 	if (!name) {
 		errors.push("The name cannot be empty.");
 	}
-	if (Object.keys(tools.value).includes(name)) {
+	if (
+		Object.keys(tools.value).includes(name) &&
+		!(originalName || originalName == name)
+	) {
 		errors.push("An existing tool with the specified name already exists.");
 	}
 	return errors;
@@ -183,6 +181,9 @@ function saveToolForm() {
 	}
 	const newFieldValue = JSON.stringify({
 		...tools.value,
+		...(toolForm.value.originalName
+			? { [toolForm.value.originalName]: undefined }
+			: {}),
 		[toolForm.value.name]: toolFromForm,
 	});
 	setContentValue(component.value.id, fieldKey.value, newFieldValue);
@@ -195,6 +196,7 @@ function getFormFromToolEntry(toolName: string, tool: Tool): ToolForm {
 		return {
 			isShown: true,
 			type: "function",
+			originalName: toolName,
 			name: toolName,
 			graphId: "",
 			code: JSON.stringify(tool, undefined, 2),
@@ -204,6 +206,7 @@ function getFormFromToolEntry(toolName: string, tool: Tool): ToolForm {
 		return {
 			isShown: true,
 			type: "graph",
+			originalName: toolName,
 			name: toolName,
 			graphId: tool.graph_ids?.[0],
 			code: "",
@@ -234,10 +237,12 @@ const customHandlerModalCloseAction: ModalAction = {
 };
 </script>
 
-<style>
-@import "@/renderer/colorTransformations.css";
+<style scoped>
+@import "./sharedStyles.css";
 
-.BuilderFieldsTool {
+.BuilderFieldsTools {
+	--separatorColor: var(--builderSeparatorColor);
+	--intensifiedButtonColor: red;
 }
 
 .tools {
diff --git a/src/ui/src/components/workflows/WorkflowsWorkflow.vue b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
index f3cea916..edcf5188 100644
--- a/src/ui/src/components/workflows/WorkflowsWorkflow.vue
+++ b/src/ui/src/components/workflows/WorkflowsWorkflow.vue
@@ -154,23 +154,23 @@ const activeCanvasMove: Ref<{
 } | null> = ref(null);
 
 function refreshArrows() {
-	const a = [];
+	const newArrows = [];
 	nodes.value
 		.filter((node) => node.outs?.length > 0)
 		.forEach((node) => {
 			const fromNodeId = node.id;
 			node.outs.forEach((out) => {
-				a.push(
-					calculateArrow(
-						fromNodeId,
-						out.outId,
-						undefined,
-						out.toNodeId,
-					),
+				const arrow = calculateArrow(
+					fromNodeId,
+					out.outId,
+					undefined,
+					out.toNodeId,
 				);
+				if (!arrow) return;
+				newArrows.push(arrow);
 			});
 		});
-	arrows.value = a;
+	arrows.value = newArrows;
 }
 
 const isUnselectable = computed(() => {
diff --git a/src/ui/src/renderer/useEvaluator.ts b/src/ui/src/renderer/useEvaluator.ts
index ca2a1a1a..5c28f8e8 100644
--- a/src/ui/src/renderer/useEvaluator.ts
+++ b/src/ui/src/renderer/useEvaluator.ts
@@ -173,7 +173,7 @@ export function useEvaluator(wf: Core) {
 			typeof evaluated == "undefined" ||
 			evaluated === null ||
 			evaluated === "";
-		if (fieldType == FieldType.Object || fieldType == FieldType.KeyValue) {
+		if (fieldType == FieldType.Object || fieldType == FieldType.KeyValue || fieldType == FieldType.Tools) {
 			if (!evaluated) {
 				return JSON.parse(defaultValue ?? null);
 			}
diff --git a/src/writer/workflows_blocks/writerchat.py b/src/writer/workflows_blocks/writerchat.py
index eed2a931..ac30703d 100644
--- a/src/writer/workflows_blocks/writerchat.py
+++ b/src/writer/workflows_blocks/writerchat.py
@@ -5,15 +5,6 @@
 
 DEFAULT_MODEL = "palmyra-x-004"
 
-function_tools_init = """{
-  "get_employee_info": {
-    "parameters": {
-      "id": {"type": "float", "description": "Id of the employee"},
-    }
-  }
-
-}"""
-
 class WriterChat(WorkflowBlock):
 
     @classmethod
@@ -41,12 +32,6 @@ def register(cls, type: str):
                         "type": "Number",
                         "default": "0.7"
                     },
-                    "functionTools": {
-                        "name": "Function tools",
-                        "type": "Object",
-                        "default": "{}",
-                        "init": function_tools_init
-                    },
                     "tools": {
                         "name": "Tools",
                         "type": "Tools",
@@ -56,7 +41,7 @@ def register(cls, type: str):
                 },
                 "outs": {
                     "$dynamic": {
-                        "field": "functionTools"
+                        "field": "tools"
                     },
                     "success": {
                         "name": "Success",
@@ -100,17 +85,27 @@ def run(self):
             temperature = float(self._get_field("temperature", False, "0.7"))
             model_id = self._get_field("modelId", False, default_field_value=DEFAULT_MODEL)
             config = { "temperature": temperature, "model": model_id}
-            function_tools_raw = self._get_field("functionTools", True)
+            tools_raw = self._get_field("tools", True)
             tools = []
 
-            for tool_name, tool_raw in function_tools_raw.items():
-                tool = writer.ai.FunctionTool(
-                    type="function",
-                    name=tool_name,
-                    description=tool_raw.get("description"),
-                    callable=self._make_callable(tool_name),
-                    parameters=tool_raw.get("parameters")
-                )
+            for tool_name, tool_raw in tools_raw.items():
+                tool_type = tool_raw.get("type")
+                tool = None
+                if tool_type == "function":
+                    tool = writer.ai.FunctionTool(
+                        type="function",
+                        name=tool_name,
+                        description=tool_raw.get("description"),
+                        callable=self._make_callable(tool_name),
+                        parameters=tool_raw.get("parameters")
+                    )
+                elif tool_type == "graph":
+                    tool = {
+                        "type": "graph",
+                        "graph_ids": tool_raw.get("graph_ids")
+                    }
+                else:
+                    continue
                 tools.append(tool)
 
             conversation = self.evaluator.evaluate_expression(conversation_state_element, self.instance_path, self.execution_env)

From fccd9df4c065f72dccba94d211386c2d6039a95a Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:59:25 +0000
Subject: [PATCH 29/30] fix: Linting

---
 src/ui/src/builder/BuilderEmbeddedCodeEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
index 36a17b77..431dcbc8 100644
--- a/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
+++ b/src/ui/src/builder/BuilderEmbeddedCodeEditor.vue
@@ -66,7 +66,7 @@ function updateDimensions() {
 }
 
 onUnmounted(() => {
-    editor.dispose();
+	editor.dispose();
 	window.removeEventListener("resize", updateDimensions.bind(this));
 });
 </script>

From 0a95b67e9ba08954995988a0904fcf3be20b0aff Mon Sep 17 00:00:00 2001
From: Ramiro Medina <64783088+ramedina86@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:09:59 +0000
Subject: [PATCH 30/30] chore: Simplify Ref

---
 src/ui/src/builder/BuilderFieldsTools.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/src/builder/BuilderFieldsTools.vue b/src/ui/src/builder/BuilderFieldsTools.vue
index 326e23ec..250d0ded 100644
--- a/src/ui/src/builder/BuilderFieldsTools.vue
+++ b/src/ui/src/builder/BuilderFieldsTools.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script setup lang="ts">
-import { toRefs, inject, computed, ref, Ref } from "vue";
+import { toRefs, inject, computed, ref } from "vue";
 import { Component, FieldControl } from "@/writerTypes";
 import { useComponentActions } from "./useComponentActions";
 import injectionKeys from "../injectionKeys";
@@ -108,7 +108,7 @@ const toolFormInitValue = {
 	graphId: "999-999",
 };
 
-const toolForm: Ref<ToolForm> = ref(toolFormInitValue);
+const toolForm = ref<ToolForm>(toolFormInitValue);
 
 const props = defineProps<{
 	componentId: Component["id"];