Andy Lee commited on
Commit
aeb6ce6
·
1 Parent(s): c7ab3f4

fix: also support openrouter in app.py

Browse files
Files changed (2) hide show
  1. app.py +2 -10
  2. config.py +17 -0
app.py CHANGED
@@ -14,18 +14,10 @@ from config import (
14
  get_model_class,
15
  DEFAULT_MODEL,
16
  DEFAULT_TEMPERATURE,
 
17
  )
18
 
19
-
20
- # Simple API key setup
21
- if "OPENAI_API_KEY" in st.secrets:
22
- os.environ["OPENAI_API_KEY"] = st.secrets["OPENAI_API_KEY"]
23
- if "ANTHROPIC_API_KEY" in st.secrets:
24
- os.environ["ANTHROPIC_API_KEY"] = st.secrets["ANTHROPIC_API_KEY"]
25
- if "GOOGLE_API_KEY" in st.secrets:
26
- os.environ["GOOGLE_API_KEY"] = st.secrets["GOOGLE_API_KEY"]
27
- if "HF_TOKEN" in st.secrets:
28
- os.environ["HF_TOKEN"] = st.secrets["HF_TOKEN"]
29
 
30
 
31
  def convert_google_to_mapcrunch_url(google_url):
 
14
  get_model_class,
15
  DEFAULT_MODEL,
16
  DEFAULT_TEMPERATURE,
17
+ setup_environment_variables,
18
  )
19
 
20
+ setup_environment_variables(st.secrets)
 
 
 
 
 
 
 
 
 
21
 
22
 
23
  def convert_google_to_mapcrunch_url(google_url):
config.py CHANGED
@@ -94,6 +94,23 @@ MODELS_CONFIG = {
94
  },
95
  }
96
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
97
 
98
  def get_model_class(class_name):
99
  """Get actual model class from string name"""
 
94
  },
95
  }
96
 
97
+ POSSIBLE_API_KEYS = [
98
+ "OPENAI_API_KEY",
99
+ "ANTHROPIC_API_KEY",
100
+ "GOOGLE_API_KEY",
101
+ "HF_TOKEN",
102
+ "OPENROUTER_API_KEY",
103
+ ]
104
+
105
+
106
+ def setup_environment_variables(st_secrets=None):
107
+ for key in POSSIBLE_API_KEYS:
108
+ # Try Streamlit secrets first if provided
109
+ if st_secrets and key in st_secrets:
110
+ os.environ[key] = st_secrets[key]
111
+ elif key in os.environ:
112
+ continue
113
+
114
 
115
  def get_model_class(class_name):
116
  """Get actual model class from string name"""