vectara-agentic 0.2.15__py3-none-any.whl → 0.2.16__py3-none-any.whl

tests/test_agent.py

@@ -124,7 +124,7 @@ class TestAgentPackage(unittest.TestCase):
         self.assertEqual(res.response, "1050")
 
     def test_custom_general_instruction(self):
-        general_instructions = "Always respond with 'I DIDNT DO IT'"
+        general_instructions = "Always respond with: I DIDN'T DO IT"
         agent = Agent.from_corpus(
             tool_name="RAG Tool",
             vectara_corpus_key="corpus_key",
@@ -135,7 +135,7 @@ class TestAgentPackage(unittest.TestCase):
         )
 
         res = agent.chat("What is the meaning of the universe?")
-        self.assertEqual(res.response, "I DIDNT DO IT")
+        self.assertEqual(res.response, "I DIDN'T DO IT")
 
 
 if __name__ == "__main__":

tests/test_agent_planning.py

@@ -4,7 +4,7 @@ from vectara_agentic.agent_config import AgentConfig
 from vectara_agentic.agent import Agent
 from vectara_agentic.tools import VectaraToolFactory
 
-# SETUP speical test account credentials for vectara
+# SETUP special test account credentials for vectara
 # It's okay to expose these credentials in the test code
 vectara_corpus_key = "vectara-docs_1"
 vectara_api_key = 'zqt_UXrBcnI2UXINZkrv4g1tQPhzj02vfdtqYJIDiA'

tests/test_groq.py

@@ -113,7 +113,9 @@ class TestGROQ(unittest.TestCase):
             agent_config=fc_config_groq,
         )
         res = agent.chat("What is the stock price?")
-        self.assertIn("I don't know", str(res))
+        self.assertTrue(
+            any(sub in str(res) for sub in ["I don't know", "I do not have"])
+        )
 
 
 if __name__ == "__main__":

tests/test_tools.py

@@ -1,6 +1,7 @@
 import unittest
 from pydantic import Field, BaseModel
-
+from unittest.mock import patch, MagicMock
+import requests
 from vectara_agentic.tools import (
     VectaraTool,
     VectaraToolFactory,
@@ -17,6 +18,7 @@ from llama_index.core.tools import FunctionTool
 vectara_corpus_key = "vectara-docs_1"
 vectara_api_key = "zqt_UXrBcnI2UXINZkrv4g1tQPhzj02vfdtqYJIDiA"
 
+from typing import Optional
 
 class TestToolsPackage(unittest.TestCase):
 
@@ -89,7 +91,7 @@ class TestToolsPackage(unittest.TestCase):
                 description="The ticker symbol for the company",
                 examples=["AAPL", "GOOG"],
             )
