@christianriedl/utils 1.0.136 → 1.0.138

package/dist/iOpenAI.d.ts

@@ -2,8 +2,30 @@ import { InjectionKey } from 'vue';
 import { ILogger } from './iLogger';
 import { Dictionary } from './types';
 export declare const getOpenAISymbol: InjectionKey<() => IOpenAIService>;
+export interface IResultAnnotation {
+    file_id?: string;
+    filename?: string;
+    url?: string;
+    index?: number;
+    type: 'file_citation' | 'url_citation';
+}
+export interface IResultContent {
+    annotations?: IResultAnnotation[];
+    text: string;
+    type: 'output_text';
+}
+export interface IResultOutput {
+    id: string;
+    queries?: string[];
+    results?: any[];
+    role?: 'assistant';
+    status?: 'in_progress' | 'completed' | 'incomplete';
+    type: 'message' | 'file_search_call' | 'mcp_call' | 'function_call';
+    content?: IResultContent[];
+}
 export interface IResponseResult {
     id?: string;
+    output?: IResultOutput[];
     text?: string;
     error?: string;
     json?: any;
@@ -32,7 +54,7 @@ export interface IMcpTool extends ITool {
 export interface IFileSearchTool extends ITool {
     type: 'file_search';
     vector_store_ids: string[];
-    filters?: any;
+    filters?: IComparisonFilter | ICompoundFilter;
     max_num_results?: number;
 }
 export interface IWebSearchLocation {
@@ -53,6 +75,15 @@ export interface IFunctionTool extends ITool {
     strict: boolean | null;
     description?: string | null;
 }
+export interface IComparisonFilter {
+    key: string;
+    type: 'eq' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte';
+    value: string | number | boolean;
+}
+export interface ICompoundFilter {
+    filters: IComparisonFilter[] | unknown;
+    type: 'and' | 'or';
+}
 export interface IOpenAIOptions {
     model: string;
     instructions?: string | null;
@@ -68,7 +99,7 @@ export interface IOpenAIService {
     options: IOpenAIOptions;
     modelNames: string[];
     initialize(): Promise<boolean>;
-    response(prompt: string | string[], tools?: string[], imageUrl?: string, json?: ISchema): Promise<IResponseResult>;
+    response(prompt: string | string[], tools?: string[], imageUrl?: string, json?: ISchema, fileSearchFilter?: ICompoundFilter | IComparisonFilter): Promise<IResponseResult>;
     clearContext(): void;
     getModels(): Promise<string[]>;
 }
@@ -86,6 +117,17 @@ export interface IVectorStore {
     name: string;
     files: Dictionary<string>;
 }
+export interface IVectorSearchContent {
+    type: 'text';
+    text: string;
+}
+export interface IVectorSearchResult {
+    attributes: Dictionary<string | number | boolean> | null;
+    content: IVectorSearchContent[];
+    file_id: string;
+    filename: string;
+    score: number;
+}
 export interface IOpenAIServiceWithVectorStore extends IOpenAIServiceWithTools {
     vectorStore?: Dictionary<IVectorStore>;
     initializeVectorStore(): Promise<boolean>;
@@ -94,6 +136,7 @@ export interface IOpenAIServiceWithVectorStore extends IOpenAIServiceWithTools {
     addFile(fileUrl: string | File, vectorStoreName: string, wait?: boolean): Promise<boolean>;
     deleteFile(fileId: string): Promise<boolean>;
     deleteVectorStore(vectorStoreId: string): Promise<boolean>;
+    searchVectoreStore(vectorStoreName: string, query: string | string[], rewriteQuery?: boolean, maxNumResults?: number, filters?: ICompoundFilter | IComparisonFilter): Promise<IVectorSearchResult[]>;
     getFileId(fileUrl: string): string | undefined;
 }
 export interface IOpenAIAppConfig {

package/package.json

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

package/src/components/OpenAI.vue

@@ -24,9 +24,10 @@
     const isUpload = ref(false);
     const showConfig = ref(false);
     const files = ref<File[]>([]);
-    const dataUrl = ref("");
+    const imageUrl = ref("");
     const camera = ref<InstanceType<typeof Camera>>();
     const htmlText = ref('');
+    const tools = ref(props.tools);
 
     onUnmounted(() => {
 	openAI.clearContext();
@@ -35,23 +36,23 @@
     });
 
     async function onComplete() {
-	replyLines.value = ["WAITING ..."];
+	htmlText.value = "<h4>WAITING ...</h4>";
 	files.value = [];
 	isUpload.value = false;
 	let answer: IResponseResult;
 	if (camera.value) {
-	    dataUrl.value = await camera.value.snapshot() as string;
+	    imageUrl.value = await camera.value.snapshot() as string;
 	    camera.value.stop();
 	    camera.value = undefined;
 	    isCamera.value = false;
 	}
-	if (dataUrl.value) {
-	    answer = await openAI.response(question.value, undefined, dataUrl.value);
-	    dataUrl.value = "";
+	if (imageUrl.value) {
+	    answer = await openAI.response(question.value, undefined, imageUrl.value);
+	    imageUrl.value = "";
 	}
 	else {
-	    if (props.tools !== undefined) {
-		answer = await openAI.response(question.value, props.tools);
+	    if (tools.value !== undefined) {
+		answer = await openAI.response(question.value, tools.value);
 	    }
 	    else {
 		answer = await openAI.response(question.value);
@@ -67,7 +68,6 @@
 		}
 	    }
 	    if (openAI.options.outputFormat == 'html') {
-
 		const tempDiv = document.createElement('div');
 		if (answer.text.startsWith('```html\n')) {
 		    if (answer.text.endsWith('\n```')) {
@@ -91,10 +91,9 @@
 	    }
 	}
 	else {
-	    htmlText.value = '';
 	    const text = "KEINE KORREKTE ANTWORT : " + answer.error;
 	    emits('result', text);
-	    replyLines.value = [text];
+	    htmlText.value = `<h4>${text}</h4>`;
 	}
     }
     async function onResult(result: SpeechRecognitionResult) {
@@ -121,13 +120,14 @@
 	    const reader = new FileReader();
 	    reader.addEventListener("load", async () => {
 		// convert image file to base64 string
-		dataUrl.value = reader.result as string;
+		imageUrl.value = reader.result as string;
 	    }, false,);
 	    reader.readAsDataURL(files.value[0]);
 	}
     }
-    function onUse(tools: string[], persist: boolean) {
-	emits('use', tools, persist);
+    function onUse(usetools: string[], persist: boolean) {
+	tools.value = usetools;
+	emits('use', usetools, persist);
     }
     // Move to some library
     async function markdownToHtml(markdownText: string): Promise<string> {
@@ -189,7 +189,7 @@
 		</v-file-input>
 	    </v-col>
 	    <v-col cols="6">
-		<img width="100%" :src="dataUrl">
+		<img width="100%" :src="imageUrl">
 	    </v-col>
 	</v-row>
 	<v-row v-if="htmlText" dense >
@@ -201,7 +201,7 @@
 	    <v-col cols="12">{{line}}</v-col>
 	</v-row>
 	<v-dialog v-model="showConfig" :fullscreen="isMobile">
-	    <OpenAIConfig :tools="props.tools" :ismobile="isMobile" @use="onUse" @back="showConfig=false"></OpenAIConfig>
+	    <OpenAIConfig :tools="tools" :ismobile="isMobile" @use="onUse" @back="showConfig=false"></OpenAIConfig>
 	</v-dialog>
     </v-container>
 </template>

package/src/components/OpenAIConfig.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
     import { inject, ref, reactive } from 'vue';
     import { appConfigSymbol, AppConfig, Dictionary } from '@christianriedl/utils';
-    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, IOpenAIAppConfig, IOpenAIOptions, ITool } from '@christianriedl/utils';
+    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, IOpenAIAppConfig, IOpenAIOptions, ITool, IMcpTool, IFileSearchTool } from '@christianriedl/utils';
 
     interface IFunction {
 	name: string;
@@ -88,6 +88,7 @@
 	if (toolsChanged.value) {
 	    for (const key in fileSearch) {
 		const vsNames = fileSearch[key];
+		tools[key].vector_store_ids.splice(0, tools[key].vector_store_ids.length);
 		for (let i = 0; i < vsNames.length; i++) {
 		    tools[key].vector_store_ids[i] = openAI.vectorStore![vsNames[i]].id;
 		}
@@ -119,6 +120,29 @@
 	emits('use', useTools, persist);
 	useChanged.value = false;
     }
+    function onAddMcp() {
+	const name = window.prompt('Enter MCP name:');
+	if (name && name.length > 0) {
+	    if (tools[name]) {
+		alert('Tool with this name already exists, please choose another name !');
+		return;
+	    }
+	    const mcpTool: IMcpTool = { type: 'mcp', server_label: name, server_url: '<set url>', require_approval: 'never' };
+	    tools[name] = mcpTool;
+	}
+    }
+    function onAddSearch() {
+	const name = window.prompt('Enter File search name:');
+	if (name && name.length > 0) {
+	    if (tools[name]) {
+		alert('Tool with this name already exists, please choose another name !');
+		return;
+	    }
+	    const searchTool: IFileSearchTool = { type: 'file_search', vector_store_ids: [] };
+	    tools[name] = searchTool;
+	    fileSearch[name] = [];
+	}
+    }
     function vectorStoreSelected() {
 	selectedVectorStoreFile.value = '';
 	const vs = openAI.vectorStore![selectedVectorStoreName.value];
@@ -302,6 +326,16 @@
 		    <v-icon icon="$save"></v-icon>
 		</v-btn>
 	    </v-col>
+	    <v-col cols="2">
+		<v-btn class="bg-office" @click="onAddMcp">ADD MCP
+		    <v-icon icon="$plus"></v-icon>
+		</v-btn>
+	    </v-col>
+	    <v-col cols="2">
+		<v-btn class="bg-office" @click="onAddSearch">ADD SEARCH
+		    <v-icon icon="$plus"></v-icon>
+		</v-btn>
+	    </v-col>
 	</v-row>
 	<template v-if="!props.ismobile && openAI.vectorStore">
 	    <v-divider></v-divider>