Merge pull request #4 from Josh-XT/main

Add configurable OpenAI-API type model's base URL and model name

Author: AmberSahdev

app/llm.py

@@ -63,8 +63,11 @@ class LLM:
 
     def __init__(self):
         settings_dict: dict[str, str] = Settings().get_dict()
-        if 'api_key' in settings_dict.keys() and settings_dict['api_key']:
-            os.environ["OPENAI_API_KEY"] = settings_dict['api_key']
+
+        base_url = settings_dict.get('base_url', 'https://api.openai.com/v1/').rstrip('/') + '/'
+        api_key = settings_dict.get('api_key')
+        if api_key:
+            os.environ["OPENAI_API_KEY"] = api_key
 
         path_to_context_file = Path(__file__).resolve().parent.joinpath('resources', 'context.txt')
         with open(path_to_context_file, 'r') as file:
@@ -81,7 +84,11 @@ def __init__(self):
             self.context += f'\nCustom user-added info: {settings_dict["custom_llm_instructions"]}.'
 
         self.client = OpenAI()
-        self.model = 'gpt-4-vision-preview'
+
+        self.model = settings_dict.get('model')
+        if not self.model:
+            self.model = 'gpt-4-vision-preview'
+        self.client = OpenAI(api_key=os.environ["OPENAI_API_KEY"], base_url=base_url)
 
     def get_instructions_for_objective(self, original_user_request: str, step_num: int = 0) -> dict[str, Any]:
         message: list[dict[str, Any]] = self.create_message_for_llm(original_user_request, step_num)

app/ui.py

@@ -26,6 +26,57 @@ def run(self) -> None:
     def display_current_status(self, text: str):
         self.main_window.update_message(text)
 
+    class AdvancedSettingsWindow(tk.Toplevel):
+        """
+        Self-contained settings sub-window for the UI
+        """
+
+        def __init__(self, parent):
+            super().__init__(parent)
+            self.title('Advanced Settings')
+            self.minsize(300, 300)
+            self.create_widgets()
+            self.settings = Settings()
+
+            # Populate UI
+            settings_dict = self.settings.get_dict()
+
+            if 'base_url' in settings_dict:
+                self.base_url_entry.insert(0, settings_dict['base_url'])
+            if 'model' in settings_dict:
+                self.model_entry.insert(0, settings_dict['model'])
+
+        def create_widgets(self) -> None:
+            label_base_url = tk.Label(self, text='Custom OpenAI-Like API Model Base URL')
+            label_base_url.pack(pady=10)
+
+            # Entry for Base URL
+            self.base_url_entry = ttk.Entry(self, width=30)
+            self.base_url_entry.pack()
+
+            # Model Label
+            label_model = tk.Label(self, text='Custom Model Name:')
+            label_model.pack(pady=10)
+
+            # Entry for Model
+            self.model_entry = ttk.Entry(self, width=30)
+            self.model_entry.pack()
+
+            # Save Button
+            save_button = ttk.Button(self, text='Save Settings', command=self.save_button)
+            save_button.pack(pady=20)
+
+        def save_button(self) -> None:
+            base_url = self.base_url_entry.get().strip()
+            model = self.model_entry.get().strip()
+            settings_dict = {
+                "base_url": base_url,
+                "model": model,
+            }
+
+            self.settings.save_settings_to_file(settings_dict)
+            self.destroy()
+
     class SettingsWindow(tk.Toplevel):
         """
         Self-contained settings sub-window for the UI
@@ -86,7 +137,11 @@ def create_widgets(self) -> None:
 
             # Save Button
             save_button = ttk.Button(self, text='Save Settings', command=self.save_button)
-            save_button.pack(pady=20)
+            save_button.pack(pady=(10, 0))
+
+            # Button to open Advanced Settings
+            advanced_settings_button = ttk.Button(self, text='Advanced Settings', command=self.open_advanced_settings)
+            advanced_settings_button.pack(pady=(0, 10))
 
             # Hyperlink Label
             link_label = tk.Label(self, text='Instructions', fg='#499CE4')
@@ -111,6 +166,10 @@ def save_button(self) -> None:
             self.settings.save_settings_to_file(settings_dict)
             self.destroy()
 
+        def open_advanced_settings(self):
+            # Open the advanced settings window
+            UI.AdvancedSettingsWindow(self)
+
     class MainWindow(tk.Tk):
         def __init__(self):
             super().__init__()

app/utils/settings.py

@@ -16,6 +16,7 @@ def get_dict(self) -> dict[str, str]:
     def save_settings_to_file(self, settings_dict) -> None:
         settings: dict[str, str] = {}
 
+        # Preserve previous settings in case new dict doesn't contain them
         if os.path.exists(self.settings_file_path):
             with open(self.settings_file_path, 'r') as file:
                 try: