Entz commited on
Commit
0db9fe9
·
verified ·
1 Parent(s): ba30b20

Upload 2 files

Browse files
Files changed (2) hide show
  1. app.py +6 -16
  2. requirements.txt +2 -1
app.py CHANGED
@@ -22,28 +22,18 @@ def setup_client(provider):
22
  if not api_key:
23
  st.error("OPENAI_API_KEY not set in environment variables.")
24
  return None, None, None
25
- client = instructor.from_openai(AsyncOpenAI(api_key=api_key))
 
 
26
  model = "gpt-4o-mini"
27
  display_model = "OpenAI (gpt-4o-mini)"
28
  elif provider == "ollama":
29
  from openai import AsyncOpenAI as OllamaClient
30
- client = instructor.from_openai(
31
- OllamaClient(base_url="http://localhost:11434/v1", api_key="ollama"), mode=instructor.Mode.JSON
32
- )
33
  model = "llama3"
34
  display_model = "Ollama (llama3)"
35
- # elif provider == "gemini":
36
- # from openai import AsyncOpenAI
37
- # api_key = os.getenv("GEMINI_API_KEY")
38
- # if not api_key:
39
- # st.error("GEMINI_API_KEY not set in environment variables.")
40
- # return None, None, None
41
- # client = instructor.from_openai(
42
- # AsyncOpenAI(api_key=api_key, base_url="https://generativelanguage.googleapis.com/v1beta/openai/"),
43
- # mode=instructor.Mode.JSON,
44
- # )
45
- # model = "gemini-2.0-flash-exp"
46
- # display_model = "Gemini (gemini-2.0-flash-exp)"
47
  else:
48
  st.error(f"Unsupported provider: {provider}")
49
  return None, None, None
 
22
  if not api_key:
23
  st.error("OPENAI_API_KEY not set in environment variables.")
24
  return None, None, None
25
+ # Explicitly pass only the required arguments to AsyncOpenAI
26
+ openai_client = AsyncOpenAI(api_key=api_key)
27
+ client = instructor.from_openai(openai_client)
28
  model = "gpt-4o-mini"
29
  display_model = "OpenAI (gpt-4o-mini)"
30
  elif provider == "ollama":
31
  from openai import AsyncOpenAI as OllamaClient
32
+ # Explicitly pass only the required arguments to OllamaClient
33
+ ollama_client = OllamaClient(base_url="http://localhost:11434/v1", api_key="ollama")
34
+ client = instructor.from_openai(ollama_client, mode=instructor.Mode.JSON)
35
  model = "llama3"
36
  display_model = "Ollama (llama3)"
 
 
 
 
 
 
 
 
 
 
 
 
37
  else:
38
  st.error(f"Unsupported provider: {provider}")
39
  return None, None, None
requirements.txt CHANGED
@@ -1,4 +1,5 @@
1
  streamlit==1.38.0
2
  instructor==1.3.4
3
  atomic-agents==0.2.1
4
- python-dotenv==1.0.1
 
 
1
  streamlit==1.38.0
2
  instructor==1.3.4
3
  atomic-agents==0.2.1
4
+ python-dotenv==1.0.1
5
+ openai==1.40.0