new ui functionalities

2025-01-18 10:46:27 +00:00 · 2023-12-29 01:43:49 +01:00 · 2023-12-29 01:43:49 +01:00 · c78130d056
commit c78130d056
parent f0e64bc4ff
12 changed files with 277 additions and 227 deletions
--- a/docs/youtube/lollms_deep_dive.txt
+++ b/docs/youtube/lollms_deep_dive.txt
@ -0,0 +1,7 @@
+Hi there,
+
+In this video, we are going to delve into the inner workings of lollms. We will learn how the underlying L.L.Ms work, how the RAG system works, and how you can connect lollms to multiple sources or clients.
+
+To start, Large Language Models or LLMs for short, are a special kind of models that perform operations on text. We are going to focus on a specific type of tasks which is text generation from a prompt.
+
+
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f1fd6521e3840a11e2e2f626d01a6c44ad39bc93
+Subproject commit ea95b5afff26f59fed9d2fc741318b9162b69dea
--- a/requirements.txt
+++ b/requirements.txt
@ -14,4 +14,5 @@ gevent
 requests
 GitPython
 ascii_colors>=0.1.4
-beautifulsoup4
+beautifulsoup4
+packaging
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@ -12,4 +12,5 @@ eventlet
 websocket-client
 GitPython
 setuptools
