Merge pull request #64 from dasmy/dev/models_selection

Dev/models selection

Author: ricklamers

.env.azure-example

@@ -3,7 +3,8 @@ OPENAI_API_TYPE=azure
 OPENAI_BASE_URL=https://your-resource-name.openai.azure.com
 OPENAI_API_VERSION=2023-03-15-preview
 # OPENAI_EXTRA_HEADERS={"key": "value"}
-AZURE_OPENAI_DEPLOYMENT=your-model-deployment-name
+AZURE_OPENAI_DEPLOYMENTS=[{"displayName": "GPT-3.5", "name": "your-gpt-3.5-deployment"}, {"displayName": "GPT-4", "name": "your-gpt-4-deployment"}]
+# OPENAI_API_LOGLEVEL=debug
 API_PORT=5010
 WEB_PORT=8080
 SNAKEMQ_PORT=8765

.env.example

@@ -3,6 +3,8 @@ OPENAI_API_TYPE=openai
 OPENAI_BASE_URL=https://api.openai.com
 OPENAI_API_VERSION=2023-03-15-preview
 # OPENAI_EXTRA_HEADERS={"key": "value"}
+OPENAI_MODELS=[{"displayName": "GPT-3.5", "name": "gpt-3.5-turbo"}, {"displayName": "GPT-4", "name": "gpt-4"}]
+# OPENAI_API_LOGLEVEL=debug
 API_PORT=5010
 WEB_PORT=8080
 SNAKEMQ_PORT=8765

frontend/src/App.tsx

@@ -2,7 +2,7 @@ import "./App.css";
 import Input from "./components/Input";
 import Sidebar from "./components/Sidebar";
 import Chat, { WaitingStates } from "./components/Chat";
-import React, { useState } from "react";
+import React, { useState, useEffect  } from "react";
 import Config from "./config";
 import { useLocalStorage } from "usehooks-ts";
 
@@ -14,16 +14,22 @@ export type MessageDict = {
 
 function App() {
   const COMMANDS = ["reset"];
-  const MODELS = [
-    {
-      displayName: "GPT-3.5",
-      name: "gpt-3.5-turbo",
-    },
-    {
-      displayName: "GPT-4",
-      name: "gpt-4",
-    },
-  ];
+
+  let [MODELS, setModels] = useState([{displayName: "GPT-3.5", name: "gpt-3.5-turbo"}]);
+
+  useEffect(() => {
+    const getModels = async () => {
+      try {
+        const response = await fetch(`${Config.WEB_ADDRESS}/models`);
+        const json = await response.json();
+        setModels(json);
+      } catch (e) {
+        console.error(e);
+      };
+    };
+
+    getModels();
+ }, []);
 
   let [selectedModel, setSelectedModel] = useLocalStorage<string>(
     "model",

gpt_code_ui/webapp/main.py

@@ -1,8 +1,8 @@
 # The GPT web UI as a template based Flask app
 import os
 import requests
-import json
 import asyncio
+import json
 import re
 import logging
 import sys
@@ -24,9 +24,18 @@
 openai.api_version = os.environ.get("OPENAI_API_VERSION", "2023-03-15-preview")
 openai.api_key = os.environ.get("OPENAI_API_KEY", "")
 openai.log = os.getenv("OPENAI_API_LOGLEVEL", "")
-AZURE_OPENAI_DEPLOYMENT = os.environ.get("AZURE_OPENAI_DEPLOYMENT", "")
 OPENAI_EXTRA_HEADERS = json.loads(os.environ.get("OPENAI_EXTRA_HEADERS", "{}"))
 
+if openai.api_type == "openai":
+    AVAILABLE_MODELS = json.loads(os.environ.get("OPENAI_MODELS", '''[{"displayName": "GPT-3.5", "name": "gpt-3.5-turbo"}, {"displayName": "GPT-4", "name": "gpt-4"}]'''))
+elif openai.api_type == "azure":
+    try:
+        AVAILABLE_MODELS = json.loads(os.environ["AZURE_OPENAI_DEPLOYMENTS"])
+    except KeyError as e:
+        raise RuntimeError('AZURE_OPENAI_DEPLOYMENTS environment variable not set') from e
+else:
+    raise ValueError(f'Invalid OPENAI_API_TYPE: {openai.api_type}')
+
 UPLOAD_FOLDER = 'workspace/'
 os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 
@@ -132,7 +141,7 @@ async def get_code(user_prompt, user_openai_key=None, model="gpt-3.5-turbo"):
     if openai.api_type == 'openai':
         arguments["model"] = model
     elif openai.api_type == 'azure':
-        arguments["deployment_id"] = AZURE_OPENAI_DEPLOYMENT
+        arguments["deployment_id"] = model
     else:
         return None, f"Error: Invalid OPENAI_PROVIDER: {openai.api_type}", 500
 
@@ -197,6 +206,11 @@ def index():
     return send_from_directory('static', 'index.html')
 
 
+@app.route("/models")
+def models():
+    return jsonify(AVAILABLE_MODELS)
+
+
 @app.route('/api/<path:path>', methods=["GET", "POST"])
 def proxy_kernel_manager(path):
     if request.method == "POST":