versionhq 1.2.4.3__tar.gz → 1.2.4.6__tar.gz

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.2.4.3
+Version: 1.2.4.6
 Summary: Autonomous agent networks for task automation with multi-step reasoning.
 Author-email: Kuriko Iwai <kuriko@versi0n.io>
 License: MIT License
@@ -295,7 +295,7 @@ def dummy_func(message: str, test1: str, test2: list[str]) -> str:
 
 task = vhq.Task(
    description="Amazing task",
-   pydantic_output=CustomOutput,
+   response_schema=CustomOutput,
    callback=dummy_func,
    callback_kwargs=dict(message="Hi! Here is the result: ")
 )
@@ -317,13 +317,13 @@ agent_b = vhq.Agent(role="Leader", llm="gemini-2.0")
 
 task_1 = vhq.Task(
    description="Analyze the client's business model.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=str, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=str, required=True),],
    allow_delegation=True
 )
 
 task_2 = vhq.Task(
    description="Define a cohort.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=int, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=int, required=True),],
    allow_delegation=False
 )
 

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/README.md

@@ -212,7 +212,7 @@ def dummy_func(message: str, test1: str, test2: list[str]) -> str:
 
 task = vhq.Task(
    description="Amazing task",
-   pydantic_output=CustomOutput,
+   response_schema=CustomOutput,
    callback=dummy_func,
    callback_kwargs=dict(message="Hi! Here is the result: ")
 )
@@ -234,13 +234,13 @@ agent_b = vhq.Agent(role="Leader", llm="gemini-2.0")
 
 task_1 = vhq.Task(
    description="Analyze the client's business model.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=str, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=str, required=True),],
    allow_delegation=True
 )
 
 task_2 = vhq.Task(
    description="Define a cohort.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=int, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=int, required=True),],
    allow_delegation=False
 )
 

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/agent/index.md

@@ -14,7 +14,7 @@ A Pydantic class to store an `Agent` object that handles `Task` execution.
 
 By defining its role and goal in a simple sentence, the AI agent will be set up to run on <bold>`gpt-4o`</bold> by default.
 
-Calling `.start()` method can start the agent operation, then generate response in text and JSON formats stored in the `TaskOutput` object.
+Calling `.start()` method can start the agent operation and generate response in text and JSON formats stored in the `TaskOutput` object.
 
 ```python
 import versionhq as vhq

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/agent-network/ref.md

@@ -22,7 +22,7 @@ tags:
 | **`pre_launch_callbacks`**    | List[Callable[..., Any]]    | list()                          | Stores callbacks to run before the network launch.    |
 | **`post_launch_callbacks`**   | List[Callable[..., Any]]    | list()                          | Stores callbacks to run after the network launch.     |
 | **`step_callbacks`**          | Callable[..., Any]          | None                            | Stores callbacks to run at every step of each member agent takes during the activation. |
-| **`cache`**                   | bool                        | True                            | Whether to store cache.                               |
+| **`cache`**                   | bool                        | True                            | Whether to store cache. |
 | **`execution_logs`**          |  List[Dict[str, Any]]       | list()                          | Stores a list of execution logs of all the tasks in the network. |
 
 
@@ -50,13 +50,13 @@ tags:
 
 ### Variable
 
-| <div style="width:200px">**Variable**</div> | **Data Type** | **Default** | **Description**                                                             |
-| :---                        | :---                          | :---        |  :---                                                                       |
-| **`agent`**                 | InstanceOf[`Agent`]           | None        | Agent as a member                                                           |
-| **`is_manager`**            | bool                          | False       | Whether the member is a manager.                                            |
-| **`can_share_knowledge`**   | bool                          | True        | Whether the member can share its knowledge among the other network members. |
-| **`can_share_memory`**      | bool                          | True        | Whether the member can share its memories among the other network members.  |
-| **`tasks`**                 | List[InstanceOf[`Task`]]      | list()      | Assinged tasks.                                                             |
+| <div style="width:200px">**Variable**</div> | **Data Type** | **Default** | **Description** |
+| :---                        | :---                  | :---        |  :---               |
+| **`agent`**                 | InstanceOf[`Agent`]   | None        | Agent as a member   |
+| **`is_manager`**            | bool                  | False       | Whether the member is a manager.  |
+| **`can_share_knowledge`**   | bool                  | True        | Whether the member can share its knowledge among the other network members. |
+| **`can_share_memory`**      | bool                  | True        | Whether the member can share its memories among the other network members.  |
+| **`tasks`**                 | List[InstanceOf[`Task`]] | list()   | Assinged tasks.     |
 
 
 ### Properties
@@ -109,7 +109,7 @@ tags:
 | :---  | :--- | :--- | :--- |
 | **`update`** | **kwargs: Any  | Self | Updates agents with given kwargs. Invalid keys will be ignored. |
 | **`start`** | context: Any = None <br> tool_res_as_final: bool = False  | `TaskOutput` \| None  | Starts to operate the agent. |
-| **`execute_task`** | task: [Task] <br> context: Any = None <br> task_tools: Optional[List[Tool \| ToolSet]] = list() | str | Returns response from the model in plane text format. |
+| **`execute_task`** | task: [Task] <br> context: Any = None | Tuple[str, str, Any, UsageMetrics] | Returns response from the model in plane text format. |
 
 
 ### Properties
@@ -122,7 +122,7 @@ tags:
 ## ENUM `Formation`
 
 ```python
