@christianriedl/media 1.0.291 → 1.0.292

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.291",
+  "version": "1.0.292",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
   "author": "Christian Riedl",
   "license": "ISC",
   "dependencies": {
-    "@christianriedl/utils": "^1.0.199",
+    "@christianriedl/utils": "^1.0.200",
     "@christianriedl/rest": "^1.0.97",
     "@christianriedl/epg": "^1.0.44",
     "buffer": "^6.0.3"

package/src/views/DocumentsPage.vue

@@ -2,11 +2,12 @@
     import { inject, ref, reactive, watch, computed, onMounted, StyleValue } from 'vue';
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, Dictionary, appStateSymbol, appConfigSymbol, EScope, Helper } from '@christianriedl/utils';
-    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, getRagSymbol, IRagService } from '@christianriedl/utils';
+    import { getOpenAISymbol, IOpenAIServiceWithVectorStore, getRagSymbol, IRagService, IRagDocument } from '@christianriedl/utils';
     import { getMediaBinSymbol, getMediaInstanceSymbol, IDocumentInfo, IMediaAppConfig } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
     import Mail from '@christianriedl/office/src/components/Mail.vue';
     import RagDocuments from '@christianriedl/utils/src/components/RagDocuments.vue';
+    import RagBatches from '@christianriedl/utils/src/components/RagBatches.vue';
 
     interface IID {
 	fileId: string;
@@ -17,8 +18,8 @@
     const router = useRouter();
     const appState = inject(appStateSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getRagService = inject(getRagSymbol);
-    const ragService = getRagService() ?? null;
+    const getRagService = inject(getRagSymbol)!;
+    const ragService = getRagService();
     const getAiService = inject(getOpenAISymbol)!;
     const aiService = ragService ? null : getAiService() as IOpenAIServiceWithVectorStore;
     const officeExtensions: string[] = mediaAppConfig.officeExtensions.split(',');
@@ -32,6 +33,7 @@
     const backVisible = ref(false);
     const uploadVisible = ref(false);
     const ragVisible = ref(false);
+    const batchVisible = ref(false);
     const recursive = ref(true);
     const like = ref("");
     const contains = ref("");
@@ -42,11 +44,13 @@
     const directoryInfos = reactive<IDocumentInfo[]>([]);
     const fileInfos = reactive<IDocumentInfo[]>([]);
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
+    let addDocument: IRagDocument;
     let documentRoot = "";
 
     onMounted(async() => {
 	mediaService.log.trace('Documents created');
-	documentRoot = await mediaService.getDocumentInfo("").path;
+	const info = await mediaService.getDocumentInfo("");
+	documentRoot = info.path! + '\\';
 	if (ragService)
 	    ragService.getSortedFileNames();
 	if (aiService)
@@ -93,7 +97,7 @@
     }
     function makeRelPath(name: string, fpath?: string) : string {
 	if (fpath)
-	    return fpath.substring(documentRoot.length).replace('\\', '/');
+	    return fpath.substring(documentRoot.length).replaceAll('\\', '/');
 	else
 	    return path.value.length > 0 ? (path.value + '/' + name) : name;
     }
@@ -101,7 +105,7 @@
 	if (fpath)
 	    return fpath;
 	else
-	    return documentRoot + '\\' + (path.value.length > 0 ? (path.value + '\\' + name) : name);
+	    return documentRoot + (path.value.length > 0 ? (path.value + '\\' + name) : name);
     }
     function download(name: string, fpath?: string) {
 	const fullPath = makeRelPath(name, fpath);
@@ -144,7 +148,7 @@
 	if (!info)
 	    window.alert("Not found: " + fullPath);
 	else {
-	    attachment.value = info.path;
+	    attachment.value = info.path!;
 	    showSendMail.value = true;
 	}
     }
@@ -177,7 +181,7 @@
 	return false;
     }
     function getFileId(file: string): IID | undefined {
-	if (aiService.vectorStore) {
+	if (aiService && aiService.vectorStore) {
 	    for (const key in aiService.vectorStore) {
 		const store = aiService.vectorStore[key];
 		for (const id in store.files) {
@@ -192,7 +196,7 @@
     function ragClass(name: string, fpath?: string): Dictionary<boolean> {
 	const cls: Dictionary<boolean> = { 'bg-office': true };
 	if (ragService) {
-	    if (ragService.containsFile(makeAbsPath(name, fpath)) {
+	    if (ragService.containsFile(makeAbsPath(name, fpath))) {
 		cls['text-warning'] = true;
 	    }
 	}
@@ -206,7 +210,7 @@
     async function checkRag(name: string, fpath?: string) {
 	if (ragService) {
 	    const fullPath = makeAbsPath(name, fpath);
-	    if (ragService.contains(fullPath); {
+	    if (ragService.containsFile(fullPath)) {
 		if (window.confirm(`File ist in Vectorstore, remove ?`)) {
 		    const docs = await ragService.getDocuments();
 		    const found = docs.find(x => x.fileName == fullPath);
@@ -217,25 +221,45 @@
 			alert("Nicht gefunden: " + fullPath);
 		}
 	    }
-	    else
-		alert("Mit Batch in Vectorstore einf�gen");
-	    return;
-	}
-	const iid = getFileId(name);
-	if (iid) {
-	    if (window.confirm(`File is in vectorstore ${iid.vectorStore}, delete ?`)) {
-		const rc = await aiService.deleteFile(iid.fileId);
+	    else {
+		if (window.confirm(`File ist nicht in Vectorstore, add it ?`)) {
+		    const relPath = makeRelPath(name, fpath);
+		    let url = mediaService.getFileUrl(relPath);
+		    addDocument = {
+			key: 0,
+			fileName: fullPath,
+			description: "",
+			url: mediaService.getFileUrl(relPath),
+			documentCategories: [],
+			documentType: ""
+		    } as IRagDocument;
+		    batchVisible.value = true;
+		}
 	    }
 	}
-	else {
-	    const vsname = window.prompt(`Enter vectorstore name for ${name} to add it`);
-	    if (vsname != null) {
-		if (!folder)
-		    folder = path.value;
-		let url = mediaService.getFileUrl(folder.length > 0 ? (folder + '/' + name) : name);
-		const rc = await aiService.addFile(url, vsname);
+	if (aiService) {
+	    const iid = getFileId(name);
+	    if (iid) {
+		if (window.confirm(`File is in vectorstore ${iid.vectorStore}, delete ?`)) {
+		    const rc = await aiService.deleteFile(iid.fileId);
+		}
+	    }
+	    else {
+		const vsname = window.prompt(`Enter vectorstore name for ${name} to add it`);
+		if (vsname != null) {
+		    const fullPath = makeRelPath(name, fpath);
+		    let url = mediaService.getFileUrl(fullPath);
+		    const rc = await aiService.addFile(url, vsname);
+		}
 	    }
 	}
+}
+    async function showRag() {
+	var entries = await ragService.getEntries();
+	if (entries && entries.length > 0)
+	    batchVisible.value = true;
+	else
+	    ragVisible.value = true;
     }
     function info(item: IDocumentInfo): string {
 	let sizeStr = "";
@@ -252,7 +276,8 @@
     }
 </script>
 <template>
-    <rag-documents v-if="ragVisible" @back="ragVisible=false"></rag-documents>
+    <rag-batches v-if="batchVisible" :addDocument="addDocument" @back="batchVisible=false"></rag-batches>
+    <rag-documents v-else-if="ragVisible" @back="ragVisible=false"></rag-documents>
     <v-card v-else class="bg-office">
 	<v-card-title>{{path}}</v-card-title>
 	<v-container v-if="isMobile" fluid>
@@ -285,7 +310,7 @@
 		    <v-btn prepend-icon="$search" variant="tonal" @click="onSearch">SEARCH</v-btn>
 		</v-col>
 		<v-col v-if="isAdmin" cols="1">
-		    <v-btn prepend-icon="$pencil" variant="tonal" @click.stop="ragVisible = true">Show RAG</v-btn>
+		    <v-btn prepend-icon="$pencil" variant="tonal" @click.stop="showRag()">Show RAG</v-btn>
 		</v-col>
 		<v-col v-if="isAdmin" cols="1">
 		    <v-btn prepend-icon="$upload" variant="tonal" @click.stop="uploadVisible = !uploadVisible">UPLOAD</v-btn>