versionhq 1.2.3.6__py3-none-any.whl → 1.2.3.8__py3-none-any.whl

versionhq/__init__.py

@@ -32,7 +32,7 @@ from versionhq.agent_network.formation import form_agent_network
 from versionhq.task_graph.draft import workflow
 
 
-__version__ = "1.2.3.6"
+__version__ = "1.2.3.8"
 __all__ = [
     "Agent",
 

versionhq/agent/model.py

@@ -7,13 +7,12 @@ from dotenv import load_dotenv
 from pydantic import UUID4, BaseModel, Field, InstanceOf, PrivateAttr, model_validator, field_validator
 from pydantic_core import PydanticCustomError
 
-from versionhq.llm.model import LLM, DEFAULT_CONTEXT_WINDOW_SIZE, DEFAULT_MODEL_NAME, PROVIDERS
+from versionhq.agent.rpm_controller import RPMController
 from versionhq.tool.model import Tool, ToolSet, BaseTool
 from versionhq.knowledge.model import BaseKnowledgeSource, Knowledge
 from versionhq.memory.contextual_memory import ContextualMemory
 from versionhq.memory.model import ShortTermMemory, LongTermMemory, UserMemory
 from versionhq._utils.logger import Logger
-from versionhq.agent.rpm_controller import RPMController
 from versionhq._utils.process_config import process_config
 
 
@@ -68,8 +67,8 @@ class Agent(BaseModel):
     callbacks: Optional[List[Callable]] = Field(default_factory=list, description="callback functions to execute after any task execution")
 
     # llm settings cascaded to the LLM model
-    llm: str | InstanceOf[LLM] | Dict[str, Any] = Field(default=None)
-    func_calling_llm: str | InstanceOf[LLM] | Dict[str, Any] = Field(default=None)
+    llm: Any = Field(default=None, description="store LLM object")
+    func_calling_llm: Any = Field(default=None, description="store LLM object")
     respect_context_window: bool = Field(default=True, description="keep messages under the context window size")
     max_execution_time: Optional[int] = Field(default=None, description="max. task execution time in seconds")
     max_rpm: Optional[int] = Field(default=None, description="max. number of requests per minute")
@@ -78,7 +77,6 @@ class Agent(BaseModel):
     # # cache, error, ops handling
     # formatting_errors: int = Field(default=0, description="number of formatting errors.")
 
-
     @field_validator("id", mode="before")
     @classmethod
     def _deny_user_set_id(cls, v: Optional[UUID4]) -> None:
@@ -106,6 +104,8 @@ class Agent(BaseModel):
         """
         Set up `llm` and `func_calling_llm` as valid LLM objects using the given kwargs.
         """
+        from versionhq.llm.model import LLM, DEFAULT_MODEL_NAME
+
         self.llm = self._convert_to_llm_object(llm=self.llm)
 
         func_calling_llm = self.func_calling_llm if self.func_calling_llm else self.llm if self.llm else None
@@ -151,7 +151,7 @@ class Agent(BaseModel):
                                 setattr(tool, k, v)
                         tool_list.append(tool)
 
-                case callable():
+                case func if callable(func):
                     tool = Tool(func=item)
                     tool_list.append(tool)
 
@@ -267,11 +267,13 @@ class Agent(BaseModel):
         return self
 
 
-    def _convert_to_llm_object(self, llm: Any = None) -> LLM:
+    def _convert_to_llm_object(self, llm: Any = None): # returns LLM object
         """
         Convert the given value to LLM object.
         When `llm` is dict or self.llm_config is not None, add these values to the LLM object after validating them.
         """
+        from versionhq.llm.model import LLM, DEFAULT_MODEL_NAME
+
         llm = llm if llm else self.llm if self.llm else DEFAULT_MODEL_NAME
 
         if not llm:
@@ -279,11 +281,11 @@ class Agent(BaseModel):
 
         match llm:
             case LLM():
-                return self._set_llm_params(llm=llm, config=self.llm_config)
+                return self._set_llm_params(llm_obj=llm, config=self.llm_config)
 
             case str():
                 llm = LLM(model=llm)
-                return self._set_llm_params(llm=llm, config=self.llm_config)
+                return self._set_llm_params(llm_obj=llm, config=self.llm_config)
 
             case dict():
                 model_name = llm.pop("model_name", llm.pop("deployment_name", str(llm)))
@@ -301,13 +303,20 @@ class Agent(BaseModel):
                     "base_url": getattr(llm, "base_url", None),
                 }
                 config = llm_params.update(self.llm_config) if self.llm_config else llm_params
-                return self._set_llm_params(llm=llm, config=config)
+                return self._set_llm_params(llm_obj=llm, config=config)
 
 
-    def _set_llm_params(self, llm: LLM, config: Dict[str, Any] = None) -> LLM:
+    def _set_llm_params(self, llm_obj, config: Dict[str, Any] = None):  # returns LLM object
         """
         Add valid params to the LLM object.
         """
+        from versionhq.llm.model import LLM, DEFAULT_CONTEXT_WINDOW_SIZE
+        from versionhq.llm.llm_vars import PROVIDERS
+
+        llm = llm_obj if isinstance(llm_obj, LLM) else None
+
+        if not llm: return
+
         if llm.provider is None:
             provider_name = llm.model.split("/")[0]
             valid_provider = provider_name if provider_name in PROVIDERS else None
@@ -352,6 +361,8 @@ class Agent(BaseModel):
         """
         Fine-tuned the base model using OpenAI train framework.
         """
