kunthawat/ALwrity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API keys setup improvements & housekeeping

Browse Source
This commit is contained in:
ajaysi
2024-10-06 16:22:12 +05:30
parent adc7f157ea
commit 16bcd86bb7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
alwrity.py
View File

@@ -210,14 +210,14 @@ def sidebar_configuration():
def main(): def main():
#load_environment #load_environment
from dotenv import load_dotenv
load_dotenv() load_dotenv()
setup_ui() setup_ui()
setup_environment_paths()
sidebar_configuration() if check_all_api_keys():
check_all_api_keys() setup_environment_paths()
setup_tabs() sidebar_configuration()
modify_prompts_sidebar() setup_tabs()
modify_prompts_sidebar()
def setup_environment_paths(): def setup_environment_paths():

10
lib/utils/api_key_manager.py
View File

@@ -2,14 +2,15 @@ import os
import streamlit as st import streamlit as st
from dotenv import load_dotenv from dotenv import load_dotenv
@st.cache_data
def check_all_api_keys(): def check_all_api_keys():
""" """
Checks if all required API keys are present in the environment variables. Checks if all required API keys are present in the environment variables.
Prompts the user to enter missing keys and saves them in the .env file. Prompts the user to enter missing keys and saves them in the .env file.
This includes general API keys and the LLM provider key. This includes general API keys and the LLM provider key.
""" """
# Load environment variables from .env (MUST COME FIRST)
load_dotenv()
api_keys = { api_keys = {
"METAPHOR_API_KEY": "https://dashboard.exa.ai/login", "METAPHOR_API_KEY": "https://dashboard.exa.ai/login",
"TAVILY_API_KEY": "https://tavily.com/#api", "TAVILY_API_KEY": "https://tavily.com/#api",
@@ -18,6 +19,7 @@ def check_all_api_keys():
"FIRECRAWL_API_KEY": "https://www.firecrawl.dev/account" "FIRECRAWL_API_KEY": "https://www.firecrawl.dev/account"
} }
# Check for missing keys AFTER loading environment variables
missing_keys = { missing_keys = {
key: url for key, url in api_keys.items() if os.getenv(key) is None key: url for key, url in api_keys.items() if os.getenv(key) is None
} }
@@ -44,14 +46,18 @@ def check_all_api_keys():
if not os.getenv(api_key_var): if not os.getenv(api_key_var):
missing_keys[api_key_var] = '' missing_keys[api_key_var] = ''
# If there are missing keys, prompt the user to enter them
if missing_keys: if missing_keys:
st.warning(f"API keys not found: {', '.join(missing_keys)}. Please provide them below. Restart the app after saving the keys.") st.warning(f"API keys not found: {', '.join(missing_keys)}. Please provide them below. Restart the app after saving the keys.")
with st.form(key='api_keys_form'): with st.form(key='api_keys_form'):
# Gather all missing keys in one go
for key, url in missing_keys.items(): for key, url in missing_keys.items():
if url: if url:
st.text_input(f"{key}: 👉[Get it here]({url})👈", type="password", key=key) st.text_input(f"{key}: 👉[Get it here]({url})👈", type="password", key=key)
else: else:
st.text_input(f"{key}:", type="password", key=key) st.text_input(f"{key}:", type="password", key=key)
# Save all keys at once when the button is clicked
if st.form_submit_button("Save Keys"): if st.form_submit_button("Save Keys"):
with open(".env", "a") as env_file: with open(".env", "a") as env_file:
for key in missing_keys: for key in missing_keys: