Update agent.py
Browse files
agent.py
CHANGED
|
@@ -10,7 +10,7 @@ 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 |
-
|
| 14 |
from rmrkl import ChatZeroShotAgent, RetryAgentExecutor
|
| 15 |
from langchain_ollama import OllamaLLM
|
| 16 |
import base64
|
|
@@ -35,17 +35,28 @@ def _make_llm(model, temp, api_key, streaming: bool = False):
|
|
| 35 |
model_name=model,
|
| 36 |
max_tokens = 5000,
|
| 37 |
openai_api_key=api_key,
|
| 38 |
-
base_url=
|
| 39 |
)
|
| 40 |
elif model.startswith("gpt") or model.startswith("deepseek"):
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
elif model.startswith("llama") :
|
| 50 |
llm = OllamaLLM(model=model,
|
| 51 |
temperature = 0.1,
|
|
@@ -82,7 +93,7 @@ class TeLLAgent:
|
|
| 82 |
raise ValueError("Invalid OpenAI API key")
|
| 83 |
|
| 84 |
if tools is None:
|
| 85 |
-
api_keys["OPENAI_API_KEY"] =
|
| 86 |
tools_llm = _make_llm(tools_model, temp, openai_api_key, streaming)
|
| 87 |
tools = make_tools(tools_llm, api_keys=api_keys, verbose=verbose, image_path = image_path, file_path = file_path)
|
| 88 |
|
|
|
|
| 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
|
| 16 |
import base64
|
|
|
|
| 35 |
model_name=model,
|
| 36 |
max_tokens = 5000,
|
| 37 |
openai_api_key=api_key,
|
| 38 |
+
base_url=os.getenv("OPENAI_API_BASE")
|
| 39 |
)
|
| 40 |
elif model.startswith("gpt") or model.startswith("deepseek"):
|
| 41 |
+
if os.getenv("OPENAI_API_BASE"):
|
| 42 |
+
llm = ChatOpenAI(model=model,
|
| 43 |
+
temperature = 0.1,
|
| 44 |
+
|
| 45 |
+
timeout=1000,
|
| 46 |
+
|
| 47 |
+
callbacks=[StreamingStdOutCallbackHandler()],
|
| 48 |
+
openai_api_key=api_key,base_url = os.getenv("OPENAI_API_BASE")
|
| 49 |
+
)
|
| 50 |
+
else:
|
| 51 |
+
llm = ChatOpenAI(model=model,
|
| 52 |
+
temperature = 0.1,
|
| 53 |
+
|
| 54 |
+
timeout=1000,
|
| 55 |
+
|
| 56 |
+
callbacks=[StreamingStdOutCallbackHandler()],
|
| 57 |
+
openai_api_key=api_key
|
| 58 |
+
)
|
| 59 |
+
|
| 60 |
elif model.startswith("llama") :
|
| 61 |
llm = OllamaLLM(model=model,
|
| 62 |
temperature = 0.1,
|
|
|
|
| 93 |
raise ValueError("Invalid OpenAI API key")
|
| 94 |
|
| 95 |
if tools is None:
|
| 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 |
|