vicuna support history

Author: little51

Vicuna_7b.py

@@ -18,17 +18,33 @@ def getAnswerFromVicuna7b(context):
         return '算力不足，请稍候再试！[stop]'
 
 
-def getAnswerFromVicuna7b_v2(context):
+def getAnswerFromVicuna7b_v2(contextx):
     url = 'http://172.16.62.137:8000/v1/chat/completions/stream'
-    data = json.dumps(
-        {"model": "vicuna-7b-v1.1",
-            "messages": [{"role": "user", "content": context}]}
-    )
+    messages = []
+    prompt = contextx["prompt"]
+    for i in range(len(contextx["history"])):
+        messages.append({"role": "user", "content": contextx["history"][i][0]})
+        messages.append(
+            {"role": "assistant", "content": contextx["history"][i][1]})
+    messages.append({"role": "user", "content": prompt})
+    data_json = {"model": "vicuna-7b-v1.1",
+                 "messages": messages}
+    data = json.dumps(data_json)
     headers = {'content-type': 'application/json;charset=utf-8'}
     r = requests.post(url, data=data, headers=headers)
     res = r.json()
+    history = []
+    history_json = res["history"]
+    his = None
+    for h in history_json:
+        if his is None:
+            his = [h["content"]]
+        elif len(his) == 1:
+            his.append(h["content"])
+            history.append(his)
+            his = None
     now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     if r.status_code == 200:
-        return {'response': res['response'], 'history': [], 'status': 200, 'time': now}
+        return {'response': res['response'], 'history': history, 'status': 200, 'time': now}
     else:
         return {'response': '算力不足，请稍候再试！[stop]', 'history': [], 'status': 200, 'time': now}

chat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiitchat",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "private": true,
   "dependencies": {
     "@chatui/core": "^2.4.2",

chat/src/App.js

@@ -5,7 +5,8 @@ import '@chatui/core/es/styles/index.less';
 import React, { useEffect, useState } from 'react';
 import './chatui-theme.css';
 import { marked } from "marked";
-import QRCode from 'react-qr-code'
+import QRCode from 'react-qr-code';
+import packageJson from '../package.json';
 
 var modelname = "ChatGLM-6b";
 var lastPrompt = "";
@@ -44,6 +45,7 @@ function App() {
   const [percentage, setPercentage] = useState(0);
   const msgRef = React.useRef(null);
   const [showQRCode, setShowQRCode] = useState(false)
+  const [version, setVersion] = useState("");
 
   function handleSend(type, val) {
     if (percentage > 0) {
@@ -119,7 +121,7 @@ function App() {
     }
     let xhr = new XMLHttpRequest();
     xhr.open('post', 'https://gitclone.com/aiit/codegen_stream/v2');
-    //xhr.open('post', 'http://localhost:5000/codegen_stream/v2');
+    //xhr.open('post', 'http://localhost:5001/codegen_stream/v2');
     xhr.setRequestHeader('Content-Type', 'application/json');
     xhr.onload = function () {
       var json = JSON.parse(xhr.response);
@@ -208,17 +210,20 @@ function App() {
   }
 
   function openQRCode() {
-    setShowQRCode(true)
+    setVersion(packageJson.name + ' ' + packageJson.version);
+    setShowQRCode(true);
   }
 
   useEffect(() => {
-    if(showQRCode){
-      return ;
-    }
     var oUl = document.getElementById('root');
     var aBox = getByClass(oUl, 'Input Input--outline Composer-input');
     if (aBox.length > 0) {
-      aBox[0].focus();
+      if (showQRCode) {
+        aBox[0].blur();
+      }
+      else {
+        aBox[0].focus();
+      }
     }
   })
 
@@ -256,6 +261,8 @@ function App() {
           <div className="qr-code-content">
             <QRCode value="https://gitclone.com/aiit/chat/" />
             <div style={{ textAlign: 'center', marginTop: '10px' }}>
+              <div>{version}</div>
+              <p></p>
               <button onClick={() => setShowQRCode(false)}>关闭</button>
             </div>
           </div>

codegen_stream.py

@@ -102,7 +102,7 @@ async def codegen_stream_v2(request):
           time.localtime()), "request : " + prompt)
     stop = False
     if modelname == 'vicuna-7b':
-        result = getAnswerFromVicuna7b_v2(prompt)
+        result = getAnswerFromVicuna7b_v2(context)
     else:
         result = getAnswerFromChatGLM6b_v2(context)
     stop = result["response"] .endswith("[stop]")