versionhq 1.2.1.8__py3-none-any.whl → 1.2.1.10__py3-none-any.whl

versionhq/__init__.py

@@ -31,7 +31,7 @@ from versionhq.task.formation import form_agent_network
 from versionhq.task_graph.draft import workflow
 
 
-__version__ = "1.2.1.8"
+__version__ = "1.2.1.10"
 __all__ = [
     "Agent",
 

versionhq/task_graph/draft.py

@@ -49,11 +49,12 @@ def workflow(final_output: Type[BaseModel], context: Any = None, human: bool = T
     )
 
     task = Task(
-        description=f"Design a resource-efficient workflow to achieve the following goal: {final_output_prompt}.  The workflow should consist of a list of tasks, each with the following information:\nname: A concise name of the task\ndescription: A concise description of the task.\nconnections: A list of target tasks that this task connects to.\ndependency_types: The type of dependency between this task and each of its connected task. Use the following dependency types: {dep_type_prompt}.\n\nPrioritize minimizing resource consumption (computation, memory, and data transfer) when defining tasks, connections, and dependencies.  Consider how data is passed between tasks and aim to reduce unnecessary data duplication or transfer.  Explain any design choices made to optimize resource usage.",
+        description=dedent(f"Design a resource-efficient workflow to achieve the following goal: {final_output_prompt}. The workflow should consist of a list of detailed tasks that represent decision making points, each with the following information:\nname: A concise name of the task\ndescription: A concise description of the task.\nconnections: A list of target tasks that this task connects to.\ndependency_types: The type of dependency between this task and each of its connected task. \noutput: key output from the task.\n\nUse the following dependency types: {dep_type_prompt}.\n\nPrioritize minimizing resource consumption (computation, memory, and data transfer) when defining tasks, connections, and dependencies.  Consider how data is passed between tasks and aim to reduce unnecessary data duplication or transfer. Explain any design choices made to optimize resource usage."),
         response_fields=[
             ResponseField(title="tasks", data_type=list, items=dict, properties=[
                     ResponseField(title="name", data_type=str),
                     ResponseField(title="description", data_type=str),
+                    ResponseField(title="output", data_type=str),
                     ResponseField(title="connections", data_type=list, items=str),
                     ResponseField(title="dependency_types", data_type=list, items=str),
                 ]
@@ -66,11 +67,20 @@ def workflow(final_output: Type[BaseModel], context: Any = None, human: bool = T
         return None
 
     task_items = res.json_dict["tasks"]
-    tasks = [Task(name=item["name"], description=item["description"]) for item in task_items]
-    nodes = [Node(task=task) for task in tasks]
+    tasks, nodes = [], []
+    for item in task_items:
+        class Output(BaseModel):
+            item["output"]: str
+
+        task = Task(name=item["name"], description=item["description"], pydantic_output=Output)
+        tasks.append(task)
+        nodes.append(Node(task=task))
+
+
     task_graph = TaskGraph(
         nodes={node.identifier: node for node in nodes},
-        concl=final_output,
+        concl_format=final_output,
+        concl=None,
         should_reform=True,
     )
 
@@ -79,23 +89,24 @@ def workflow(final_output: Type[BaseModel], context: Any = None, human: bool = T
             dependency_types = [DependencyType[dt] if DependencyType[dt] else DependencyType.FINISH_TO_START for dt in res["dependency_types"]]
 
             for i, target_task_name in enumerate(res["connections"]):
-                source = [v for k, v in task_graph.nodes.items() if v.task.name == res["name"]][0]
-                target = [v for k, v in task_graph.nodes.items() if v.task.name == target_task_name][0]
+                source = [v for v in task_graph.nodes.values() if v.task.name == res["name"]][0]
+                target = [v for v in task_graph.nodes.values() if v.task.name == target_task_name][0]
                 dependency_type = dependency_types[i]
-                task_graph.add_dependency(source_node_identifier=source.identifier, target_node_identifier=target.identifier, dependency_type=dependency_type)
+                task_graph.add_dependency(
+                    source_node_identifier=source.identifier, target_node_identifier=target.identifier, dependency_type=dependency_type)
+
 
-    ## test purpose
-    # task_graph.visualize()
+    task_graph.visualize()
 
-    # if human:
-    #     print('Proceed? Y/n:')
-    #     x = input()
+    if human:
+        print('Proceed? Y/n:')
+        x = input()
 
-    #     if x.lower() == "y":
-    #         print("ok. generating agent network")
+        if x.lower() == "y":
+            print("ok. generating agent network")
 
-    #     else:
-    #         request = input("request?")
-    #         print('ok. regenerating the graph based on your input: ', request)
+        else:
+            request = input("request?")
+            print('ok. regenerating the graph based on your input: ', request)
 
     return task_graph

versionhq/task_graph/model.py

@@ -1,12 +1,14 @@
+import matplotlib
+matplotlib.use('agg')
+
 import enum
 import uuid
 import networkx as nx
 import matplotlib.pyplot as plt
 from abc import ABC
 from typing import List, Any, Optional, Callable, Dict, Type, Tuple
-from typing_extensions import Self
 
-from pydantic import BaseModel, InstanceOf, Field, UUID4, field_validator, model_validator
+from pydantic import BaseModel, InstanceOf, Field, UUID4, field_validator
 from pydantic_core import PydanticCustomError
 
 from versionhq.task.model import Task, TaskOutput
@@ -60,7 +62,7 @@ class Node(BaseModel):
     def is_independent(self) -> bool:
         return not self.in_degree_nodes and not self.out_degree_nodes
 
-    def handle_task_execution(self, agent: Agent = None, context: str = None) -> TaskOutput | None:
+    def handle_task_execution(self, agent: Agent = None, context: str = None, format: Type[BaseModel] = None) -> TaskOutput | None:
         """
         Start task execution and update status accordingly.
         """
@@ -72,6 +74,7 @@ class Node(BaseModel):
             self.status = TaskStatus.ERROR
             return None
 
+        self.task.pydantic_output = self.task.pydantic_output if self.task.pydantic_output else format if type(format) == BaseModel else None
         res = self.task.execute(agent=agent, context=context)
         self.status = TaskStatus.COMPLETED if res else TaskStatus.ERROR
         return res
@@ -176,7 +179,7 @@ class Edge(BaseModel):
                     return False
 
 
-    def activate(self) -> TaskOutput | None:
+    def activate(self, format: Type[BaseModel] = None) -> TaskOutput | None:
         """
         Activates the edge to initiate task execution of the target node.
         """
@@ -194,7 +197,7 @@ class Edge(BaseModel):
             time.sleep(self.lag)
 
         context = self.source.task.output.raw if self.data_transfer else None
-        res = self.target.handle_task_execution(context=context)
+        res = self.target.handle_task_execution(context=context, format=format)
         return res
 
 
@@ -398,7 +401,7 @@ class TaskGraph(Graph):
         return self._return_node_object(identifier).status
 
 
-    def visualize(self, layout: str = None):
+    def visualize(self, layout: str = None, should_save: bool = False):
         from matplotlib.lines import Line2D
         from versionhq.task_graph.colors import white, black, darkgrey, grey, primary, orange, lightgreen, green, darkgreen, darkergreen
 
@@ -475,7 +478,9 @@ class TaskGraph(Graph):
 
         plt.legend(handles=legend_elements, loc='lower right')
         plt.title(f"vhq-Diagram {str(self.id)}")
-        self._save(title=f"vhq-Diagram {str(self.id)}")
+
+        if should_save:
+            self._save(title=f"vhq-Diagram {str(self.id)}")
         plt.show(block=False)
 
 
@@ -559,5 +564,7 @@ class TaskGraph(Graph):
                     node_identifier = edge.target.identifier
                     self.outputs.update({ node_identifier: res })
 
+            self.concl = res
+            self.concl_template = self.concl_template if self.concl_template else res.pydantic.__class__ if res.pydantic else None
             # last_task_output = [v for v in self.outputs.values()][len([v for v in self.outputs.values()]) - 1] if [v for v in self.outputs.values()] else None
             return res, self.outputs

{versionhq-1.2.1.8.dist-info → versionhq-1.2.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.2.1.8
+Version: 1.2.1.10
 Summary: An agentic orchestration framework for building agent networks that handle task automation.
 Author-email: Kuriko Iwai <kuriko@versi0n.io>
 License: MIT License

{versionhq-1.2.1.8.dist-info → versionhq-1.2.1.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-versionhq/__init__.py,sha256=GoMOSZ9GCDbTwRDAI2HkiMxHD9_g11Kio6PaCM-sULA,2882
+versionhq/__init__.py,sha256=ClLVOtkbqwq-6OR4_q7e_YoKHUYVPUtIkwVtq12gfQ8,2883
 versionhq/_utils/__init__.py,sha256=dzoZr4cBlh-2QZuPzTdehPUCe9lP1dmRtauD7qTjUaA,158
 versionhq/_utils/i18n.py,sha256=TwA_PnYfDLA6VqlUDPuybdV9lgi3Frh_ASsb_X8jJo8,1483
 versionhq/_utils/logger.py,sha256=zgogTwAY-ujDLrdryAKhdtoaNe1nOFajmEN0V8aMR34,3155
@@ -52,8 +52,8 @@ versionhq/task/structured_response.py,sha256=4q-hQPu7oMMHHXEzh9YW4SJ7N5eCZ7OfZ65
 versionhq/task/TEMPLATES/Description.py,sha256=V-4kh8xpQTKOcDMi2xnuP-fcNk6kuoz1_5tYBlDLQWQ,420
 versionhq/task_graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 versionhq/task_graph/colors.py,sha256=naJCx4Vho4iuJtbW8USUXb-M5uYvd5ds2p8qbjUfRus,669
-versionhq/task_graph/draft.py,sha256=nALpwFIDEEhij64ezMRKyNhmyyiXIhzA-6wpcU35xIs,4772
-versionhq/task_graph/model.py,sha256=ZXpuG6f1OZBrGV0Ai1kBuRDNSlwj17WH5GAuWvTWjFQ,23545
+versionhq/task_graph/draft.py,sha256=_I8H1Tgbox4xcWpZNWRNEPUhdb02H44gl9DDz2HArlU,5078
+versionhq/task_graph/model.py,sha256=njyHQyHrVTZP46iVkC6YvuMnGcS40vOy1wszRtf7DHY,23971
 versionhq/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 versionhq/tool/cache_handler.py,sha256=iL8FH7X0G-cdT0uhJwzuhLDaadTXOdfybZcDy151-es,1085
 versionhq/tool/composio_tool.py,sha256=38mEiVvTkuw1BLD233Bl1Gwxbpss1yfQiZLTWwX6BdA,8648
@@ -61,8 +61,8 @@ versionhq/tool/composio_tool_vars.py,sha256=FvBuEXsOQUYnN7RTFxT20kAkiEYkxWKkiVtg
 versionhq/tool/decorator.py,sha256=C4ZM7Xi2gwtEMaSeRo-geo_g_MAkY77WkSLkAuY0AyI,1205
 versionhq/tool/model.py,sha256=PO4zNWBZcJhYVur381YL1dy6zqurio2jWjtbxOxZMGI,12194
 versionhq/tool/tool_handler.py,sha256=2m41K8qo5bGCCbwMFferEjT-XZ-mE9F0mDUOBkgivOI,1416
-versionhq-1.2.1.8.dist-info/LICENSE,sha256=cRoGGdM73IiDs6nDWKqPlgSv7aR4n-qBXYnJlCMHCeE,1082
-versionhq-1.2.1.8.dist-info/METADATA,sha256=zG1Jl-lNkrNiP1XCaAVGZgsU8__2SCBUOT-9jjAZJZ8,22032
-versionhq-1.2.1.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-versionhq-1.2.1.8.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
-versionhq-1.2.1.8.dist-info/RECORD,,
+versionhq-1.2.1.10.dist-info/LICENSE,sha256=cRoGGdM73IiDs6nDWKqPlgSv7aR4n-qBXYnJlCMHCeE,1082
+versionhq-1.2.1.10.dist-info/METADATA,sha256=7uewLR8nv9scszLK4QlDFhx47T_vhPwgXTkpm_D1ETg,22033
+versionhq-1.2.1.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+versionhq-1.2.1.10.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
+versionhq-1.2.1.10.dist-info/RECORD,,