-numpy
+numpy
+packaging
--- a/web/dist/assets/index-916f9dad.js
+++ b/web/dist/assets/index-916f9dad.js
--- a/web/dist/assets/index-a577e700.css
+++ b/web/dist/assets/index-a577e700.css
--- a/web/dist/assets/javascript_block-5e59df30.svg
+++ b/web/dist/assets/javascript_block-5e59df30.svg
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 630 630" style="enable-background:new 0 0 630 630;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#EDBF4A;}
+	.st1{fill:#0C0C0C;}
+</style>
+<rect class="st0" width="630" height="630"/>
+<path class="st1" d="M423.2,492.2c12.7,20.7,29.2,36,58.4,36c24.5,0,40.2-12.3,40.2-29.2c0-20.3-16.1-27.5-43.1-39.3l-14.8-6.4
+	c-42.7-18.2-71.1-41-71.1-89.2c0-44.4,33.8-78.2,86.7-78.2c37.6,0,64.7,13.1,84.2,47.4l-46.1,29.6c-10.1-18.2-21.1-25.4-38.1-25.4
+	c-17.3,0-28.3,11-28.3,25.4c0,17.8,11,25,36.4,36l14.8,6.3c50.3,21.6,78.7,43.6,78.7,93c0,53.3-41.9,82.5-98.1,82.5
+	c-55,0-90.5-26.2-107.9-60.5L423.2,492.2z M214.1,497.3c9.3,16.5,17.8,30.5,38.1,30.5c19.5,0,31.7-7.6,31.7-37.2V289.3h59.2v202.1
+	c0,61.3-35.9,89.2-88.4,89.2c-47.4,0-74.9-24.5-88.8-54.1L214.1,497.3z"/>
+</svg>
--- a/web/dist/index.html
+++ b/web/dist/index.html
@ -6,8 +6,8 @@
    
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>LoLLMS WebUI - Welcome</title>
-    <script type="module" crossorigin src="/assets/index-21d0d4ec.js"></script>
-    <link rel="stylesheet" href="/assets/index-f7641d38.css">
+    <script type="module" crossorigin src="/assets/index-916f9dad.js"></script>
+    <link rel="stylesheet" href="/assets/index-a577e700.css">
  </head>
  <body>
    <div id="app"></div>
--- a/web/src/components/Message.vue
+++ b/web/src/components/Message.vue
@ -73,11 +73,15 @@
                                <i data-feather="edit"></i>
                            </div>
                            <div v-if="editMsgMode" class="text-lg hover:text-secondary duration-75 active:scale-90 p-2"
-                                title="Add python block" @click.stop="addPythonBlock()">
+                                title="Add python block" @click.stop="addBlock('python')">
                                <img :src="python_block" width="25" height="25">
                            </div>
                            <div v-if="editMsgMode" class="text-lg hover:text-secondary duration-75 active:scale-90 p-2"
-                                title="Add bash block" @click.stop="addBashBlock()">
+                                title="Add javascript block" @click.stop="addBlock('javascript')">
+                                <img :src="javascript_block" width="25" height="25">
+                            </div>
+                            <div v-if="editMsgMode" class="text-lg hover:text-secondary duration-75 active:scale-90 p-2"
+                                title="Add bash block" @click.stop="addBlock('bash')">
                                <img :src="bash_block" width="25" height="25">
                            </div>
                            
@ -239,6 +243,8 @@ import JsonViewer from "./JsonViewer.vue";
 import Step from './Step.vue';
 import axios from 'axios'
 import python_block from '@/assets/python_block.png';
+import javascript_block from '@/assets/javascript_block.svg';
+
 import bash_block from '@/assets/bash_block.png';


@ -265,6 +271,7 @@ export default {
    },
    data() {
        return {
+            javascript_block:javascript_block,
            python_block:python_block,
            bash_block:bash_block,
            audio_url:null,
@ -425,28 +432,16 @@ export default {
        toggleModel() {
            this.expanded = !this.expanded;
        },
-        addBashBlock(){
+        addBlock(bloc_name){
            let p =this.$refs.mdTextarea.selectionStart
            if(p==0 || this.message.content[p-1]=="\n"){
-                this.message.content = this.message.content.slice(0, p) + "```bash\n\n```\n" + this.message.content.slice(p)
+                this.message.content = this.message.content.slice(0, p) + "```"+bloc_name+"\n\n```\n" + this.message.content.slice(p)
+                p = p+4+bloc_name.length
            }
            else{
-                this.message.content = this.message.content.slice(0, p) + "\n```bash\n\n```\n" + this.message.content.slice(p)
+                this.message.content = this.message.content.slice(0, p) + "\n```"+bloc_name+"\n\n```\n" + this.message.content.slice(p)
+                p = p+3+bloc_name.length
            }
-            p = p+9
-            this.$refs.mdTextarea.focus();
-            this.$refs.mdTextarea.selectionStart = this.$refs.mdTextarea.selectionEnd = p;
-        },
-        addPythonBlock() {
-            let p =this.$refs.mdTextarea.selectionStart
-            if(p==0 || this.message.content[p-1]=="\n"){
-                this.message.content = this.message.content.slice(0, p) + "```python\n\n```\n" + this.message.content.slice(p)
-            }
-            else{
-                this.message.content = this.message.content.slice(0, p) + "\n```python\n\n```\n" + this.message.content.slice(p)
-            }
-
-            p = p+11
            this.$refs.mdTextarea.focus();
            this.$refs.mdTextarea.selectionStart = this.$refs.mdTextarea.selectionEnd = p;
        },
--- a/web/src/components/MessageBox.vue
+++ b/web/src/components/MessageBox.vue
@ -5,9 +5,19 @@
          <div class="text-lg font-medium">{{ message }}</div>
        </div>
        <div class="mt-4 flex justify-center">
-          <button @click="hide" class="bg-primary hover:bg-primary-light active:scale-95 duration-150 text-white px-4 py-2 rounded-lg shadow-lg hover:bg-secondary-dark">
+          <button v-if="has_button" @click="hide" class="bg-primary hover:bg-primary-light active:scale-95 duration-150 text-white px-4 py-2 rounded-lg shadow-lg hover:bg-secondary-dark">
            OK
          </button>
+          <svg v-if="!has_button" aria-hidden="true" class="w-6 h-6   animate-spin  fill-secondary" viewBox="0 0 100 101"
+              fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path
+                  d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                  fill="currentColor" />
+              <path
+                  d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                  fill="currentFill" />
+          </svg>
+
        </div>
      </div>
    </div>
@ -18,6 +28,7 @@
    data() {
      return {
        show: false,
+        has_button: true,
        message: "",
      };
    },
@ -28,8 +39,21 @@
      },
      showMessage(message) {
        this.message = message;
+        this.has_button = true;
        this.show = true;
      },
+      showBlockingMessage(message) {
+        this.message = message;
+        this.has_button = false;
+        this.show = true;
+      },
+      updateMessage(message) {
+        this.message = message;
+        this.show = true;
+      },
+      hideMessage() {
+        this.show = false;
+      },
    },
  };
  </script>
--- a/web/src/views/DiscussionsView.vue
+++ b/web/src/views/DiscussionsView.vue
@ -1227,10 +1227,18 @@ export default {
                this.$store.state.messageBox.showMessage(notif.content)
            }
            else if(notif.display_type==2){
-                this.$store.state.yesNoDialog.askQuestion(notif.content, 'Yes', 'Cancel').then(yesRes => {
+                this.$store.state.messageBox.hideMessage()
+                this.$store.state.yesNoDialog.askQuestion(notif.content, 'Yes', 'No').then(yesRes => {
                    socket.emit("yesNoRes",{yesRes:yesRes})
                })
            }
+            else if(notif.display_type==3){
+                this.$store.state.messageBox.showBlockingMessage(notif.content)
+            }
+            else if(notif.display_type==4){
+                this.$store.state.messageBox.hideMessage()
+            }
+            
            this.chime.play()
        },
        streamMessageContent(msgObj) {
--- a/zoos/bindings_zoo
+++ b/zoos/bindings_zoo
@ -1 +1 @@
-Subproject commit 3dcfab2216f386ba558c508fa6f565593b740700
+Subproject commit 8e331e39ade62d660213f7a1246a38ac675c399f