Merge branch 'dev'

Author: AuLaSW

app.py

@@ -1,11 +1,14 @@
 from os import environ
-# import openai
+import openai
 from tests.unit.fixture import api
 from openaiclient.controller import Controller
-
-# get API key from usr folder
-# openai.api_key = environ["OPENAI_API_KEY"]
+from openaiclient.controller.controller import StartKey as sk
 
 controller = Controller(api)
 
-controller.start()
+# get API key from environment
+try:
+    openai.api_key = environ["OPENAI_API_KEY"]
+    controller.start()
+except Exception as err:
+    controller.start(sk.NO_API_KEY)

openaiclient/controller/controller.py

@@ -4,7 +4,7 @@
 
     * buildRequest - builds the request from a request object
 """
-
+from enum import Enum
 from openaiclient.model.request.completion import CompletionRequest
 from openaiclient.model.request.edit import EditRequest
 from openaiclient.model.models import Models
@@ -44,8 +44,12 @@ def __init__(self, api):
         # the response
         self._response = None
 
-    def start(self) -> None:
-        self.view.mainWindow()
+    def start(self, startVal) -> None:
+        match startVal:
+            case StartKey.GOOD_START:
+                self.view.mainWindow()
+            case StartKey.NO_API_KEY:
+                self.view.apiWindow()
 
     @property
     def models(self):
@@ -118,6 +122,10 @@ def getEditSettings(self):
         return self.getSettings(EditRequest)
     """
 
+class StartKey(Enum):
+    GOOD_START = 0
+    NO_API_KEY = 1
+
 
 if __name__ == "__main__":
 

openaiclient/model/request/completion.py

@@ -57,9 +57,13 @@ def __init__(self, module, models):
         self._settings.remove("prompt")
 
     def getResponse(self):
+    
+        request = dict(self._requestDict)
+        request['model'] = request['model'].name
+
         return Response(
             self._module.Completion.create(
-                **self._requestDict,
+                **request,
             )
         )
 

openaiclient/view/frame/apiframe.py

