vectara-agentic 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

tests/endpoint.py

@@ -1,8 +1,13 @@
 from openai import OpenAI
 from flask import Flask, request, jsonify
+import logging
 from functools import wraps
 
 app = Flask(__name__)
+app.config['TESTING'] = True
+
+log = logging.getLogger('werkzeug')
+log.setLevel(logging.ERROR)
 
 # Set your OpenAI API key (ensure you've set this in your environment)
 
@@ -39,4 +44,4 @@ def chat_completions():
 
 if __name__ == "__main__":
     # Run on port 5000 by default; adjust as needed.
-    app.run(debug=True, port=5000)
+    app.run(debug=True, port=5000, use_reloader=False)

tests/test_agent.py

@@ -6,6 +6,9 @@ from vectara_agentic.agent_config import AgentConfig
 from vectara_agentic.types import ModelProvider, ObserverType
 from vectara_agentic.tools import ToolsFactory
 
+def mult(x, y):
+    return x * y
+
 class TestAgentPackage(unittest.TestCase):
     def test_get_prompt(self):
         prompt_template = "{chat_topic} on {today} with {custom_instructions}"
@@ -21,9 +24,6 @@ class TestAgentPackage(unittest.TestCase):
         )
 
     def test_agent_init(self):
-        def mult(x, y):
-            return x * y
-
         tools = [ToolsFactory().create_tool(mult)]
         topic = "AI"
         custom_instructions = "Always do as your mother tells you!"
@@ -41,9 +41,6 @@ class TestAgentPackage(unittest.TestCase):
         )
 
     def test_agent_config(self):
-        def mult(x, y):
-            return x * y
-
         tools = [ToolsFactory().create_tool(mult)]
         topic = "AI topic"
         instructions = "Always do as your father tells you, if your mother agrees!"
@@ -78,9 +75,6 @@ class TestAgentPackage(unittest.TestCase):
         )
 
     def test_multiturn(self):
-        def mult(x, y):
-            return x * y
-
         tools = [ToolsFactory().create_tool(mult)]
         topic = "AI topic"
         instructions = "Always do as your father tells you, if your mother agrees!"
@@ -127,6 +121,20 @@ class TestAgentPackage(unittest.TestCase):
         self.assertEqual(agent, agent_reloaded_again)
         self.assertEqual(agent.agent_type, agent_reloaded_again.agent_type)
 
+    def test_chat_history(self):
+        tools = [ToolsFactory().create_tool(mult)]
+        topic = "AI topic"
+        instructions = "Always do as your father tells you, if your mother agrees!"
+        agent = Agent(
+            tools=tools,
+            topic=topic,
+            custom_instructions=instructions,
+            chat_history=[("What is 5 times 10", "50"), ("What is 3 times 7", "21")]
+        )
+
+        res = agent.chat("multiply the results of the last two questions. Output only the answer.")
+        self.assertEqual(res.response, "1050")
+
 
 if __name__ == "__main__":
     unittest.main()

vectara_agentic/_version.py

@@ -1,4 +1,4 @@
 """
 Define the version of the package.
 """
-__version__ = "0.2.1"
+__version__ = "0.2.2"

vectara_agentic/agent.py

@@ -11,6 +11,8 @@ import logging
 import traceback
 import asyncio
 
+from collections import Counter
+
 import cloudpickle as pickle
 
 from dotenv import load_dotenv
@@ -144,6 +146,7 @@ class Agent:
         query_logging_callback: Optional[Callable[[str, str], None]] = None,
         agent_config: Optional[AgentConfig] = None,
         chat_history: Optional[list[Tuple[str, str]]] = None,
+        validate_tools: bool = False,
     ) -> None:
         """
         Initialize the agent with the specified type, tools, topic, and system message.
@@ -160,6 +163,8 @@ class Agent:
             agent_config (AgentConfig, optional): The configuration of the agent.
                 Defaults to AgentConfig(), which reads from environment variables.
             chat_history (Tuple[str, str], optional): A list of user/agent chat pairs to initialize the agent memory.
+            validate_tools (bool, optional): Whether to validate tool inconsistency with instructions.
+                Defaults to False.
         """
         self.agent_config = agent_config or AgentConfig()
         self.agent_type = self.agent_config.agent_type
@@ -172,11 +177,37 @@ class Agent:
         self.agent_progress_callback = agent_progress_callback if agent_progress_callback else update_func
         self.query_logging_callback = query_logging_callback
 
