Removing Dependence on secrets.toml for environment variables

.gitignore

@@ -2,3 +2,5 @@
 .streamlit
 .venv
 __pycache__
+.env
+_trouble/

1_🏠_Home.py

@@ -1,5 +1,6 @@
 import streamlit as st
 from streamlit_pills import pills
+import os
 
 from st_utils import (
  add_builder_config,
@@ -29,7 +30,10 @@
  "To build a new agent, please make sure that 'Create a new agent' is selected.",
  icon="ℹ️",
 )
-if "metaphor_key" in st.secrets:
+# removing all use of st.secrets
+# relying on good old fashioned env vars
+# if "metaphor_key" in st.secrets:
+if "metaphor_key" in os.environ:
  st.info("**NOTE**: The ability to add web search is enabled.")
 
 

cache/agents/agent_ids.json

@@ -0,0 +1 @@
+{"agent_ids": []}

core/agent_builder/loader.py

@@ -14,7 +14,8 @@
 from core.agent_builder.registry import AgentCacheRegistry
 from core.agent_builder.base import RAGAgentBuilder, BaseRAGAgentBuilder
 from core.agent_builder.multimodal import MultimodalRAGAgentBuilder
-
+# importing os to get env vars
+import os
 ####################
 #### META Agent ####
 ####################
@@ -47,8 +48,10 @@ def _get_builder_agent_tools(agent_builder: RAGAgentBuilder) -> List[FunctionToo
  """Get list of builder agent tools to pass to the builder agent."""
  # see if metaphor api key is set, otherwise don't add web tool
  # TODO: refactor this later
-
- if "metaphor_key" in st.secrets:
+ # removing all use of st.secrets
+ # relying on good old fashioned env vars
+ #if "metaphor_key" in st.secrets:
+ if "METAPHOR_KEY" in os.environ:
  fns: List[Callable] = [
  agent_builder.create_system_prompt,
  agent_builder.load_data,

core/builder_config.py

@@ -1,17 +1,23 @@
 """Configuration."""
-import streamlit as st
+# no streamlit import here, to ensure we aren't relying on streamlit
+# import streamlit as st
+# adding os to allow for env vars
 import os
 
+
 ### DEFINE BUILDER_LLM #####
 ## Uncomment the LLM you want to use to construct the meta agent
 
 ## OpenAI
 from llama_index.llms import OpenAI
 
+# nickknyc's OpenAI key routine
+openai_api_key = os.getenv("OPENAI_API_KEY")
+# removing Streamlit secrets in favor of env vars
 # set OpenAI Key - use Streamlit secrets
-os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
+# os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
 # load LLM
-BUILDER_LLM = OpenAI(model="gpt-4-1106-preview")
+BUILDER_LLM = OpenAI(model="gpt-4-1106-preview",api_key=openai_api_key)
 
 # # Anthropic (make sure you `pip install anthropic`)
 # from llama_index.llms import Anthropic

core/utils.py

@@ -80,18 +80,20 @@ def _resolve_llm(llm_str: str) -> LLM:
  # - if there is, resolve it
  tokens = llm_str.split(":")
  if len(tokens) == 1:
- os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
+ # removing all instances of relying on st.secrets
+ # because using env vars is more well understood and works in all cases
+ # os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
  llm: LLM = OpenAI(model=llm_str)
  elif tokens[0] == "local":
  llm = resolve_llm(llm_str)
  elif tokens[0] == "openai":
- os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
+ # os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
  llm = OpenAI(model=tokens[1])
  elif tokens[0] == "anthropic":
- os.environ["ANTHROPIC_API_KEY"] = st.secrets.anthropic_key
+ # os.environ["ANTHROPIC_API_KEY"] = st.secrets.anthropic_key
  llm = Anthropic(model=tokens[1])
  elif tokens[0] == "replicate":
- os.environ["REPLICATE_API_KEY"] = st.secrets.replicate_key
+ # os.environ["REPLICATE_API_KEY"] = st.secrets.replicate_key
  llm = Replicate(model=tokens[1])
  else:
  raise ValueError(f"LLM {llm_str} not recognized.")
@@ -305,7 +307,8 @@ def get_web_agent_tool() -> QueryEngineTool:
 
  # TODO: set metaphor API key
  metaphor_tool = MetaphorToolSpec(
- api_key=st.secrets.metaphor_key,
+ #api_key=st.secrets.metaphor_key,
+ api_key=os.environ["METAPHOR_KEY"],
  )
  metaphor_tool_list = metaphor_tool.to_tool_list()
 
@@ -437,7 +440,7 @@ def construct_mm_agent(
  # first resolve llm and embedding model
  embed_model = resolve_embed_model(rag_params.embed_model)
  # TODO: use OpenAI for now
- os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
+ # os.environ["OPENAI_API_KEY"] = st.secrets.openai_key
  openai_mm_llm = OpenAIMultiModal(model="gpt-4-vision-preview", max_new_tokens=1500)
 
  # first let's index the data with the right parameters

requirements.txt

@@ -5,3 +5,5 @@ llama-hub==0.0.44
 # NOTE: this is due to a trivial dependency in the web tool, will refactor
 langchain==0.0.305
 pypdf
+# a dependency of the web tool - was failing when not specified
+metaphor-python