versionhq 1.1.10.3__tar.gz → 1.1.10.5__tar.gz

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.1.10.3
+Version: 1.1.10.5
 Summary: LLM orchestration frameworks for model-agnostic AI agents that handle complex outbound workflows
 Author-email: Kuriko Iwai <kuriko@versi0n.io>
 License: MIT License

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["test*", "__pycache__"]
 
 [project]
 name = "versionhq"
-version = "1.1.10.3"
+version = "1.1.10.5"
 authors = [{ name = "Kuriko Iwai", email = "kuriko@versi0n.io" }]
 description = "LLM orchestration frameworks for model-agnostic AI agents that handle complex outbound workflows"
 readme = "README.md"

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq/__init__.py

@@ -18,7 +18,7 @@ from versionhq.tool.model import Tool
 from versionhq.tool.composio_tool import ComposioHandler
 
 
-__version__ = "1.1.10.3"
+__version__ = "1.1.10.5"
 __all__ = [
     "Agent",
     "Customer",

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq/agent/model.py

@@ -255,9 +255,9 @@ class Agent(BaseModel):
         llm.timeout = self.max_execution_time if llm.timeout is None else llm.timeout
         llm.max_tokens = self.max_tokens if self.max_tokens else llm.max_tokens
 
-        # if self.callbacks:
-        #     llm.callbacks = self.callbacks
-        #     llm._set_callbacks(llm.callbacks)
+        if self.callbacks:
+            llm.callbacks = self.callbacks
+            llm._set_callbacks(llm.callbacks)
 
         if self.respect_context_window == False:
             llm.context_window_size = DEFAULT_CONTEXT_WINDOW_SIZE
@@ -364,9 +364,6 @@ class Agent(BaseModel):
             task_execution_counter += 1
             self._logger.log(level="info", message=f"Agent response: {raw_response}", color="blue")
 
-            if raw_response and self.callbacks:
-                for item in self.callbacks:
-                    raw_response = item(raw_response)
 
         except Exception as e:
             self._logger.log(level="error", message=f"An error occured. The agent will retry: {str(e)}", color="red")
@@ -379,10 +376,6 @@ class Agent(BaseModel):
                 task_execution_counter += 1
                 self._logger.log(level="info", message=f"Agent #{task_execution_counter} response: {raw_response}", color="blue")
 
-                if raw_response and self.callbacks:
-                    for item in self.callbacks:
-                        raw_response = item(raw_response)
-
             if not raw_response:
                 self._logger.log(level="error", message="Received None or empty response from the model", color="red")
                 raise ValueError("Invalid response from LLM call - None or empty.")

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq/llm/model.py

@@ -200,7 +200,7 @@ class LLM(BaseModel):
 
         with suppress_warnings():
             if len(self.callbacks) > 0:
-                self._set_callbacks(self.callbacks)
+                self._set_callbacks(self.callbacks) # passed by agent
 
             try:
                 if tools:
@@ -261,7 +261,6 @@ class LLM(BaseModel):
                         return tool_res
 
                     else:
-                        print(messages)
                         res = litellm.completion(messages=messages, stream=False, **params)
 
                 return res["choices"][0]["message"]["content"]

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq/task/model.py

@@ -169,6 +169,7 @@ class TaskOutput(BaseModel):
     json_dict: Dict[str, Any] = Field(default=None, description="`raw` converted to dictionary")
     pydantic: Optional[Any] = Field(default=None)
     tool_output: Optional[Any] = Field(default=None, description="store tool result when the task takes tool output as its final output")
+    callback_output: Optional[Any] = Field(default=None, description="store task or agent callback outcome")
 
     def __str__(self) -> str:
         return str(self.pydantic) if self.pydantic else str(self.json_dict) if self.json_dict else self.raw
@@ -243,7 +244,7 @@ class Task(BaseModel):
     # execution rules
     allow_delegation: bool = Field(default=False, description="ask other agents for help and run the task instead")
     async_execution: bool = Field(default=False,description="whether the task should be executed asynchronously or not")
-    callback: Optional[Any] = Field(default=None, description="callback to be executed after the task is completed.")
+    callback: Optional[Callable] = Field(default=None, description="callback to be executed after the task is completed.")
     callback_kwargs: Optional[Dict[str, Any]] = Field(default_factory=dict, description="kwargs for the callback when the callback is callable")
 
     # recording
@@ -574,8 +575,9 @@ Ref. Output image: {output_formats_to_follow}
         self.output = task_output
         self.processed_by_agents.add(agent.role)
 
-        if self.callback:
-            self.callback({ **self.callback_kwargs, **self.output.__dict__ })
+        if self.callback and isinstance(self.callback, Callable):
+            callback_res = self.callback(**self.callback_kwargs, **task_output.json_dict)
+            task_output.callback_output = callback_res
 
         # if self.output_file: ## disabled for now
         #     content = (

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq/task/structured_response.py

@@ -1,4 +1,3 @@
-#! FIXME
 from typing import Dict, Optional, Type, List, Any, TypeVar
 
 from pydantic import BaseModel, Field, InstanceOf
@@ -92,12 +91,13 @@ class StructuredList:
 
                 elif nested_object_type == list:
                     props.update({
-                        "nest":  {
+                        # "nest":  {
                             "type": "array",
-                            "items": { "item": { "type": "string" } }, #! REFINEME - field title <>`item`
-                        }})
+                            "items": { "type": "string" } , #! REFINEME - field title <>`item`
+                        # }
+                        })
                 else:
-                    props.update({ "nest": { "type": SchemaType(nested_object_type).convert() }})
+                    props.update({ "type": SchemaType(nested_object_type).convert() })
 
             self.items = { **props }
             return {
@@ -109,8 +109,6 @@ class StructuredList:
             }
 
 
-
-
 class StructuredOutput(BaseModel):
     response_format: Any = None
     provider: str = "openai"

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/src/versionhq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.1.10.3
+Version: 1.1.10.5
 Summary: LLM orchestration frameworks for model-agnostic AI agents that handle complex outbound workflows
 Author-email: Kuriko Iwai <kuriko@versi0n.io>
 License: MIT License

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/tests/agent/agent_test.py

@@ -122,7 +122,7 @@ def test_build_agent_with_llm_config():
     assert agent.llm.max_tokens == 4000
     assert agent.llm.logprobs == False
     assert [hasattr(agent.llm, k) and v for k, v in llm_config.items() if v is not None]
-    assert agent.llm.callbacks == []
+    assert agent.llm.callbacks == [dummy_func]
 
 
 def test_build_agent_with_llm_instance():
@@ -142,7 +142,7 @@ def test_build_agent_with_llm_instance():
     assert agent.llm.api_key is not None
     assert agent.llm.max_tokens == 3000
     assert agent.llm.logprobs == False
-    assert agent.llm.callbacks == []
+    assert agent.llm.callbacks == [dummy_func]
 
 
 def test_build_agent_with_llm_and_func_llm_config():
@@ -163,7 +163,7 @@ def test_build_agent_with_llm_and_func_llm_config():
     assert agent.function_calling_llm.api_key is not None
     assert agent.function_calling_llm.max_tokens == 4000
     assert agent.function_calling_llm.logprobs == False
-    assert agent.function_calling_llm.callbacks == []
+    assert agent.function_calling_llm.callbacks == [dummy_func]
 
 
 def test_build_agent_with_llm_and_func_llm_instance():
@@ -185,7 +185,7 @@ def test_build_agent_with_llm_and_func_llm_instance():
     assert agent.function_calling_llm.api_key is not None
     assert agent.function_calling_llm.max_tokens == 3000
     assert agent.function_calling_llm.logprobs == False
-    assert agent.function_calling_llm.callbacks == []
+    assert agent.function_calling_llm.callbacks == [dummy_func]
 
 
 def test_agent_with_random_dict_tools():
@@ -234,7 +234,3 @@ def test_agent_custom_max_iterations():
         )
         agent.execute_task(task=task)
         assert private_mock.call_count == 1
