versionhq 1.1.8.1__py3-none-any.whl → 1.1.9.1__py3-none-any.whl

versionhq/__init__.py

@@ -15,9 +15,10 @@ from versionhq.llm.model import LLM
 from versionhq.task.model import Task, TaskOutput
 from versionhq.team.model import Team, TeamOutput
 from versionhq.tool.model import Tool
+from versionhq.tool.composio import Composio
 
 
-__version__ = "1.1.8.1"
+__version__ = "1.1.9.1"
 __all__ = [
     "Agent",
     "Customer",
@@ -33,4 +34,5 @@ __all__ = [
     "Team",
     "TeamOutput",
     "Tool",
+    "Composio"
 ]

versionhq/_utils/cache_handler.py

@@ -6,8 +6,8 @@ from pydantic import BaseModel, PrivateAttr
 class CacheHandler(BaseModel):
     _cache: Dict[str, Any] = PrivateAttr(default_factory=dict)
 
-    def add(self, tool, input, output):
+    def add(self, tool: str, input: str, output: Any) -> None:
         self._cache[f"{tool}-{input}"] = output
 
-    def read(self, tool, input) -> Optional[str]:
+    def read(self, tool: str, input: str) -> Optional[str]:
         return self._cache.get(f"{tool}-{input}")

versionhq/_utils/rpm_controller.py

@@ -1,6 +1,7 @@
 import threading
 import time
 from typing import Optional
+from typing_extensions import Self
 
 from pydantic import BaseModel, Field, PrivateAttr, model_validator
 
@@ -16,14 +17,14 @@ class RPMController(BaseModel):
     _shutdown_flag: bool = PrivateAttr(default=False)
 
     @model_validator(mode="after")
-    def reset_counter(self):
+    def reset_counter(self) -> Self:
         if self.max_rpm is not None:
             if not self._shutdown_flag:
                 self._lock = threading.Lock()
                 self._reset_request_count()
         return self
 
-    def check_or_wait(self):
+    def check_or_wait(self) -> bool:
         if self.max_rpm is None:
             return True
 
@@ -46,16 +47,16 @@ class RPMController(BaseModel):
         else:
             return _check_and_increment()
 
-    def stop_rpm_counter(self):
+    def stop_rpm_counter(self) -> None:
         if self._timer:
             self._timer.cancel()
             self._timer = None
 
-    def _wait_for_next_minute(self):
+    def _wait_for_next_minute(self) -> None:
         time.sleep(60)
         self._current_rpm = 0
 
-    def _reset_request_count(self):
+    def _reset_request_count(self) -> None:
         def _reset():
             self._current_rpm = 0
             if not self._shutdown_flag:

versionhq/_utils/usage_metrics.py

@@ -12,7 +12,7 @@ class UsageMetrics(BaseModel):
     completion_tokens: int = Field(default=0, description="Number of tokens used in completions")
     successful_requests: int = Field(default=0, description="Number of successful requests made")
 
-    def add_usage_metrics(self, usage_metrics: "UsageMetrics"):
+    def add_usage_metrics(self, usage_metrics: "UsageMetrics") -> None:
         """
         Add the usage metrics from another UsageMetrics object.
         """

versionhq/agent/model.py

@@ -1,7 +1,7 @@
 import os
 import uuid
-from abc import ABC
 from typing import Any, Dict, List, Optional, TypeVar
+from typing_extensions import Self
 from dotenv import load_dotenv
 from pydantic import UUID4, BaseModel, Field, InstanceOf, PrivateAttr, model_validator, field_validator
 from pydantic_core import PydanticCustomError
@@ -15,8 +15,7 @@ from versionhq.llm.llm_vars import LLM_VARS
 from versionhq.llm.model import LLM, DEFAULT_CONTEXT_WINDOW
 from versionhq.task import TaskOutputFormat
 from versionhq.task.model import ResponseField
-from versionhq.tool.model import Tool, ToolCalled
-from versionhq.tool.tool_handler import ToolHandler
+from versionhq.tool.model import Tool, ToolSet
 
 load_dotenv(override=True)
 T = TypeVar("T", bound="Agent")
@@ -51,18 +50,18 @@ class TokenProcess:
     completion_tokens: int = 0
     successful_requests: int = 0
 
-    def sum_prompt_tokens(self, tokens: int):
+    def sum_prompt_tokens(self, tokens: int) -> None:
         self.prompt_tokens = self.prompt_tokens + tokens
         self.total_tokens = self.total_tokens + tokens
 
-    def sum_completion_tokens(self, tokens: int):
+    def sum_completion_tokens(self, tokens: int) -> None:
         self.completion_tokens = self.completion_tokens + tokens
         self.total_tokens = self.total_tokens + tokens
 
-    def sum_cached_prompt_tokens(self, tokens: int):
+    def sum_cached_prompt_tokens(self, tokens: int) -> None:
         self.cached_prompt_tokens = self.cached_prompt_tokens + tokens
 
-    def sum_successful_requests(self, requests: int):
+    def sum_successful_requests(self, requests: int) -> None:
         self.successful_requests = self.successful_requests + requests
 
     def get_summary(self) -> UsageMetrics:
@@ -76,7 +75,7 @@ class TokenProcess:
 
 
 # @track_agent()
-class Agent(ABC, BaseModel):
+class Agent(BaseModel):
     """
     Agent class that run on LLM.
     Agents execute tasks alone or in the team, using RAG tools and knowledge base if any.
@@ -97,10 +96,7 @@ class Agent(ABC, BaseModel):
     backstory: Optional[str] = Field(default=None, description="system context passed to the LLM")
     knowledge: Optional[str] = Field(default=None, description="external knowledge fed to the agent")
     skillsets: Optional[List[str]] = Field(default_factory=list)
-
-    # tools
-    tools: Optional[List[Any]] = Field(default_factory=list)
-    tool_handler: InstanceOf[ToolHandler] = Field(default=None, description="handle tool cache and last used tool")
+    tools: Optional[List[Tool | Any]] = Field(default_factory=list)
 
     # team, task execution rules
     team: Optional[List[Any]] = Field(default=None, description="Team to which the agent belongs")
@@ -146,7 +142,7 @@ class Agent(ABC, BaseModel):
 
 
     @model_validator(mode="after")
-    def validate_required_fields(self):
+    def validate_required_fields(self) -> Self:
         required_fields = ["role", "goal"]
         for field in required_fields:
             if getattr(self, field) is None:
@@ -155,7 +151,7 @@ class Agent(ABC, BaseModel):
 
 
     @model_validator(mode="after")
-    def set_up_llm(self):
+    def set_up_llm(self) -> Self:
         """
         Set up the base model and function calling model (if any) using the LLM class.
         Pass the model config params: `llm`, `max_tokens`, `max_execution_time`, `step_callback`,`respect_context_window` to the LLM class.
@@ -270,31 +266,42 @@ class Agent(ABC, BaseModel):
 
 
     @model_validator(mode="after")
-    def set_up_tools(self):
+    def set_up_tools(self) -> Self:
         """
         Similar to the LLM set up, when the agent has tools, we will declare them using the Tool class.
         """
-
         if not self.tools:
             pass
 
         else:
-            tools_in_class_format = []
-            for tool in self.tools:
-                if isinstance(tool, Tool):
-                    tools_in_class_format.append(tool)
-                elif isinstance(tool, str):
-                    tool_to_add = Tool(name=tool)
-                    tools_in_class_format.append(tool_to_add)
+            tool_list = []
+            def empty_func():
+                return "empty function"
+
+            for item in self.tools:
+                if isinstance(item, Tool):
+                    tool_list.append(item)
+
+                elif isinstance(item, dict):
+                    if "function" not in item:
+                       setattr(item, "function", empty_func)
+                    tool = Tool(**item)
+                    tool_list.append(tool)
+
+                elif isinstance(item, str):
+                    tool = Tool(name=item, function=empty_func)
+                    tool_list.append(tool)
+
                 else:
-                    pass
-            self.tools = tools_in_class_format
+                    tool_list.append(item) # address custom tool
+
+            self.tools = tool_list
 
         return self
 
 
     @model_validator(mode="after")
-    def set_up_backstory(self):
+    def set_up_backstory(self) -> Self:
         """
         Set up the backstory using a templated BACKSTORY when the backstory is None
         """
@@ -305,7 +312,7 @@ class Agent(ABC, BaseModel):
                 role=self.role,
                 knowledge=self.knowledge if isinstance(self.knowledge, str) else None,
                 skillsets=", ".join([item for item in self.skillsets]),
-                rag_tool_overview=", ".join([item.name for item in self.tools]),
+                rag_tool_overview=", ".join([item.name for item in self.tools if hasattr(item, "name")]) if self.tools else "",
                 goal=self.goal,
             )
             self.backstory = backstory
@@ -313,9 +320,7 @@ class Agent(ABC, BaseModel):
         return self
 
 
-    def invoke(
-            self, prompts: str, output_formats: List[TaskOutputFormat], response_fields: List[ResponseField], **kwargs
-            ) -> Dict[str, Any]:
+    def invoke(self, prompts: str, output_formats: List[TaskOutputFormat], response_fields: List[ResponseField], **kwargs) -> Dict[str, Any]:
         """
         Receive the system prompt in string and create formatted prompts using the system prompt and the agent's backstory.
         Then call the base model.
@@ -358,11 +363,10 @@ class Agent(ABC, BaseModel):
         return {"output": response.output if hasattr(response, "output") else response}
 
 
-    def execute_task(self, task, context: Optional[str] = None, tools: Optional[str] = None) -> str:
+    def execute_task(self, task, context: Optional[str] = None) -> str:
         """
-        Execute the task and return the output in string.
-        To simplify, the tools are cascaded from the `tools_called` under the `task` Task instance if any.
-        When the tools are given, the agent must use them.
+        Execute the task and return the response in string.
+        The agent utilizes the tools in task or their own tools if the task.can_use_agent_tools is True.
         The agent must consider the context to excute the task as well when it is given.
         """
 
@@ -371,13 +375,29 @@ class Agent(ABC, BaseModel):
             task_prompt += context
 
         tool_results = []
-        if task.tools_called:
-            for tool_called in task.tools_called:
-                tool_result = tool_called.tool.run()
+        if task.tools:
+            for item in task.tools:
+                if isinstance(item, ToolSet):
+                    tool_result = item.tool.run(**item.kwargs)
+                    tool_results.append(tool_result)
+                elif isinstance(item, Tool):
+                    tool_result = item.run()
+                    tool_results.append(tool_result)
+                else:
+                    try:
+                        item.run()
+                    except:
+                        pass
+
+        if task.can_use_agent_tools is True and self.tools:
+            for tool in self.tools:
+                tool_result = tool.run()
                 tool_results.append(tool_result)
 
-            if task.take_tool_res_as_final:
-                return tool_results
+        if task.take_tool_res_as_final:
+            return tool_results
+
+
 
         # if self.team and self.team._train:
         #     task_prompt = self._training_handler(task_prompt=task_prompt)
@@ -395,9 +415,7 @@ class Agent(ABC, BaseModel):
             self._times_executed += 1
             if self._times_executed > self.max_retry_limit:
                 raise e
-            result = self.execute_task(
-                task, context, [tool_called.tool for tool_called in task.tools_called]
-            )
+            result = self.execute_task(task, context)
 
         if self.max_rpm and self._rpm_controller:
             self._rpm_controller.stop_rpm_counter()

versionhq/agent/parser.py

@@ -73,9 +73,7 @@ class AgentParser:
     def parse(self, text: str) -> AgentAction | AgentFinish:
         thought = self._extract_thought(text)
         includes_answer = FINAL_ANSWER_ACTION in text
-        regex = (
-            r"Action\s*\d*\s*:[\s]*(.*?)[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)"
-        )
+        regex = r"Action\s*\d*\s*:[\s]*(.*?)[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)"
         action_match = re.search(regex, text, re.DOTALL)
         if action_match:
             if includes_answer:
@@ -127,18 +125,9 @@ class AgentParser:
     def _safe_repair_json(self, tool_input: str) -> str:
         UNABLE_TO_REPAIR_JSON_RESULTS = ['""', "{}"]
 
-        # Skip repair if the input starts and ends with square brackets
-        # Explanation: The JSON parser has issues handling inputs that are enclosed in square brackets ('[]').
-        # These are typically valid JSON arrays or strings that do not require repair. Attempting to repair such inputs
-        # might lead to unintended alterations, such as wrapping the entire input in additional layers or modifying
-        # the structure in a way that changes its meaning. By skipping the repair for inputs that start and end with
-        # square brackets, we preserve the integrity of these valid JSON structures and avoid unnecessary modifications.
         if tool_input.startswith("[") and tool_input.endswith("]"):
             return tool_input
 
-        # Before repair, handle common LLM issues:
-        # 1. Replace """ with " to avoid JSON parser errors
-
         tool_input = tool_input.replace('"""', '"')
 
         result = repair_json(tool_input)

versionhq/clients/customer/model.py

@@ -1,16 +1,7 @@
 import uuid
 from abc import ABC
 from typing import Any, Dict, List, Callable, Type, Optional, get_args, get_origin
-from pydantic import (
-    UUID4,
-    InstanceOf,
-    BaseModel,
-    ConfigDict,
-    Field,
-    create_model,
-    field_validator,
-    model_validator,
-)
+from pydantic import UUID4, InstanceOf, BaseModel, ConfigDict, Field, create_model, field_validator, model_validator
 from pydantic_core import PydanticCustomError
 
 from versionhq.clients.product.model import Product, ProductProvider
@@ -23,18 +14,11 @@ class Customer(ABC, BaseModel):
 
     id: UUID4 = Field(default_factory=uuid.uuid4, frozen=True)
     name: Optional[str] = Field(default=None, description="customer's name if any")
-    product_list: Optional[List[Product]] = Field(
-        default=list, description="store products that the customer is associated with"
-    )
-    analysis: str = Field(
-        default=None, description="store the latest analysis results on the customer"
-    )
-    on_workflow: bool = Field(
-        default=False, description="`True` if they are on some messaging workflows"
-    )
-    on: Optional[str] = Field(
-        default=None, description="destination service for this customer if any"
-    )
+    product_list: Optional[List[Product]] = Field(default=list, description="store products that the customer is associated with")
+    analysis: str = Field(default=None, description="store the latest analysis results on the customer")
+    on_workflow: bool = Field(default=False, description="`True` if they are on some messaging workflows")
+    on: Optional[str] = Field(default=None, description="destination service for this customer if any")
+
 
     @field_validator("id", mode="before")
     @classmethod