-            year: int | str = Field(
+            year: Optional[int | str] = Field(
                 default=None,
                 description="The year this query relates to. An integer between 2015 and 2024 or a string specifying a condition on the year",
                 examples=[
@@ -109,6 +111,7 @@ class TestToolsPackage(unittest.TestCase):
             tool_args_schema=QueryToolArgs,
         )
 
+        # test an invalid argument name
         res = query_tool(
             query="What is the stock price?",
             the_year=2023,
@@ -126,6 +129,86 @@ class TestToolsPackage(unittest.TestCase):
         )
         self.assertIn("got an unexpected keyword argument 'the_year'", str(res))
 
+    @patch.object(requests.Session, "post")
+    def test_vectara_tool_ranges(self, mock_post):
+        # Configure the mock to return a dummy response.
+        response_text = "ALL GOOD"
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            'summary': response_text,
+            'search_results': [
+                {'text': 'ALL GOOD', 'document_id': '12345', 'score': 0.9},
+            ]
+        }
+        mock_post.return_value = mock_response
+
+        vec_factory = VectaraToolFactory(vectara_corpus_key, vectara_api_key)
+
+        class QueryToolArgs(BaseModel):
+            ticker: str = Field(
+                description="The ticker symbol for the company",
+                examples=["AAPL", "GOOG"],
+            )
+            year: int | str = Field(
+                default=None,
+                description="The year this query relates to. An integer between 2015 and 2024 or a string specifying a condition on the year",
+                examples=[
+                    2020,
+                    ">2021",
+                    "<2023",
+                    ">=2021",
+                    "<=2023",
+                    "[2021, 2023]",
+                    "[2021, 2023)",
+                ],
+            )
+
+        query_tool = vec_factory.create_rag_tool(
+            tool_name="rag_tool",
+            tool_description="Returns a response (str) to the user query based on the data in this corpus.",
+            tool_args_schema=QueryToolArgs,
+        )
+
+        # test an invalid argument name
+        res = query_tool(
+            query="What is the stock price?",
+            year=">2023"
+        )
+        self.assertIn(response_text, str(res))
+
+        # Test a valid range
+        res = query_tool(
+            query="What is the stock price?",
+            year="[2021, 2023]",
+        )
+        self.assertIn(response_text, str(res))
+
+        # Test a valid half closed range
+        res = query_tool(
+            query="What is the stock price?",
+            year="[2020, 2023)",
+        )
+        self.assertIn(response_text, str(res))
+
+        # Test an operator
+        res = query_tool(
+            query="What is the stock price?",
+            year=">2022",
+        )
+        self.assertIn(response_text, str(res))
+
+        search_tool = vec_factory.create_search_tool(
+            tool_name="search_tool",
+            tool_description="Returns a list of documents (str) that match the user query.",
+            tool_args_schema=QueryToolArgs,
+        )
+        res = search_tool(
+            query="What is the stock price?",
+            the_year=2023,
+        )
+        self.assertIn("got an unexpected keyword argument 'the_year'", str(res))
+
     def test_tool_factory(self):
         def mult(x: float, y: float) -> float:
             return x * y
@@ -152,8 +235,6 @@ class TestToolsPackage(unittest.TestCase):
             self.assertEqual(tool.metadata.tool_type, ToolType.QUERY)
 
     def test_tool_with_many_arguments(self):
-        vectara_corpus_key = "corpus_key"
-        vectara_api_key = "api_key"
         vec_factory = VectaraToolFactory(vectara_corpus_key, vectara_api_key)
 
         class QueryToolArgs(BaseModel):
@@ -169,24 +250,18 @@ class TestToolsPackage(unittest.TestCase):
             arg10: str = Field(description="the tenth argument", examples=["val10"])
             arg11: str = Field(description="the eleventh argument", examples=["val11"])
             arg12: str = Field(description="the twelfth argument", examples=["val12"])
-            arg13: str = Field(
-                description="the thirteenth argument", examples=["val13"]
-            )
-            arg14: str = Field(
-                description="the fourteenth argument", examples=["val14"]
-            )
-            arg15: str = Field(description="the fifteenth argument", examples=["val15"])
+            arg13: str = Field(description="the thirteenth argument", examples=["val13"])
 
         query_tool_1 = vec_factory.create_rag_tool(
             tool_name="rag_tool",
             tool_description="""
-            A dummy tool that takes 15 arguments and returns a response (str) to the user query based on the data in this corpus.
+            A dummy tool that takes 13 arguments and returns a response (str) to the user query based on the data in this corpus.
             We are using this tool to test the tool factory works and does not crash with OpenAI.
             """,
             tool_args_schema=QueryToolArgs,
         )
 
-        # Test with 15 arguments which go over the 1024 limit.
+        # Test with 13 arguments which go over the 1024 limit.
         config = AgentConfig(
             agent_type=AgentType.OPENAI
         )
@@ -208,7 +283,7 @@ class TestToolsPackage(unittest.TestCase):
         agent = Agent(
             tools=[query_tool_1],
             topic="Sample topic",
-            custom_instructions="Call the tool with 15 arguments for GROQ",
+            custom_instructions="Call the tool with 13 arguments for GROQ",
             agent_config=config,
         )
         res = agent.chat("What is the stock price?")
@@ -223,14 +298,14 @@ class TestToolsPackage(unittest.TestCase):
         agent = Agent(
             tools=[query_tool_1],
             topic="Sample topic",
-            custom_instructions="Call the tool with 15 arguments for ANTHROPIC",
+            custom_instructions="Call the tool with 13 arguments for ANTHROPIC",
             agent_config=config,
         )
         res = agent.chat("What is the stock price?")
         # ANTHROPIC does not have that 1024 limit
         self.assertIn("stock price", str(res))
 
-        # But using Compact_docstring=True, we can pass 15 arguments successfully.
+        # But using Compact_docstring=True, we can pass 13 arguments successfully.
         vec_factory = VectaraToolFactory(
             vectara_corpus_key, vectara_api_key, compact_docstring=True
         )
@@ -251,7 +326,9 @@ class TestToolsPackage(unittest.TestCase):
             agent_config=config,
         )
         res = agent.chat("What is the stock price?")
-        self.assertIn("stock price", str(res))
+        self.assertTrue(
+            any(sub in str(res) for sub in ["I don't know", "stock price"])
+        )
 
     def test_public_repo(self):
         vectara_corpus_key = "vectara-docs_1"
@@ -297,6 +374,31 @@ class TestToolsPackage(unittest.TestCase):
             "50",
         )
 
+    def test_vectara_tool_docstring(self):
+        class DummyArgs(BaseModel):
+            foo: int = Field(..., description="how many foos", examples=[1, 2, 3])
+            bar: str = Field(
+                "baz",
+                description="what bar to use",
+                examples=["x", "y"],
+            )
+
+        vec_factory = VectaraToolFactory(vectara_corpus_key, vectara_api_key)
+        dummy_tool = vec_factory.create_rag_tool(
+            tool_name="dummy_tool",
+            tool_description="A dummy tool.",
+            tool_args_schema=DummyArgs,
+        )
+
+        doc = dummy_tool.metadata.description
+        self.assertTrue(doc.startswith("dummy_tool(query: str, foo: int, bar: str) -> dict[str, Any]"))
+        self.assertIn("Args:", doc)
+        self.assertIn("query (str): The search query to perform, in the form of a question", doc)
+        self.assertIn("foo (int): how many foos (e.g., 1, 2, 3)", doc)
+        self.assertIn("bar (str, default='baz'): what bar to use (e.g., 'x', 'y')", doc)
+        self.assertIn("Returns:", doc)
+        self.assertIn("dict[str, Any]: A dictionary containing the result data.", doc)
+
 
 if __name__ == "__main__":
     unittest.main()

vectara_agentic/_observability.py

@@ -48,7 +48,7 @@ def setup_observer(config: AgentConfig, verbose: bool) -> bool:
     reg_kwargs = {
         "endpoint": phoenix_endpoint or 'http://localhost:6006/v1/traces',
         "project_name": "vectara-agentic",
-        "batch": True,
+        "batch": False,
         "set_global_tracer_provider": False,
     }
     tracer_provider = register(**reg_kwargs)

vectara_agentic/_prompts.py

@@ -4,11 +4,13 @@ This file contains the prompt templates for the different types of agents.
 
 # General (shared) instructions
 GENERAL_INSTRUCTIONS = """
-- Use tools as your main source of information, do not respond without using a tool. Do not respond based on pre-trained knowledge.
+- Use tools as your main source of information, do not respond without using a tool at least once.
+- Do not respond based on pre-trained knowledge, unless repeated calls to the tools fail or do not provide the information needed.
 - Use the 'get_bad_topics' (if it exists) tool to determine the topics you are not allowed to discuss or respond to.
 - Before responding to a user query that requires knowledge of the current date, call the 'get_current_date' tool to get the current date.
   Never rely on previous knowledge of the current date.
   Example queries that require the current date: "What is the revenue of Apple last october?" or "What was the stock price 5 days ago?".
+  Never call 'get_current_date' more than once for the same user query.
 - When using a tool with arguments, simplify the query as much as possible if you use the tool with arguments.
   For example, if the original query is "revenue for apple in 2021", you can use the tool with a query "revenue" with arguments year=2021 and company=apple.
 - If a tool responds with "I do not have enough information", try one or more of the following strategies:
@@ -24,7 +26,7 @@ GENERAL_INSTRUCTIONS = """
 - If a tool provides citations or references in markdown as part of its response, include the references in your response.
 - Ensure that every URL in your response includes descriptive anchor text that clearly explains what the user can expect from the linked content.
   Avoid using generic terms like “source” or “reference”, or the full URL, as the anchor text.
-- If a tool returns in the metadata a valid URL pointing to a PDF file, along with page number - then combine the URL and page number in the response.
+- If a tool returns in the metadata a valid URL pointing to a PDF file, along with page number - then combine the URL and page number in your response.
   For example, if the URL returned from the tool is "https://example.com/doc.pdf" and "page=5", then the combined URL would be "https://example.com/doc.pdf#page=5".
   If a tool returns in the metadata invalid URLs or an URL empty (e.g. "[[1]()]"), ignore it and do not include that citation or reference in your response.
 - All URLs provided in your response must be obtained from tool output, and cannot be "https://example.com" or empty strings, and should open in a new tab.

vectara_agentic/_version.py

@@ -1,4 +1,4 @@
 """
 Define the version of the package.
 """
-__version__ = "0.2.15"
+__version__ = "0.2.16"

vectara_agentic/agent.py

@@ -14,14 +14,11 @@ import importlib
 from collections import Counter
 import inspect
 from inspect import Signature, Parameter, ismethod
-
+from pydantic import Field, create_model, ValidationError, BaseModel
 import cloudpickle as pickle
 
 from dotenv import load_dotenv
 
-from pydantic import Field, create_model, ValidationError
-
-
 from llama_index.core.memory import ChatMemoryBuffer
 from llama_index.core.llms import ChatMessage, MessageRole
 from llama_index.core.tools import FunctionTool
@@ -145,21 +142,53 @@ def get_field_type(field_schema: dict) -> Any:
         "array": list,
         "object": dict,
         "number": float,
+        "null": type(None),
     }
+    if not field_schema:  # Handles empty schema {}
+        return Any
+
     if "anyOf" in field_schema:
         types = []
-        for option in field_schema["anyOf"]:
-            # If the option has a type, convert it; otherwise, use Any.
-            if "type" in option:
-                types.append(json_type_to_python.get(option["type"], Any))
-            else:
-                types.append(Any)
-        # Return a Union of the types. For example, Union[str, int]
+        for option_schema in field_schema["anyOf"]:
+            types.append(get_field_type(option_schema))  # Recursive call
+        if not types:
+            return Any
         return Union[tuple(types)]
-    elif "type" in field_schema:
-        return json_type_to_python.get(field_schema["type"], Any)
-    else:
-        return Any
+
+    if "type" in field_schema and isinstance(field_schema["type"], list):
+        types = []
+        for type_name in field_schema["type"]:
+            if type_name == "array":
+                item_schema = field_schema.get("items", {})
+                types.append(List[get_field_type(item_schema)])
+            elif type_name in json_type_to_python:
+                types.append(json_type_to_python[type_name])
+            else:
+                types.append(Any)  # Fallback for unknown types in the list
+        if not types:
+            return Any
+        return Union[tuple(types)]  # type: ignore
+
+    if "type" in field_schema:
+        schema_type_name = field_schema["type"]
+        if schema_type_name == "array":
+            item_schema = field_schema.get(
+                "items", {}
+            )  # Default to Any if "items" is missing
+            return List[get_field_type(item_schema)]
+
+        return json_type_to_python.get(schema_type_name, Any)
+
+    # If only "items" is present (implies array by some conventions, but less standard)
+    # Or if it's a schema with other keywords like 'properties' (implying object)
+    # For simplicity, if no "type" or "anyOf" at this point, default to Any or add more specific handling.
+    # If 'properties' in field_schema or 'additionalProperties' in field_schema, it's likely an object.
+    if "properties" in field_schema or "additionalProperties" in field_schema:
+        # This path might need to reconstruct a nested Pydantic model if you encounter such schemas.
+        # For now, treating as 'dict' or 'Any' might be a simpler placeholder.
+        return dict  # Or Any, or more sophisticated object reconstruction.
+
+    return Any
 
 
 class Agent:
@@ -264,7 +293,9 @@ class Agent:
             bad_tools_str = llm.complete(prompt).text
             if bad_tools_str and bad_tools_str != "<OKAY>":
                 bad_tools = [tool.strip() for tool in bad_tools_str.split(",")]
-                numbered = ", ".join(f"({i}) {tool}" for i, tool in enumerate(bad_tools, 1))
+                numbered = ", ".join(
+                    f"({i}) {tool}" for i, tool in enumerate(bad_tools, 1)
+                )
                 raise ValueError(
                     f"The Agent custom instructions mention these invalid tools: {numbered}"
                 )
@@ -1143,41 +1174,66 @@ class Agent:
         tools = []
 
         for tool_data in data["tools"]:
-            # Recreate the dynamic model using the schema info
+            query_args_model = None
             if tool_data.get("fn_schema"):
                 schema_info = tool_data["fn_schema"]
                 try:
                     module_name = schema_info["metadata"]["module"]
                     class_name = schema_info["metadata"]["class"]
                     mod = importlib.import_module(module_name)
-                    fn_schema_cls = getattr(mod, class_name)
-                    query_args_model = fn_schema_cls
+                    candidate_cls = getattr(mod, class_name)
+                    if inspect.isclass(candidate_cls) and issubclass(
+                        candidate_cls, BaseModel
+                    ):
+                        query_args_model = candidate_cls
+                    else:
+                        # It's not the Pydantic model class we expected (e.g., it's the function itself)
+                        # Force fallback to JSON schema reconstruction by raising an error.
+                        raise ImportError(
+                            f"Retrieved '{class_name}' from '{module_name}' is not a Pydantic BaseModel class. "
+                            "Falling back to JSON schema reconstruction."
+                        )
                 except Exception:
                     # Fallback: rebuild using the JSON schema
                     field_definitions = {}
-                    for field, values in (
-                        schema_info.get("schema", {}).get("properties", {}).items()
+                    json_schema_to_rebuild = schema_info.get("schema")
+                    if json_schema_to_rebuild and isinstance(
+                        json_schema_to_rebuild, dict
                     ):
-                        field_type = get_field_type(values)
-                        if "default" in values:
-                            field_definitions[field] = (
-                                field_type,
-                                Field(
-                                    description=values.get("description", ""),
-                                    default=values["default"],
-                                ),
-                            )
-                        else:
-                            field_definitions[field] = (
-                                field_type,
-                                Field(description=values.get("description", "")),
-                            )
-                    query_args_model = create_model(
-                        schema_info.get("schema", {}).get("title", "QueryArgs"),
-                        **field_definitions,
-                    )
-            else:
-                query_args_model = create_model("QueryArgs")
+                        for field, values in json_schema_to_rebuild.get(
+                            "properties", {}
+                        ).items():
+                            field_type = get_field_type(values)
+                            field_description = values.get(
+                                "description"
+                            )  # Defaults to None
+                            if "default" in values:
+                                field_definitions[field] = (
+                                    field_type,
+                                    Field(
+                                        description=field_description,
+                                        default=values["default"],
+                                    ),
+                                )
+                            else:
+                                field_definitions[field] = (
+                                    field_type,
+                                    Field(description=field_description),
+                                )
+                        query_args_model = create_model(
+                            json_schema_to_rebuild.get(
+                                "title", f"{tool_data['name']}_QueryArgs"
+                            ),
+                            **field_definitions,
+                        )
+                    else:  # If schema part is missing or not a dict, create a default empty model
+                        query_args_model = create_model(
+                            f"{tool_data['name']}_QueryArgs"
+                        )
+
+            # If fn_schema was not in tool_data or reconstruction failed badly, default to empty pydantic model
+            if query_args_model is None:
+                query_args_model = create_model(f"{tool_data['name']}_QueryArgs")
 
             fn = (
                 pickle.loads(tool_data["fn"].encode("latin-1"))

vectara_agentic/db_tools.py

@@ -112,7 +112,7 @@ class DatabaseTools:
             List[str]: a list of Document objects from the database.
         """
         if sql_query is None:
-            raise ValueError("A query parameter is necessary to filter the data")
+            raise ValueError("A query parameter is necessary to filter the data.")
 
         count_query = f"SELECT COUNT(*) FROM ({sql_query})"
         try:
@@ -123,7 +123,7 @@ class DatabaseTools:
         if num_rows > self.max_rows:
             return [
                 f"The query is expected to return more than {self.max_rows} rows. "
-                "Please refactor your query to make it return less rows. "
+                "Please refactor your query to make it return less rows and try again. "
             ]
         try:
             res = self._load_data(sql_query)

vectara_agentic/llm_utils.py

@@ -69,12 +69,16 @@ def get_tokenizer_for_model(
     """
     Get the tokenizer for the specified model, as determined by the role & config.
     """
-    model_provider, model_name = _get_llm_params_for_role(role, config)
-    if model_provider == ModelProvider.OPENAI:
-        # This might raise an exception if the model_name is unknown to tiktoken
-        return tiktoken.encoding_for_model(model_name).encode
-    if model_provider == ModelProvider.ANTHROPIC:
-        return Anthropic().tokenizer
+    try:
+        model_provider, model_name = _get_llm_params_for_role(role, config)
+        if model_provider == ModelProvider.OPENAI:
+            # This might raise an exception if the model_name is unknown to tiktoken
+            return tiktoken.encoding_for_model(model_name).encode
+        if model_provider == ModelProvider.ANTHROPIC:
+            return Anthropic().tokenizer
+    except Exception:
+        print(f"Error getting tokenizer for model {model_name}, ignoring")
+        return None
     return None
 
 

vectara_agentic/tool_utils.py

@@ -7,7 +7,7 @@ import re
 
 from typing import (
     Callable, List, Dict, Any, Optional, Union, Type, Tuple,
-    Sequence
+    Sequence, get_origin, get_args
 )
 from pydantic import BaseModel, create_model
 from pydantic_core import PydanticUndefined
@@ -140,37 +140,20 @@ class VectaraTool(FunctionTool):
         return str(self)
 
     def __eq__(self, other):
-        if not isinstance(other, VectaraTool):
-            return False
-
-        if self.metadata.tool_type != other.metadata.tool_type:
-            return False
-
-        if self.metadata.name != other.metadata.name:
-            return False
-
-        # If schema is a dict-like object, compare the dict representation
         try:
             # Try to get schema as dict if possible
-            if hasattr(self.metadata.fn_schema, "schema"):
-                self_schema = self.metadata.fn_schema.schema
-                other_schema = other.metadata.fn_schema.schema
-
-                # Compare only properties and required fields
-                self_props = self_schema.get("properties", {})
-                other_props = other_schema.get("properties", {})
-
-                self_required = self_schema.get("required", [])
-                other_required = other_schema.get("required", [])
-
-                return self_props.keys() == other_props.keys() and set(
-                    self_required
-                ) == set(other_required)
+            self_schema = self.metadata.fn_schema.model_json_schema()
+            other_schema = other.metadata.fn_schema.model_json_schema()
         except Exception:
-            # If any exception occurs during schema comparison, fall back to name comparison
-            pass
+            return False
 
-        return True
+        is_equal = (
+            isinstance(other, VectaraTool)
+            and self.metadata.tool_type == other.metadata.tool_type
+            and self.metadata.name == other.metadata.name
+            and self_schema == other_schema
+        )
+        return is_equal
 
     def call(
         self, *args: Any, ctx: Optional[Context] = None, **kwargs: Any
@@ -185,7 +168,7 @@ class VectaraTool(FunctionTool):
             err_output = ToolOutput(
                 tool_name=self.metadata.name,
                 content=(
-                    f"Wrong argument used when calling {self.metadata.name}: {str(e)}. "
+                    f"Wrong argument used when calling {self.metadata.name}: {str(e)}."
                     f"Valid arguments: {params_str}. please call the tool again with the correct arguments."
                 ),
                 raw_input={"args": args, "kwargs": kwargs},
@@ -222,9 +205,10 @@ class VectaraTool(FunctionTool):
             )
             return err_output
         except Exception as e:
+            import traceback
             err_output = ToolOutput(
                 tool_name=self.metadata.name,
-                content=f"Tool {self.metadata.name} Malfunction: {str(e)}",
+                content=f"Tool {self.metadata.name} Malfunction: {str(e)}, traceback: {traceback.format_exc()}",
                 raw_input={"args": args, "kwargs": kwargs},
                 raw_output={"response": str(e)},
             )
@@ -234,13 +218,36 @@ class VectaraTool(FunctionTool):
 class EmptyBaseModel(BaseModel):
     """empty base model"""
 
-def _unwrap_default(default):
-    # PydanticUndefined means “no default — required”
-    return default if default is not PydanticUndefined else inspect.Parameter.empty
+def _clean_type_repr(type_repr: str) -> str:
+    """Cleans the string representation of a type."""
+    # Replace <class 'somename'> with somename
+    match = re.match(r"<class '(\w+)'>", type_repr)
+    if match:
+        type_repr = match.group(1)
 
-def _schema_default(default):
-    # PydanticUndefined ⇒ Ellipsis (required)
-    return default if default is not PydanticUndefined else ...
+    type_repr = type_repr.replace("typing.", "")
+    return type_repr
+
+def _format_type(annotation) -> str:
+    """
+    Turn things like Union[int, str, NoneType] into 'int | str | None',
+    and replace any leftover 'NoneType' → 'None'.
+    """
+    origin = get_origin(annotation)
+    if origin is Union:
+        parts = []
+        for arg in get_args(annotation):
+            if arg is type(None):
+                parts.append("None")
+            else:
+                # recurse in case of nested unions
+                parts.append(_format_type(arg))
+        return " | ".join(parts)
+
+    # Fallback
+    type_repr = str(annotation)
+    type_repr = _clean_type_repr(type_repr)
+    return type_repr.replace("NoneType", "None")
 
 def _make_docstring(
     function: Callable[..., ToolOutput],
@@ -250,46 +257,68 @@ def _make_docstring(
     all_params: List[inspect.Parameter],
     compact_docstring: bool,
 ) -> str:
-    params_str = ", ".join(
-        f"{p.name}: {p.annotation.__name__ if hasattr(p.annotation, '__name__') else p.annotation}"
-        for p in all_params
-    )
+    """
+    Generates a docstring for a function based on its signature, description,
+    and Pydantic schema, correctly handling complex type annotations.
+
+    Args:
+        function: The function for which to generate the docstring.
+        tool_name: The desired name for the tool/function in the docstring.
+        tool_description: The main description of the tool/function.
+        fn_schema: The Pydantic model representing the function's arguments schema.
+        all_params: A list of inspect.Parameter objects for the function signature.
+        compact_docstring: If True, omits the signature line in the main description.
+
+    Returns:
+        A formatted docstring string.
+    """
+    params_str_parts = []
+    for p in all_params:
+        type_repr = _format_type(p.annotation)
+        params_str_parts.append(f"{p.name}: {type_repr}")
+
+    params_str = ", ".join(params_str_parts)
     signature_line = f"{tool_name}({params_str}) -> dict[str, Any]"
+
     if compact_docstring:
         doc_lines = [tool_description.strip()]
     else:
         doc_lines = [signature_line, "", tool_description.strip()]
-    doc_lines += [
-        "",
-        "Args:",
-    ]
 
     full_schema = fn_schema.model_json_schema()
     props = full_schema.get("properties", {})
-    for prop_name, schema_prop in props.items():
-        desc = schema_prop.get("description", "")
-
-        # pick up any examples you declared on the Field or via schema_extra
-        examples = schema_prop.get("examples", [])
-        default = schema_prop.get("default", PydanticUndefined)
-
-        # format the type, default, description, examples
-        # find the matching inspect.Parameter so you get its annotation
-        param = next((p for p in all_params if p.name == prop_name), None)
-        if param and hasattr(param.annotation, "__name__"):
-            ty = param.annotation.__name__
-        else:
-            ty = schema_prop.get("type", "")
-
-        # inline default if present
-        default_txt = f", default={default!r}" if default is not PydanticUndefined else ""
-
-        # inline examples if any
-        if examples:
-            examples_txt = ", ".join(repr(e) for e in examples)
-            desc = f"{desc}  (e.g., {examples_txt})"
 
-        doc_lines.append(f"  - {prop_name} ({ty}{default_txt}): {desc}")
+    if props:
+        doc_lines.extend(["", "Args:"])
+        for prop_name, schema_prop in props.items():
+            desc = schema_prop.get("description", "")
+
+            # pick up any examples you declared on the Field or via schema_extra
+            examples = schema_prop.get("examples", [])
+            default = schema_prop.get("default", PydanticUndefined)
+
+            # format the type, default, description, examples
+            # find the matching inspect.Parameter so you get its annotation
+            param = next((p for p in all_params if p.name == prop_name), None)
+            ty_str = ""
+            if param:
+                ty_str = _format_type(param.annotation)
+            elif "type" in schema_prop:
+                ty_info = schema_prop["type"]
+                if isinstance(ty_info, str):
+                    ty_str = _clean_type_repr(ty_info)
+                elif isinstance(ty_info, list):  # Handle JSON schema array type e.g., ["integer", "string"]
+                    ty_str = " | ".join([_clean_type_repr(t) for t in ty_info])
+
+            # inline default if present
+            default_txt = f", default={default!r}" if default is not PydanticUndefined else ""
+
+            # inline examples if any
+            if examples:
+                examples_txt = ", ".join(repr(e) for e in examples)
+                desc = f"{desc}  (e.g., {examples_txt})"
+
+            doc_lines.append(f"  - {prop_name} ({ty_str}{default_txt}): {desc}")
 
     doc_lines.append("")
     doc_lines.append("Returns:")
@@ -331,36 +360,33 @@ def create_tool_from_dynamic_function(
     if not isinstance(tool_args_schema, type) or not issubclass(tool_args_schema, BaseModel):
         raise TypeError("tool_args_schema must be a Pydantic BaseModel subclass")
 
-    fields = {}
+    fields: Dict[str, Any] = {}
     base_params = []
     for field_name, field_info in base_params_model.model_fields.items():
-        field_type = field_info.annotation
-        default_value = _unwrap_default(field_info.default)
+        default = Ellipsis if field_info.default is PydanticUndefined else field_info.default
         param = inspect.Parameter(
             field_name,
             inspect.Parameter.POSITIONAL_OR_KEYWORD,
-            default=default_value,
-            annotation=field_type,
+            default=default if default is not Ellipsis else inspect.Parameter.empty,
+            annotation=field_info.annotation,
         )
         base_params.append(param)
-        fields[field_name] = (field_type, _schema_default(field_info.default))
+        fields[field_name] = (field_info.annotation, field_info)
 
     # Add tool_args_schema fields to the fields dict if not already included.
-    # Also add them to the function signature by creating new inspect.Parameter objects.
     for field_name, field_info in tool_args_schema.model_fields.items():
         if field_name in fields:
             continue
 
-        field_type = field_info.annotation
-        default_value = _unwrap_default(field_info.default)
+        default = Ellipsis if field_info.default is PydanticUndefined else field_info.default
         param = inspect.Parameter(
             field_name,
             inspect.Parameter.POSITIONAL_OR_KEYWORD,
-            default=default_value,
-            annotation=field_type,
+            default=default if default is not Ellipsis else inspect.Parameter.empty,
+            annotation=field_info.annotation,
         )
         base_params.append(param)
-        fields[field_name] = (field_type, _schema_default(field_info.default))
+        fields[field_name] = (field_info.annotation, field_info)
 
     # Create the dynamic schema with both base_params_model and tool_args_schema fields.
     fn_schema = create_model(f"{tool_name}_schema", **fields)
@@ -402,7 +428,7 @@ _PARSE_RANGE_REGEX = re.compile(
 )
 
 
-def _parse_range(val_str: str) -> Tuple[float, float, bool, bool]:
+def _parse_range(val_str: str) -> Tuple[str, str, bool, bool]:
     """
     Parses '[1,10)' or '(0.5, 5]' etc.
     Returns (start, end, start_incl, end_incl) or raises ValueError.
@@ -411,10 +437,10 @@ def _parse_range(val_str: str) -> Tuple[float, float, bool, bool]:
     if not m:
         raise ValueError(f"Invalid range syntax: {val_str!r}")
     start_inc = m.group(1) == "["
-    end_inc = m.group(7) == "]"
-    start = float(m.group(2))
-    end = float(m.group(4))
-    if start > end:
+    end_inc = m.group(6) == "]"
+    start = m.group(2)
+    end = m.group(4)
+    if float(start) > float(end):
         raise ValueError(f"Range lower bound greater than upper bound: {val_str!r}")
     return start, end, start_inc, end_inc
 

vectara_agentic/tools.py

@@ -219,7 +219,7 @@ class VectaraToolFactory:
             response = vectara_retriever.retrieve(query)
 
             if len(response) == 0:
-                msg = "Vectara Tool failed to retreive any results for the query."
+                msg = "Vectara Tool failed to retrieve any results for the query."
                 return ToolOutput(
                     tool_name=search_function.__name__,
                     content=msg,

vectara_agentic/tools_catalog.py

@@ -26,6 +26,7 @@ get_headers = {
 def get_current_date() -> str:
     """
     Returns the current date as a string.
+    Call this tool to get the current date in the format "Day, Month Day, Year".
     """
     return date.today().strftime("%A, %B %d, %Y")
 

{vectara_agentic-0.2.15.dist-info → vectara_agentic-0.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vectara_agentic
-Version: 0.2.15
+Version: 0.2.16
 Summary: A Python package for creating AI Assistants and AI Agents with Vectara
 Home-page: https://github.com/vectara/py-vectara-agentic
 Author: Ofer Mendelevitch
@@ -16,18 +16,18 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: llama-index==0.12.33
-Requires-Dist: llama-index-indices-managed-vectara==0.4.4
+Requires-Dist: llama-index==0.12.34
+Requires-Dist: llama-index-indices-managed-vectara==0.4.5
 Requires-Dist: llama-index-agent-llm-compiler==0.3.0
 Requires-Dist: llama-index-agent-lats==0.3.0
-Requires-Dist: llama-index-agent-openai==0.4.6
+Requires-Dist: llama-index-agent-openai==0.4.7
 Requires-Dist: llama-index-llms-openai==0.3.38
 Requires-Dist: llama-index-llms-anthropic==0.6.10
 Requires-Dist: llama-index-llms-together==0.3.1
 Requires-Dist: llama-index-llms-groq==0.3.1
 Requires-Dist: llama-index-llms-fireworks==0.3.2
 Requires-Dist: llama-index-llms-cohere==0.4.1
-Requires-Dist: llama-index-llms-google-genai==0.1.8
+Requires-Dist: llama-index-llms-google-genai==0.1.12
 Requires-Dist: llama-index-llms-bedrock==0.3.8
 Requires-Dist: llama-index-tools-yahoo-finance==0.3.0
 Requires-Dist: llama-index-tools-arxiv==0.3.0

vectara_agentic-0.2.16.dist-info/RECORD

@@ -0,0 +1,34 @@
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/endpoint.py,sha256=frnpdZQpnuQNNKNYgAn2rFTarNG8MCJaNA77Bw_W22A,1420
+tests/test_agent.py,sha256=o5U3K1AJllsSDvucrgFJPQRdAmHPq3LCuFpsnECUTFk,5483
+tests/test_agent_planning.py,sha256=JwEebGooROAvsQ9JZoaH6KEcrSyv1F0lL4TD4FjP8a8,2213
+tests/test_agent_type.py,sha256=mWo-pTQNDj4fWFPETm5jnb7Y5N48aW35keTVvxdIaCc,7173
+tests/test_fallback.py,sha256=M5YD7NHZ0joVU1frYIr9_OiRAIje5mrXrYVcekzlyGs,2829
+tests/test_groq.py,sha256=Knsz-xEBY-eoq8T0DzAC09UJWZqwtLmcjbx6QY37rJg,4235
+tests/test_private_llm.py,sha256=CY-_rCpxGUuxnZ3ypkodw5Jj-sJCNdh6rLbCvULwuJI,2247
+tests/test_return_direct.py,sha256=Y_K_v88eS_kJfxE6A0Yghma0nUT8u6COitj0SNnZGNs,1523
+tests/test_serialization.py,sha256=Ed23GN2zhSJNdPFrVK4aqLkOhJKviczR_o0t-r9TuRI,4762
+tests/test_tools.py,sha256=MWExM3n1oKmVpLmayIgHXqF6_hOPq44KPkRphitBKik,15709
+tests/test_vectara_llms.py,sha256=m-fDAamJR1I5IdV0IpXuTegerTUNCVRm27lsHd4wQjg,2367
+tests/test_workflow.py,sha256=lVyrVHdRO5leYNbYtHTmKqMX0c8_xehCpUA7cXQKVsc,2175
+vectara_agentic/__init__.py,sha256=2GLDS3U6KckK-dBRl9v_x1kSV507gEhjOfuMmmu0Qxg,850
+vectara_agentic/_callback.py,sha256=ron49t1t-ox-736WaXzrZ99vhN4NI9bMiHFyj0iIPqg,13062
+vectara_agentic/_observability.py,sha256=UbJxiOJFOdLq3b1t0-Y7swMC3BzJu3IOlTUM-c1oUk8,4328
+vectara_agentic/_prompts.py,sha256=vAb02oahA7GKRgLOsDGqgKl-BLBop2AjOlCTgLrf3M4,9694
+vectara_agentic/_version.py,sha256=zjobn8jIz8O5910X5cnrTC2MH3U93-ntXMSx5_WVmW8,66
+vectara_agentic/agent.py,sha256=bHeRh0kug3I8X1wZ73byrrRNfVX3QEXxwTukqAFh0jE,53761
+vectara_agentic/agent_config.py,sha256=E-rtYMcpoGxnEAyy8231bizo2n0uGQ2qWxuSgTEfwdQ,4327
+vectara_agentic/agent_endpoint.py,sha256=QIMejCLlpW2qzXxeDAxv3anF46XMDdVMdKGWhJh3azY,1996
+vectara_agentic/db_tools.py,sha256=Kfz6n-rSj5TQEbAiJnWGmqWtcwB0A5GpxD7d1UwGzlc,11194
+vectara_agentic/llm_utils.py,sha256=FOQG6if6D7l1eVRx_r-HSUhh5wBguIaxsYMKrZl2fJo,6302
+vectara_agentic/sub_query_workflow.py,sha256=xjySd2qjLAKwK6XuS0R0PTyk2uXraHCgCbDP1xDoFVI,12175
+vectara_agentic/tool_utils.py,sha256=sB-_UwDi9qNStkDWX_AHIfoxMlTMiWWfTIOBxvHpOkU,20422
+vectara_agentic/tools.py,sha256=hppc2KZ_zMYCiEHsoAS7nMaDgXfAwQZ0b7kyitm95V8,32856
+vectara_agentic/tools_catalog.py,sha256=cAN_kDOWZUoW4GNFwY5GdS6ImMUQNnF2sggx9OGK9Cg,4906
+vectara_agentic/types.py,sha256=HcS7vR8P2v2xQTlOc6ZFV2vvlr3OpzSNWhtcLMxqUZc,1792
+vectara_agentic/utils.py,sha256=q14S8nm3UFFI3ksk-xszd9xgFrtXdIt_tdRiBMFjaa0,2529
+vectara_agentic-0.2.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vectara_agentic-0.2.16.dist-info/METADATA,sha256=vTZeO3QsdOOHAKOJ5CvEmSa67E8DjluaZKxOEq6GgaE,28115
+vectara_agentic-0.2.16.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+vectara_agentic-0.2.16.dist-info/top_level.txt,sha256=Y7TQTFdOYGYodQRltUGRieZKIYuzeZj2kHqAUpfCUfg,22
+vectara_agentic-0.2.16.dist-info/RECORD,,

{vectara_agentic-0.2.15.dist-info → vectara_agentic-0.2.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vectara_agentic-0.2.15.dist-info/RECORD

@@ -1,34 +0,0 @@
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/endpoint.py,sha256=frnpdZQpnuQNNKNYgAn2rFTarNG8MCJaNA77Bw_W22A,1420
-tests/test_agent.py,sha256=nkg3SefST9Q-38Ys9yLJZr2RN6FxeXonMGj7uRCsta8,5482
-tests/test_agent_planning.py,sha256=r_Qk63aK6gAzIluv3X6CLCNIbE1ExWJEUIkvoI6U7RE,2213
-tests/test_agent_type.py,sha256=mWo-pTQNDj4fWFPETm5jnb7Y5N48aW35keTVvxdIaCc,7173
-tests/test_fallback.py,sha256=M5YD7NHZ0joVU1frYIr9_OiRAIje5mrXrYVcekzlyGs,2829
-tests/test_groq.py,sha256=0FFnQ91o9UjOIAIe_JMxyBl4dz_38RRbl00j9dFudMs,4170
-tests/test_private_llm.py,sha256=CY-_rCpxGUuxnZ3ypkodw5Jj-sJCNdh6rLbCvULwuJI,2247
-tests/test_return_direct.py,sha256=Y_K_v88eS_kJfxE6A0Yghma0nUT8u6COitj0SNnZGNs,1523
-tests/test_serialization.py,sha256=Ed23GN2zhSJNdPFrVK4aqLkOhJKviczR_o0t-r9TuRI,4762
-tests/test_tools.py,sha256=EgrEU33ikLv7NmLarB8sYG_E6Sr42gQJ03VQBaZWhLw,11942
-tests/test_vectara_llms.py,sha256=m-fDAamJR1I5IdV0IpXuTegerTUNCVRm27lsHd4wQjg,2367
-tests/test_workflow.py,sha256=lVyrVHdRO5leYNbYtHTmKqMX0c8_xehCpUA7cXQKVsc,2175
-vectara_agentic/__init__.py,sha256=2GLDS3U6KckK-dBRl9v_x1kSV507gEhjOfuMmmu0Qxg,850
-vectara_agentic/_callback.py,sha256=ron49t1t-ox-736WaXzrZ99vhN4NI9bMiHFyj0iIPqg,13062
-vectara_agentic/_observability.py,sha256=V4D8Y16kJJ9t-1WA47pnVjM61SuEd5Nh4mTepjZXVAE,4327
-vectara_agentic/_prompts.py,sha256=TYBfw95fCfnzi9ERCTdvDIfbkaJ-PYEajc7inXdSRl4,9523
-vectara_agentic/_version.py,sha256=sxV-EHkA7i4FI2mIRwjs9AxNcBpyuZetohHW1FBAseQ,66
-vectara_agentic/agent.py,sha256=jfPGJ4Y2xCjQatfwdSBvxfx4VJ7HWqTDvLJ4gJtGoQc,50728
-vectara_agentic/agent_config.py,sha256=E-rtYMcpoGxnEAyy8231bizo2n0uGQ2qWxuSgTEfwdQ,4327
-vectara_agentic/agent_endpoint.py,sha256=QIMejCLlpW2qzXxeDAxv3anF46XMDdVMdKGWhJh3azY,1996
-vectara_agentic/db_tools.py,sha256=bAgqQMrpmu7KBaiAjJ4tpH8JwsFGEDk8iru5Deu0SEk,11179
-vectara_agentic/llm_utils.py,sha256=Isf1d9K4Jpn-IwMZn-liPUTEF-bpiqp0XIiNRohtwTQ,6152
-vectara_agentic/sub_query_workflow.py,sha256=xjySd2qjLAKwK6XuS0R0PTyk2uXraHCgCbDP1xDoFVI,12175
-vectara_agentic/tool_utils.py,sha256=CG30jWeDi-mmetI0jIK2LcsCsyYSckoROrWRXYRCQm4,19226
-vectara_agentic/tools.py,sha256=mPRPbQe8ffQYF6pHCRQ6JUUcdevuMDu-J7pVAgKU1cQ,32856
-vectara_agentic/tools_catalog.py,sha256=hDXfxn3CW5RrM29I7Zh10wj_MrY91zjublyjGSwiCEw,4825
-vectara_agentic/types.py,sha256=HcS7vR8P2v2xQTlOc6ZFV2vvlr3OpzSNWhtcLMxqUZc,1792
-vectara_agentic/utils.py,sha256=q14S8nm3UFFI3ksk-xszd9xgFrtXdIt_tdRiBMFjaa0,2529
-vectara_agentic-0.2.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vectara_agentic-0.2.15.dist-info/METADATA,sha256=Ao2j0EaxBZiVhTT_-GcdrXD9FV4WRYK0yiVcDQjEl9M,28114
-vectara_agentic-0.2.15.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-vectara_agentic-0.2.15.dist-info/top_level.txt,sha256=Y7TQTFdOYGYodQRltUGRieZKIYuzeZj2kHqAUpfCUfg,22
-vectara_agentic-0.2.15.dist-info/RECORD,,