+        from versionhq.llm.model import LLM
+
         if not isinstance(self.llm, LLM):
             pass
 

versionhq/tool/model.py

@@ -144,6 +144,11 @@ class BaseTool(ABC, BaseModel):
 class Tool(BaseTool):
     func: Callable = Field(default=None)
 
+    # def __init__(self, func: Callable = None, *args, **kwargs):
+    #     self.func = func
+    #     super().__init__(*args, **kwargs)
+
+
     @model_validator(mode="after")
     def validate_func(self) -> Self:
         if not self.func and not self._run:

{versionhq-1.2.3.6.dist-info → versionhq-1.2.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.2.3.6
+Version: 1.2.3.8
 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.3.6.dist-info → versionhq-1.2.3.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-versionhq/__init__.py,sha256=40KCEmDQ4M8HPz4QLSdkRurG7jggekd83nKYJJ1j6dE,2980
+versionhq/__init__.py,sha256=-XmzMUZrIz4XrCUOjV4K8kAbNGaSeptDjYOyWfMUYOc,2980
 versionhq/_utils/__init__.py,sha256=d-vYVcORZKG-kkLe_fzE8VbViDpAk9DDOKe2fVK25ew,178
 versionhq/_utils/i18n.py,sha256=TwA_PnYfDLA6VqlUDPuybdV9lgi3Frh_ASsb_X8jJo8,1483
 versionhq/_utils/llm_as_a_judge.py,sha256=RM0oYfoeanuUyUL3Ewl6_8Xn1F5Axd285UMH46kxG1I,2378
@@ -8,7 +8,7 @@ versionhq/_utils/usage_metrics.py,sha256=xgYGRW3OTuK9EJyi3QYJeYcJl7dL27olcWaLo_7
 versionhq/_utils/vars.py,sha256=bZ5Dx_bFKlt3hi4-NNGXqdk7B23If_WaTIju2fiTyPQ,57
 versionhq/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 versionhq/agent/inhouse_agents.py,sha256=BPkvEyMH8VnZWsMeCwsGplDT_kLwlIejeRcr-6ItGqQ,2637
-versionhq/agent/model.py,sha256=C3MptCdVF7c2xM5TR4Bz5TJzZw1MfYh50TLrvXFMrJ4,25656
+versionhq/agent/model.py,sha256=xKfg20EdL11HiFbG7V7ErHlFSDpvh5lopnHDfWULJM4,25996
 versionhq/agent/parser.py,sha256=riG0dkdQCxH7uJ0AbdVdg7WvL0BXhUgJht0VtQvxJBc,4082
 versionhq/agent/rpm_controller.py,sha256=grezIxyBci_lDlwAlgWFRyR5KOocXeOhYkgN02dNFNE,2360
 versionhq/agent/TEMPLATES/Backstory.py,sha256=dkfuATUQ2g2WoUKkmgAIch-RB--bektGoQaUlsDOn0g,529
@@ -59,11 +59,11 @@ versionhq/tool/cache_handler.py,sha256=iL8FH7X0G-cdT0uhJwzuhLDaadTXOdfybZcDy151-
 versionhq/tool/composio_tool.py,sha256=IATfsEnF_1RPJyGtPBmAtEJh5XPcgDHpyG3SUR461Og,8572
 versionhq/tool/composio_tool_vars.py,sha256=FvBuEXsOQUYnN7RTFxT20kAkiEYkxWKkiVtgpqOzKZQ,1843
 versionhq/tool/decorator.py,sha256=C4ZM7Xi2gwtEMaSeRo-geo_g_MAkY77WkSLkAuY0AyI,1205
-versionhq/tool/model.py,sha256=Nc2f9frTK5tH4kh6EeEAk1Fi1w19kEXLOcsBwHCS1a4,12189
+versionhq/tool/model.py,sha256=ve9C4WyiRjQigOU0hRWVxtSUWAQNntlmeW-_DL0_lJY,12328
 versionhq/tool/rag_tool.py,sha256=dW5o-83V4bMFFJEj3PUm7XjblwrYJGmZVBlCpPj6CeM,3852
 versionhq/tool/tool_handler.py,sha256=2m41K8qo5bGCCbwMFferEjT-XZ-mE9F0mDUOBkgivOI,1416
-versionhq-1.2.3.6.dist-info/LICENSE,sha256=cRoGGdM73IiDs6nDWKqPlgSv7aR4n-qBXYnJlCMHCeE,1082
-versionhq-1.2.3.6.dist-info/METADATA,sha256=pse3tddq8a1S0jxvDrZBlb2v2a83PaF6oPRlSBvjXlM,21262
-versionhq-1.2.3.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-versionhq-1.2.3.6.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
-versionhq-1.2.3.6.dist-info/RECORD,,
+versionhq-1.2.3.8.dist-info/LICENSE,sha256=cRoGGdM73IiDs6nDWKqPlgSv7aR4n-qBXYnJlCMHCeE,1082
+versionhq-1.2.3.8.dist-info/METADATA,sha256=c-aVXe5FBs_a_YPXQN4HBxfAJZv7ZxR0c1f_5cAsuKg,21262
+versionhq-1.2.3.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+versionhq-1.2.3.8.dist-info/top_level.txt,sha256=DClQwxDWqIUGeRJkA8vBlgeNsYZs4_nJWMonzFt5Wj0,10
+versionhq-1.2.3.8.dist-info/RECORD,,