Merge branch '29049_apikey' into 'master'

29049 apikey

See merge request !90

+# Examples values are set to DEV
+
+OPENAI_API_ORG="org-h5sz5MQR8tCfmhZZVU3FdhKz" 
+OPENAI_API_KEY="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" 
+SERVER_URL="https://dev.chatgpt.ai-pro.org/" 
+REACT_APP_SERVER_URL="https://dev.chatgpt.ai-pro.org" 
+
+REACT_APP_BTUTIL_ASSET_URL=https://dev.api.ai-pro.org/ext-app/js/btutil-all-v1.min.js?ver=
+
+API_URL='https://dev.api.ai-pro.org'
+
+OPENSOURCE_MODELS="openchat_3.5,zephyr-7B-beta" 
+OPENSOURCE_ENDPOINTS={"openchat_3.5": "http://192.168.22.180:5000/v1", "zephyr-7B-beta": "http://192.168.22.180:5000/v1"}
+OPENSOURCE_API_KEY={"openchat_3.5": "Q8QZG0HhS62piZSmvSR7CP3E53fY8J99Ad2wmJLdiW05cpjnnBAH5xlQlClYdqeh", "zephyr-7B-beta": "Q8QZG0HhS62piZSmvSR7CP3E53fY8J99Ad2wmJLdiW05cpjnnBAH5xlQlClYdqeh"}
+
+REACT_APP_START_SERVER_URL= https://dev.start.ai-pro.org                                    
\ No newline at end of file

-OPENAI_API_ORG=
-OPENAI_API_KEY=
-
-
-OPENSOURCE_MODELS="openchat_3.5,zephyr-7B-beta"
-OPENSOURCE_ENDPOINTS={"openchat_3.5": "https://openchat.llm.ai-pro.org/v1", "zephyr-7B-beta": "https://zephyr.llm.ai-pro.org/v1"}
\ No newline at end of file

@@ -227,6 +227,12 @@ const get_endpoint_api_url = (currentModel) => {
   const endpoint_api_url = endpoints?.[currentModel];
   return endpoint_api_url
 }
+const get_endpoint_api_key = (currentModel) => {
+  const OPENSOURCE_API_KEY = process.env.OPENSOURCE_API_KEY;
+  const api_keys = JSON.parse(OPENSOURCE_API_KEY);
+  const key = api_keys?.[currentModel];
+  return key
+}
 async function runOpensource(req, res) {
   const { message, currentModel, temperature } = req.body;
   var input = '';
@@ -234,19 +240,27 @@ async function runOpensource(req, res) {
   const query_prompt = message_history.length ? message_history[message_history.length - 1].content : "";
 
   try {
+    let error_msg = "";
     const endpoint_api_url = get_endpoint_api_url(currentModel);
-    console.log('endpoint_api_url', endpoint_api_url);
+    const api_key = get_endpoint_api_key(currentModel);
     const response = await axios.post(endpoint_api_url + '/chat/completions', {
       messages: JSON.parse(message),
       temperature
     }, {
       headers: {
         'Content-Type': 'application/json',
-        // 'Authorization': `Bearer ${process.env.OPENSOURCE_API_KEY}`
-      },
+        'Authorization': 'Bearer '+api_key
+    },
+    }) .catch(error => {
+      error_msg = error.response.statusText ? error.response.statusText : '';
     });
-    console.log(" zephyr response", response.data.choices[0])
-    input = response.data.choices[0].message.content
+
+    if (error_msg!==''){
+      input = "Error: "+error_msg;
+    }else{
+      input = response.data.choices[0].message.content
+    }
+    
   } catch (e) {
     let error_msg = e.response.data.error.message ? e.response.data.error.message : '';
     if (error_msg.indexOf('maximum context length') >= 0) {