Merge branch 'main' into improve-041712

sugarforever · Apr 17, 2024 · c7b5a12 · c7b5a12
2 parents 9b5f700 + 5107de1
commit c7b5a12
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -140,3 +140,4 @@ tmp
 chroma_data
 
 .DS_Store
+yarn.lock
diff --git a/assets/index.scss b/assets/index.scss
@@ -5,11 +5,23 @@
   @import 'highlight.js/scss/github-dark.scss';
 }
 
-html, body, #__nuxt {
+html,
+body,
+#__nuxt {
   height: 100%;
   font-family: "Noto Sans", SF Pro SC, SF Pro Text, SF Pro Icons, PingFang SC, Helvetica Neue, Helvetica, Arial, sans-serif;
 }
 
+body {
+
+  code,
+  pre,
+  kbd,
+  samp {
+    font-family: inherit;
+  }
+}
+
 .md-body {
   --color-neutral-muted: rgb(var(--color-primary-100));
   --color-canvas-subtle: rgb(var(--color-primary-50));
@@ -32,7 +44,7 @@ html, body, #__nuxt {
     list-style: initial;
   }
 
-  li > p {
+  li>p {
     display: inline;
   }
 }
@@ -57,4 +69,4 @@ html, body, #__nuxt {
       transform: translateX(0%);
     }
   }
-}
+}
diff --git a/components/ChatSettings.vue b/components/ChatSettings.vue
@@ -85,7 +85,7 @@ async function onReset() {
           <UInput v-model="state.title" maxlength="40" />
         </UFormGroup>
         <UFormGroup label="Model" name="model" required class="mb-4">
-          <ModelsSelectMenu v-model="state.model" v-model:model="currentModel" />
+          <ModelsSelectMenu v-model="state.model" v-model:modelInfo="currentModel" />
         </UFormGroup>
         <UFormGroup label="Knowledge Base" name="knowledgeBaseId" class="mb-4">
           <USelectMenu v-model="state.knowledgeBaseId"

diff --git a/components/KnowledgeBaseForm.vue b/components/KnowledgeBaseForm.vue
@@ -1,8 +1,42 @@
 <script lang="ts" setup>
 import type { KnowledgeBase } from '@prisma/client'
+import { OPENAI_EMBEDDING_MODELS, GEMINI_EMBEDDING_MODELS } from '@/server/utils/models'
 
 type OperateType = 'create' | 'update'
 
+type EmbeddingModelType = {
+  label: string,
+  value: string,
+  group: string,
+  color: string
+}
+
+const embeddings = (() => {
+  const embeddings_list = Array<EmbeddingModelType>()
+
+  OPENAI_EMBEDDING_MODELS.forEach((item) => {
+    embeddings_list.push({
+      label: item,
+      value: item,
+      group: 'OpenAI',
+      color: 'primary'
+    })
+  })
+
+  GEMINI_EMBEDDING_MODELS.forEach((item) => {
+    embeddings_list.push({
+      label: item,
+      value: item,
+      group: 'Gemini',
+      color: 'green'
+    })
+  })
+
+  return embeddings_list
+})()
+
+
+
 const props = defineProps<{
   title: string
   type: OperateType
@@ -15,7 +49,7 @@ const toast = useToast()
 const state = reactive({
   files: [] as File[],
   name: props.data?.name || '',
-  embedding: props.data?.embedding || '',
+  embedding: props.data?.embedding || undefined,
   description: props.data?.description || '',
   urls: '',
   pageParser: 'cheerio' as 'cheerio' | 'jinaReader'
@@ -101,7 +135,26 @@ async function submit(formData: FormData) {
         </UFormGroup>
 
         <UFormGroup label="Embedding" name="embedding" :required="!isModify" class="mb-4">
-          <UInput type="text" v-model="state.embedding" :disabled="isModify" />
+          <USelectMenu v-model="state.embedding"
+                       :options="embeddings"
+                       option-attribute="label"
+                       value-attribute="value"
+                       :disabled="isModify"
+                       searchable
+                       creatable>
+            <template #option="{ option }">
+              <span class="block truncate">
+                <UBadge :label="option.group" :color="option.color" size="xs" />&nbsp;
+                {{ option.label }}
+              </span>
+            </template>
+
+            <template #option-create="{ option }">
+              <span class="flex-shrink-0">Click to use embedding:</span>
+              <span class="flex-shrink-0 w-2 h-2 mt-px rounded-full -mx-1"></span>
+              <span class="block truncate text-primary">{{ option }}</span>
+            </template>
+          </USelectMenu>
         </UFormGroup>
 
         <UFormGroup label="Description" name="description" class="mb-4">

diff --git a/components/ModelsSelectMenu.vue b/components/ModelsSelectMenu.vue
@@ -9,7 +9,7 @@ const props = withDefaults(defineProps<{
 })
 
 const value = defineModel<string>()
-const currentModel = defineModel<ModelInfo>('model')
+const currentModel = defineModel<ModelInfo>('modelInfo')
 
 const models = await loadModels()
 

diff --git a/package.json b/package.json
@@ -48,7 +48,9 @@
     "chromadb": "^1.8.1",
     "dexie": "^4.0.1",
     "highlight.js": "^11.9.0",
+    "html-to-text": "^9.0.5",
     "ioredis": "^5.3.2",
+    "jsdom": "^24.0.0",
     "langchain": "^0.1.31",
     "langsmith": "^0.1.14",
     "mammoth": "^1.7.1",