@christianriedl/media 1.0.265 → 1.0.267

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.265",
+  "version": "1.0.267",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
   "author": "Christian Riedl",
   "license": "ISC",
   "dependencies": {
-    "@christianriedl/utils": "^1.0.115",
+    "@christianriedl/utils": "^1.0.119",
     "@christianriedl/rest": "^1.0.84",
     "@christianriedl/epg": "^1.0.43"
   },

package/src/components/PhotoMetaData.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
     import { ref, computed, inject } from 'vue';
-    import { VTreeview } from 'vuetify/labs/VTreeview';
     import { Dictionary, Helper } from '@christianriedl/utils';
     import { IPictureFile, EOrientation, EPictureFlags, getMediaBinSymbol } from '@christianriedl/media';
 

package/src/views/BooksPage.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
     import { inject, ref, reactive, onMounted, onUnmounted, computed, StyleValue } from 'vue';
     import { useRouter, useRoute } from 'vue-router';
-    import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, ICompleteData, EScope, EDevice } from '@christianriedl/utils';
+    import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, IResponseResult, ISchema, EScope, EDevice } from '@christianriedl/utils';
     import { BooksService, getBooksSymbol, IAuthorShort, IAuthor, IBook } from '@christianriedl/media';
     import BookLine from '../components/BookLine.vue';
 
@@ -283,7 +283,7 @@
         return true;
     }
     async function getAuthorDataFromAI(surName: string, givenName: string) : Promise<boolean> {
-        const schema =
+        const schema : ISchema =
         {
           "name": "author_data",
           "schema": {
@@ -302,20 +302,20 @@
             },
             "required": ["geburtstag", "sterbetag", "geburtsland"],
             "type": "object"
-          },
-          "strict": true
+          }
         }
         const prompt = `Geburtstag, Sterbetag, Geburtsland von ${givenName} ${surName} ?`;
-        const result = await openAI.completeJson(prompt, schema) as any;
-        if (result) {
+        const result = await openAI.response(prompt, undefined, undefined, schema);
+        if (result.json) {
+            const json = result.json as any;
             if (!currentAuthor.yearOfBirth)
-                currentAuthor.yearOfBirth = getYear(result.geburtstag);
+                currentAuthor.yearOfBirth = getYear(json.geburtstag);
             if (!currentAuthor.yearOfDeath)
-                currentAuthor.yearOfDeath = result.sterbetag ? getYear(result.sterbetag) : undefined;
+                currentAuthor.yearOfDeath = json.sterbetag ? getYear(json.sterbetag) : undefined;
             if (!currentAuthor.category)
                 currentAuthor.category = booksService.categories[0];
             if (!currentAuthor.country)
-                currentAuthor.country = result.geburtsland;
+                currentAuthor.country = json.geburtsland;
             return true;
         }
         else {
@@ -332,7 +332,7 @@
         return 0;
     }
     async function getAuthorBooksFromAI(surName: string, givenName: string,  authorId: number) : Promise  <IBook[]> {
-        const schema = 
+        const schema: ISchema = 
         {
           "name": "books",
           "schema": {
@@ -358,15 +358,15 @@
               },
               "required": ["werke"],
               "type": "object"
-          },
-          "strict": true
+          }
         }
         const prompt = `Alle Buchtitel in Deutsch mit Erscheinungsjahr von ${givenName} ${surName}`;
