Merge pull request #494 from sugarforever/improve/modelsList

简单的区分文本嵌入模型
sugarforever · May 29, 2024 · dabba7a · dabba7a
2 parents eb6d82c + 703b93c
commit dabba7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/components/KnowledgeBaseForm.vue b/components/KnowledgeBaseForm.vue
@@ -60,10 +60,6 @@ const tabs = computed(() => {
   ]
 })
 
-watch(embeddingList, (list) => {
-  showEmbeddingDropdown.value = list.flat().length > 0
-})
-
 async function onSubmit() {
   loading.value = true
   const formData = new FormData()
@@ -157,7 +153,7 @@ function generateEmbeddingData(groupName: string, list: string[], slotName: stri
           <div class="flex">
             <UDropdown v-model:open="showEmbeddingDropdown"
                        :items="embeddingList"
-                       :ui="{ item: { disabled: 'pointer-events-none' } }"
+                       :ui="{ item: { disabled: 'pointer-events-none' }, width: 'w-auto' }"
                        :popper="{ placement: 'bottom-start' }">
               <div></div>
               <template #group="{ item }">

diff --git a/composables/useModels.ts b/composables/useModels.ts
@@ -25,10 +25,11 @@ export function useModels(options?: Options) {
   const opts = Object.assign({ immediate: true, forceReload: false }, options)
   const loading = ref(false)
   const OLLAMA_EMBEDDING_FAMILY_LIST = ['nomic-bert']
+  const embeddingRegExp = /(\b|_)embed(d?ed|d?ings?)?(\b|_)/i
 
   const chatModels = computed(() => {
     return models.value
-      .filter(el => !OLLAMA_EMBEDDING_FAMILY_LIST.includes(el?.details?.family))
+      .filter(el => !OLLAMA_EMBEDDING_FAMILY_LIST.includes(el?.details?.family) || !embeddingRegExp.test(el.name!))
       .map(el => ({
         label: `${el?.details?.family === "Azure OpenAI" ? `Azure ${el.name}` : el.name}`,
         name: el.name!,
@@ -39,7 +40,7 @@ export function useModels(options?: Options) {
 
   const ollamaEmbeddingModels = computed(() => {
     return models.value
-      .filter(el => OLLAMA_EMBEDDING_FAMILY_LIST.includes(el?.details?.family))
+      .filter(el => OLLAMA_EMBEDDING_FAMILY_LIST.includes(el?.details?.family) || embeddingRegExp.test(el.name!))
       .map(el => ({ label: el.name!, value: el.name!, family: el?.details?.family }))
   })