versionhq/clients/workflow/model.py

@@ -2,6 +2,7 @@ import uuid
 from abc import ABC
 from datetime import date, datetime, time, timedelta
 from typing import Any, Dict, List, Callable, Type, Optional, get_args, get_origin
+from typing_extensions import Self
 from pydantic import UUID4, InstanceOf, BaseModel, ConfigDict, Field, field_validator, model_validator
 from pydantic_core import PydanticCustomError
 
@@ -63,7 +64,7 @@ class MessagingComponent(ABC, BaseModel):
     condition: str = Field(default=None, max_length=128, description="condition to execute the next messaging component")
 
 
-    def store_scoring_result(self, scoring_subject: str, score_raw: int | Score | ScoreFormat = None):
+    def store_scoring_result(self, scoring_subject: str, score_raw: int | Score | ScoreFormat = None) -> Self:
         """
         Set up the `score` field
         """
@@ -117,15 +118,6 @@ class MessagingWorkflow(ABC, BaseModel):
         description="store metrics that used to predict and track the performance of this workflow."
     )
 
-
-    @property
-    def name(self):
-        if self.customer.id:
-            return f"Workflow ID: {self.id} - on {self.product.id} for {self.customer.id}"
-        else:
-            return f"Workflow ID: {self.id} - on {self.product.id}"
-
-
     @field_validator("id", mode="before")
     @classmethod
     def _deny_user_set_id(cls, v: Optional[UUID4]) -> None:
@@ -160,3 +152,11 @@ class MessagingWorkflow(ABC, BaseModel):
         self.agents = agents
         self.team = team
         self.updated_at = datetime.datetime.now()
+
+
+    @property
+    def name(self) -> str:
+        if self.customer.id:
+            return f"Workflow ID: {self.id} - on {self.product.id} for {self.customer.id}"
+        else:
+            return f"Workflow ID: {self.id} - on {self.product.id}"