change message protocol

chat/consumers.py

@@ -2,17 +2,27 @@ import json
 from . import model_manage as md
 from channels.generic.websocket import WebsocketConsumer
 from .database_manage import DataManage
+from django.views.decorators.csrf import csrf_exempt
+from django.utils.decorators import method_decorator
+from django.views import View
+import json
+from django.http import JsonResponse
+
 
 class ChatConsumer(WebsocketConsumer):
     def connect(self):
+        print("Starting connect socket")
         self.user = self.scope["user"]
+        print(f"User: {self.user}")
         if self.user.is_authenticated:
             self.accept()
+            print(f"User accepted")
             self.model, self.session = md.init_model("auto")
         else:
             self.close()
         
     def disconnect(self, close_code):
+        print("End, close code: ",close_code)
         del self.model, self.session
         pass
     
@@ -34,4 +44,4 @@ class ChatConsumer(WebsocketConsumer):
         md.print_history(history_state)
         self.send(text_data=json.dumps({"message": response}))
         self.database.Add_prompt_response(roomid,question,response)
-        
+        

chat/database_manage.py

@@ -30,7 +30,6 @@ class DataManage:
     def LoadRoomDetail(self, roomid):
         room = Room.objects.get(RoomID=roomid)
         print(room)
-        print(room==None)
         chat_details = ChatDetails.objects.filter(RoomID=room.RoomID).order_by('order')
         print(chat_details)
         mes = []

chat/templates/index.html

@@ -5,6 +5,7 @@
     <title>Python Project</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="csrf-token" content="{{ csrf_token }}">
     <script src="https://cdn.tailwindcss.com"></script>
     <!-- <script>
         // const roomdata = JSON.parse('{{ roomdata|safe }}');
@@ -151,11 +152,11 @@
                 <div class="w-full flex flex-row border border-1 border-[#919191] rounded-xl px-4 py-6 items-center">
                     <textarea
                         class="w-full h-full outline-0 bg-transparent border-none text-white resize-none text-md max-h-[100px]"
-                        v-on:keyup.enter="sendMessage" placeholder="Type a message" :rows="message.split('\n').length"
+                        v-on:keyup.enter="sendMessageAPI" placeholder="Type a message" :rows="message.split('\n').length"
                         v-model="message"></textarea>
                     <div class="flex flex-col justify-end gap-4 text-[#2E2E2E] rounded-md p-1"
                         :class="{'bg-white':message!='','bg-white/10':message==''}">
-                        <button @click="sendMessage">
+                        <button @click="sendMessageAPI">
                             <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"
                                 xmlns="http://www.w3.org/2000/svg">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
@@ -241,7 +242,12 @@
                     if (this.id == null) {
                         return
                     }
