jinysun commited on
Commit
320ed98
·
verified ·
1 Parent(s): c5b57db

Update agent.py

Browse files
Files changed (1) hide show
  1. agent.py +6 -5
agent.py CHANGED
@@ -9,7 +9,7 @@ from pydantic import ValidationError
9
  from langchain.agents import AgentExecutor
10
  from langchain.agents.mrkl.base import ZeroShotAgent
11
  from prompts import FORMAT_INSTRUCTIONS, QUESTION_PROMPT, QUESTION_PROMPT1, SUFFIX
12
- from tools import make_tools
13
  import os
14
  from rmrkl import ChatZeroShotAgent, RetryAgentExecutor
15
  from langchain_ollama import OllamaLLM
@@ -96,7 +96,10 @@ class TeLLAgent:
96
  api_keys["OPENAI_API_KEY"] = os.getenv("OPENAI_API_KEY")
97
  tools_llm = _make_llm(tools_model, temp, openai_api_key, streaming)
98
  tools = make_tools(tools_llm, api_keys=api_keys, verbose=verbose, image_path = image_path, file_path = file_path)
99
-
 
 
 
100
  # Initialize agent
101
  self.agent_executor1 = RetryAgentExecutor.from_agent_and_tools(
102
  tools=tools,
@@ -133,6 +136,4 @@ class TeLLAgent:
133
  else:
134
  prompt = str(' ' + outputs["input"] + ' ' + outputs["intermediate_steps"][0][0].log.split('Action')[0].replace("*", ""))
135
  outputs = self.agent_executor2.invoke( {"input": prompt})
136
- return outputs['output']
137
-
138
-
 
9
  from langchain.agents import AgentExecutor
10
  from langchain.agents.mrkl.base import ZeroShotAgent
11
  from prompts import FORMAT_INSTRUCTIONS, QUESTION_PROMPT, QUESTION_PROMPT1, SUFFIX
12
+ from tools import make_tools , drug_tools
13
  import os
14
  from rmrkl import ChatZeroShotAgent, RetryAgentExecutor
15
  from langchain_ollama import OllamaLLM
 
96
  api_keys["OPENAI_API_KEY"] = os.getenv("OPENAI_API_KEY")
97
  tools_llm = _make_llm(tools_model, temp, openai_api_key, streaming)
98
  tools = make_tools(tools_llm, api_keys=api_keys, verbose=verbose, image_path = image_path, file_path = file_path)
99
+ if tools == 'drug':
100
+ api_keys["OPENAI_API_KEY"] = os.getenv("OPENAI_API_KEY")
101
+ tools_llm = _make_llm(tools_model, temp, openai_api_key, streaming)
102
+ tools = drug_tools(tools_llm, api_keys=api_keys, verbose=verbose, image_path = image_path, file_path = file_path)
103
  # Initialize agent
104
  self.agent_executor1 = RetryAgentExecutor.from_agent_and_tools(
105
  tools=tools,
 
136
  else:
137
  prompt = str(' ' + outputs["input"] + ' ' + outputs["intermediate_steps"][0][0].log.split('Action')[0].replace("*", ""))
138
  outputs = self.agent_executor2.invoke( {"input": prompt})
139
+ return outputs['output']