+        # Validate tools
+        # Check for:
+        # 1. multiple copies of the same tool
+        # 2. Instructions for using tools that do not exist
+        tool_names = [tool.metadata.name for tool in self.tools]
+        duplicates = [tool for tool, count in Counter(tool_names).items() if count > 1]
+        if duplicates:
+            raise ValueError(f"Duplicate tools detected: {', '.join(duplicates)}")
+
+        if validate_tools:
+            prompt = f'''
+            Given the following instructions, and a list of tool names,
+            Please identify tools mentioned in the instructions that do not exist in the list.
+            Instructions:
+            {self._custom_instructions}
+            Tool names: {', '.join(tool_names)}
+            Your response should include a comma separated list of tool names that do not exist in the list.
+            Your response should be an empty string if all tools mentioned in the instructions are in the list.
+            '''
+            llm = get_llm(LLMRole.MAIN, config=self.agent_config)
+            bad_tools = llm.complete(prompt).text.split(", ")
+            if bad_tools:
+                raise ValueError(f"The Agent custom instructions mention these invalid tools: {', '.join(bad_tools)}")
+
+        # Create token counters for the main and tool LLMs
         main_tok = get_tokenizer_for_model(role=LLMRole.MAIN)
         self.main_token_counter = TokenCountingHandler(tokenizer=main_tok) if main_tok else None
         tool_tok = get_tokenizer_for_model(role=LLMRole.TOOL)
         self.tool_token_counter = TokenCountingHandler(tokenizer=tool_tok) if tool_tok else None
 
+        # Setup callback manager
         callbacks: list[BaseCallbackHandler] = [AgentCallbackHandler(self.agent_progress_callback)]
         if self.main_token_counter:
             callbacks.append(self.main_token_counter)
@@ -188,9 +219,9 @@ class Agent:
 
         if chat_history:
             msg_history = []
-            for inx, text in enumerate(chat_history):
-                role = MessageRole.USER if inx % 2 == 0 else MessageRole.ASSISTANT
-                msg_history.append(ChatMessage.from_str(content=text, role=role))
+            for text_pairs in chat_history:
+                msg_history.append(ChatMessage.from_str(content=text_pairs[0], role=MessageRole.USER))
+                msg_history.append(ChatMessage.from_str(content=text_pairs[1], role=MessageRole.ASSISTANT))
             self.memory = ChatMemoryBuffer.from_defaults(token_limit=128000, chat_history=msg_history)
         else:
             self.memory = ChatMemoryBuffer.from_defaults(token_limit=128000)
@@ -652,7 +683,6 @@ class Agent:
 
         for tool in self.tools:
             # Serialize each tool's metadata, function, and dynamic model schema (QueryArgs)
-            # TODO: deal with tools that have weakref (e.g. db_tools); for now those cannot be serialized.
             tool_dict = {
                 "tool_type": tool.metadata.tool_type.value,
                 "name": tool.metadata.name,

vectara_agentic/tools.py

@@ -17,7 +17,6 @@ from llama_index.indices.managed.vectara import VectaraIndex
 from llama_index.core.utilities.sql_wrapper import SQLDatabase
 from llama_index.core.tools.types import ToolMetadata, ToolOutput
 
-
 from .types import ToolType
 from .tools_catalog import ToolsCatalog, get_bad_topics
 from .db_tools import DBLoadSampleData, DBLoadUniqueValues, DBLoadData
@@ -100,9 +99,14 @@ class VectaraTool(FunctionTool):
         fn_schema: Optional[Type[BaseModel]] = None,
         async_fn: Optional[AsyncCallable] = None,
         tool_metadata: Optional[ToolMetadata] = None,
+        callback: Optional[Callable[[Any], Any]] = None,
+        async_callback: Optional[AsyncCallable] = None,
         tool_type: ToolType = ToolType.QUERY,
     ) -> "VectaraTool":
-        tool = FunctionTool.from_defaults(fn, name, description, return_direct, fn_schema, async_fn, tool_metadata)
+        tool = FunctionTool.from_defaults(
+            fn, name, description, return_direct, fn_schema, async_fn, tool_metadata,
+            callback, async_callback
+        )
         vectara_tool = cls(tool_type=tool_type, fn=tool.fn, metadata=tool.metadata, async_fn=tool.async_fn)
         return vectara_tool
 
@@ -302,6 +306,8 @@ class VectaraToolFactory:
         rerank_chain: List[Dict] = None,
         save_history: bool = True,
         verbose: bool = False,
+        vectara_base_url: str = "https://api.vectara.io",
+        vectara_verify_ssl: bool = True,
     ) -> VectaraTool:
         """
         Creates a Vectara search/retrieval tool
@@ -333,6 +339,8 @@ class VectaraToolFactory:
                 If using slingshot/multilingual_reranker_v1, it must be first in the list.
             save_history (bool, optional): Whether to save the query in history.
             verbose (bool, optional): Whether to print verbose output.
+            vectara_base_url (str, optional): The base URL for the Vectara API.
+            vectara_verify_ssl (bool, optional): Whether to verify SSL certificates for the Vectara API.
 
         Returns:
             VectaraTool: A VectaraTool object.
@@ -342,6 +350,8 @@ class VectaraToolFactory:
             vectara_api_key=self.vectara_api_key,
             vectara_corpus_key=self.vectara_corpus_key,
             x_source_str="vectara-agentic",
+            base_url=vectara_base_url,
+            verify_ssl=vectara_verify_ssl,
         )
 
         # Dynamically generate the search function
@@ -482,6 +492,8 @@ class VectaraToolFactory:
         save_history: bool = False,
         fcs_threshold: float = 0.0,
         verbose: bool = False,
+        vectara_base_url: str = "https://api.vectara.io",
+        vectara_verify_ssl: bool = True,
     ) -> VectaraTool:
         """
         Creates a RAG (Retrieve and Generate) tool.
@@ -532,6 +544,8 @@ class VectaraToolFactory:
             fcs_threshold (float, optional): A threshold for factual consistency.
                 If set above 0, the tool notifies the calling agent that it "cannot respond" if FCS is too low.
             verbose (bool, optional): Whether to print verbose output.
+            vectara_base_url (str, optional): The base URL for the Vectara API.
+            vectara_verify_ssl (bool, optional): Whether to verify SSL certificates for the Vectara API.
 
         Returns:
             VectaraTool: A VectaraTool object.
@@ -541,6 +555,8 @@ class VectaraToolFactory:
             vectara_api_key=self.vectara_api_key,
             vectara_corpus_key=self.vectara_corpus_key,
             x_source_str="vectara-agentic",
+            base_url=vectara_base_url,
+            verify_ssl=vectara_verify_ssl,
         )
 
         # Dynamically generate the RAG function
@@ -749,7 +765,6 @@ class ToolsFactory:
 
         # Get the tool spec class or function from the module
         tool_spec = getattr(module, tool_spec_name)
-
         func_type = LI_packages[tool_package_name]
         tools = tool_spec(**kwargs).to_tool_list()
         vtools = []