@@ -0,0 +1,193 @@
+"""
+APIFrame class
+"""
+from increment import Increment
+import tkinter as tk
+from tkinter import ttk
+import webbrowser
+import os
+import openai
+from openaiclient.view.frame import BaseFrame
+from tests.unit.fixture import api
+
+
+class APIFrame(BaseFrame):
+    """
+    A class for creating the frame for the API window when no
+    API key is discovered on startup
+    """
+    
+    def __init__(self, main, controller):
+        super().__init__(main, controller)
+        
+        self._api_key = tk.StringVar()
+
+    def create(self):
+        col = Increment()
+        row = Increment()
+        
+        tempFrame1 = tk.Frame(self.master)
+        
+        tempCol = Increment()
+        tempRow = Increment()
+        
+        self.addHorizSeparator(tempCol, tempRow, tempFrame1)
+        
+        tk.Label(
+            tempFrame1,
+            text=instruction.strip(),
+            justify=tk.LEFT,
+            font=("", 10, ""),
+        ).grid(
+            column=tempCol,
+            row=tempRow,
+            padx=10,
+            columnspan=2
+        )
+        
+        ~tempCol
+        +tempRow
+        
+        self.addHorizSeparator(tempCol, tempRow, tempFrame1)
+        
+        tempFrame1.grid(
+            column=col,
+            row=row,
+            columnspan=2
+        )
+        
+        ~tempCol
+        ~tempRow
+        
+        ~col
+        +row
+        
+        tempFrame2 = tk.Frame(self.master)
+        
+        tempCol = Increment()
+        tempRow = Increment()
+        
+        tk.Button(
+            tempFrame2,
+            text="Get API Key",
+            font=("", 10, ""),
+            command=self.getAPI
+        ).grid(
+            column=tempCol,
+            row=tempRow,
+            padx=10,
+            pady=(5,5),
+            ipadx=2
+        )
+        
+        +tempCol
+        
+        tk.Button(
+            tempFrame2,
+            text="Use Test API",
+            font=("", 10, ""),
+            command=self.setTestAPI
+        ).grid(
+            column=tempCol,
+            row=tempRow,
+            padx=10,
+            pady=(5,5),
+            ipadx=2
+        )
+        
+        tempFrame2.grid(
+            column=col,
+            row=row,
+            columnspan=2
+        )
+        
+        ~col
+        +row
+        
+        tk.Label(
+            self,
+            text="API Key:",
+            font=("", 10, ""),
+        ).grid(
+            column=col,
+            row=row,
+            pady=(5,10),
+            padx=(10,5),
+        )
+        
+        +col
+        
+        tk.Entry(
+            self,
+            width=30,
+            textvariable=self._api_key
+        ).grid(
+            column=col,
+            row=row,
+            pady=5,
+            padx=(5,10),
+        )
+        
+        ~col
+        +row
+        
+        tk.Button(
+            self,
+            text="Save API Key",
+            font=("", 10, ""),
+            width=30,
+            command=self.setAPIKey
+        ).grid(
+            column=col,
+            row=row,
+            pady=(5,10),
+            padx=10,
+            columnspan=2
+        )
+    
+    def addHorizSeparator(self, col, row, frame):
+        ~col
+        
+        ttk.Separator(
+            frame,
+            orient="horizontal",
+        ).grid(
+            column=col,
+            row=row,
+            columnspan=2,
+            sticky=tk.W+tk.E,
+            padx=10,
+            pady=5
+        )
+        
+        +row
+    
+    def getAPI(self):
+        api_url = "https://platform.openai.com/account/api-keys"
+        webbrowser.open(api_url)
+
+    def setTestAPI(self):
+        self.controller._api = api
+        self.master.destroy()
+        
+    def setAPIKey(self):
+        self.controller._module = openai
+        self.controller._module.api_key = \
+        os.environ['OPENAI_API_KEY'] = self._api_key.get()
+
+        self.master.destroy()
+
+
+instruction="""
+If you would like to use OpenAI's API,
+please log into your account and generate
+the API key there, then paste the API key
+into the designated space below. 
+
+You can also click the "Generate API Key"
+below to open the login link to get the 
+API key.
+
+If you just want to test out the application, 
+select the "Use Test API" button below.
+"""

openaiclient/view/frame/input/completioninput.py

@@ -2,6 +2,8 @@
 CompletionInput class
 """
 import tkinter as tk
+from tkinter import ttk
+from increment import Increment
 from openaiclient.view.frame.baseframe import BaseFrame
 
 
@@ -17,19 +19,45 @@ def __init__(self, main, controller):
         )
 
     def create(self):
+        row = Increment()
+        col = Increment()
+        
+        self.addHorizSeparator(col, row)
+        
         tk.Label(
+            self,
             text="Completion Endpoint",
-            font=("", 10, "")
+            font=("", 14, "")
         ).grid(
-            column=0,
-            row=1,
-            pady=10
+            column=col,
+            row=row,
+            pady=0
         )
+        
+        +row
+        
+        self.addHorizSeparator(col, row)
+        
+        """
+        tk.Button(
+            self,
+            text="test"
+        ).grid(
+            column=col,
+            row=row,
+            pady=10,
+            padx=10,
+            sticky=tk.W
+        )
+        """
+        
+        +row
 
         self._prompt.grid(
-            column=0,
-            row=1,
+            column=col,
+            row=row,
             padx=10,
+            pady=5
         )
 
         """
@@ -38,14 +66,16 @@ def create(self):
             self.underlineUpdate
         )
         """
+        
+        +row
 
         tk.Button(
             master=self,
             text="Send",
             command=self.sendInput
         ).grid(
-            column=0,
-            row=2,
+            column=col,
+            row=row,
             padx=10,
             pady=10,
             ipadx=40
@@ -54,6 +84,23 @@ def create(self):
         self.tags()
 
         return self
+    
+    def addHorizSeparator(self, col, row):
+        ~col
+        
+        ttk.Separator(
+            self,
+            orient="horizontal",
+        ).grid(
+            column=col,
+            row=row,
+            columnspan=2,
+            sticky=tk.W+tk.E,
+            padx=10,
+            pady=5
+        )
+        
+        +row
 
     def tags(self):
         pass