vectara-agentic 0.2.15__tar.gz → 0.2.17__tar.gz

{vectara_agentic-0.2.15/vectara_agentic.egg-info → vectara_agentic-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vectara_agentic
-Version: 0.2.15
+Version: 0.2.17
 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.35
+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
@@ -36,15 +36,17 @@ Requires-Dist: llama-index-tools-google==0.3.0
 Requires-Dist: llama-index-tools-tavily_research==0.3.0
 Requires-Dist: llama_index.tools.brave_search==0.3.0
 Requires-Dist: llama-index-tools-neo4j==0.3.0
+Requires-Dist: llama-index-tools-waii==0.3.0
 Requires-Dist: llama-index-graph-stores-kuzu==0.7.0
+Requires-Dist: llama-index-tools-salesforce==0.3.0
 Requires-Dist: llama-index-tools-slack==0.3.0
 Requires-Dist: llama-index-tools-exa==0.3.0
 Requires-Dist: llama-index-tools-wikipedia==0.3.0
 Requires-Dist: llama-index-tools-bing-search==0.3.0
-Requires-Dist: tavily-python==0.5.4
-Requires-Dist: exa-py==1.12.0
+Requires-Dist: tavily-python==0.7.2
+Requires-Dist: exa-py==1.12.1
 Requires-Dist: openinference-instrumentation-llama-index==4.2.1
-Requires-Dist: opentelemetry-proto==1.32.1
+Requires-Dist: opentelemetry-proto>=1.31.0
 Requires-Dist: arize-phoenix==8.26.1
 Requires-Dist: arize-phoenix-otel==0.9.2
 Requires-Dist: protobuf==5.29.3
@@ -365,51 +367,92 @@ vectara-agentic includes various other tools from LlamaIndex ToolSpecs:
   * Tavily Search: Real-time web search using [Tavily API](https://tavily.com/)
     ```python
     from vectara_agentic.tools_catalog import ToolsCatalog
-    tavily_tool = ToolsCatalog(agent_config).tavily_search
+    tools_factory = ToolsFactory()
+    tavily_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="tavily_research",
+                    tool_spec_name="TavilyToolSpec",
+                    api_key=str(os.environ["TAVILY_API_KEY"]),
+                )
     ```
   * EXA.AI: Advanced web search and data extraction
     ```python
-    exa_tool = ToolsCatalog(agent_config).exa_search
+    exa_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="exa.ai",
+                    tool_spec_name="ExaToolSpec",
+                    api_key=str(os.environ["EXA_API_KEY"]),
+                )
     ```
   * Brave Search: Web search using Brave's search engine
     ```python
-    brave_tool = ToolsCatalog(agent_config).brave_search
+    brave_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="brave_search",
+                    tool_spec_name="BraveSearchToolSpec",
+                    api_key=str(os.environ["BRAVE_API_KEY"]),
+                )
     ```
 
 * **Academic Tools**
   * arXiv: Search and retrieve academic papers
     ```python
-    arxiv_tool = ToolsCatalog(agent_config).arxiv_search
+    arxiv_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="arxiv",
+                    tool_spec_name="ArxivToolSpec",
+                )
     ```
 
-* **Graph Database Tools**
+* **Database Tools**
   * Neo4j: Graph database integration
     ```python
-    neo4j_tool = ToolsCatalog(agent_config).neo4j_query
+    neo4j_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="neo4j",
+                    tool_spec_name="Neo4jQueryToolSpec",
+                )
     ```
   * Kuzu: Lightweight graph database
     ```python
-    kuzu_tool = ToolsCatalog(agent_config).kuzu_query
+    kuzu_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="kuzu",
+                    tool_spec_name="KuzuGraphStore",
+                )
+    ```
+  * Waii: tools for natural langauge query of a relational database
+    ```python
+    waii_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="waii",
+                    tool_spec_name="WaiiToolSpec",
+                )
     ```
 
 * **Google Tools**
   * Gmail: Read and send emails
     ```python
-    gmail_tool = ToolsCatalog(agent_config).gmail
+    gmail_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GmailToolSpec",
+                )
     ```
   * Calendar: Manage calendar events
     ```python
-    calendar_tool = ToolsCatalog(agent_config).calendar
+    calendar_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GoogleCalendarToolSpec",
+                )
     ```
   * Search: Google search integration
     ```python
-    google_search_tool = ToolsCatalog(agent_config).google_search
+    search_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GoogleSearchToolSpec",
+                )
     ```
 
 * **Communication Tools**
   * Slack: Send messages and interact with Slack
     ```python
-    slack_tool = ToolsCatalog(agent_config).slack
+    slack_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="slack",
+                    tool_spec_name="SlackToolSpec",
+                )
     ```
 
 For detailed setup instructions and API key requirements, please refer the instructions on [LlamaIndex hub](https://llamahub.ai/?tab=tools) for the specific tool.

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/README.md

@@ -295,51 +295,92 @@ vectara-agentic includes various other tools from LlamaIndex ToolSpecs:
   * Tavily Search: Real-time web search using [Tavily API](https://tavily.com/)
     ```python
     from vectara_agentic.tools_catalog import ToolsCatalog
-    tavily_tool = ToolsCatalog(agent_config).tavily_search
+    tools_factory = ToolsFactory()
+    tavily_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="tavily_research",
+                    tool_spec_name="TavilyToolSpec",
+                    api_key=str(os.environ["TAVILY_API_KEY"]),
+                )
     ```
   * EXA.AI: Advanced web search and data extraction
     ```python
-    exa_tool = ToolsCatalog(agent_config).exa_search
+    exa_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="exa.ai",
+                    tool_spec_name="ExaToolSpec",
+                    api_key=str(os.environ["EXA_API_KEY"]),
+                )
     ```
   * Brave Search: Web search using Brave's search engine
     ```python
-    brave_tool = ToolsCatalog(agent_config).brave_search
+    brave_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="brave_search",
+                    tool_spec_name="BraveSearchToolSpec",
+                    api_key=str(os.environ["BRAVE_API_KEY"]),
+                )
     ```
 
 * **Academic Tools**
   * arXiv: Search and retrieve academic papers
     ```python
-    arxiv_tool = ToolsCatalog(agent_config).arxiv_search
+    arxiv_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="arxiv",
+                    tool_spec_name="ArxivToolSpec",
+                )
     ```
 
-* **Graph Database Tools**
+* **Database Tools**
   * Neo4j: Graph database integration
     ```python
-    neo4j_tool = ToolsCatalog(agent_config).neo4j_query
+    neo4j_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="neo4j",
+                    tool_spec_name="Neo4jQueryToolSpec",
+                )
     ```
   * Kuzu: Lightweight graph database
     ```python
-    kuzu_tool = ToolsCatalog(agent_config).kuzu_query
+    kuzu_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="kuzu",
+                    tool_spec_name="KuzuGraphStore",
+                )
+    ```
+  * Waii: tools for natural langauge query of a relational database
+    ```python
+    waii_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="waii",
+                    tool_spec_name="WaiiToolSpec",
+                )
     ```
 
 * **Google Tools**
   * Gmail: Read and send emails
     ```python
-    gmail_tool = ToolsCatalog(agent_config).gmail
+    gmail_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GmailToolSpec",
+                )
     ```
   * Calendar: Manage calendar events
     ```python
-    calendar_tool = ToolsCatalog(agent_config).calendar
+    calendar_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GoogleCalendarToolSpec",
+                )
     ```
   * Search: Google search integration
     ```python
-    google_search_tool = ToolsCatalog(agent_config).google_search
+    search_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="google",
+                    tool_spec_name="GoogleSearchToolSpec",
+                )
     ```
 
 * **Communication Tools**
   * Slack: Send messages and interact with Slack
     ```python
-    slack_tool = ToolsCatalog(agent_config).slack
+    slack_tools = tools_factory.get_llama_index_tools(
+                    tool_package_name="slack",
+                    tool_spec_name="SlackToolSpec",
+                )
     ```
 
 For detailed setup instructions and API key requirements, please refer the instructions on [LlamaIndex hub](https://llamahub.ai/?tab=tools) for the specific tool.

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/requirements.txt

@@ -1,15 +1,15 @@
-llama-index==0.12.33
-llama-index-indices-managed-vectara==0.4.4
+llama-index==0.12.35
+llama-index-indices-managed-vectara==0.4.5
 llama-index-agent-llm-compiler==0.3.0
 llama-index-agent-lats==0.3.0
-llama-index-agent-openai==0.4.6
+llama-index-agent-openai==0.4.7
 llama-index-llms-openai==0.3.38
 llama-index-llms-anthropic==0.6.10
 llama-index-llms-together==0.3.1
 llama-index-llms-groq==0.3.1
 llama-index-llms-fireworks==0.3.2
 llama-index-llms-cohere==0.4.1
-llama-index-llms-google-genai ==0.1.8
+llama-index-llms-google-genai ==0.1.12
 llama-index-llms-bedrock==0.3.8
 llama-index-tools-yahoo-finance==0.3.0
 llama-index-tools-arxiv==0.3.0
@@ -18,15 +18,17 @@ llama-index-tools-google==0.3.0
 llama-index-tools-tavily_research==0.3.0
 llama_index.tools.brave_search==0.3.0
 llama-index-tools-neo4j==0.3.0
+llama-index-tools-waii==0.3.0
 llama-index-graph-stores-kuzu==0.7.0
+llama-index-tools-salesforce==0.3.0
 llama-index-tools-slack==0.3.0
 llama-index-tools-exa==0.3.0
 llama-index-tools-wikipedia==0.3.0
 llama-index-tools-bing-search==0.3.0
-tavily-python==0.5.4
-exa-py==1.12.0
+tavily-python==0.7.2
+exa-py==1.12.1
 openinference-instrumentation-llama-index==4.2.1
-opentelemetry-proto==1.32.1
+opentelemetry-proto>=1.31.0
 arize-phoenix==8.26.1
 arize-phoenix-otel==0.9.2
 protobuf==5.29.3

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/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__":

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/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'

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/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__":

{vectara_agentic-0.2.15 → vectara_agentic-0.2.17}/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()