@christianriedl/utils 1.0.141 → 1.0.142

package/dist/iOpenAI.d.ts

@@ -81,9 +81,13 @@ export interface IComparisonFilter {
     value: ItemType;
 }
 export interface ICompoundFilter {
-    filters: IComparisonFilter[] | unknown;
+    filters: IComparisonFilter[];
     type: 'and' | 'or';
 }
+export interface IOpenAIFilter {
+    fileFilter: ICompoundFilter;
+    vectorStoreFilter: Dictionary<string>;
+}
 export interface IOpenAIOptions {
     model: string;
     instructions?: string | null;
@@ -98,8 +102,8 @@ export interface IOpenAIService {
     log: ILogger;
     options: IOpenAIOptions;
     modelNames: string[];
-    initialize(): Promise<boolean>;
-    response(prompt: string | string[], tools?: string[], imageUrl?: string, json?: ISchema, fileSearchFilter?: ICompoundFilter | IComparisonFilter): Promise<IResponseResult>;
+    initializeModelNames(): Promise<boolean>;
+    response(prompt: string | string[], tools?: string[], imageUrl?: string, json?: ISchema, fileSearchFilter?: IOpenAIFilter): Promise<IResponseResult>;
     clearContext(): void;
     getModels(): Promise<string[]>;
 }
@@ -139,6 +143,7 @@ export interface IOpenAIServiceWithVectorStore extends IOpenAIServiceWithTools {
     vsMetadata: IDataItem[];
     fileAttributes: IDataItem[];
     initializeVectorStore(): Promise<boolean>;
+    initializeVectorStoreFiles(): Promise<boolean>;
     getVectorStore(vectorStoreId: string): IVectorStore | undefined;
     addVectorStore(vectorStoreName: string, metadata?: Dictionary<string>): Promise<boolean>;
     addFile(fileUrl: string | File, vectorStoreName: string, attributes?: Dictionary<ItemType>, wait?: boolean): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/utils",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "description": "Interfaces, local storage, service worker, configuration, application state",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/OpenAI.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
     import { inject, ref, toRef, computed, onUnmounted } from 'vue';
     import { appStateSymbol, appConfigSymbol, ESize, EDevice } from '@christianriedl/utils';
-    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, IResponseResult, ICompoundFilter } from '@christianriedl/utils';
+    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, IResponseResult, IOpenAIFilter } from '@christianriedl/utils';
     import Microphone from '@christianriedl/utils/src/components/Microphone.vue';
     import Camera from '@christianriedl/utils/src/components/Camera.vue';
     import OpenAIConfig from '@christianriedl/utils/src/components/OpenAIConfig.vue';
@@ -30,7 +30,7 @@
     const camera = ref<InstanceType<typeof Camera>>();
     const htmlText = ref('');
     const tools = ref(props.tools);
-    const filter = ref<ICompoundFilter | undefined>(undefined);
+    const filter = ref<IOpenAIFilter | undefined>(undefined);
 
     onUnmounted(() => {
 	openAI.clearContext();
@@ -153,10 +153,14 @@
 	    return '';
 	}
     }
-    function setFilter(f: ICompoundFilter) {
-	filter.value = f;
+    function setFilter(newFilter: IOpenAIFilter) {
+	filter.value = newFilter;
 	showFilter.value = false;
     }
+    async function showConfigDialog() {
+	if (await openAI.initializeModelNames())
+	    showConfig.value = true;
+    }
 </script>
 
 <template>
@@ -175,7 +179,7 @@
 		<v-btn variant="tonal" class="bg-office aibutton" @click="isUpload=true;replyLines=[]">
 		    <v-icon size="large" icon="$image" color="primary"></v-icon>
 		</v-btn>
-		<v-btn variant="tonal" class="bg-office aibutton" @click="showConfig=true">
+		<v-btn variant="tonal" class="bg-office aibutton" @click="showConfigDialog">
 		    <v-icon size="large" icon="$settings" color="primary"></v-icon>
 		</v-btn>
 	    </v-col>
@@ -211,7 +215,7 @@
 	    <OpenAIConfig :tools="tools" :ismobile="isMobile" @use="onUse" @back="showConfig=false"></OpenAIConfig>
 	</v-dialog>
 	<v-dialog v-model="showFilter" :fullscreen="isMobile">
-	    <OpenAIFilter :fileattributes="openAI.fileAttributes" :filter="filter" @back="setFilter"></OpenAIFilter>
+	    <OpenAIFilter :vsmetadata="openAI.vsMetadata" :fileattributes="openAI.fileAttributes" :filter="filter" @back="setFilter"></OpenAIFilter>
 	</v-dialog>
     </v-container>
 </template>

package/src/components/OpenAIConfig.vue

@@ -147,8 +147,11 @@
 	    fileSearch[name] = [];
 	}
     }
-    function vectorStoreSelected() {
-	selectedVectorStoreFile.value = '';
+    async function vectorStoreSelected() {
+
+	selectedVectorStoreFile.value = 'Get vectorestore files ...';
+	if (!await openAI.initializeVectorStoreFiles())
+	    return;
 	const vs = openAI.vectorStore![selectedVectorStoreName.value];
 	vectorStoreFiles.value.splice(0, vectorStoreFiles.value.length);
 	if (vs) {
@@ -248,7 +251,7 @@
 		const mdCopy = Object.assign({}, md);
 		if (file.attributes && file.attributes[md.name])
 		    mdCopy.value = file.attributes[md.name];
-		else if (vs && vs.metadata && vs.metadata[md.name]) 
+		else if (vs && vs.metadata && vs.metadata[md.name])
 		    mdCopy.value = vs.metadata[md.name];
 		metadata.value.push(mdCopy);
 	    }

package/src/components/OpenAIFilter.vue

@@ -1,24 +1,41 @@
 <script setup lang="ts">
     import { inject, computed, ref, StyleValue } from 'vue';
-    import { IDataItem, Dictionary, IComparisonFilter, ICompoundFilter } from '@christianriedl/utils'
+    import { IDataItem, Dictionary, IComparisonFilter, ICompoundFilter, IOpenAIFilter } from '@christianriedl/utils'
     import SettingsLine from '../components/SettingsLine.vue';
 
-    const props = defineProps<{ fileattributes: IDataItem[], filter?: ICompoundFilter }>();
-    const emits = defineEmits<{ (e: 'back', filter: ICompoundFilter): void }>();
+    const props = defineProps<{ vsmetadata: IDataItem[], fileattributes: IDataItem[], filter?: IOpenAIFilter }>();
+    const emits = defineEmits<{ (e: 'back', filter: IOpenAIFilter): void }>();
     const items: IDataItem[] = [];
-    const ops = ['', 'eq', 'ne', 'gt', 'gte', 'lt', 'lte'];
+    const opsvs = ['', 'eq'];
+    const opsfile = ['', 'eq', 'ne', 'gt', 'gte', 'lt', 'lte'];
     const operators: Dictionary<string> = {};;
+    const numvs = props.vsmetadata.length;
 
+    for (const it of props.vsmetadata) {
+	items.push(Object.assign({}, it));
+	operators[it.name] = '';
+    }
     for (const it of props.fileattributes) {
 	items.push(Object.assign({}, it));
 	operators[it.name] = '';
     }
     if (props.filter) {
-	for (const f of props.filter.filters as IComparisonFilter[]) {
-	    const it = items.find(i => i.name === f.key);
-	    if (it) {
-		it.value = f.value;
-		operators[it.name] = f.type;
+	if (props.filter.fileFilter) {
+	    for (const f of props.filter.fileFilter.filters) {
+		const it = items.find(i => i.name === f.key);
+		if (it) {
+		    it.value = f.value;
+		    operators[it.name] = f.type;
+		}
+	    }
+	}
+	if (props.filter.vectorStoreFilter) {
+	    for (const name in props.filter.vectorStoreFilter) {
+		const it = items.find(i => i.name === name);
+		if (it) {
+		    it.value = props.filter.vectorStoreFilter[name];
+		    operators[it.name] = 'eq';
+		}
 	    }
 	}
     }
@@ -27,11 +44,20 @@
 	    operators[item.name] = '';
     }
     function onBack() {
-	const filter: ICompoundFilter = { type: 'and', filters: [] };
-	for (const item of items) {
+	const filter: IOpenAIFilter = {
+	    fileFilter: { type: 'and', filters: [] },
+	    vectorStoreFilter: {}
+	};
+	for (let i = 0; i < items.length; i++) {
+	    const item = items[i];
 	    if (operators[item.name]) {
-		const f: IComparisonFilter = { key: item.name, type: operators[item.name] as 'eq' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte', value: item.value };
-		(filter.filters as IComparisonFilter[]).push(f);
+		if (i < numvs) {
+		    filter.vectorStoreFilter[item.name] = item.value;
+		}
+		else {
+		    const f: IComparisonFilter = { key: item.name, type: operators[item.name] as 'eq' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte', value: item.value };
+		    filter.fileFilter.filters.push(f);
+		}
 	    }
 	}
 	emits('back', filter);
@@ -53,7 +79,8 @@
 		</tr>
 	    </thead>
 	    <tbody>
-		<settings-line v-for="item in items" :key="item.name" :item="item" :op="operators[item.name]" :operations="ops" clearable @change="onChange(item, true)" 
+		<settings-line v-for="(item, index) in items" :key="item.name" :item="item" :op="operators[item.name]" 
+			       :operations="index < numvs ? opsvs : opsfile" clearable @change="onChange(item, true)" 
 			       @clear="onChange(item, false)" @operation="(op) => onOperation(item, op)">
 		</settings-line>
 		<tr>