-                    this.connect()
+                    // this.connect()
+                    this.ques = params.get('ques');
+                    if (this.ques != null) {
+                        this.message = this.ques;
+                        this.sendMessageAPI();
+                    }
                 },
                 methods: {
                     refresh() {
@@ -251,54 +257,89 @@
                         window.location.href = '/chat/delete?id=' + id;
                         return;
                     },
-                    sendMessage() {
+                    sendMessageAPI() {
+                        console.log("call sendMesageAPI");
                         if (this.id == null) {
                             window.location.href = '/chat/newchat?ques=' + this.message;
                             return;
                         }
+                        this.ques = this.message;
+                        this.message = "";
                         this.messages.push({
                             role: "user",
-                            content: this.message
+                            content: this.ques
                         });
-                        this.chatSocket.send(JSON.stringify({
-                            'roomid':this.id,
-                            'message': this.message,
+                        fetch('/chat/messages/', {
+                            method: 'POST',
+                            headers: {
+                            'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify({
+                            'roomid': this.id,
+                            'message': this.ques,
                             'messages': this.messages,
-                        }));
-                        console.log(JSON.stringify({
-                            'messages': this.messages
-                        }))
-                        this.message = "";
+                            })
+                        })
+                        .then(response => response.json())
+                        .then(data => {
+                            this.messages.push({
+                                role: "model",
+                                content: data.message
+                            });
+                        })
+                        .catch(error => {
+                            console.error('Error sending or fetching messages:', error);
+                        });
                     },
+
+                    // sendMessage() {
+                    //     if (this.id == null) {
+                    //         window.location.href = '/chat/newchat?ques=' + this.message;
+                    //         return;
+                    //     }
+                    //     this.messages.push({
+                    //         role: "user",
+                    //         content: this.message
+                    //     });
+                    //     this.chatSocket.send(JSON.stringify({
+                    //         'roomid':this.id,
+                    //         'message': this.message,
+                    //         'messages': this.messages,
+                    //     }));
+                    //     console.log(JSON.stringify({
+                    //         'messages': this.messages
+                    //     }))
+                    //     this.message = "";
+                    // },
                     
-                    connect() {
-                        this.chatSocket = new WebSocket(
-                            'wss://' + window.location.host + '/wss/chat'
-                        );
+                    // connect() {
+                    //     this.chatSocket = new WebSocket(
+                    //         'wss://' + window.location.host + '/wss/chat'
+                    //     );
 
-                        this.chatSocket.onopen = () => {
-                            this.connectionStatus = 'Connected';
-                            console.log('WebSocket connected');
-                        };
+                    //     this.chatSocket.onopen = () => {
+                    //         this.connectionStatus = 'Connected';
+                    //         console.log('WebSocket connected');
+                    //     };
 
-                        this.chatSocket.onmessage = (event) => {
-                            var mes = JSON.parse(event.data)
-                            this.messages.push({
-                                role: "model",
-                                content: mes.message
-                            });
-                            console.log('Message received: ', event.data);
-                        };
+                    //     this.chatSocket.onmessage = (event) => {
+                    //         var mes = JSON.parse(event.data)
+                    //         this.messages.push({
+                    //             role: "model",
+                    //             content: mes.message
+                    //         });
+                    //         console.log('Message received: ', event.data);
+                    //     };
 
-                        this.chatSocket.onclose = () => {
-                            this.connectionStatus = 'Disconnected';
-                            console.log('WebSocket disconnected');
-                        };
+                    //     this.chatSocket.onclose = () => {
+                    //         this.connectionStatus = 'Disconnected';
+                    //         console.log('WebSocket disconnected');
+                    //     };
 
-                        this.chatSocket.onerror = (error) => {
-                            console.error('WebSocket Error: ', error);
-                        };
-                    }
+                    //     this.chatSocket.onerror = (error) => {
+                    //         console.error('WebSocket Error: ', error);
+                    //     };
+                    // }
                 },
             }).mount('#app')
         </script>

chat/urls.py

@@ -5,7 +5,7 @@ app_name = 'chat'
 
 urlpatterns = [
     path('', views.index, name='index'),
+    path('messages/', views.MessageView.as_view(), name='messages'),
     path('newchat/',views.newchat,name = 'newchat'),
     path('delete/',views.deletechat,name = 'delete'),
-    path("<str:room_name>/", views.room, name="room"),
 ]

chat/views.py

@@ -3,7 +3,11 @@ from django.shortcuts import render,redirect
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
 from .database_manage import DataManage
-import uuid
+from django.views.decorators.csrf import csrf_exempt
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.http import JsonResponse
+from . import model_manage as md
 import json
 @login_required
 def index(request):
@@ -43,4 +47,29 @@ def deletechat(request):
     data = DataManage()
     roomid = request.GET.get('id')
     data.DeleteRoom(roomid)
-    return redirect('/chat')
+    return redirect('/chat')
+
+@method_decorator(csrf_exempt, name='dispatch')
+class MessageView(View):
+    def __init__(self) -> None:
+        super().__init__()
+        self.model = None
+        self.session = None
+        self.database = None
+
+    def post(self, request):
+        if not self.model:
+            self.model, self.session = md.init_model("auto")
+        text_data_json = json.loads(request.body)
+        self.database = DataManage()
+        print(text_data_json)
+        roomid = text_data_json["roomid"]
+        message = text_data_json["messages"]
+        print(message)
+        question = message[-1]['content']
+        response, history_state = md.full_chain_history_question(question, self.session, mode="auto")
+        # print("First answer: ",response)
+        print("Session history:")
+        md.print_history(history_state)
+        self.database.Add_prompt_response(roomid,question,response)
+        return JsonResponse({"message": response}, status=201)

chatbot_django/settings.py

@@ -28,7 +28,7 @@ LOGIN_URL = '/users/login/'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['arxivbot-arxiv-chatbot.hf.space']
+ALLOWED_HOSTS = ['artteiv-arxiv-chatbot.hf.space','arxivbot-arxiv-chatbot.hf.space','localhost','127.0.0.1']
 
 CSRF_TRUSTED_ORIGINS = ['https://arxivbot-arxiv-chatbot.hf.space']
 

oldindex.html

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Python Project</title>
+    <title>Python Projec</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="https://cdn.tailwindcss.com"></script>