Resolve issue with key logic

Dockerfile

@@ -15,4 +15,4 @@ ENV PATH="/root/.local/bin:${PATH}"
 EXPOSE 8501
 EXPOSE 7000
 
-CMD python server.py 
+CMD python server.py --port 7000

modules/knowledge_retrieval/base/router_chain.py

@@ -1,4 +1,5 @@
 from modules.base.chain import IChain
+from modules.settings.user_settings import UserSettings
 from typing import Dict , Any, Callable
 import os
 
@@ -22,7 +23,7 @@ class RouterChain(IChain):
     question: str
     usage: str
     llm: Any
-    api_key: str = os.environ.get('OPENAI_API_KEY')
+    api_key: str 
 
     def add_chain(self, domain: str, chain: IChain) -> None:
         self.destination_chains[domain] = chain

modules/knowledge_retrieval/component.py

@@ -4,12 +4,12 @@ import gradio as gr
 import os 
 
 
-def determine_and_execute(question: str, temperature: float, api_key = "" ):
+def determine_and_execute(question: str, temperature: float):
     settings = UserSettings.get_instance()
-    api_key = settings.get_api_key()
+
     config = get_knowledge_domain_router_config(temperature=temperature)
     config.temperature = temperature
-    determiner = KnowledgeDomainRouter(api_key=api_key, config=config, question=question, display=print)
+    determiner = KnowledgeDomainRouter(config=config, question=question, display=print)
     determine_output, execute_output = determiner.determine_and_execute(question=question)
     return determine_output, execute_output
 

modules/knowledge_retrieval/destination_chain.py

@@ -1,6 +1,7 @@
 from modules.base.chain import IChain
 from modules.base.llm_chain_config import LLMChainConfig
 from modules.knowledge_retrieval.base.knowledge_domain import KnowledgeDomain
+from modules.settings.user_settings import UserSettings
 from typing import Dict , Any, Callable
 import os
 
@@ -21,7 +22,7 @@ class DestinationChain(IChain):
     DestinationChain class will return a response generated by the KnowledgeDomain.
     """
     knowledge_domain: KnowledgeDomain
-    api_key: str = os.environ.get('OPENAI_API_KEY')
+    api_key: str 
     llm: Any
     display: Callable
     usage: str
@@ -33,7 +34,12 @@ class DestinationChainStrategy(DestinationChain):
     """Base class for Chain Strategies"""
     
     def __init__(self, config: LLMChainConfig, display: Callable, knowledge_domain: KnowledgeDomain, usage: str):
-        super().__init__(knowledge_domain=knowledge_domain, llm=config.llm_class, display=display, usage=usage)
+        settings = UserSettings.get_instance()
+        api_key = settings.get_api_key()
+        print("Api key")
+        print(api_key)
+        super().__init__(api_key=api_key, knowledge_domain=knowledge_domain, llm=config.llm_class, display=display, usage=usage)
+        
         self.llm = config.llm_class(temperature=config.temperature, max_tokens=config.max_tokens)
         
         self.usage = config.usage

modules/knowledge_retrieval/knowledge_router.py

@@ -9,11 +9,14 @@ from modules.knowledge_retrieval.destination_chain import DestinationChainStrate
 from langchain import PromptTemplate, LLMChain
 
 import pprint
+from modules.settings.user_settings import UserSettings
 from typing import Callable, Dict, Optional, Tuple
 import re
 
 class KnowledgeDomainRouter(RouterChain):
-    def __init__(self, api_key: str, config: LLMChainConfig, question: str, display: Callable):
+    def __init__(self, config: LLMChainConfig, question: str, display: Callable):
+        settings = UserSettings.get_instance()
+        
         chains : Dict[int, DestinationChainStrategy] = {
         1: BusinessChain(config=get_business_chain_config(), display=display),
         2: FamilyChain(config=get_family_chain_config(), display=display),
@@ -36,11 +39,12 @@ class KnowledgeDomainRouter(RouterChain):
 
             The number and name of the selected strategy is...
             """
-
-        super().__init__(template = template, api_key = api_key, destination_chains=chains, usage=config.usage, llm=config.llm_class, question=question)
+        api_key = settings.get_api_key()
+        super().__init__(api_key=api_key, template = template, destination_chains=chains, usage=config.usage, llm=config.llm_class, question=question)
+        self.api_key = settings.get_api_key()
         print("Creating Knowledge Domain Router with config: ")
         # pprint.pprint(config)
-        self.llm = config.llm_class(temperature=config.temperature, max_tokens=config.max_tokens, api_key=api_key)
+        self.llm = config.llm_class(temperature=config.temperature, max_tokens=config.max_tokens, api_key=self.api_key)
         self.question: str = question
 
     def run(self, question: str) -> str:

modules/reasoning/component.py

@@ -1,8 +1,6 @@
 from modules.reasoning.reasoning_router import ReasoningRouter, get_reasoning_router_config
 from modules.settings.user_settings import UserSettings
 import gradio as gr
-import os 
-openai_api_key = os.getenv("OPENAI_API_KEY")
 
 
 def determine_and_execute(question, temperature):

modules/settings/component.py

@@ -8,7 +8,8 @@ def set_api_key(key: str):
 
 def create_settings_ui():
     settings = UserSettings.get_instance()
-    api_key = gr.Textbox(label="You OpenAI API key", type="password", default=settings.get_api_key())
+    api_key_default = settings.get_api_key()
+    api_key = gr.Textbox(label="You OpenAI API key", type="password")
     set_status = gr.Text()
     key_button = gr.Button(label="Set Key")
     key_button.click(set_api_key, outputs=[set_status], inputs=[api_key])

modules/settings/user_settings.py

@@ -16,6 +16,7 @@ class UserSettings:
 
     def set_api_key(self, api_key):
         self.api_key = api_key
+        os.environ["OPENAI_API_KEY"] = api_key
 
     def get_api_key(self):
         return self.api_key

server.py

@@ -30,7 +30,7 @@ if __name__ == "__main__":
     args = parser.parse_args()
 
     port = args.port
-    settings = UserSettings().get_instance()
+    settings = UserSettings.get_instance()
     if openai_api_key:
         settings.set_api_key(openai_api_key)
     create_interface()