errchh commited on
Commit
58a8b47
·
1 Parent(s): 549efa5

change formatted result

Browse files
Files changed (2) hide show
  1. agent.py +3 -4
  2. app.py +1 -1
agent.py CHANGED
@@ -100,7 +100,7 @@ def search_wiki(query: str) -> Dict[str, str]:
100
  docs = WikipediaQueryRun(api_wrapper=WikipediaAPIWrapper())
101
  docs.run(query)
102
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
103
- return {"wiki_results": formatted_result}
104
 
105
 
106
  # internet search tool
@@ -114,7 +114,7 @@ def search_web(query: str) -> Dict[str, str]:
114
  docs = DuckDuckGoSearchResults(api_wrapper=wrapper)
115
  docs.invoke(query)
116
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
117
- return {"web_results": formatted_result}
118
 
119
 
120
  # ArXiv search tool
@@ -127,7 +127,7 @@ def search_arxiv(query: str) -> Dict[str, str]:
127
  arxiv = ArxivAPIWrapper()
128
  docs = arxiv.run(query)
129
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
130
- return {"arxiv_results": formatted_result}
131
 
132
 
133
  # build retriever
@@ -155,7 +155,6 @@ tools = [
155
  ]
156
 
157
 
158
-
159
  # build graph function
160
  def build_graph():
161
  # llm
 
100
  docs = WikipediaQueryRun(api_wrapper=WikipediaAPIWrapper())
101
  docs.run(query)
102
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
103
+ return formatted_result
104
 
105
 
106
  # internet search tool
 
114
  docs = DuckDuckGoSearchResults(api_wrapper=wrapper)
115
  docs.invoke(query)
116
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
117
+ return formatted_result
118
 
119
 
120
  # ArXiv search tool
 
127
  arxiv = ArxivAPIWrapper()
128
  docs = arxiv.run(query)
129
  formatted_result = f'<Document source="{docs.metadata["source"]}" page="{docs.metadata.get("page", "")}"/>\n{docs.page_content}\n</Document>'
130
+ return formatted_result
131
 
132
 
133
  # build retriever
 
155
  ]
156
 
157
 
 
158
  # build graph function
159
  def build_graph():
160
  # llm
app.py CHANGED
@@ -25,7 +25,7 @@ class BasicAgent:
25
  messages = [HumanMessage(content=question)]
26
  messages = self.graph.invoke({"messages": messages})
27
  answer = messages['messages'][-1].content
28
- return answer[14:]
29
 
30
 
31
  def run_and_submit_all( profile: gr.OAuthProfile | None):
 
25
  messages = [HumanMessage(content=question)]
26
  messages = self.graph.invoke({"messages": messages})
27
  answer = messages['messages'][-1].content
28
+ return answer
29
 
30
 
31
  def run_and_submit_all( profile: gr.OAuthProfile | None):