-        const result = await openAI.completeJson(prompt, schema) as any;
-        if (result && result.werke) {
+        const result = await openAI.response(prompt, undefined, undefined, schema);
+        if (result && result.json) {
             const books: IBook[] = [];
-            for (let i = 0; i < result.werke.length; i++) {
-                books.push ({ id: i, authorId: authorId, title: result.werke[i].werk, year : result.werke[i].erscheinungsjahr});
+            const json = result.json as any;
+            for (let i = 0; i < json.werke.length; i++) {
+                books.push ({ id: i, authorId: authorId, title: json.werke[i].werk, year : json.werke[i].erscheinungsjahr});
             }
             return books;
         }
@@ -377,9 +377,9 @@
     }
     async function getBookDescriptionFromAI(surName: string, givenName: string,  title: string, prefix?: string) : Promise <string> {
         const prompt = `Eine ${prefix} Inhaltsangabe von dem Buch "${title}" von ${givenName} ${surName}`;
-        const result = await openAI.complete(prompt);
-        if (result && result.choices) {
-            return result.choices[0];
+        const result = await openAI.response(prompt);
+        if (result && result.text) {
+            return result.text;
         }
         else {
           alert("No AI result for : " + prompt);

package/src/views/BooksPlacePage.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-    import { inject, ref, reactive, onMounted, onUnmounted, computed, StyleValue } from 'vue';
+    import { inject, ref, reactive, computed } from 'vue';
     import { useRouter, useRoute } from 'vue-router';
-    import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, ICompleteData, EScope, EDevice } from '@christianriedl/utils';
-    import { BooksService, getBooksSymbol, IAuthorShort, IAuthor, IFullBook, IPlace } from '@christianriedl/media';
+    import { IAppState, appStateSymbol, EScope, EDevice } from '@christianriedl/utils';
+    import { BooksService, getBooksSymbol, IFullBook, IPlace } from '@christianriedl/media';
     import BookPlace from '../components/BookPlace.vue';
 
     const route = useRoute();

package/src/views/BooksSearchPage.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-    import { inject, ref, reactive, onMounted, onUnmounted, computed, StyleValue } from 'vue';
-    import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, ICompleteData, EScope, EDevice } from '@christianriedl/utils';
+    import { inject, ref, reactive, computed, StyleValue } from 'vue';
+    import { IAppState, appStateSymbol, EDevice } from '@christianriedl/utils';
     import { BooksService, getBooksSymbol, IAuthorShort, IAuthor, IFullBook } from '@christianriedl/media';
     import BookSearchLine from '../components/BookSearchLine.vue';
 

package/src/views/DocumentsPage.vue

@@ -2,6 +2,7 @@
     import { inject, ref, reactive, watch, computed, onMounted, StyleValue } from 'vue';
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, appStateSymbol, appConfigSymbol, EScope, Helper } from '@christianriedl/utils';
+    import { getOpenAISymbol, IOpenAIServiceWithVectorStore } from '@christianriedl/utils';
     import { getMediaBinSymbol, getMediaInstanceSymbol, IDocumentInfo, IMediaAppConfig } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
 
@@ -9,6 +10,8 @@
     const router = useRouter();
     const appState = inject(appStateSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
+    const getAiService = inject(getOpenAISymbol)!;
+    const aiService = getAiService() as IOpenAIServiceWithVectorStore;
     const officeExtensions: string[] = mediaAppConfig.officeExtensions.split(',');
     const isMobile = appState.isMobile;
     const getMediaService = inject(getMediaBinSymbol)!;
@@ -27,86 +30,94 @@
     const directoryInfos = reactive<IDocumentInfo[]>([]);
     const fileInfos = reactive<IDocumentInfo[]>([]);
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
+    const inVectorStore = reactive<Dictionary<string>>({});
 
     onMounted(() => {
-        mediaService.log.trace('Documents created');
-        start();
+	mediaService.log.trace('Documents created');
+	start();
     });
     async function start() {
-        if (route.query && route.query.path) {
-            path.value = decodeURIComponent(route.query.path.toString());
-        } 
-        else {
-            path.value = "";
-        }
-        getItems(path.value);
+	if (route.query && route.query.path) {
+	    path.value = decodeURIComponent(route.query.path.toString());
+	}
+	else {
+	    path.value = "";
+	}
+	aiService.initializeVectorStore()
+	    .then(() => {
+		for (const key in aiService.vectorStore) {
+		    const store = aiService.vectorStore[key];
+		    for (const file in store.files) {
+			inVectorStore[store.files[file]] = key;
+		    }
+		}
+	    });
+	getItems(path.value);
     }
     watch(() => route.query, () => start());
 
     async function getItems(fullPath: string) {
-        if (isMobile) {
-            const directories = await mediaService.getDirectories(fullPath);
-            directoryNames.splice(0, directoryNames.length, ...directories);
-            const files = await mediaService.getFiles(fullPath);
-            fileNames.splice(0, fileNames.length, ...files);
-            mediaService.log.trace(`At ${fullPath} : ${directories.length} directories, ${files.length} files`);
-        }
-        else {
-            const directories = await mediaService.getDirectoriesFull(fullPath);
-            directoryInfos.splice(0, directoryInfos.length, ...directories);
-            const files = await mediaService.getFilesFull(fullPath);
-            fileInfos.splice(0, fileInfos.length, ...files);
-            mediaService.log.trace(`At ${fullPath} : ${directories.length} directories, ${files.length} files`);
-        }
-        backVisible.value = path.value.length > 0;
+	if (isMobile) {
+	    const directories = await mediaService.getDirectories(fullPath);
+	    directoryNames.splice(0, directoryNames.length, ...directories);
+	    const files = await mediaService.getFiles(fullPath);
+	    fileNames.splice(0, fileNames.length, ...files);
+	    mediaService.log.trace(`At ${fullPath} : ${directories.length} directories, ${files.length} files`);
+	}
+	else {
+	    const directories = await mediaService.getDirectoriesFull(fullPath);
+	    directoryInfos.splice(0, directoryInfos.length, ...directories);
+	    const files = await mediaService.getFilesFull(fullPath);
+	    fileInfos.splice(0, fileInfos.length, ...files);
+	    mediaService.log.trace(`At ${fullPath} : ${directories.length} directories, ${files.length} files`);
+	}
+	backVisible.value = path.value.length > 0;
     }
     async function onSelect(name: string) {
-        const fullPath = path.value.length > 0 ? (path.value + '/' + name) : name;
-        router.push ({path: 'documents', query: { path: encodeURIComponent(fullPath) }});
+	const fullPath = path.value.length > 0 ? (path.value + '/' + name) : name;
+	router.push({ path: 'documents', query: { path: encodeURIComponent(fullPath) } });
     }
     async function onSearch() {
-        const files = await mediaService.searchFiles(path.value, contains.value, like.value, recursive.value);
-        directoryInfos.splice(0, directoryInfos.length);
-        fileInfos.splice(0, fileInfos.length, ...files);
-        mediaService.log.trace(`At ${path.value} : search ${files.length} files`);
+	const files = await mediaService.searchFiles(path.value, contains.value, like.value, recursive.value);
+	directoryInfos.splice(0, directoryInfos.length);
+	fileInfos.splice(0, fileInfos.length, ...files);
+	mediaService.log.trace(`At ${path.value} : search ${files.length} files`);
     }
     function download(name: string, folder?: string) {
-        if (!folder)
-            folder = path.value;
-        let url = mediaService.getFileUrl(folder.length > 0 ? (folder + '/' + name) : name);
-        const i = name.lastIndexOf('.');
-        if (i > 0) {
-            const ext = name.substring(i + 1);
-            if (officeExtensions.includes(ext)) {
-                url = 'https://view.officeapps.live.com/op/view.aspx?src=' + url;
-            }
-        }
-        window.open(url);
+	cccccctefcfkhjggitufgrlhcebiccnlcctfrkghrkrd
+	const i = name.lastIndexOf('.');
+	if (i > 0) {
+	    const ext = name.substring(i + 1);
+	    if (officeExtensions.includes(ext)) {
+		url = 'https://view.officeapps.live.com/op/view.aspx?src=' + url;
+	    }
+	}
+	window.open(url);
     }
     async function listBack() {
-        router.back();
+	router.back();
     }
-    async function shareDir (name: string) {
-        const fullPath = path.value.length > 0 ? (path.value + '/' + name) : name;
-        if (!await checkPublic(fullPath)) {
-            window.alert ("Not a public folder !!");
-            return;
-        }
-        const url = `https://www.christian-riedl.com/photos/documents?path=${encodeURIComponent(fullPath)}`;
-        await window.navigator.clipboard.writeText(url);
-        window.alert(`Created and Pasted : ${url} !`);
+    async function shareDir(name: string) {
+	const fullPath = path.value.length > 0 ? (path.value + '/' + name) : name;
+	if (!await checkPublic(fullPath)) {
+	    window.alert("Not a public folder !!");
+	    return;
+	}
+	const url = `https://www.christian-riedl.com/photos/documents?path=${encodeURIComponent(fullPath)}`;
+	await window.navigator.clipboard.writeText(url);
+	window.alert(`Created and Pasted : ${url} !`);
     }
     async function shareFile(name: string, folder?: string) {
-        if (!folder)
-            folder = path.value;
-        const fullPath = folder.length > 0 ? (folder + '/' + name) : name;
-        if (!await checkPublic(fullPath)) {
-            window.alert ("Not a public folder !!");
-            return;
-        }
-        const url = mediaService.getFileUrl(fullPath);;
-        await window.navigator.clipboard.writeText(url);
-        window.alert(`Created and Pasted : ${url} !`);
+	if (!folder)
+	    folder = path.value;
+	const fullPath = folder.length > 0 ? (folder + '/' + name) : name;
+	if (!await checkPublic(fullPath)) {
+	    window.alert("Not a public folder !!");
+	    return;
+	}
+	const url = mediaService.getFileUrl(fullPath);;
+	await window.navigator.clipboard.writeText(url);
+	window.alert(`Created and Pasted : ${url} !`);
     }
     async function deleteDirOrFile(name: string, folder?: string) {
 	if (!folder)
@@ -127,29 +138,60 @@
     function uploadDone() {
 	window.location.reload();
     }
-    async function checkPublic (path: string) : Promise<boolean> {
-        const instanceInfo = await instanceService.getInformation();
-        if (instanceInfo != null && instanceInfo.publicDocumentRoots) {
-            const publicRoots = instanceInfo.publicDocumentRoots.split(';');
-            for (let i = 0; i < publicRoots.length; i++) {
-                if (path.startsWith(publicRoots[i]))
-                    return true;
-            }
-        }
-        return false;
+    async function checkPublic(path: string): Promise<boolean> {
+	const instanceInfo = await instanceService.getInformation();
+	if (instanceInfo != null && instanceInfo.publicDocumentRoots) {
+	    const publicRoots = instanceInfo.publicDocumentRoots.split(';');
+	    for (let i = 0; i < publicRoots.length; i++) {
+		if (path.startsWith(publicRoots[i]))
+		    return true;
+	    }
+	}
+	return false;
+    }
+    function vectorColor(file: string): string | undefined {
+	if (inVectorStore[file]) {
+	    return 'warning';
+	}
+	return undefined;
+    }
+    async function vectorStore(file: string) {
+	if (inVectorStore[file]) {
+	    if (window.confirm(`File is in vectorstore ${inVectorStore[file]}, delete ?`)) {
+		const store = aiService.vectorStore[inVectorStore[file]]
+		for (const vsf in store.files) {
+		    if (store.files[vsf] == file) {
+			if (await aiService.deleteFile(vsf))
+			    delete inVectorStore[file];
+			break;
+		    }
+		}
+	    }
+	}
+	else {
+	    const name = window.prompt(`Enter vectorstore name for ${file} to add it`);
+	    if (name != null) {
+		if (!folder)
+		    folder = path.value;
+		let url = mediaService.getFileUrl(folder.length > 0 ? (folder + '/' + name) : name);
+		if (await aiService.addFile(url, name) {
+		    inVectorStore[file] = name;
+		}
+	    }
+	}
     }
-    function info (item: IDocumentInfo) : string {
-        let sizeStr = "";
-        if (item.size) {
-            if (item.size < 10000)
-                sizeStr = '  ' + item.size.toString() + ' B'; 
-            else if (item.size < 10000000)
-                sizeStr = '  ' + Helper.round (item.size / 1000, 2) + ' Kb'; 
-            else
-                sizeStr = '  ' + Helper.round (item.size / 1000000, 2) + ' Mb'; 
-        }
-        const str = ` - (${Helper.formatDate(item.date)}${sizeStr})`;
-        return str;
+    function info(item: IDocumentInfo): string {
+	let sizeStr = "";
+	if (item.size) {
+	    if (item.size < 10000)
+		sizeStr = '  ' + item.size.toString() + ' B';
+	    else if (item.size < 10000000)
+		sizeStr = '  ' + Helper.round(item.size / 1000, 2) + ' Kb';
+	    else
+		sizeStr = '  ' + Helper.round(item.size / 1000000, 2) + ' Mb';
+	}
+	const str = ` - (${Helper.formatDate(item.date)}${sizeStr})`;
+	return str;
     }
 </script>
 <template>
@@ -162,12 +204,13 @@
                 <v-col cols="1"><v-btn v-if="isAdmin" icon="$delete" class="bg-office" density="compact" variant="flat" @click.stop="deleteDirOrFile(dir)"></v-btn></v-col>
                 <v-divider />
             </v-row>
-            <v-row v-for="file in fileNames" :key="file" class="text-decoration-underline text-primary">
-                <v-col cols="10"><p class="font-weight-medium text-decoration-underline text-primary" @click.stop="download(file)">{{file}}</p></v-col>
-                <v-col cols="1"><v-btn v-if="isAdmin" icon="$share" class="bg-office" density="compact" variant="flat" @click.stop="shareFile(file)"></v-btn></v-col>
-                <v-col cols="1"><v-btn v-if="isAdmin" icon="$delete" class="bg-office" density="compact" variant="flat" @click.stop="deleteDirOrFile(file)"></v-btn></v-col>
-                <v-divider />
-            </v-row>
+	    <v-row v-for="file in fileNames" :key="file" class="text-decoration-underline text-primary">
+		<v-col cols="9"><p class="font-weight-medium text-decoration-underline text-primary" @click.stop="download(file)">{{file}}</p></v-col>
+		<v-col cols="1"><v-btn v-if="isAdmin" icon="$brain" class="bg-office" density="compact" variant="flat" :color="vectorColor(file)" @click.stop="vectorStore(file)"></v-btn></v-col>
+		<v-col cols="1"><v-btn v-if="isAdmin" icon="$share" class="bg-office" density="compact" variant="flat" @click.stop="shareFile(file)"></v-btn></v-col>
+		<v-col cols="1"><v-btn v-if="isAdmin" icon="$delete" class="bg-office" density="compact" variant="flat" @click.stop="deleteDirOrFile(file)"></v-btn></v-col>
+		<v-divider />
+	    </v-row>
         </v-container>
         <v-container v-else fluid>
             <v-row dense align="center">