-class Formation(str, Enum):
+class Formation(IntEnum):
     SOLO = 1
     SUPERVISING = 2
     SQUAD = 3
@@ -133,7 +133,7 @@ class Formation(str, Enum):
 ## ENUM `TaskHandlingProcess`
 
 ```python
-class TaskHandlingProcess(str, Enum):
+class TaskHandlingProcess(IntEnum):
     HIERARCHY = 1
     SEQUENTIAL = 2
     CONSENSUAL = 3

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/llm/index.md

@@ -17,16 +17,17 @@ You can specify a model and integration platform from the list. Else, we'll use
 ```python
 "openai": [
     "gpt-4.5-preview-2025-02-27",
+    "gpt-4",
     "gpt-4o",
     "gpt-4o-mini",
-    "gpt-4",
     "o1-mini",
     "o1-preview",
 ],
 "gemini": [
-    "gemini/gemini-1.5-flash",
-    "gemini/gemini-1.5-pro",
     "gemini/gemini-2.0-flash-exp",
+    "gemini/gemini-2.0-flash",
+    "gemini/gemini-2.0-flash-thinking-exp",
+    "gemini/gemini-2.0-flash-lite-preview-02-05",
 ],
 "anthropic": [
     "claude-3-7-sonnet-latest",
@@ -47,6 +48,7 @@ You can specify a model and integration platform from the list. Else, we'll use
     "bedrock/us.meta.llama3-2-1b-instruct-v1:0",
     "bedrock/us.meta.llama3-2-3b-instruct-v1:0",
     "bedrock/us.meta.llama3-2-11b-instruct-v1:0",
+    "bedrock/us.meta.llama3-2-90b-instruct-v1:0",
     "bedrock/mistral.mistral-7b-instruct-v0:2",
     "bedrock/mistral.mixtral-8x7b-instruct-v0:1",
     "bedrock/mistral.mistral-large-2407-v1:0",

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/task/evaluation.md

@@ -59,7 +59,7 @@ class CustomOutput(BaseModel):
 
 task = vhq.Task(
     description="Research a topic to teach a kid aged 6 about math.",
-    pydantic_output=CustomOutput,
+    response_schema=CustomOutput,
     should_evaluate=True, # triggers evaluation
     eval_criteria=["uniquness", "audience fit",],
 

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/task/reference.md

@@ -2,30 +2,29 @@
 
 ### Variables
 
-| <div style="width:160px">**Variable**</div> | **Data Type**       | **Default**               | **Description**                   |
-| :---                      | :---                                  | :---                      | :---                              |
-| **`id`**                  | UUID                                  | uuid.uuid4()              | Stores task `id` as an identifier. |
-| **`name`**                | Optional[str]                         | None                      | Stores a task name (Inherited as `node` identifier if the task is dependent) |
-| **`description`**         | str                                   | None                      | Required field to store a concise task description |
-| **`pydantic_output`**     | Optional[Type[BaseModel]]             | None                      | Stores pydantic custom output class for structured response |
-| **`response_fields`**     | Optional[List[ResponseField]]         | list()                    | Stores JSON formats for stuructured response |
-| **`tools`**               | Optional[List[BaseTool \| ToolSet]]   | None                      | Stores tools to be called when the agent executes the task. |
-| **`can_use_agent_tools`** | bool                                  | True                      | Whether to use the agent tools |
-| **`tool_res_as_final`**   | bool                                  | False                     | Whether to make a tool output as a final response from the agent |
-| **`image`**               | Optional[str]                         | None                      | Stores an absolute file path or URL to the image file in string |
-| **`file`**                | Optional[str]                         | None                      | Stores an absolute file path or URL to the file in string |
-| **`audio`**               | Optional[str]                         | None                      | Stores an absolute file path or URL to the audio file in string |
-| **`should_test_run`**     | bool                                  | False                     | Whether to turn on auto-feedback learning             |
-| **`human`**               | bool                                  | False                     | Whether to ask human input during the task execution  |
-| **`execution_type`**      | TaskExecutionType                     | TaskExecutionType.SYNC    | Sync or async execution |
-| **`allow_delegation`**    | bool                                  | False                     | Whether to allow the agent to delegate the task to another agent |
-| **`callback`**            | Optional[Callable]                    | None                      | Callback function to be executed after LLM calling |
-| **`callback_kwargs`**     | Optional[Dict[str, Any]]              | dict()                    | Args for the callback function (if any)|
-| **`should_evaluate`**     | bool                                  | False                     | Whether to evaluate the task output using eval criteria |
-| **`eval_criteria`**       | Optional[List[str]]                   | list()                    | Evaluation criteria given by the human client |
-| **`fsls`**                | Optional[List[str]]                   | None                      | Examples of competitive and/or weak responses |
-| **`processed_agents`**    | Set[str]                              | set()                     | Stores keys of agents that executed the task |
-| **`output`**              | Optional[TaskOutput]                  | None                      | Stores `TaskOutput` object after the execution |
+| <div style="width:160px">**Variable**</div> | **Data Type**       | **Default**       | **Description**                   |
+| :---                      | :---                                  | :---              | :---                              |
+| **`id`**                  | UUID                                  | uuid.uuid4()      | Stores task `id` as an identifier. |
+| **`name`**                | Optional[str]                         | None              | Stores a task name (Inherited as `node` identifier if the task is dependent) |
+| **`description`**         | str                                   | None              | Required field to store a concise task description |
+| **`response_schema`**     | Optional[Type[BaseModel] \| List[ResponseField]] | None   | Response schema for structured output. |
+| **`tools`**               | Optional[List[Any]]                   | None              | Tools, tool sets, or RAG tools |
+| **`can_use_agent_tools`** | bool                                  | True              | Whether to use the agent tools |
+| **`tool_res_as_final`**   | bool                                  | False             | Whether to make a tool output as a final response from the agent |
+| **`image`**               | Optional[str]                         | None              | Absolute file path or URL to the image file |
+| **`file`**                | Optional[str]                         | None              | Absolute file path or URL to the file |
+| **`audio`**               | Optional[str]                         | None              | Absolute file path or URL to the audio file |
+| **`should_test_run`**     | bool                                  | False             | Whether to turn on auto-feedback learning             |
+| **`human`**               | bool                                  | False             | Whether to ask human input during the task execution  |
+| **`execution_type`**      | TaskExecutionType                     | TaskExecutionType.SYNC | Sync or async execution |
+| **`allow_delegation`**    | bool                                  | False             | Whether to allow the agent to delegate the task to another agent |
+| **`callback`**            | Optional[Callable]                    | None              | Callback function to be executed after LLM calling |
+| **`callback_kwargs`**     | Optional[Dict[str, Any]]              | dict()            | Args for the callback function (if any)|
+| **`should_evaluate`**     | bool                                  | False             | Whether to evaluate the task output using eval criteria |
+| **`eval_criteria`**       | Optional[List[str]]                   | list()            | Evaluation criteria given by the human client |
+| **`fsls`**                | Optional[List[str]]                   | None              | Examples of competitive and/or weak responses |
+| **`processed_agents`**    | Set[str]                              | set()             | Stores keys of agents that executed the task |
+| **`output`**              | Optional[TaskOutput]                  | None              | Stores `TaskOutput` object after the execution |
 
 
 ### Class Methods
@@ -68,12 +67,13 @@
 | :---                      | :---                                  | :---          | :---                                                  |
 | **`task_id`**             | UUID                                  | uuid.uuid4()  | Stores task `id` as an identifier.                    |
 | **`raw`**                 | str                                   | None          | Stores response in plane text format. `None` or `""` when the model returned errors.|
-| **`json_dict`**           | Dict[str, Any]                        | None          | Stores response in JSON serializable dictionary. When the system failed formatting or executing tasks without response_fields, `{ output: <res.raw> }` will be returned. |
-| **`pydantic`**            | Type[`BaseModel`]                     | None          | Populates and stores Pydantic class object defined in the `pydantic_output` field if given. |
-| **`tool_output`**         | Optional[Any]                         | None          | Stores results from the tools of the task or agents ONLY when `tool_res_as_final` set as `True`. |
+| **`json_dict`**           | Dict[str, Any]                        | None          | Stores response in JSON serializable dictionary. |
+| **`pydantic`**            | Type[`BaseModel`]                     | None          | Populates the given response schema in pydantic class |
+| **`tool_output`**         | Optional[Any]                         | None          | Stores results from the tools of the task or agents when `tool_res_as_final` == True |
 | **`callback_output`**     | Optional[Any]                         | None          | Stores results from callback functions if any. |
-| **`latency`**             | Optional[float]                       | None          | Stores job latency in milseconds. |
+| **`annotations`**         | Optional[Dict[str, Any]]              | None          | Stores annotations given by the model. |
 | **`evaluation`**          | Optional[InstanceOf[`Evaluation`]]    | None          | Stores overall evaluations and usage of the task output. |
+| **`usage`**               | Optional[InstanceOf[`UsageMetrics]`]  | None          | Usage related values. |
 
 
 ### Class Methods

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/task/task-output.md

@@ -27,7 +27,7 @@ def summarize_response(message: str, test1: str, test2: list[str]) -> str:
 
 task = vhq.Task(
     description="Research a topic to teach a kid aged 6 about math.",
-    pydantic_output=CustomOutput,
+    response_schema=CustomOutput,
     tools=[dummy_tool],
     callback=summarize_response,
     callback_kwargs=dict(message="Hi! Here is the result: "),

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/core/task/task-strc-response.md

@@ -8,11 +8,11 @@ But you can choose to generate Pydantic class or specifig JSON object as respons
 
 <hr />
 
-## 1. Pydantic
+`[var]`<bold>`response_schema: Optional[Type[BaseModel] | List[ResponseField]] = None`</bold>
 
-`[var]`<bold>`pydantic_output: Optional[Type[BaseModel]] = None`</bold>
+## 1. Pydantic
 
-Add a `custom Pydantic class` as a structured response format to the `pydantic_output` field.
+Add a `custom Pydantic class` to the `response_schema` field to generate a structured response.
 
 The custom class can accept **one layer of a nested child** as you can see in the following code snippet:
 
@@ -44,7 +44,7 @@ class Demo(BaseModel):
 # 2. Define a task
 task = vhq.Task(
     description="generate random output that strictly follows the given format",
-    pydantic_output=Demo,
+    response_schema=Demo,
 )
 
 # 3. Execute
@@ -63,8 +63,6 @@ assert [
 
 ## 2. JSON
 
-`[var]`<bold>`response_fields: List[InstanceOf[ResponseField]] = None`</bold>
-
 Similar to Pydantic, JSON output structure can be defined by using a list of `ResponseField` objects.
 
 The following code snippet demonstrates how to use `ResponseField` to generate output with a maximum of one level of nesting.
@@ -75,16 +73,15 @@ Custom JSON outputs can accept **one layer of a nested child**.
 
 - `demo_response_fields` in the following case is identical to the previous Demo class, except that titles are specified for nested fields.
 
-- Agents generate JSON output by default, whether or not `response_fields` are used.
+- Agents generate JSON output by default, whether or not `response_schema` is given.
 
-- However, response_fields are REQUIRED to specify JSON key titles and data types.
+- However, `response_schema` is required to specify the key value sets.
 
 ```python
 import versionhq as vhq
 
 # 1. Define a list of ResponseField objects.
 demo_response_fields = [
-    # no nesting
     vhq.ResponseField(title="demo_1", data_type=int),
     vhq.ResponseField(title="demo_2", data_type=float),
     vhq.ResponseField(title="demo_3", data_type=str),
@@ -125,16 +122,15 @@ demo_response_fields = [
 # 2. Define a task
 task = vhq.Task(
     description="Output random values strictly following the data type defined in the given response format.",
-    response_fields=demo_response_fields
+    response_schema=demo_response_fields
 )
 
 
 # 3. Execute
 res = task.execute()
 
-assert isinstance(res, vhq.TaskOutput) and res.task_id is task.id
-assert res.raw and res.json and res.pydantic is None
-assert [v and type(v) == task.response_fields[i].data_type for i, (k, v) in enumerate(res.json_dict.items())]
+assert isinstance(res, vhq.TaskOutput)
+assert [v and type(v) == task.response_schema[i].data_type for i, (k, v) in enumerate(res.json_dict.items())]
 ```
 
 * Ref. <a href="/core/task/response-field">`ResponseField`</a> class
@@ -172,7 +168,7 @@ class Sub(BaseModel):
 
 sub_task = vhq.Task(
     description="generate random values that strictly follows the given format.",
-    pydantic_output=Sub
+    response_schema=Sub
 )
 sub_res = sub_task.execute()
 
@@ -190,7 +186,7 @@ def format_response(sub, main1, main2) -> Main:
 # 3. Executes
 main_task = vhq.Task(
     description="generate random values that strictly follows the given format.",
-    pydantic_output=Main,
+    response_schema=Main,
     callback=format_response,
     callback_kwargs=dict(sub=sub_res.json_dict),
 )

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/docs/quickstart.md

@@ -52,7 +52,7 @@ agent = vhq.Agent(role="demo manager")
 
 task = vhq.Task(
    description="Amazing task",
-   pydantic_output=CustomOutput,
+   response_schema=CustomOutput,
    callback=dummy_func,
    callback_kwargs=dict(message="Hi! Here is the result: ")
 )
@@ -88,13 +88,13 @@ agent_b = vhq.Agent(role="agent b", goal="My amazing goals", llm="llm-of-your-ch
 
 task_1 = vhq.Task(
    description="Analyze the client's business model.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=str, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=str, required=True),],
    allow_delegation=True
 )
 
 task_2 = vhq.Task(
    description="Define a cohort.",
-   response_fields=[vhq.ResponseField(title="test1", data_type=int, required=True),],
+   response_schema=[vhq.ResponseField(title="test1", data_type=int, required=True),],
    allow_delegation=False
 )
 

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["test*", "__pycache__", "*.egg-info"]
 
 [project]
 name = "versionhq"
-version = "1.2.4.3"
+version = "1.2.4.6"
 authors = [{ name = "Kuriko Iwai", email = "kuriko@versi0n.io" }]
 description = "Autonomous agent networks for task automation with multi-step reasoning."
 readme = "README.md"

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/src/versionhq/__init__.py

@@ -24,7 +24,10 @@ from versionhq.tool.model import Tool, ToolSet
 from versionhq.tool.rag_tool import RagTool
 from versionhq.tool.cache_handler import CacheHandler
 from versionhq.tool.tool_handler import ToolHandler
-from versionhq.tool.composio_tool import ComposioHandler
+from versionhq.tool.composio.model import ComposioBaseTool
+from versionhq.tool.gpt.cup import GPTToolCUP, CUPToolSchema
+from versionhq.tool.gpt.file_search import GPTToolFileSearch, FilterSchema
+from versionhq.tool.gpt.web_search import GPTToolWebSearch
 from versionhq.memory.contextual_memory import ContextualMemory
 from versionhq.memory.model import ShortTermMemory,LongTermMemory, UserMemory, MemoryItem
 
@@ -32,7 +35,7 @@ from versionhq.agent_network.formation import form_agent_network
 from versionhq.task_graph.draft import workflow
 
 
-__version__ = "1.2.4.3"
+__version__ = "1.2.4.6"
 __all__ = [
     "Agent",
 
@@ -85,7 +88,13 @@ __all__ = [
     "RagTool",
     "CacheHandler",
     "ToolHandler",
-    "ComposioHandler",
+    "ComposioBaseTool",
+
+    "GPTToolCUP",
+    "CUPToolSchema",
+    "GPTToolFileSearch",
+    "FilterSchema",
+    "GPTToolWebSearch",
 
     "ContextualMemory",
     "ShortTermMemory",

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/src/versionhq/_prompt/auto_feedback.py

@@ -5,7 +5,7 @@ from pydantic import InstanceOf, Field
 
 from versionhq.agent.model import Agent
 from versionhq.task.model import Task
-from versionhq.task_graph.model import TaskGraph, Node, DependencyType, ReformTriggerEvent
+from versionhq.task_graph.model import TaskGraph, Node, DependencyType
 from versionhq._prompt.model import Prompt
 from versionhq._prompt.constants import REFLECT, INTEGRATE, parameter_sets
 
@@ -67,7 +67,7 @@ class PromptFeedbackGraph(TaskGraph):
         if not agents:
             return None
 
-        self.concl_template = base_task.pydantic_output if base_task.pydantic_output else base_task.response_fields if base_task.response_fields else None
+        self.concl_response_schema = base_task.response_schema
         base_agent.callbacks.append(self._reflect)
         init_node = Node(task=base_task, assigned_to=base_agent)
         self.add_node(init_node)

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/src/versionhq/_prompt/model.py

@@ -2,9 +2,9 @@
 from typing import Dict, List, Tuple, Any
 from textwrap import dedent
 
-from pydantic import InstanceOf
+from pydantic import InstanceOf, BaseModel
 
-from versionhq._utils import is_valid_url
+from versionhq._utils import is_valid_url, convert_img_url
 
 
 class Prompt:
@@ -25,34 +25,26 @@ class Prompt:
 
 
     def _draft_output_prompt(self) -> str:
-        """Drafts prompt for output either from `pydantic_output` or `response_fields`"""
+        """Drafts prompt for output format using `response_schema`."""
 
-        from versionhq.llm.model import DEFAULT_MODEL_PROVIDER_NAME
+        from versionhq.task.model import ResponseField
 
         output_prompt = ""
-        model_provider = self.agent.llm.provider if self.agent else DEFAULT_MODEL_PROVIDER_NAME
+        output_formats_to_follow = dict()
 
-        if self.task.pydantic_output:
-            output_prompt, output_formats_to_follow = "", dict()
-            response_format = str(self.task._structure_response_format(model_provider=model_provider))
-            for k, v in self.task.pydantic_output.model_fields.items():
-                output_formats_to_follow[k] = f"<Return your answer in {v.annotation}>"
+        if self.task.response_schema:
+            if isinstance(self.task.response_schema, list):
+                for item in self.task.response_schema:
+                    if isinstance(item, ResponseField):
+                        output_formats_to_follow[item.title] = f"<Return your answer in {item.data_type.__name__}>"
 
-            output_prompt = f"""Your response MUST be a valid JSON string that strictly follows the response format. Use double quotes for all keys and string values. Do not use single quotes, trailing commas, or any other non-standard JSON syntax.
-Response format: {response_format}
-Ref. Output image: {output_formats_to_follow}
-"""
-        elif self.task.response_fields:
-            output_prompt, output_formats_to_follow = "", dict()
-            response_format = str(self.task._structure_response_format(model_provider=model_provider))
-            for item in self.task.response_fields:
-                if item:
-                    output_formats_to_follow[item.title] = f"<Return your answer in {item.data_type.__name__}>"
+            elif issubclass(self.task.response_schema, BaseModel):
+                for k, v in self.task.response_schema.model_fields.items():
+                    output_formats_to_follow[k] = f"<Return your answer in {v.annotation}>"
 
             output_prompt = f"""Your response MUST be a valid JSON string that strictly follows the response format. Use double quotes for all keys and string values. Do not use single quotes, trailing commas, or any other non-standard JSON syntax.
-Response format: {response_format}
 Ref. Output image: {output_formats_to_follow}
-"""
+    """
         else:
             output_prompt = "You MUST return your response as a valid JSON serializable string, enclosed in double quotes. Use double quotes for all keys and string values. Do NOT use single quotes, trailing commas, or other non-standard JSON syntax."
 
@@ -107,12 +99,9 @@ Ref. Output image: {output_formats_to_follow}
         content_messages = {}
 
         if self.task.image:
-            with open(self.task.image, "rb") as file:
-                content = file.read()
-                if content:
-                    encoded_file = base64.b64encode(content).decode("utf-8")
-                    img_url = f"data:image/jpeg;base64,{encoded_file}"
-                    content_messages.update({ "type": "image_url", "image_url": { "url": img_url }})
+            img_url = convert_img_url(self.task.image)
+            if img_url:
+                content_messages.update({ "type": "image_url", "image_url": { "url": img_url }})
 
         if self.task.file:
             if is_valid_url(self.task.file):
@@ -154,7 +143,7 @@ Ref. Output image: {output_formats_to_follow}
         return "\n".join(task_slices)
 
 
-    def format_core(self, rag_tools: List[Any] = None) -> Tuple[str, str, List[Dict[str, str]]]:
+    def format_core(self, rag_tools: List[Any] = None, gpt_tools: List[Any] = None) -> Tuple[str, str, List[Dict[str, str]]]:
         """Formats prompt messages sent to the LLM, then returns task prompt, developer prompt, and messages."""
 
         from versionhq.knowledge._utils import extract_knowledge_context
@@ -176,6 +165,12 @@ Ref. Output image: {output_formats_to_follow}
                 if rag_tool_context:
                     user_prompt += ",".join(rag_tool_context) if isinstance(rag_tool_context, list) else str(rag_tool_context)
 
+        if gpt_tools:
+            for item in gpt_tools:
+                raw, _, _ = item.run()
+                if raw:
+                    user_prompt += str(raw)
+
         if self.agent.with_memory == True:
             contextual_memory = ContextualMemory(
                 memory_config=self.agent.memory_config, stm=self.agent.short_term_memory, ltm=self.agent.long_term_memory, um=self.agent.user_memory

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/src/versionhq/_utils/__init__.py

@@ -3,3 +3,5 @@ from versionhq._utils.process_config import process_config
 from versionhq._utils.vars import KNOWLEDGE_DIRECTORY, MAX_FILE_NAME_LENGTH
 from versionhq._utils.is_valid_url import is_valid_url
 from versionhq._utils.usage_metrics import UsageMetrics, ErrorType
+from versionhq._utils.convert_img_url import convert_img_url
+from versionhq._utils.is_valid_enum import is_valid_enum

versionhq-1.2.4.6/src/versionhq/_utils/convert_img_url.py

@@ -0,0 +1,15 @@
+import base64
+
+def convert_img_url(img_url: str) -> str | None:
+    try:
+        with open(img_url, "rb") as file:
+            content = file.read()
+            if content:
+                encoded_file = base64.b64encode(content).decode("utf-8")
+                img_url = f"data:image/jpeg;base64,{encoded_file}"
+                return img_url
+
+            else: return None
+
+    except:
+        return None

versionhq-1.2.4.6/src/versionhq/_utils/is_valid_enum.py

@@ -0,0 +1,25 @@
+from enum import Enum, IntEnum
+from typing import Any
+
+
+def is_valid_enum(enum: Enum | IntEnum, key: str = None, val: str | Enum | IntEnum = None) -> bool:
+    if not enum: return False
+
+    if key:
+        key = key.upper()
+        matched = [k for k in enum._member_map_.keys() if hasattr(enum, "_member_map_") and k == key]
+        return bool(matched)
+
+    elif val:
+        match val:
+            case str():
+                matched = [k for k in enum._value2member_map_.keys() if hasattr(enum, "_value2member_map_") and k == val]
+                return bool(matched)
+
+            case Enum() | IntEnum():
+                return val in enum
+
+            case _:
+                return False
+
+    else: return False

{versionhq-1.2.4.3 → versionhq-1.2.4.6}/src/versionhq/_utils/llm_as_a_judge.py

@@ -2,7 +2,6 @@ import json
 import numpy as np
 from sklearn.metrics import precision_score, recall_score, roc_auc_score, cohen_kappa_score
 from typing import List, Tuple, Dict, Any
-from pathlib import Path
 
 
 class LLMJudge: