versionhq 1.1.11.7__tar.gz → 1.1.11.8__tar.gz

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/.gitignore

@@ -3,6 +3,8 @@ destinations.py
 
 entity_memory.py
 
+llm_connection_test.py
+
 train.py
 
 dist/

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.1.11.7
+Version: 1.1.11.8
 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.11.7 → versionhq-1.1.11.8}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["test*", "__pycache__", "*.egg-info"]
 
 [project]
 name = "versionhq"
-version = "1.1.11.7"
+version = "1.1.11.8"
 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.11.7 → versionhq-1.1.11.8}/src/versionhq/__init__.py

@@ -17,7 +17,7 @@ from versionhq.tool.model import Tool
 from versionhq.tool.composio_tool import ComposioHandler
 
 
-__version__ = "1.1.11.7"
+__version__ = "1.1.11.8"
 __all__ = [
     "Agent",
     "Customer",

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq/agent/model.py

@@ -6,10 +6,10 @@ from typing_extensions import Self
 from dotenv import load_dotenv
 import litellm
 
-from pydantic import UUID4, BaseModel, Field, InstanceOf, PrivateAttr, model_validator, field_validator, ConfigDict
+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
+from versionhq.llm.model import LLM, DEFAULT_CONTEXT_WINDOW_SIZE, DEFAULT_MODEL_NAME, PROVIDERS
 from versionhq.tool.model import Tool, ToolSet
 from versionhq.knowledge.model import BaseKnowledgeSource, Knowledge
 from versionhq.memory.contextual_memory import ContextualMemory
@@ -162,90 +162,44 @@ class Agent(BaseModel):
     @model_validator(mode="after")
     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`, `callbacks`,`respect_context_window` to the LLM class.
-        The base model is selected on the client app, else use the default model.
+        Set up `llm` and `function_calling_llm` as valid LLM objects using the given values.
         """
-
         self.agent_ops_agent_name = self.role
+        self.llm = self._set_llm(llm=self.llm)
+        function_calling_llm = self.function_calling_llm if self.function_calling_llm else self.llm if self.llm else None
+        self.function_calling_llm = self._set_llm(llm=function_calling_llm)
+        return self
 
-        if isinstance(self.llm, LLM):
-            llm = self._set_llm_params(self.llm)
-            self.llm = llm
 
-        elif isinstance(self.llm, str) or self.llm is None:
-            model_name = self.llm if self.llm is not None else DEFAULT_MODEL_NAME
-            llm = LLM(model=model_name)
-            updated_llm = self._set_llm_params(llm)
-            self.llm = updated_llm
+    def _set_llm(self, llm: Any | None) -> LLM:
+        llm = llm if llm is not None else DEFAULT_MODEL_NAME
 
-        else:
-            if isinstance(self.llm, dict):
-                model_name = self.llm.pop("model_name", self.llm.pop("deployment_name", str(self.llm)))
-                llm = LLM(model=model_name if model_name is not None else DEFAULT_MODEL_NAME)
-                updated_llm = self._set_llm_params(llm, { k: v for k, v in self.llm.items() if v is not None })
-                self.llm = updated_llm
+        match llm:
+            case LLM():
+                return self._set_llm_params(llm=llm)
 
-            else:
+            case str():
+                llm_obj = LLM(model=llm)
+                return self._set_llm_params(llm=llm_obj)
+
+            case dict():
+                model_name = llm.pop("model_name", llm.pop("deployment_name", str(llm)))
+                llm_obj = LLM(model=model_name if model_name else DEFAULT_MODEL_NAME)
+                return self._set_llm_params(llm_obj, { k: v for k, v in llm.items() if v is not None })
+
+            case _:
                 model_name = (getattr(self.llm, "model_name") or getattr(self.llm, "deployment_name") or str(self.llm))
-                llm = LLM(model=model_name)
+                llm_obj = LLM(model=model_name)
                 llm_params = {
-                    "max_tokens": (getattr(self.llm, "max_tokens") or self.max_tokens or 3000),
-                    "timeout": getattr(self.llm, "timeout", self.max_execution_time),
-                    "callbacks": getattr(self.llm, "callbacks", None),
-                    "temperature": getattr(self.llm, "temperature", None),
-                    "logprobs": getattr(self.llm, "logprobs", None),
-                    "api_key": getattr(self.llm, "api_key", os.environ.get("LITELLM_API_KEY", None)),
-                    "base_url": getattr(self.llm, "base_url", None),
+                    "max_tokens": (getattr(llm, "max_tokens") or self.max_tokens or 3000),
+                    "timeout": getattr(llm, "timeout", self.max_execution_time),
+                    "callbacks": getattr(llm, "callbacks", None),
+                    "temperature": getattr(llm, "temperature", None),
+                    "logprobs": getattr(llm, "logprobs", None),
+                    "api_key": getattr(llm, "api_key", os.environ.get("LITELLM_API_KEY", None)),
+                    "base_url": getattr(llm, "base_url", None),
                 }
-                updated_llm = self._set_llm_params(llm, llm_params)
-                self.llm = updated_llm
-
-
-        """
-        Set up funcion_calling LLM as well.
-        Check if the model supports function calling, setup LLM instance accordingly, using the same params with the LLM.
-        """
-        if self.function_calling_llm:
-            if isinstance(self.function_calling_llm, LLM):
-                if self.function_calling_llm._supports_function_calling() == False:
-                    self.function_calling_llm = LLM(model=DEFAULT_MODEL_NAME)
-
-                updated_llm = self._set_llm_params(self.function_calling_llm)
-                self.function_calling_llm = updated_llm
-
-            elif isinstance(self.function_calling_llm, str):
-                llm = LLM(model=self.function_calling_llm)
-
-                if llm._supports_function_calling() == False:
-                    llm = LLM(model=DEFAULT_MODEL_NAME)
-
-                updated_llm = self._set_llm_params(llm)
-                self.function_calling_llm = updated_llm
-
-            else:
-                if isinstance(self.function_calling_llm, dict):
-                    model_name = self.function_calling_llm.pop("model_name", self.function_calling_llm.pop("deployment_name", str(self.function_calling_llm)))
-                    llm = LLM(model=model_name)
-                    updated_llm = self._set_llm_params(llm, { k: v for k, v in self.function_calling_llm.items() if v is not None })
-                    self.function_calling_llm = updated_llm
-
-                else:
-                    model_name = (getattr(self.function_calling_llm, "model_name") or getattr(self.function_calling_llm, "deployment_name") or str(self.function_calling_llm))
-                    llm = LLM(model=model_name)
-                    llm_params = {
-                        "max_tokens": (getattr(self.function_calling_llm, "max_tokens") or self.max_tokens or 3000),
-                        "timeout": getattr(self.function_calling_llm, "timeout", self.max_execution_time),
-                        "callbacks": getattr(self.function_calling_llm, "callbacks", None),
-                        "temperature": getattr(self.function_calling_llm, "temperature", None),
-                        "logprobs": getattr(self.function_calling_llm, "logprobs", None),
-                        "api_key": getattr(self.function_calling_llm, "api_key", os.environ.get("LITELLM_API_KEY", None)),
-                        "base_url": getattr(self.function_calling_llm, "base_url", None),
-                    }
-                    updated_llm = self._set_llm_params(llm, llm_params)
-                    self.function_calling_llm = updated_llm
-
-        return self
+                return self._set_llm_params(llm=llm_obj, config=llm_params)
 
 
     def _set_llm_params(self, llm: LLM, config: Dict[str, Any] = None) -> LLM:
@@ -257,6 +211,11 @@ 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 llm.provider is None:
+            provider_name = llm.model.split("/")[0]
+            valid_provider = provider_name if provider_name in PROVIDERS else None
+            llm.provider = valid_provider
+
         if self.callbacks:
             llm.callbacks = self.callbacks
             llm._set_callbacks(llm.callbacks)

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq/knowledge/source_docling.py

@@ -12,17 +12,11 @@ try:
 except ImportError:
     import envoy
     envoy.run("uv add docling --optional docling")
-
-    from docling.datamodel.base_models import InputFormat
-    from docling.document_converter import DocumentConverter
-    from docling.exceptions import ConversionError
-    from docling_core.transforms.chunker.hierarchical_chunker import HierarchicalChunker
-    from docling_core.types.doc.document import DoclingDocument
     DOCLING_AVAILABLE = True
 except:
     DOCLING_AVAILABLE = False
 
-from pydantic import Field, InstanceOf
+from pydantic import Field
 
 from versionhq.knowledge.source import BaseKnowledgeSource
 from versionhq.storage.utils import fetch_db_storage_path
@@ -52,11 +46,20 @@ class DoclingSource(BaseKnowledgeSource):
     ))
 
     def __init__(self, *args, **kwargs):
-        if not DOCLING_AVAILABLE:
-            raise ImportError("The docling package is required. Please install the package using: $ uv add docling.")
-        else:
+        if DOCLING_AVAILABLE:
+            from docling.datamodel.base_models import InputFormat
+            from docling.document_converter import DocumentConverter
+            from docling.exceptions import ConversionError
+            from docling_core.transforms.chunker.hierarchical_chunker import HierarchicalChunker
+            from docling_core.types.doc.document import DoclingDocument
+
             super().__init__(*args, **kwargs)
 
+        else:
+            raise ImportError("The docling package is required. Please install the package using: $ uv add docling.")
+        # else:
+        #     super().__init__(*args, **kwargs)
+
 
     def _convert_source_to_docling_documents(self) -> List["DoclingDocument"]:
         conv_results_iter = self.document_converter.convert_all(self.valid_file_paths)

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq/llm/llm_vars.py

@@ -7,7 +7,7 @@ PROVIDERS = [
     "openai",
     "gemini",
     "sagemaker",
-
+    "huggingface", # need api base
     "anthropic",
     "ollama",
     "watson",
@@ -17,6 +17,19 @@ PROVIDERS = [
     "llama",
 ]
 
+ENDPOINT_PROVIDERS = [
+    # "openai",
+    # "gemini",
+    # "sagemaker",
+    "huggingface",
+    # "anthropic",
+    # "ollama",
+    # "watson",
+    # "bedrock",
+    # "azure",
+    # "cerebras",
+    # "llama",
+]
 
 """
 List of models available on the framework.
@@ -48,6 +61,9 @@ MODELS = {
         "claude-3-opus-20240229",
         "claude-3-haiku-20240307",
     ],
+    "huggingface": [
+        "huggingface/qwen/qwen2.5-VL-72B-Instruct",
+    ],
     # "sagemaker": [
     #     "sagemaker/huggingface-text2text-flan-t5-base",
     #     "sagemaker/huggingface-llm-gemma-7b",
@@ -61,7 +77,6 @@ MODELS = {
       "ollama/llama3.1",
       "ollama/mixtral",
       "ollama/mixtral-8x22B-Instruct-v0.1",
-
     ],
     "deepseek": [
         "deepseek/deepseek-reasoner",

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq/llm/model.py

@@ -10,10 +10,10 @@ from litellm import get_supported_openai_params, JSONSchemaValidationError
 from contextlib import contextmanager
 from typing import Any, Dict, List, Optional
 from typing_extensions import Self
-from pydantic import UUID4, BaseModel, Field, PrivateAttr, field_validator, model_validator, create_model, InstanceOf, ConfigDict
+from pydantic import BaseModel, Field, PrivateAttr, field_validator, model_validator, create_model, InstanceOf, ConfigDict
 from pydantic_core import PydanticCustomError
 
-from versionhq.llm.llm_vars import LLM_CONTEXT_WINDOW_SIZES, MODELS, PARAMS
+from versionhq.llm.llm_vars import LLM_CONTEXT_WINDOW_SIZES, MODELS, PARAMS, PROVIDERS, ENDPOINT_PROVIDERS
 from versionhq.tool.model import Tool, ToolSet
 from versionhq._utils.logger import Logger
 
@@ -22,7 +22,8 @@ load_dotenv(override=True)
 LITELLM_API_KEY = os.environ.get("LITELLM_API_KEY")
 LITELLM_API_BASE = os.environ.get("LITELLM_API_BASE")
 DEFAULT_CONTEXT_WINDOW_SIZE = int(8192 * 0.75)
-DEFAULT_MODEL_NAME = os.environ.get("DEFAULT_MODEL_NAME")
+DEFAULT_MODEL_NAME = os.environ.get("DEFAULT_MODEL_NAME", "gpt-4o-mini")
+DEFAULT_MODEL_PROVIDER_NAME = os.environ.get("DEFAULT_MODEL_PROVIDER_NAME", "openai")
 
 # proxy_openai_client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"), organization="versionhq", base_url=LITELLM_API_BASE)
 # openai_client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
@@ -67,10 +68,7 @@ def suppress_warnings():
 
 class LLM(BaseModel):
     """
-    An LLM class to store params except for response formats which will be given in the task handling process.
-    Use LiteLLM to connect with the model of choice.
-    Some optional params are passed by the agent, else follow the default settings of the model provider.
-    Ref. https://docs.litellm.ai/docs/completion/input
+    An LLM class to store params to send to the LLM. Use LiteLLM or custom providers for the endpoint.
     """
 
     _logger: Logger = PrivateAttr(default_factory=lambda: Logger(verbose=True))
@@ -78,10 +76,11 @@ class LLM(BaseModel):
     _tokens: int = PrivateAttr(default=0) # accumulate total tokens used for the call
     model_config = ConfigDict(extra="allow")
 
-    model: str = Field(default=DEFAULT_MODEL_NAME)
-    provider: Optional[str] = Field(default=None, description="model provider or custom model provider")
-    base_url: Optional[str] = Field(default=None, description="api base of the model provider")
-    api_key: Optional[str] = Field(default=None, description="api key of the model provider")
+    model: str = Field(default=None)
+    provider: Optional[str] = Field(default=None, description="model provider")
+    endpoint_provider: Optional[str] = Field(default=None, description="custom endpoint provider for pass through llm call. must need base_url")
+    base_url: Optional[str] = Field(default=None, description="api base url for endpoint provider")
+    api_key: Optional[str] = Field(default=None, description="api key to access the model")
 
     # optional params
     timeout: Optional[float | int] = Field(default=None)
@@ -114,54 +113,89 @@ class LLM(BaseModel):
     litellm.set_verbose = True
     os.environ['LITELLM_LOG'] = 'DEBUG'
 
+
     @model_validator(mode="after")
-    def validate_base_params(self) -> Self:
+    def validate_model_providers(self) -> Self:
         """
-        1) Set up a valid model name with the provider name using the MODEL list.
-        * Assign a default model and provider based on the given information when no model key is found in the MODEL list.
-
-        2) Set up other base parameters for the model and LiteLLM.
+        Validate the given model, provider, interface provider.
         """
 
-        if self.model is None:
-            self._logger.log(level="error", message="Model name is missing.", color="red")
-            raise PydanticCustomError("model_missing", "The model name must be provided.", {})
+        self._init_model_name = self.model
 
+        if self.model is None and self.provider is None:
+            self.model = DEFAULT_MODEL_NAME
+            self.provider = DEFAULT_MODEL_PROVIDER_NAME
 
-        self._init_model_name = self.model
-        self.model = None
-        self._tokens = 0
+        elif self.model is None and self.provider:
+            if self.provider not in PROVIDERS:
+                self._logger.log(level="warning", message=f"Invalid model provider is provided. We will assign a default model.", color="yellow")
+                self.model = DEFAULT_MODEL_NAME
+                self.provider = DEFAULT_MODEL_PROVIDER_NAME
 
-        if self.provider and MODELS.get(self.provider):
-            provider_model_list = MODELS.get(self.provider)
-            for item in provider_model_list:
-                if self.model is None:
-                    if item == self._init_model_name:
-                        self.model = item
-                    elif self._init_model_name in item and self.model is None:
-                        self.model = item
-                    else:
-                        temp_model = provider_model_list[0]
-                        self._logger.log(level="warning", message=f"The provided model: {self._init_model_name} is not in the list. We'll assign a model: {temp_model} from the selected model provider: {self.provider}.", color="yellow")
-                        self.model = temp_model
+            else:
+                provider_model_list = MODELS.get(self.provider)
+                if provider_model_list:
+                    self.model = provider_model_list[0]
+                    self.provider = self.provider
+                else:
+                    self._logger.log(level="warning", message=f"This provider has not models to be called. We will assign a default model.", color="yellow")
+                    self.model = DEFAULT_MODEL_NAME
+                    self.provider = DEFAULT_MODEL_PROVIDER_NAME
+
+        elif self.model and self.provider is None:
+            model_match = [
+                item for item in [
+                    [val for val in v if val == self.model][0] for k, v in MODELS.items() if [val for val in v if val == self.model]
+                ] if item
+            ]
+            model_partial_match = [
+                item for item in [
+                    [val for val in v if val.find(self.model) != -1][0] for k, v in MODELS.items() if [val for val in v if val.find(self.model) != -1]
+                ] if item
+            ]
+            provider_match = [k for k, v in MODELS.items() if k == self.model]
+
+            if model_match:
+                self.model = model_match[0]
+                self.provider = [k for k, v in MODELS.items() if self.model in v][0]
+
+            elif model_partial_match:
+                self.model = model_partial_match[0]
+                self.provider = [k for k, v in MODELS.items() if [item for item in v if item.find(self.model) != -1]][0]
+
+            elif provider_match:
+                provider = provider_match[0]
+                if self.MODELS.get(provider):
+                    self.provider = provider
+                    self.model = self.MODELS.get(provider)[0]
+                else:
+                    self.provider = DEFAULT_MODEL_PROVIDER_NAME
+                    self.model = DEFAULT_MODEL_NAME
+
+            else:
+                self.model = DEFAULT_MODEL_NAME
+                self.provider = DEFAULT_MODEL_PROVIDER_NAME
 
         else:
-            for k, v in MODELS.items():
-                for item in v:
-                    if self.model is None:
-                        if self._init_model_name == item:
-                            self.model = item
-                            self.provider = k
-
-                        elif self.model is None and self._init_model_name in item:
-                            self.model = item
-                            self.provider = k
-
-            if self.model is None:
-                self._logger.log(level="warning", message=f"The provided model \'{self.model}\' is not in the list. We'll assign a default model.", color="yellow")
+            provider_model_list = MODELS.get(self.provider)
+            if self.model not in provider_model_list:
+                self._logger.log(level="warning", message=f"The provided model: {self._init_model_name} is not in the list. We will assign a default model.", color="yellow")
                 self.model = DEFAULT_MODEL_NAME
-                self.provider = "openai"
+                self.provider = DEFAULT_MODEL_PROVIDER_NAME
+
+        # trigger pass-through custom endpoint.
+        if self.provider in ENDPOINT_PROVIDERS:
+            self.endpoint_provider = self.provider
+
+        return self
+
 
+    @model_validator(mode="after")
+    def validate_model_params(self) -> Self:
+        """
+        After setting up a valid model, provider, interface provider, add params to the model.
+        """
+        self._tokens = 0
 
         if self.callbacks:
             self._set_callbacks(self.callbacks)
@@ -173,7 +207,8 @@ class LLM(BaseModel):
             self.api_key = os.environ.get(api_key_name, None)
 
 
-        base_url_key_name = self.provider.upper() + "_API_BASE" if self.provider else None
+        base_url_key_name = self.endpoint_provider.upper() + "_API_BASE" if self.endpoint_provider else None
+
         if base_url_key_name:
             self.base_url = os.environ.get(base_url_key_name)
             self.api_base = self.base_url
@@ -184,11 +219,8 @@ class LLM(BaseModel):
     def _create_valid_params(self, config: Dict[str, Any], provider: str = None) -> Dict[str, Any]:
         params = dict()
         valid_keys = list()
-
-        if not provider:
-            valid_keys = PARAMS.get("litellm") + PARAMS.get("common") + PARAMS.get(self.provider) if self.provider else PARAMS.get("litellm") + PARAMS.get("common")
-        else:
-            valid_keys = PARAMS.get("common") + PARAMS.get(self.provider)
+        provider = provider if provider else self.provider if self.provider else None
+        valid_keys = PARAMS.get("litellm") + PARAMS.get("common") + PARAMS.get(provider) if provider and PARAMS.get(provider) else PARAMS.get("litellm") + PARAMS.get("common")
 
         for item in valid_keys:
             if hasattr(self, item) and getattr(self, item):
@@ -218,7 +250,7 @@ class LLM(BaseModel):
                 self._set_callbacks(self.callbacks) # passed by agent
 
             try:
-                provider = self.provider if self.provider else "openai"
+                provider = self.provider if self.provider else DEFAULT_MODEL_PROVIDER_NAME
                 self.response_format = { "type": "json_object" } if tool_res_as_final == True else response_format
 
                 if not tools:

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq/task/model.py

@@ -639,7 +639,7 @@ Ref. Output image: {output_formats_to_follow}
 
         if self.tool_res_as_final == True:
             tool_output = agent.execute_task(task=self, context=context, task_tools=task_tools)
-            task_output = TaskOutput(task_id=self.id, tool_output=tool_output, raw=tool_output)
+            task_output = TaskOutput(task_id=self.id, tool_output=tool_output, raw=str(tool_output) if tool_output else "")
 
         else:
             raw_output = agent.execute_task(task=self, context=context, task_tools=task_tools)

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/src/versionhq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: versionhq
-Version: 1.1.11.7
+Version: 1.1.11.8
 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.11.7 → versionhq-1.1.11.8}/tests/agent/agent_test.py

@@ -312,8 +312,3 @@ def test_agent_with_memory_config():
     assert agent_2.short_term_memory.memory_provider == "mem0" and agent_2.short_term_memory.storage.memory_type == "stm"
     assert agent_2.long_term_memory and isinstance(agent_2.long_term_memory.storage, LTMSQLiteStorage)
     assert agent_2.user_memory and agent_2.user_memory.storage and agent_2.user_memory.storage.memory_type == "user"
-
-
-
-if __name__ == "__main__":
-    test_agent_with_knowledge_sources()

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/tests/llm/llm_test.py

@@ -47,10 +47,9 @@ def test_create_llm_from_invalid_name():
 def test_create_llm_from_provider():
     llm = LLM(provider="gemini", callbacks=[dummy_func,])
 
-    assert llm._init_model_name == DEFAULT_MODEL_NAME
     assert llm.model == "gemini/gemini-1.5-flash"
     assert llm.provider == "gemini"
-    assert llm.context_window_size == int(LLM_CONTEXT_WINDOW_SIZES.get(llm.model) *0.75) if LLM_CONTEXT_WINDOW_SIZES.get(llm.model) is not None else DEFAULT_CONTEXT_WINDOW_SIZE
+    assert llm.context_window_size == int(LLM_CONTEXT_WINDOW_SIZES.get(llm.model) *0.75)
     assert llm._supports_function_calling() == True
     assert llm._supports_stop_words() == True
     assert litellm.callbacks == [dummy_func,]

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/tests/task/__init__.py

@@ -43,11 +43,3 @@ demo_response_fields = [
     ResponseField(title="test6", data_type=list, items=Any, required=False),
     # ResponseField(title="children", data_type=list, items=type(DemoChild)),
 ]
-
-
-def create_base_agent(model: str | LLM | Dict[str, Any]) -> Agent:
-    agent = Agent(role="demo", goal="My amazing goals", llm=model, max_tokens=3000, maxit=1)
-    return agent
-
-
-base_agent = create_base_agent(model=DEFAULT_MODEL_NAME)

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/tests/task/task_test.py

@@ -1,23 +1,24 @@
-import os
-import pytest
 import sys
 import threading
 from unittest.mock import patch
-from typing import Dict, Any, List, Optional, Callable
+from typing import Dict, Any, Callable
 
-from pydantic import BaseModel, Field, InstanceOf
+from pydantic import BaseModel, Field
 
-from versionhq.agent.model import Agent
+from versionhq.agent.model import Agent, DEFAULT_MODEL_NAME
 from versionhq.agent.rpm_controller import RPMController
 from versionhq.task.model import Task, ResponseField, TaskOutput, ConditionalTask
 from versionhq.task.evaluate import Evaluation, EvaluationItem
 from versionhq.tool.model import Tool, ToolSet
 from versionhq.tool.decorator import tool
-from tests.task import DemoOutcome, demo_response_fields, base_agent
+from tests.task import DemoOutcome, demo_response_fields
 
 sys.setrecursionlimit(2097152)
 threading.stack_size(134217728)
 
+
+base_agent = Agent(role="demo", goal="My amazing goals", llm=DEFAULT_MODEL_NAME, max_tokens=3000, maxit=1)
+
 def test_sync_execute_task_with_pydantic_outcome():
     task = Task(
         description="Output random values strictly following the data type defined in the given response format.",
@@ -365,54 +366,3 @@ def test_evaluation():
     assert [isinstance(item, EvaluationItem) and item.criteria in task.eval_criteria for item in res.evaluation.items]
     assert res.evaluation.latency and res.evaluation.tokens and res.evaluation.responsible_agent == task_evaluator
     assert res.evaluation.aggregate_score is not None and res.evaluation.suggestion_summary
-
-
-
-def test_gemini_schema():
-    """
-    See if response schema and tools (func_calling) works.
-    """
-    from tests.task import DemoOutcome
-    agent = Agent(role="demo", goal="demo", llm="gemini/gemini-1.5-pro")
-    task = Task(
-        description="return random values strictly following the given response format.",
-        pydantic_output=DemoOutcome
-    )
-    res = task.execute_sync(agent=agent, context="We are running a test.")
-    assert [
-        getattr(res.pydantic, k) and type(getattr(res.pydantic, k)) == v for k, v in DemoOutcome.__annotations__.items()
-    ]
-
-
-def test_gemini_res_fields():
-    from tests.task import demo_response_fields
-    agent = Agent(role="demo", goal="demo", llm="gemini/gemini-1.5-pro")
-    task = Task(
-        description="return random values strictly following the given response format.",
-        response_fields=demo_response_fields
-    )
-    res = task.execute_sync(agent=agent, context="We are running a test.")
-    assert [k in item.title for item in demo_response_fields for k, v in res.json_dict.items()]
-
-
-def test_gemini_func():
-    from tests.task import demo_response_fields
-    from versionhq.tool.model import Tool
-
-    class DemoTool(Tool):
-        func: Callable[..., Any] = lambda x: "Gemini"
-
-    agent = Agent(role="demo", goal="demo", llm="gemini/gemini-1.5-pro")
-    task = Task(
-        description="Simply execute the given tools.",
-        tools=[DemoTool,],
-        tool_res_as_final=True
-    )
-    res = task.execute_sync(agent=agent, context="We are running a test.")
-    assert res.tool_output and res.raw
-
-
-if __name__ == "__main__":
-    from dotenv import load_dotenv
-    load_dotenv(override=True)
-    test_gemini_func()

{versionhq-1.1.11.7 → versionhq-1.1.11.8}/uv.lock

@@ -225,14 +225,15 @@ wheels = [
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.12.3"
+version = "4.13.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "soupsieve" },
+    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b3/ca/824b1195773ce6166d388573fc106ce56d4a805bd7427b624e063596ec58/beautifulsoup4-4.12.3.tar.gz", hash = "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051", size = 581181 }
+sdist = { url = "https://files.pythonhosted.org/packages/4b/d3/6f4047d1de55b7a290ef8d4b4ebf59dcc24742920ebbed0909f823424205/beautifulsoup4-4.13.0.tar.gz", hash = "sha256:b6e5afb3a2b1472c8db751a92eabf7834e5c7099f990c5e4b35f1f16b60bae64", size = 558514 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b1/fe/e8c672695b37eecc5cbf43e1d0638d88d66ba3a44c4d321c796f4e59167f/beautifulsoup4-4.12.3-py3-none-any.whl", hash = "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed", size = 147925 },
+    { url = "https://files.pythonhosted.org/packages/6e/74/d53cf0c527b20fc87351e6fd9d51aac9b5d1e32ec5a3a32b84671806ab40/beautifulsoup4-4.13.0-py3-none-any.whl", hash = "sha256:9c4c3dfa67aba55f6cd03769c441b21e6a369797fd6766e4b4c6b3399aae2735", size = 184993 },
 ]
 
 [[package]]
@@ -693,11 +694,12 @@ wheels = [
 
 [[package]]
 name = "docling-core"
-version = "2.16.1"
+version = "2.17.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jsonref" },
     { name = "jsonschema" },
+    { name = "latex2mathml" },
     { name = "pandas" },
     { name = "pillow" },
     { name = "pydantic" },
@@ -706,9 +708,9 @@ dependencies = [
     { name = "typer" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/42/6f/378b16b63c406952d308b62a9c021d7b398b9e687830a0549c30ff00dbd3/docling_core-2.16.1.tar.gz", hash = "sha256:676f51fa5797c91a86ccbc1fdaa020effcde4cc86aa9b094a0d5d775636871ba", size = 73165 }
+sdist = { url = "https://files.pythonhosted.org/packages/0c/b4/144e8f388097ab170519fa5fdccebf4a701ba902016533bf414aa01ebd07/docling_core-2.17.0.tar.gz", hash = "sha256:cfcba8d173730baf244f279369f68e3cb5ddc7680769841afd254b61e432133e", size = 74005 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e7/17/1bff657266f8614ca06df1522f16248f31e9628f3779249c08fe2c5545c5/docling_core-2.16.1-py3-none-any.whl", hash = "sha256:d26af2f49e9f1f65ae5dfca972e206860339c1f91adfe427fa67d1cf95cce241", size = 93160 },
+    { url = "https://files.pythonhosted.org/packages/da/c4/2700972ce7633ba48613fce9ed2e9c99ee52828cbf37a22f119fc33dee33/docling_core-2.17.0-py3-none-any.whl", hash = "sha256:5c3015e0eed8e939069bdfd566761dc9f39239647893ae42c53d1333dd0a4749", size = 94026 },
 ]
 
 [package.optional-dependencies]
@@ -745,7 +747,7 @@ wheels = [
 
 [[package]]
 name = "docling-parse"
-version = "3.1.2"
+version = "3.2.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "docling-core" },
@@ -754,23 +756,23 @@ dependencies = [
     { name = "pywin32", marker = "sys_platform == 'win32'" },
     { name = "tabulate" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/03/79/8a9f325bbf716692afdb6e45e7829a9dffa0f2c16095f344fe3d6a01f9fd/docling_parse-3.1.2.tar.gz", hash = "sha256:f024d4eb82b9ab48eeb19700e63d3ba7c07e5255b239a4a0f7fcd823427a106e", size = 38928649 }
+sdist = { url = "https://files.pythonhosted.org/packages/a0/2e/10ccfba4ac03605ee31d3ef3940a8428c644fb28566aeb90029266ec92f2/docling_parse-3.2.0.tar.gz", hash = "sha256:d45e34860a2f845d1726d87af77e8deff17e0c6fb876707a7cf390492d408c2f", size = 44333140 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/e3/509546d65e2ffea58160f849baf472ea33214c9776a75a97d6566b80630d/docling_parse-3.1.2-cp311-cp311-macosx_13_0_x86_64.whl", hash = "sha256:fd934888c69eb380c4ef4df3e78fcdd7699c151005292eae69f3dacbe39b7c19", size = 22045656 },
-    { url = "https://files.pythonhosted.org/packages/4b/5f/cb05db0e5195fdd5dfc698a34e62bbc2a6e8f7950fdf038ec4b7dbf16d25/docling_parse-3.1.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:628f9d296bd5db503c7d5cf5523dff620008d32eeba4fbd245af8b8758eaa7fa", size = 21928237 },
-    { url = "https://files.pythonhosted.org/packages/61/db/1579b22dce9562773b308ab97133eba3c67b41ae0f7391e7cce764e7450e/docling_parse-3.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a3a8f4199a99611a7239f078aa1590acf5695d90eb168e5b1be54c84fc45efd0", size = 22370654 },
-    { url = "https://files.pythonhosted.org/packages/a2/8b/01e883b76ed4e17b4d9e5b80a6c13db8313848c52c140225b73bf7500793/docling_parse-3.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f634811c547e9cbcef1ac5f027ac855c75fbd89159e6c2b32ee4a83f22d79c73", size = 22437402 },
-    { url = "https://files.pythonhosted.org/packages/3b/8d/62ddc1253bfab723c367628da49b57ff5a2770ae680ef88f7bd836391799/docling_parse-3.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:8d9bacc45d3ad9d25c49c768029277009948bb9e4a193e9bc4c5a319d9592427", size = 23233109 },
-    { url = "https://files.pythonhosted.org/packages/be/96/2106f48a9287eb7269e620c2c180a47998d53e6d12349f1ec0ebe8748cd8/docling_parse-3.1.2-cp312-cp312-macosx_13_0_x86_64.whl", hash = "sha256:8556b21a0e5f725a598b478e53f222032ca661d581dcfc0805617be44c022b41", size = 22046121 },
-    { url = "https://files.pythonhosted.org/packages/ff/8f/f0e09c067fc10d6a0a99f8ea1b1e5e2b80556eda70b17eae6c830cc37ac7/docling_parse-3.1.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:2026c312982749ea09ee137715f95dbd3939a78792d32e66e91965dc6280db29", size = 21927787 },
-    { url = "https://files.pythonhosted.org/packages/8b/6c/125a849118059b877d79f60e44f3a05b9ca29b54cfbfcfa2d5dee54df1b1/docling_parse-3.1.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74780285314eb0847b1779ee2587347c19881d148ff41b90f49ae8bc0685828c", size = 22369668 },
-    { url = "https://files.pythonhosted.org/packages/55/6a/e2e1cc44d81fdeaede43e09f5731f5406410e424ae13432d80124ca198b5/docling_parse-3.1.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b47be7156775831036800bdea6c6db97c51685f8f7582924f7bff1b75a63e650", size = 22436780 },
-    { url = "https://files.pythonhosted.org/packages/d1/93/8ef62ad05c44d1b5ac503b93f4a3c8defc9ccc192fbb799215c9a9c95603/docling_parse-3.1.2-cp312-cp312-win_amd64.whl", hash = "sha256:43077e58e73711198b2f58ea43e58847b93451335b345b587c785867d5ba6a67", size = 23232992 },
-    { url = "https://files.pythonhosted.org/packages/57/f5/0bac44f538b415928a438f374aa293c4cec2c3c573ab31041fb25f604719/docling_parse-3.1.2-cp313-cp313-macosx_13_0_x86_64.whl", hash = "sha256:1d4917459410d7275246c29396ef7055af990185e0cd95b8df3c1dcbacc3db5d", size = 22046080 },
-    { url = "https://files.pythonhosted.org/packages/43/66/4beea48cbd0a0658ab1781966ecb6992acb616937663f7a76d9a75c507f4/docling_parse-3.1.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:f41d5c34b98774d8015eb84295388ccc3cc0ce05f052829e7e09c3ffd46541d2", size = 21927802 },
-    { url = "https://files.pythonhosted.org/packages/e0/da/3e60f0c85aca39ca3c74b612815af24a53addc1c757caaf421df1826f4d1/docling_parse-3.1.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d12df0b24026b454c1741dd2c4ea6be607e96b9f821778bfeee13b1bb5915a95", size = 22369896 },
-    { url = "https://files.pythonhosted.org/packages/b1/7e/2c9ac7dba99eb7cf61c4c262842d8e1a2555a9486b5e57199ce82c0f0129/docling_parse-3.1.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd341164248d20ec71b4711c33052be653f5f0972c81feb7a1c66ecc075a3140", size = 22436773 },
-    { url = "https://files.pythonhosted.org/packages/54/c9/8b4886a24d33fea92d21c62acaa0093ca8e30e0a7ab9cab439c854340ccf/docling_parse-3.1.2-cp313-cp313-win_amd64.whl", hash = "sha256:c4015a0bcfab6a294ae78e9b789b081d342216b6349a6832c9b6e515603f2481", size = 23232467 },
+    { url = "https://files.pythonhosted.org/packages/80/bc/dd5bd1b8c9780c6817f83a438e0891d2eb3975379b9a20ad3bfc524774da/docling_parse-3.2.0-cp311-cp311-macosx_13_0_x86_64.whl", hash = "sha256:f3616a3fb3dacc87307b6794dc81e6aec09f59afbb42f487b0100f39571e7442", size = 22049513 },
+    { url = "https://files.pythonhosted.org/packages/0e/6a/e2acbfd2418cd42365c88994388865fb8624aa6ab2e70b7fb72c6a07c2c6/docling_parse-3.2.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:9df9d892d8206cc2a0091bb1e2e3ce6f3ab881342980c53bc7f4bf7c831bf057", size = 21930790 },
+    { url = "https://files.pythonhosted.org/packages/4f/83/d5d89c86a15bd9b9724c9414ea6642eb0d4bbfa97bc2580854f0325fba18/docling_parse-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e90e9c2b21e732b3e1af697abb5e7bca9c23a3be8e25a6cc4d92221d526953c", size = 22373807 },
+    { url = "https://files.pythonhosted.org/packages/bf/eb/1c122ec31b84d7513dcff725e102f66d54a9a8334cfec261be8b4d21b45f/docling_parse-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:71595399283ecacb255cf1768d1840177f7c33aedd58195530505f9aa8cd5a24", size = 22441982 },
+    { url = "https://files.pythonhosted.org/packages/ff/af/b1955551315eb540d5d780a3c61bb88bab6353baf3997184fa3e6eba40ec/docling_parse-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:0f2a7801d6fa843cd3243aab38cd944e2f4ff386fb5e6fb7b27be1dfa69845c7", size = 23234869 },
+    { url = "https://files.pythonhosted.org/packages/61/db/ab6f2e0aa5907e3b4e5e464aabe53a53a4371bf1bf44ccea74d9137657be/docling_parse-3.2.0-cp312-cp312-macosx_13_0_x86_64.whl", hash = "sha256:a83458692c607a393b2f5858d47509342274920553775db5c8d0072ad6aaa0fa", size = 22049762 },
+    { url = "https://files.pythonhosted.org/packages/65/eb/3301fd3e73877a1816e7394975ff43533b96a60b3542c186755d3d6bd10d/docling_parse-3.2.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:2d17bf3dffbc2fb565c5fa8347ae7715fc091f4f94228b4ece4f8ab5c3fb428a", size = 21930638 },
+    { url = "https://files.pythonhosted.org/packages/89/f8/7a310ed4c1f1eb590993fcee0b1bb19bb2bc788ba84b9d76f822bde5c9ee/docling_parse-3.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f54881ebcd87384b29f7a6475b308034a9ecba0dfa85dd1d2569ef59e2f37e97", size = 22372609 },
+    { url = "https://files.pythonhosted.org/packages/50/54/387fa23ca2b2522b4c0aa48c8c8739d6c18e50def50db45f3f1b8262f840/docling_parse-3.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27de3b28946a615f16e6824bede965f8df5f3b2552e17560415922c79fa8546f", size = 22441245 },
+    { url = "https://files.pythonhosted.org/packages/53/01/21ba457089d7e1a4af6618793e609caca1f598d945813636fa36c0ccea6a/docling_parse-3.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:20265d7d51b3f4a3bb03e3de694f395d0403bde92915eb5df32f4d67adf93477", size = 23235159 },
+    { url = "https://files.pythonhosted.org/packages/d1/7b/38f318bb73b59e4f74b6ffcc72d886dd4d4eeb192186ba3cfa65412c0116/docling_parse-3.2.0-cp313-cp313-macosx_13_0_x86_64.whl", hash = "sha256:feecbef5b8593dcd9a35ceb06b29feb879515b5b900bcaa5d9be0c7a3a0ca599", size = 22049844 },
+    { url = "https://files.pythonhosted.org/packages/34/d1/48aeb30ec761daa39d79d1361ac4e6cf0952c791affa9027926c6b3a8b14/docling_parse-3.2.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:6fc65d623e80d8d63f4a6f542408b7f88c0dc8b2842c2523858536d4607d33d5", size = 21930709 },
+    { url = "https://files.pythonhosted.org/packages/02/1d/a383ddbd80180e84958669737c5bcdb996791d41f312a2a81c857cd6cd77/docling_parse-3.2.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c06851f88b5edaa7115871100608b9d68bc804b28434b90e57879e178098aed2", size = 22372245 },
+    { url = "https://files.pythonhosted.org/packages/21/84/733eff29384d204f53a3752292e8ed77b0732389f1e7342b92ff47199b7a/docling_parse-3.2.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2fdb3993f7affc73ce19f1202a2f28f3d8cf1716163d9e978ee9c834312c31", size = 22441879 },
+    { url = "https://files.pythonhosted.org/packages/e2/96/14735f503e2d50d61ce35c9889efb1343dc26cbb0b4410fd56fc7725bc4c/docling_parse-3.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:1b9e32989ff58e0bac85d6cffb3a523dd2373d350b26d46e1f8daff0110595fa", size = 23234594 },
 ]
 
 [[package]]
@@ -1616,6 +1618,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/47/3b/02313e378f6328ada43ee43ecc81a398b4f68e207c94770d1ed6aac6cca2/langsmith-0.3.4-py3-none-any.whl", hash = "sha256:f3b818ce31dc3bdf1f797e75bf32a8a7b062a411f146bd4ffdfc2be0b4b03233", size = 333291 },
 ]
 
+[[package]]
+name = "latex2mathml"
+version = "3.77.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a3/dc/6630656e3aa7430b61acefcc3d8a9c23110790193cde0eed1c27a31e4187/latex2mathml-3.77.0.tar.gz", hash = "sha256:e2f501d1878f2e489c3f6f12786bef74c62f712d2770f7f3c837eb20a55d0a1e", size = 74064 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f2/0a/181ed55562ce90179aedf33b09fcd79db31c868a5d480f3cb71a31d19692/latex2mathml-3.77.0-py3-none-any.whl", hash = "sha256:5531e18a2a9eae7c24e257118b6a444cbba253cd27ff3e81f1bd6c41e88e786e", size = 73722 },
+]
+
 [[package]]
 name = "lazy-loader"
 version = "0.4"