-
-
-if __name__ == "__main__":
-    test_agent_custom_max_iterations()

{versionhq-1.1.10.3 → versionhq-1.1.10.5}/tests/task/task_test.py

@@ -1,5 +1,7 @@
 import os
 import pytest
+import sys
+import threading
 from unittest.mock import patch
 from typing import Dict, Any, List, Optional, Callable
 
@@ -10,7 +12,8 @@ from versionhq.task.model import Task, ResponseField, TaskOutput, ConditionalTas
 from versionhq.tool.model import Tool, ToolSet
 from tests.task import DemoOutcome, demo_response_fields, base_agent
 
-
+sys.setrecursionlimit(2097152)
+threading.stack_size(134217728)
 
 def test_sync_execute_task_with_pydantic_outcome():
     task = Task(
@@ -144,7 +147,7 @@ def test_callback():
 
 
 def test_delegate():
-    agent = Agent(role="demo agent 6", goal="My amazing goals")
+    agent = Agent(role="demo agent 6", goal="My amazing goals", maxit=1, max_tokens=3000)
     task = Task(
         description="return the output following the given prompt.",
         response_fields=[
@@ -193,7 +196,7 @@ def test_store_task_log():
 
 def test_task_with_agent_tools():
     simple_tool = Tool(name="simple tool", func=lambda x: "simple func")
-    agent = Agent(role="demo", goal="execute tools", tools=[simple_tool,])
+    agent = Agent(role="demo", goal="execute tools", tools=[simple_tool,], maxit=1, max_tokens=3000)
     task = Task(description="execute tool", can_use_agent_tools=True, tool_res_as_final=True)
     res = task.execute_sync(agent=agent)
     assert res.tool_output == "simple func"
@@ -227,7 +230,7 @@ def test_task_with_tools():
     tool = Tool(name="tool", func=random_func)
     tool_set = ToolSet(tool=tool, kwargs=dict(message="empty func"))
 
-    agent = Agent(role="Tool Handler", goal="execute tools")
+    agent = Agent(role="Tool Handler", goal="execute tools", maxit=1, max_tokens=3000)
     task = Task(description="execute the function", tools=[tool_set,], tool_res_as_final=True)
     res = task.execute_sync(agent=agent)
     assert res.tool_output == "empty func_demo"
@@ -272,5 +275,45 @@ def test_build_agent_without_developer_prompt():
 
 
 
+def test_callback():
+    from pydantic import BaseModel
+    from versionhq.agent.model import Agent
+    from versionhq.task.model import Task
+
+    class CustomOutput(BaseModel):
+        test1: str
+        test2: list[str]
+
+    def dummy_func(message: str, test1: str, test2: list[str]) -> str:
+        return f"{message}: {test1}, {", ".join(test2)}"
+
+    agent = Agent(role="demo", goal="amazing project goal", maxit=1, max_tokens=3000)
+
+    task = Task(
+        description="Amazing task",
+        pydantic_custom_output=CustomOutput,
+        callback=dummy_func,
+        callback_kwargs=dict(message="Hi! Here is the result: ")
+    )
+    res = task.execute_sync(agent=agent, context="amazing context to consider.")
+
+    assert res.task_id == task.id
+    assert res.pydantic.test1 and res.pydantic.test2
+    assert "Hi! Here is the result: " in res.callback_output and res.pydantic.test1 in res.callback_output and ", ".join(res.pydantic.test2) in res.callback_output
+
+
+def test_task_with_agent_callback():
+    def dummy_func(*args, **kwargs) -> str:
+        return "Demo func"
+
+    agent = Agent(role="demo", goal="amazing project goal", maxit=1, max_tokens=3000, callbacks=[dummy_func,])
+    task = Task(description="Amazing task")
+    res = task.execute_sync(agent=agent)
+
+    assert res.raw and res.task_id == task.id
 
 # task - maxit, loop, rpm
+
+
+if __name__ == "__main__":
+    test_task_with_agent_callback()