Address comments

Signed-off-by: Daishan Peng <[email protected]>

Author: StrongMonkey

actions/knowledge/filehelper.ts

@@ -2,8 +2,8 @@
 
 import fs from 'fs';
 import path from 'path';
-import { FileDetail } from '@/actions/knowledge/util';
 import { WORKSPACE_DIR } from '@/config/env';
+import { FileDetail } from '@/model/knowledge';
 
 export async function getFileOrFolderSizeInKB(
   filePath: string
@@ -30,13 +30,12 @@ export async function getFileOrFolderSizeInKB(
   return 0;
 }
 
-export async function importFiles(
-  files: string[]
-): Promise<Map<string, FileDetail>> {
+export async function importFiles(files: string[]) {
   const result: Map<string, FileDetail> = new Map();
 
   for (const file of files) {
     // check if filepath lives in notion or onedrive integration folders
+    // The file should live in a folder with the pattern ${WORKSPACE_DIR}/knowledge/integrations/${type}/${DocumentId}/${fileName}
     const baseDir = path.dirname(path.dirname(file));
     let type = path.basename(baseDir);
     if (

actions/knowledge/knowledge.ts

@@ -4,8 +4,8 @@ import path from 'path';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { KNOWLEDGE_DIR } from '@/config/env';
-import { FileDetail } from '@/actions/knowledge/util';
 import { getFileOrFolderSizeInKB } from '@/actions/knowledge/filehelper';
+import { FileDetail } from '@/model/knowledge';
 
 const execPromise = promisify(exec);
 

actions/knowledge/notion.ts

@@ -17,9 +17,7 @@ export async function isNotionConfigured() {
   );
 }
 
-export async function getNotionFiles(): Promise<
-  Map<string, { url: string; fileName: string }>
-> {
+export async function getNotionFiles() {
   const dir = path.join(WORKSPACE_DIR(), 'knowledge', 'integrations', 'notion');
   const metadataFromFiles = fs.readFileSync(path.join(dir, 'metadata.json'));
   const metadata = JSON.parse(metadataFromFiles.toString());

actions/knowledge/tool.ts

@@ -43,8 +43,10 @@ export async function runSyncTool(
   return;
 }
 
-// syncFiles syncs all files only when they are selected
-// todo: we can stop syncing once file is no longer used by any other script
+/**
+ * syncFiles syncs all files only when they are selected
+ * todo: we can stop syncing once file is no longer used by any other script
+ */
 export async function syncFiles(
   selectedFiles: string[],
   type: 'notion' | 'onedrive'

actions/knowledge/util.ts

@@ -1,9 +1,3 @@
-export interface FileDetail {
-  fileName: string;
-  size: number;
-  type: 'local' | 'notion' | 'onedrive';
-}
-
 export function gatewayTool(): string {
   return 'github.com/gptscript-ai/knowledge/[email protected]';
 }

contexts/edit.tsx

@@ -16,11 +16,8 @@ import {
   getFiles,
   runKnowledgeIngest,
 } from '@/actions/knowledge/knowledge';
-import {
-  ensureKnowledgeTool,
-  FileDetail,
-  getCookie,
-} from '@/actions/knowledge/util';
+import { ensureKnowledgeTool, getCookie } from '@/actions/knowledge/util';
+import { FileDetail } from '@/model/knowledge';
 
 const DEBOUNCE_TIME = 1000; // milliseconds
 const DYNAMIC_INSTRUCTIONS = 'dynamic-instructions';

model/knowledge.ts

@@ -0,0 +1,14 @@
+export const FileProviderType = {
+  Local: 'local',
+  OneDrive: 'onedrive',
+  Notion: 'notion',
+} as const;
+
+export type FileProviderType =
+  (typeof FileProviderType)[keyof typeof FileProviderType];
+
+export interface FileDetail {
+  fileName: string;
+  size: number;
+  type: FileProviderType;
+}

server/app.mjs

@@ -59,7 +59,7 @@ export const startAppServer = ({ dev, hostname, port, appDir }) => {
       () => {
         syncKnowledgeFilesFromIntegrations(gptscript);
       },
-      24 * 60 * 60 * 1000
+      24 * 60 * 60 * 1000 // 24 hours
     );
 
     Promise.resolve(gptscriptInitPromise).then(() => {