updated

agent.py

@@ -24,29 +24,17 @@ get_headers = {
     "Connection": "keep-alive",
 }
 
-def create_assistant_tools(cfg, agent_config):
-    
-    class QueryHackerNews(BaseModel):
-        query: str = Field(..., description="The user query.")
-
-    vec_factory = VectaraToolFactory(vectara_api_key=cfg.api_key, 
-                                     vectara_corpus_key=cfg.corpus_key)
-    summarizer = 'vectara-summary-ext-24-05-med-omni'
-    ask_hackernews = vec_factory.create_rag_tool(
-        tool_name = "ask_hackernews",
-        tool_description = """
-        Provides information on any topic or query, based on relevant hacker news stories.
-        """,
-        tool_args_schema = QueryHackerNews,
-        reranker = "multilingual_reranker_v1", rerank_k = 100, 
-        n_sentences_before = 2, n_sentences_after = 2, lambda_val = 0.0,
-        summary_num_results = 10,
-        vectara_summarizer = summarizer,
-        include_citations = True,
-        verbose=True
-    )
+class AgentTools:
+    def __init__(self, _cfg, agent_config):
+        self.tools_factory = ToolsFactory()
+        self.agent_config = agent_config
+        self.cfg = _cfg
+        self.vec_factory = VectaraToolFactory(vectara_api_key=_cfg.api_key,
+                                              vectara_corpus_key=_cfg.corpus_key)
+
 
     def get_top_stories(
+            self,
             n_stories: int = Field(default=10, description="The number of top stories to return.")
     ) -> list[str]:
         """
@@ -58,6 +46,7 @@ def create_assistant_tools(cfg, agent_config):
         return top_stories[:n_stories]
 
     def get_show_stories(
+            self,
             n_stories: int = Field(default=10, description="The number of top SHOW HN stories to return.")
     ) -> list[str]:
         """
@@ -69,6 +58,7 @@ def create_assistant_tools(cfg, agent_config):
         return top_stories[:n_stories]
 
     def get_ask_stories(
+            self,
             n_stories: int = Field(default=10, description="The number of top ASK HN stories to return.")
     ) -> list[str]:
         """
@@ -80,16 +70,17 @@ def create_assistant_tools(cfg, agent_config):
         return top_stories[:n_stories]
 
     def get_story_details(
+            self,
             story_id: str = Field(..., description="The story ID.")
     ) -> Tuple[str, str]:
         """
         Get the title, url and external link of a story from hacker news.
         Returns:
-         - The title of the story (str)
-         - The main URL of the story (str)
-         - The external link pointed to in the story (str)
-         - The author of the story
-         - The number of descendants (comments + replies) of the story
+            - The title of the story (str)
+            - The main URL of the story (str)
+            - The external link pointed to in the story (str)
+            - The author of the story
+            - The number of descendants (comments + replies) of the story
         """
         db_url = 'https://hacker-news.firebaseio.com/v0/'
         story = requests.get(f"{db_url}item/{story_id}.json").json()
@@ -97,6 +88,7 @@ def create_assistant_tools(cfg, agent_config):
         return story['title'], story_url, story['url'], story['by'], story['descendants']
 
     def get_story_text(
+            self,
             story_id: str = Field(..., description="The story ID.")
     ) -> str:
         """
@@ -112,6 +104,7 @@ def create_assistant_tools(cfg, agent_config):
         return text
 
     def whats_new(
+            self,
             n_stories: int = Field(default=10, description="The number of new stories to return.")
     ) -> list[str]:
         """
@@ -119,31 +112,53 @@ def create_assistant_tools(cfg, agent_config):
         by summarizing the content and comments of top stories.
         Returns a string with the summary.
         """
-        stories = get_top_stories(n_stories)
-        texts = [get_story_text(story_id) for story_id in stories[:n_stories]]
+        stories = self.get_top_stories(n_stories)
+        texts = [self.get_story_text(story_id) for story_id in stories[:n_stories]]
         all_stories = '---------\n\n'.join(texts)
-        summarize_text = ToolsCatalog(agent_config).summarize_text
+        summarize_text = ToolsCatalog(AgentConfig()).summarize_text
         return summarize_text(all_stories)
-    
-    tools_factory = ToolsFactory()
-    return (
-        [ask_hackernews] + 
-        [tools_factory.create_tool(tool) for tool in 
-            [
-                get_top_stories, 
-                get_show_stories,
-                get_ask_stories,
-                get_story_details,
-                get_story_text,
-                whats_new,
-            ]
-        ] +
-        tools_factory.get_llama_index_tools(
-            "tavily_research", "TavilyToolSpec", 
-            tool_name_prefix="tavily", api_key=cfg.tavily_api_key
-        ) +
-        tools_factory.standard_tools()
-    )
+
+
+    def get_tools(self):
+        class QueryHackerNews(BaseModel):
+            query: str = Field(..., description="The user query.")
+
+        vec_factory = VectaraToolFactory(vectara_api_key=cfg.api_key, 
+                                        vectara_corpus_key=cfg.corpus_key)
+        summarizer = 'vectara-summary-ext-24-05-med-omni'
+        ask_hackernews = vec_factory.create_rag_tool(
+            tool_name = "ask_hackernews",
+            tool_description = """
+            Provides information on any topic or query, based on relevant hacker news stories.
+            """,
+            tool_args_schema = QueryHackerNews,
+            reranker = "multilingual_reranker_v1", rerank_k = 100, 
+            n_sentences_before = 2, n_sentences_after = 2, lambda_val = 0.0,
+            summary_num_results = 10,
+            vectara_summarizer = summarizer,
+            include_citations = True,
+            verbose=True
+        )
+        
+        tools_factory = ToolsFactory()
+        return (
+            [ask_hackernews] + 
+            [tools_factory.create_tool(tool) for tool in 
+                [
+                    self.get_top_stories, 
+                    self.get_show_stories,
+                    self.get_ask_stories,
+                    self.get_story_details,
+                    self.get_story_text,
+                    self.whats_new,
+                ]
+            ] +
+            tools_factory.get_llama_index_tools(
+                "tavily_research", "TavilyToolSpec", 
+                tool_name_prefix="tavily", api_key=self.cfg.tavily_api_key
+            ) +
+            tools_factory.standard_tools()
+        )
 
 def initialize_agent(_cfg, agent_progress_callback = None):
     bot_instructions = """
@@ -158,7 +173,7 @@ def initialize_agent(_cfg, agent_progress_callback = None):
     """
     agent_config = AgentConfig()
     agent = Agent(
-        tools=create_assistant_tools(_cfg, agent_config),
+        tools=AgentTools(_cfg, agent_config).get_tools(),
         topic="hacker news",
         custom_instructions=bot_instructions,
         agent_progress_callback=agent_progress_callback,

requirements.txt

@@ -6,5 +6,5 @@ streamlit_feedback==0.1.3
 uuid==1.30
 langdetect==1.0.9
 langcodes==3.4.0
-vectara-agentic==0.2.0
+vectara-agentic==0.2.1