Skip to content

Commit

Permalink
since available tools can be infered from config, Chuanhu Assistant n…
Browse files Browse the repository at this point in the history
…ow uses GPT 3.5 by default, and uses GPT4-Turbo (preview) in Pro mode
  • Loading branch information
GaiZhenbiao committed Apr 10, 2024
1 parent faf1d94 commit 3fda5bb
Showing 1 changed file with 34 additions and 32 deletions.
66 changes: 34 additions & 32 deletions modules/models/ChuanhuAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@ def __init__(self, model_name, openai_api_key, user_name="") -> None:
super().__init__(model_name=model_name, user=user_name)
self.text_splitter = TokenTextSplitter(chunk_size=500, chunk_overlap=30)
self.api_key = openai_api_key
self.llm = ChatOpenAI(
openai_api_key=openai_api_key,
temperature=0,
model_name=default_chuanhu_assistant_model,
openai_api_base=os.environ.get("OPENAI_API_BASE", None),
)
self.cheap_llm = ChatOpenAI(
openai_api_key=openai_api_key,
temperature=0,
Expand All @@ -85,34 +79,29 @@ def __init__(self, model_name, openai_api_key, user_name="") -> None:
)
self.index_summary = None
self.index = None
self.tools = []
if "Pro" in self.model_name:
tools_to_enable = ["llm-math", "arxiv", "wikipedia"]
# if exists GOOGLE_CSE_ID and GOOGLE_API_KEY, enable google-search-results-json
if (
os.environ.get("GOOGLE_CSE_ID", None) is not None
and os.environ.get("GOOGLE_API_KEY", None) is not None
):
tools_to_enable.append("google-search-results-json")
else:
logging.warning(
"GOOGLE_CSE_ID and/or GOOGLE_API_KEY not found, google-search-results-json is disabled."
)
# if exists WOLFRAM_ALPHA_APPID, enable wolfram-alpha
if os.environ.get("WOLFRAM_ALPHA_APPID", None) is not None:
tools_to_enable.append("wolfram-alpha")
else:
logging.warning(
"WOLFRAM_ALPHA_APPID not found, wolfram-alpha is disabled."
)
# if exists SERPAPI_API_KEY, enable serpapi
if os.environ.get("SERPAPI_API_KEY", None) is not None:
tools_to_enable.append("serpapi")
else:
logging.warning("SERPAPI_API_KEY not found, serpapi is disabled.")
self.tools = load_tools(tools_to_enable, llm=self.llm)
self.llm = ChatOpenAI(
openai_api_key=openai_api_key,
model_name="gpt-4-turbo-preview",
openai_api_base=os.environ.get("OPENAI_API_BASE", None),
)
else:
self.llm = ChatOpenAI(
openai_api_key=openai_api_key,
model_name="gpt-3.5-turbo",
openai_api_base=os.environ.get("OPENAI_API_BASE", None),
)
tools_to_enable = ["llm-math", "arxiv", "wikipedia"]
# if exists GOOGLE_CSE_ID and GOOGLE_API_KEY, enable google-search-results-json
if (
os.environ.get("GOOGLE_CSE_ID", None) is not None
and os.environ.get("GOOGLE_API_KEY", None) is not None
):
tools_to_enable.append("google-search-results-json")
else:
self.tools = load_tools(
["ddg-search", "llm-math", "arxiv", "wikipedia"], llm=self.llm
logging.warning(
"GOOGLE_CSE_ID and/or GOOGLE_API_KEY not found, using DuckDuckGo instead."
)
self.tools.append(
Tool.from_function(
Expand All @@ -122,6 +111,19 @@ def __init__(self, model_name, openai_api_key, user_name="") -> None:
args_schema=GoogleSearchInput,
)
)
# if exists WOLFRAM_ALPHA_APPID, enable wolfram-alpha
if os.environ.get("WOLFRAM_ALPHA_APPID", None) is not None:
tools_to_enable.append("wolfram-alpha")
else:
logging.warning(
"WOLFRAM_ALPHA_APPID not found, wolfram-alpha is disabled."
)
# if exists SERPAPI_API_KEY, enable serpapi
if os.environ.get("SERPAPI_API_KEY", None) is not None:
tools_to_enable.append("serpapi")
else:
logging.warning("SERPAPI_API_KEY not found, serpapi is disabled.")
self.tools += load_tools(tools_to_enable, llm=self.llm)

self.tools.append(
Tool.from_function(
Expand Down

0 comments on commit 3fda5bb

Please sign in to comment.