{vectara_agentic-0.2.1.dist-info → vectara_agentic-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: vectara_agentic
-Version: 0.2.1
+Version: 0.2.2
 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,19 +16,19 @@ 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.11
-Requires-Dist: llama-index-indices-managed-vectara==0.4.0
+Requires-Dist: llama-index==0.12.22
+Requires-Dist: llama-index-indices-managed-vectara==0.4.1
 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.3
-Requires-Dist: llama-index-llms-openai==0.3.18
-Requires-Dist: llama-index-llms-anthropic==0.6.4
+Requires-Dist: llama-index-agent-openai==0.4.6
+Requires-Dist: llama-index-llms-openai==0.3.25
+Requires-Dist: llama-index-llms-anthropic==0.6.7
 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.1
+Requires-Dist: llama-index-llms-fireworks==0.3.2
 Requires-Dist: llama-index-llms-cohere==0.4.0
-Requires-Dist: llama-index-llms-gemini==0.4.4
-Requires-Dist: llama-index-llms-bedrock==0.3.3
+Requires-Dist: llama-index-llms-gemini==0.4.11
+Requires-Dist: llama-index-llms-bedrock==0.3.4
 Requires-Dist: llama-index-tools-yahoo-finance==0.3.0
 Requires-Dist: llama-index-tools-arxiv==0.3.0
 Requires-Dist: llama-index-tools-database==0.3.0
@@ -38,8 +38,8 @@ Requires-Dist: llama-index-tools-neo4j==0.3.0
 Requires-Dist: llama-index-graph-stores-kuzu==0.6.0
 Requires-Dist: llama-index-tools-slack==0.3.0
 Requires-Dist: llama-index-tools-exa==0.3.0
-Requires-Dist: tavily-python==0.5.0
-Requires-Dist: exa-py==1.8.5
+Requires-Dist: tavily-python==0.5.1
+Requires-Dist: exa-py==1.8.9
 Requires-Dist: yahoo-finance==1.4.0
 Requires-Dist: openinference-instrumentation-llama-index==3.1.4
 Requires-Dist: opentelemetry-proto==1.26.0
@@ -50,7 +50,7 @@ Requires-Dist: tokenizers>=0.20
 Requires-Dist: pydantic==2.10.3
 Requires-Dist: retrying==1.3.4
 Requires-Dist: python-dotenv==1.0.1
-Requires-Dist: tiktoken==0.8.0
+Requires-Dist: tiktoken==0.9.0
 Requires-Dist: cloudpickle>=3.1.1
 Requires-Dist: httpx==0.27.2
 Dynamic: author

{vectara_agentic-0.2.1.dist-info → vectara_agentic-0.2.2.dist-info}/RECORD

@@ -1,23 +1,23 @@
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/endpoint.py,sha256=rnHyXEZhjipyR2Stj2Mum331REChWuhmn5WPpyDryV0,1291
-tests/test_agent.py,sha256=SzSE1T_9PyIs-LUjj-fJjfGDlpJBzHUigyVX-KEhmJ4,4967
+tests/endpoint.py,sha256=frnpdZQpnuQNNKNYgAn2rFTarNG8MCJaNA77Bw_W22A,1420
+tests/test_agent.py,sha256=xd_JdSakJfbLEDm5h2Z-p8KJIZM7F7Hwqd25qMha3L8,5409
 tests/test_private_llm.py,sha256=b7RrOHHsTQKARHskCbh2I4f_LmjZmD5bdk1oEWGhP7s,2150
 tests/test_tools.py,sha256=lPihJ5mRdK66exWqDFRPEYIM2kUDeGtoaiG78UH5WMs,3499
 vectara_agentic/__init__.py,sha256=ADH4fPKLbpGNYYYszv3c3QDOjPToPE_qh3LpkH_seCU,430
 vectara_agentic/_callback.py,sha256=jpzHqnl297k2qajYc-6nkPtIPtgVLpVWYEISHS7ySlM,9186
 vectara_agentic/_observability.py,sha256=HeQYJIkqPLW3EWHiXHatkaJzo08IQGESKujdeWTuRgk,3805
 vectara_agentic/_prompts.py,sha256=7xOcRf9XNtpfFpDIUzgb-yMQ516K8X7bAzayAp406FU,6595
-vectara_agentic/_version.py,sha256=r1kR7ilT4Tx4v5m7GtBI1hwUMe-C5VRwnozb3l382_0,65
-vectara_agentic/agent.py,sha256=LMnJJfw2udDrsZAVlYpji0_rkmasHOsCuv206UJpH7Q,32007
+vectara_agentic/_version.py,sha256=T1HvoeNWaV-7hM79Ns-wfsj8VWQtrCb1vYqbFa92N90,65
+vectara_agentic/agent.py,sha256=g064FBJXS98Qg-pqJYkSCfqiEJ8cPtpAnInm0N8ZfBc,33494
 vectara_agentic/agent_config.py,sha256=yof3zU8OgYE5441EAwcoDBpTHDM5lNN-CyeO0LrT4-c,3350
 vectara_agentic/agent_endpoint.py,sha256=QIMejCLlpW2qzXxeDAxv3anF46XMDdVMdKGWhJh3azY,1996
 vectara_agentic/db_tools.py,sha256=3_hPrutNIGEeU2kH503GjcYbtAMsK6BidQLIm6DT6C8,3591
-vectara_agentic/tools.py,sha256=gI6zsVNh2SfAOqeQ5ZzAmf8NxkmtV6NUPJsTN7Cnb7o,39440
+vectara_agentic/tools.py,sha256=bk4H1iUpo8Vjj9GtbNjAeZE2HpqbEpxspnnvxkqE2gs,40343
 vectara_agentic/tools_catalog.py,sha256=0gfF-JzTEnFS8e_x2uA6mvcvjVkY9ygRskxJetKGtrs,5231
 vectara_agentic/types.py,sha256=Qy7c7gSXJbvzddzhSRx2Flaf6a3go8u2LW17IKNxkKI,1603
 vectara_agentic/utils.py,sha256=ZhS82hA9yconr9yqDJ0GCBUjRxc06ZTlFaBzF67Yb3Y,5008
-vectara_agentic-0.2.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vectara_agentic-0.2.1.dist-info/METADATA,sha256=ZZpRSVHVy9gI9QsNHFKKtdYyl3DWbR_h_LyD6oX9bJw,21857
-vectara_agentic-0.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-vectara_agentic-0.2.1.dist-info/top_level.txt,sha256=Y7TQTFdOYGYodQRltUGRieZKIYuzeZj2kHqAUpfCUfg,22
-vectara_agentic-0.2.1.dist-info/RECORD,,
+vectara_agentic-0.2.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vectara_agentic-0.2.2.dist-info/METADATA,sha256=TEbmq0rzQ4dLo0D3VLkajDAeicYQb3VvwY61LVdWeKA,21858
+vectara_agentic-0.2.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+vectara_agentic-0.2.2.dist-info/top_level.txt,sha256=Y7TQTFdOYGYodQRltUGRieZKIYuzeZj2kHqAUpfCUfg,22
+vectara_agentic-0.2.2.dist-info/RECORD,,

{vectara_agentic-0.2.1.dist-info → vectara_agentic-0.2.2.dist-info}/WHEEL

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