ExternalVendorCode/lollms-webui
1
0
Fork 0
mirror of https://github.com/ParisNeo/lollms-webui.git synced 2024-12-19 04:17:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enhanced message types

Browse Source
This commit is contained in:
Saifeddine ALOUI 2023-07-02 15:55:59 +02:00
parent 510aa8dba9
commit 9c16f8fae5
6 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/__init__.py
View File

@ -397,6 +397,7 @@ class LoLLMsAPPI():
message_id = self.current_discussion.add_message( message_id = self.current_discussion.add_message(
"user", "user",
message, message,
message_type=DiscussionsDB.MSG_TYPE_NORMAL_USER,
parent=self.message_id parent=self.message_id
) )
@ -632,7 +633,7 @@ class LoLLMsAPPI():
if self.personality.welcome_message!="": if self.personality.welcome_message!="":
message_id = self.current_discussion.add_message( message_id = self.current_discussion.add_message(
self.personality.name, self.personality.welcome_message, self.personality.name, self.personality.welcome_message,
DiscussionsDB.MSG_TYPE_NORMAL, DiscussionsDB.MSG_TYPE_NORMAL_AI if self.personality.include_welcome_message_in_disucssion else DiscussionsDB.MSG_TYPE_USER_ONLY,
0, 0,
-1, -1,
binding= self.config["binding_name"], binding= self.config["binding_name"],
@ -664,7 +665,7 @@ class LoLLMsAPPI():
self.full_message_list = [] self.full_message_list = []
for message in messages: for message in messages:
if message["id"]< message_id or message_id==-1: if message["id"]< message_id or message_id==-1:
if message["type"]==self.db.MSG_TYPE_NORMAL: if message["type"]==self.db.MSG_TYPE_NORMAL_USER or message["type"]==self.db.MSG_TYPE_NORMAL_AI:
if message["sender"]==self.personality.name: if message["sender"]==self.personality.name:
self.full_message_list.append(self.personality.ai_message_prefix+message["content"]) self.full_message_list.append(self.personality.ai_message_prefix+message["content"])
else: else:
@ -879,10 +880,11 @@ class LoLLMsAPPI():
self.current_ai_message_id = self.current_discussion.add_message( self.current_ai_message_id = self.current_discussion.add_message(
self.personality.name, self.personality.name,
"", "",
parent = self.current_user_message_id, message_type = DiscussionsDB.MSG_TYPE_NORMAL_AI,
binding = self.config["binding_name"], parent = self.current_user_message_id,
model = self.config["model_name"], binding = self.config["binding_name"],
personality = self.config["personalities"][self.config["active_personality_id"]] model = self.config["model_name"],
personality = self.config["personalities"][self.config["active_personality_id"]]
) # first the content is empty, but we'll fill it at the end ) # first the content is empty, but we'll fill it at the end
self.socketio.emit('infos', self.socketio.emit('infos',
{ {

8
api/db.py
View File

@ -12,8 +12,12 @@ __license__ = "Apache 2.0"
# =================================== Database ================================================================== # =================================== Database ==================================================================
class DiscussionsDB: class DiscussionsDB:
MSG_TYPE_NORMAL = 0 MSG_TYPE_NORMAL_USER = 0 # A normal message from user
MSG_TYPE_CONDITIONNING = 1 MSG_TYPE_NORMAL_AI = 1 # A normal message from ai
MSG_TYPE_CONDITIONNING = 2 # This is the AI conditionning (to be protected from window sliding)
MSG_TYPE_HIDDEN = 3 # Don't show this to user
MSG_TYPE_USER_ONLY = 4 # Don't give this to the AI
def __init__(self, db_path="database.db"): def __init__(self, db_path="database.db"):
self.db_path = Path(db_path) self.db_path = Path(db_path)

4
web/dist/assets/index-d867bca8.js → web/dist/assets/index-2eb5bb15.js vendored
View File

File diff suppressed because one or more lines are too long

2
web/dist/assets/index-dda20b95.css → web/dist/assets/index-54172bba.css vendored
View File

File diff suppressed because one or more lines are too long

4
web/dist/index.html vendored
View File

@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>LoLLMS WebUI - Welcome</title> <title>LoLLMS WebUI - Welcome</title>
<script type="module" crossorigin src="/assets/index-d867bca8.js"></script> <script type="module" crossorigin src="/assets/index-2eb5bb15.js"></script>
<link rel="stylesheet" href="/assets/index-dda20b95.css"> <link rel="stylesheet" href="/assets/index-54172bba.css">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

20
web/src/views/DiscussionsView.vue
View File

@ -232,6 +232,14 @@ export default {
setup() { }, setup() { },
data() { data() {
return { return {
// To be synced with the backend database types
msgTypes: {
MSG_TYPE_NORMAL_USER: 0,
MSG_TYPE_NORMAL_AI: 1,
MSG_TYPE_CONDITIONNING: 2,
MSG_TYPE_HIDDEN: 3,
MSG_TYPE_USER_ONLY: 4
},
list: [], // Discussion list list: [], // Discussion list
tempList: [], // Copy of Discussion list (used for keeping the original list during filtering discussions/searching action) tempList: [], // Copy of Discussion list (used for keeping the original list during filtering discussions/searching action)
currentDiscussion: {}, // Current/selected discussion id currentDiscussion: {}, // Current/selected discussion id
@ -298,8 +306,13 @@ export default {
this.setDiscussionLoading(id, this.loading) this.setDiscussionLoading(id, this.loading)
if (res) { if (res) {
// Filter out the user and bot entries // Filter out the user and bot entries
this.discussionArr = res.data.filter((item) => item.type == 0) this.discussionArr = res.data.filter((item) =>
item.type == this.msgTypes.MSG_TYPE_NORMAL_AI ||
item.type == this.msgTypes.MSG_TYPE_NORMAL_USER ||
item.type == this.msgTypes.MSG_TYPE_USER_ONLY
)
console.log("this.discussionArr")
console.log(this.discussionArr)
} }
} }
@ -596,12 +609,11 @@ export default {
binding: msgObj.binding, binding: msgObj.binding,
content: msgObj.message, content: msgObj.message,
created_at: msgObj.created_at, created_at: msgObj.created_at,
type: msgObj.type,
finished_generating_at: msgObj.finished_generating_at, finished_generating_at: msgObj.finished_generating_at,
id: msgObj.user_message_id, id: msgObj.user_message_id,
model: msgObj.model, model: msgObj.model,
personality: msgObj.personality, personality: msgObj.personality,
sender: msgObj.user, sender: msgObj.user,
} }