@s-hirano-ist/s-scripts 1.12.2 → 1.14.0

package/dist/ingest-notes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-notes.d.ts","sourceRoot":"","sources":["../src/ingest-notes.ts"],"names":[],"mappings":""}

package/dist/ingest-notes.js

@@ -0,0 +1,187 @@
+#!/usr/bin/env node
+import { readFile } from "node:fs/promises";
+import { basename } from "node:path";
+import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
+import { createPushoverService } from "@s-hirano-ist/s-notification";
+import { glob } from "glob";
+const SCRIPT_NAME = "ingest-notes";
+function parseFrontmatter(content) {
+    if (!content.startsWith("---")) {
+        return { body: content };
+    }
+    const endIndex = content.indexOf("---", 3);
+    if (endIndex === -1) {
+        return { body: content };
+    }
+    const frontmatter = content.slice(3, endIndex).trim();
+    const body = content.slice(endIndex + 3).trim();
+    let heading;
+    let draft = false;
+    for (const line of frontmatter.split("\n")) {
+        const [key, ...rest] = line.split(":");
+        const value = rest.join(":").trim();
+        if (key?.trim() === "heading")
+            heading = value;
+        if (key?.trim() === "draft" && value === "true")
+            draft = true;
+    }
+    return { heading, draft, body };
+}
+function parseNoteFile(filePath, content) {
+    const { heading, draft, body } = parseFrontmatter(content);
+    if (draft)
+        return null;
+    if (heading) {
+        return { title: heading, markdown: body };
+    }
+    const title = basename(filePath, ".md");
+    const titleLine = `# ${title}`;
+    let markdown = body;
+    if (markdown.startsWith(titleLine)) {
+        markdown = markdown.slice(titleLine.length).replace(/^\n+/, "");
+    }
+    return { title, markdown };
+}
+async function main() {
+    const dryRun = process.argv.includes("--dry-run");
+    const env = {
+        DATABASE_URL: process.env.DATABASE_URL,
+        PUSHOVER_URL: process.env.PUSHOVER_URL,
+        PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
+        PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN,
+        USERNAME_TO_EXPORT: process.env.USERNAME_TO_EXPORT,
+    };
+    if (Object.values(env).some((v) => !v)) {
+        throw new Error("Required environment variables are not set.");
+    }
+    const contentsPath = process.env.S_CONTENTS_PATH ?? process.cwd();
+    // Dynamic import for Prisma ESM compatibility
+    const { PrismaClient } = await import("@s-hirano-ist/s-database/generated");
+    const prisma = new PrismaClient({ accelerateUrl: env.DATABASE_URL ?? "" });
+    const notificationService = createPushoverService({
+        url: env.PUSHOVER_URL ?? "",
+        userKey: env.PUSHOVER_USER_KEY ?? "",
+        appToken: env.PUSHOVER_APP_TOKEN ?? "",
+    });
+    const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
+    const exported = makeExportedStatus();
+    const fileTitles = new Set();
+    async function ingestNotes() {
+        const files = await glob(`${contentsPath}/markdown/note/*.md`);
+        console.log(`📁 ${files.length} 件のファイルを検出しました。`);
+        const existingNotes = await prisma.note.findMany({
+            where: { userId },
+            select: { id: true, title: true, markdown: true },
+        });
+        const existingNotesMap = new Map(existingNotes.map((n) => [n.title, n]));
+        console.log(`📊 DB に ${existingNotesMap.size} 件の既存ノートがあります。`);
+        let insertedCount = 0;
+        let updatedCount = 0;
+        let skippedCount = 0;
+        let errorCount = 0;
+        for (const filePath of files) {
+            let parsed = null;
+            try {
+                const content = await readFile(filePath, "utf-8");
+                parsed = parseNoteFile(filePath, content);
+                if (!parsed) {
+                    console.log(`⏭️  スキップ（draft）: ${basename(filePath)}`);
+                    skippedCount++;
+                    continue;
+                }
+                fileTitles.add(parsed.title);
+                const existing = existingNotesMap.get(parsed.title);
+                if (existing) {
+                    if (existing.markdown === parsed.markdown) {
+                        // console.log(`⏭️  スキップ（変更なし）: ${parsed.title}`);
+                        skippedCount++;
+                        continue;
+                    }
+                    if (dryRun) {
+                        console.log(`🔄 [dry-run] 更新予定: ${parsed.title}`);
+                    }
+                    else {
+                        await prisma.note.update({
+                            where: { id: existing.id },
+                            data: { markdown: parsed.markdown },
+                        });
+                        console.log(`🔄 更新: ${parsed.title}`);
+                    }
+                    updatedCount++;
+                    continue;
+                }
+                if (dryRun) {
+                    console.log(`🔍 [dry-run] 挿入予定: ${parsed.title}`);
+                    insertedCount++;
+                    continue;
+                }
+                await prisma.note.create({
+                    data: {
+                        id: String(makeId()),
+                        title: parsed.title,
+                        markdown: parsed.markdown,
+                        status: exported.status,
+                        exportedAt: exported.exportedAt,
+                        userId,
+                        createdAt: new Date(),
+                    },
+                });
+                insertedCount++;
+                console.log(`✅ 挿入: ${parsed.title}`);
+            }
+            catch (error) {
+                console.error(`❌ エラー（${basename(filePath)}）:`, parsed
+                    ? `title(${parsed.title.length}文字) markdown(${parsed.markdown.length}文字)`
+                    : "parse前", error);
+                errorCount++;
+            }
+        }
+        return { insertedCount, updatedCount, skippedCount, errorCount };
+    }
+    async function purgeNotes() {
+        const exportedNotes = await prisma.note.findMany({
+            where: { userId, status: exported.status },
+            select: { id: true, title: true },
+        });
+        const toDelete = exportedNotes.filter((n) => !fileTitles.has(n.title));
+        if (toDelete.length === 0) {
+            console.log("🗑️  削除対象なし");
+            return 0;
+        }
+        let deletedCount = 0;
+        for (const note of toDelete) {
+            if (dryRun) {
+                console.log(`🗑️  [dry-run] 削除予定: ${note.title}`);
+            }
+            else {
+                await prisma.note.delete({ where: { id: note.id } });
+                console.log(`🗑️  削除: ${note.title}`);
+            }
+            deletedCount++;
+        }
+        return deletedCount;
+    }
+    try {
+        const { insertedCount, updatedCount, skippedCount, errorCount } = await ingestNotes();
+        const deletedCount = await purgeNotes();
+        console.log(`\n📊 結果: 挿入 ${insertedCount} 件, 更新 ${updatedCount} 件, スキップ ${skippedCount} 件, 削除 ${deletedCount} 件, エラー ${errorCount} 件${dryRun ? " (dry-run)" : ""}`);
+        await notificationService.notifyInfo(`${SCRIPT_NAME} completed`, {
+            caller: SCRIPT_NAME,
+        });
+    }
+    catch (error) {
+        console.error("❌ エラーが発生しました:", error);
+        await notificationService.notifyError(`${SCRIPT_NAME} failed: ${error}`, {
+            caller: SCRIPT_NAME,
+        });
+        process.exit(1);
+    }
+    finally {
+        await prisma.$disconnect();
+    }
+}
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
+//# sourceMappingURL=ingest-notes.js.map

package/dist/ingest-notes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-notes.js","sourceRoot":"","sources":["../src/ingest-notes.ts"],"names":[],"mappings":"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"}

package/dist/rag/ingest-config.d.ts

@@ -0,0 +1,8 @@
+export declare const INGEST_CONFIG: {
+    readonly paths: {
+        readonly notes: "markdown/note/**/*.md";
+        readonly books: "markdown/book/**/*.md";
+        readonly articles: "json/article/**/*.json";
+    };
+};
+//# sourceMappingURL=ingest-config.d.ts.map

package/dist/rag/ingest-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-config.d.ts","sourceRoot":"","sources":["../../src/rag/ingest-config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;;;;;CAMhB,CAAC"}

package/dist/rag/ingest-config.js

@@ -0,0 +1,8 @@
+export const INGEST_CONFIG = {
+    paths: {
+        notes: "markdown/note/**/*.md",
+        books: "markdown/book/**/*.md",
+        articles: "json/article/**/*.json",
+    },
+};
+//# sourceMappingURL=ingest-config.js.map

package/dist/rag/ingest-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-config.js","sourceRoot":"","sources":["../../src/rag/ingest-config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC5B,KAAK,EAAE;QACN,KAAK,EAAE,uBAAuB;QAC9B,KAAK,EAAE,uBAAuB;QAC9B,QAAQ,EAAE,wBAAwB;KAClC;CACQ,CAAC"}

package/dist/rag/ingest.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-export {};
+import "dotenv/config";
 //# sourceMappingURL=ingest.d.ts.map

package/dist/rag/ingest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ingest.d.ts","sourceRoot":"","sources":["../../src/rag/ingest.ts"],"names":[],"mappings":""}
+{"version":3,"file":"ingest.d.ts","sourceRoot":"","sources":["../../src/rag/ingest.ts"],"names":[],"mappings":";AACA,OAAO,eAAe,CAAC"}

package/dist/rag/ingest.js

@@ -1,49 +1,31 @@
 #!/usr/bin/env node
+import "dotenv/config";
 import { readFileSync } from "node:fs";
+import { parseJsonArticle, parseMarkdown, } from "@s-hirano-ist/s-search/chunker";
+import { createEmbeddingClient } from "@s-hirano-ist/s-search/embedding-client";
+import { ingestChunks } from "@s-hirano-ist/s-search/ingest";
+import { ensureCollection, getCollectionStats, } from "@s-hirano-ist/s-search/qdrant-client";
 import { glob } from "glob";
-import { parseJsonArticle, parseMarkdown } from "./chunker.js";
-import { RAG_CONFIG } from "./config.js";
-import { embedBatch } from "./embedding.js";
-import { ensureCollection, getCollectionStats, getExistingHashes, upsertPoints, } from "./qdrant-client.js";
-const BATCH_SIZE = 20;
-const MAX_RETRIES = 3;
-const RETRY_DELAY_MS = 2000;
-async function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function withRetry(fn, retries = MAX_RETRIES) {
-    for (let i = 0; i < retries; i++) {
-        try {
-            return await fn();
-        }
-        catch (error) {
-            if (i === retries - 1)
-                throw error;
-            console.log(`  Retry ${i + 1}/${retries} after error...`);
-            await sleep(RETRY_DELAY_MS);
-        }
-    }
-    throw new Error("Unreachable");
-}
+import { INGEST_CONFIG } from "./ingest-config.js";
 /**
- * List all files to process
+ * List all files to process with content type information
  */
 async function listFiles() {
     const files = [];
-    // JSON files
-    const jsonFiles = await glob(RAG_CONFIG.paths.json);
-    for (const path of jsonFiles) {
-        files.push({ path, type: "json" });
+    // Articles (JSON)
+    const articleFiles = await glob(INGEST_CONFIG.paths.articles);
+    for (const path of articleFiles) {
+        files.push({ path, type: "json", contentType: "articles" });
     }
-    // Markdown files (supports array of patterns)
-    const mdPatterns = Array.isArray(RAG_CONFIG.paths.markdown)
-        ? RAG_CONFIG.paths.markdown
-        : [RAG_CONFIG.paths.markdown];
-    for (const pattern of mdPatterns) {
-        const mdFiles = await glob(pattern);
-        for (const path of mdFiles) {
-            files.push({ path, type: "markdown" });
-        }
+    // Notes (Markdown)
+    const noteFiles = await glob(INGEST_CONFIG.paths.notes);
+    for (const path of noteFiles) {
+        files.push({ path, type: "markdown", contentType: "notes" });
+    }
+    // Books (Markdown)
+    const bookFiles = await glob(INGEST_CONFIG.paths.books);
+    for (const path of bookFiles) {
+        files.push({ path, type: "markdown", contentType: "books" });
     }
     return files;
 }
@@ -55,23 +37,30 @@ function parseFile(file) {
     if (file.type === "json") {
         return parseJsonArticle(file.path, content);
     }
-    return parseMarkdown(file.path, content);
+    return parseMarkdown(file.path, content, file.contentType);
 }
 /**
- * Ingest all documents
+ * CLI entry point: list files, parse into chunks, delegate to ingestChunks
  */
-async function ingest() {
+async function ingest(force) {
     console.log("Starting ingest...\n");
     // Ensure collection exists
     await ensureCollection();
     // Get initial stats
     const initialStats = await getCollectionStats();
     console.log(`Initial points count: ${initialStats.pointsCount}\n`);
+    if (force) {
+        console.log("Force mode enabled: skipping change detection\n");
+    }
     // List all files
     const files = await listFiles();
+    const articleCount = files.filter((f) => f.contentType === "articles").length;
+    const noteCount = files.filter((f) => f.contentType === "notes").length;
+    const bookCount = files.filter((f) => f.contentType === "books").length;
     console.log(`Found ${files.length} files to process`);
-    console.log(`  - JSON: ${files.filter((f) => f.type === "json").length}`);
-    console.log(`  - Markdown: ${files.filter((f) => f.type === "markdown").length}\n`);
+    console.log(`  - Articles: ${articleCount}`);
+    console.log(`  - Notes: ${noteCount}`);
+    console.log(`  - Books: ${bookCount}\n`);
     // Parse all files into chunks
     console.log("Parsing files...");
     const allChunks = [];
@@ -84,57 +73,37 @@ async function ingest() {
             console.error(`Error parsing ${file.path}:`, error);
         }
     }
-    console.log(`Total chunks: ${allChunks.length}\n`);
-    // Get existing hashes for change detection
-    console.log("Checking for changes...");
-    const chunkIds = allChunks.map((c) => c.chunk_id);
-    const existingHashes = await getExistingHashes(chunkIds);
-    // Filter to only changed chunks
-    const changedChunks = allChunks.filter((chunk) => {
-        const existingHash = existingHashes.get(chunk.chunk_id);
-        return existingHash !== chunk.content_hash;
-    });
-    console.log(`Changed chunks: ${changedChunks.length}`);
-    console.log(`Skipped (unchanged): ${allChunks.length - changedChunks.length}\n`);
-    if (changedChunks.length === 0) {
-        console.log("No changes detected. Done!");
-        return;
-    }
-    // Generate embeddings and upsert in batches
-    console.log("Generating embeddings and upserting...");
-    let processed = 0;
-    for (let i = 0; i < changedChunks.length; i += BATCH_SIZE) {
-        const batch = changedChunks.slice(i, i + BATCH_SIZE);
-        const texts = batch.map((c) => c.text);
-        // Generate embeddings
-        const embeddings = await embedBatch(texts, false);
-        // Prepare points
-        const points = batch.map((chunk, idx) => ({
-            id: chunk.chunk_id,
-            vector: embeddings[idx],
-            payload: chunk,
-        }));
-        // Upsert to Qdrant with retry
-        await withRetry(() => upsertPoints(points));
-        processed += batch.length;
-        console.log(`  Progress: ${processed}/${changedChunks.length}`);
-        // Small delay between batches to avoid overwhelming Qdrant
-        await sleep(100);
-    }
+    // Use VPS embedding if EMBEDDING_API_URL is set, otherwise local
+    const embedBatchFn = process.env.EMBEDDING_API_URL
+        ? createEmbeddingClient({
+            apiUrl: process.env.EMBEDDING_API_URL,
+            apiKey: process.env.EMBEDDING_API_KEY ?? "",
+            cfAccessClientId: process.env.CF_ACCESS_CLIENT_ID ?? "",
+            cfAccessClientSecret: process.env.CF_ACCESS_CLIENT_SECRET ?? "",
+        }).embedBatch
+        : undefined;
+    // Delegate to core ingest logic
+    const result = await ingestChunks(allChunks, { embedBatchFn, force });
     // Get final stats
     const finalStats = await getCollectionStats();
     console.log(`\nFinal points count: ${finalStats.pointsCount}`);
-    console.log("Ingest completed successfully!");
+    console.log(`Ingest completed successfully! (${result.changedChunks} changed, ${result.skippedChunks} skipped)`);
 }
 async function main() {
     const env = {
         QDRANT_URL: process.env.QDRANT_URL,
+        CF_ACCESS_CLIENT_ID: process.env.CF_ACCESS_CLIENT_ID,
+        CF_ACCESS_CLIENT_SECRET: process.env.CF_ACCESS_CLIENT_SECRET,
     };
     if (!env.QDRANT_URL) {
         throw new Error("QDRANT_URL environment variable is required.");
     }
+    if (!env.CF_ACCESS_CLIENT_ID || !env.CF_ACCESS_CLIENT_SECRET) {
+        throw new Error("CF_ACCESS_CLIENT_ID and CF_ACCESS_CLIENT_SECRET environment variables are required.");
+    }
+    const force = process.argv.includes("--force");
     try {
-        await ingest();
+        await ingest(force);
     }
     catch (error) {
         console.error("❌ エラーが発生しました:", error);

package/dist/rag/ingest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../src/rag/ingest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../src/rag/ingest.ts"],"names":[],"mappings":"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"}

package/dist/rag/search.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-export {};
+import "dotenv/config";
 //# sourceMappingURL=search.d.ts.map

package/dist/rag/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/rag/search.ts"],"names":[],"mappings":""}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/rag/search.ts"],"names":[],"mappings":";AACA,OAAO,eAAe,CAAC"}

package/dist/rag/search.js

@@ -1,86 +1,74 @@
 #!/usr/bin/env node
-import { embed } from "./embedding.js";
-import { getCollectionStats, search } from "./qdrant-client.js";
-/**
- * Search for documents matching a query
- */
-async function runSearch() {
-    // Parse command line arguments
+import "dotenv/config";
+import { embed } from "@s-hirano-ist/s-search/embedding";
+import { ensureCollection, search as qdrantSearch, } from "@s-hirano-ist/s-search/qdrant-client";
+function parseArgs() {
     const args = process.argv.slice(2);
-    if (args.length === 0) {
-        console.log("Usage: rag-search <query> [options]");
-        console.log("");
-        console.log("Options:");
-        console.log("  --top-k <number>     Number of results (default: 5)");
-        console.log("  --type <type>        Filter by type: markdown_note | bookmark_json");
-        console.log("  --heading <heading>  Filter by top_heading");
-        console.log("");
-        console.log("Examples:");
-        console.log('  rag-search "ルネサンス 遠近法"');
-        console.log('  rag-search "AI 脆弱性" --type bookmark_json');
-        console.log('  rag-search "React" --heading javascript --top-k 10');
-        process.exit(1);
-    }
-    // Parse options
-    let query = "";
-    let topK = 5;
-    let filterType;
-    let filterHeading;
+    const options = {};
+    const positional = [];
     for (let i = 0; i < args.length; i++) {
-        if (args[i] === "--top-k" && args[i + 1]) {
-            topK = Number.parseInt(args[i + 1], 10);
-            i++;
+        const arg = args[i];
+        if (arg === "--top-k" && i + 1 < args.length) {
+            options.topK = Number(args[++i]);
+        }
+        else if (arg === "--type" && i + 1 < args.length) {
+            options.type = args[++i];
         }
-        else if (args[i] === "--type" && args[i + 1]) {
-            filterType = args[i + 1];
-            i++;
+        else if (arg === "--heading" && i + 1 < args.length) {
+            options.heading = args[++i];
         }
-        else if (args[i] === "--heading" && args[i + 1]) {
-            filterHeading = args[i + 1];
-            i++;
+        else if (arg === "--content-type" && i + 1 < args.length) {
+            const value = args[++i];
+            const types = value.split(",");
+            options.contentType = types.length === 1 ? types[0] : types;
         }
-        else if (!args[i].startsWith("--")) {
-            query = args[i];
+        else {
+            positional.push(arg);
         }
     }
+    const query = positional.join(" ");
     if (!query) {
-        console.error("Error: Query is required");
-        process.exit(1);
-    }
-    // Check collection status
-    const stats = await getCollectionStats();
-    if (stats.status === "not_found") {
-        console.error("Error: Collection not found. Run ingest first.");
+        console.error("Usage: rag-search <query> [--top-k N] [--type markdown_note|bookmark_json] [--heading HEADING] [--content-type articles|books|notes]");
         process.exit(1);
     }
-    console.log(`Searching for: "${query}"`);
-    console.log(`Collection has ${stats.pointsCount} points\n`);
-    // Generate query embedding
-    console.log("Generating query embedding...");
+    return { query, options };
+}
+async function searchContent(query, options = {}) {
     const queryVector = await embed(query, true);
-    // Search
-    console.log("Searching...\n");
-    const results = await search(queryVector, {
-        topK,
+    const results = await qdrantSearch(queryVector, {
+        topK: options.topK,
         filter: {
-            type: filterType,
-            top_heading: filterHeading,
+            type: options.type,
+            top_heading: options.heading,
+            content_type: options.contentType,
         },
     });
-    // Display results
-    console.log(`Found ${results.length} results:\n`);
-    console.log("=".repeat(80));
-    for (let i = 0; i < results.length; i++) {
-        const r = results[i];
-        console.log(`\n[${i + 1}] Score: ${r.score.toFixed(4)}`);
-        console.log(`    Title: ${r.title}`);
-        console.log(`    Type: ${r.type}`);
-        console.log(`    Path: ${r.heading_path.join(" > ")}`);
-        if (r.url) {
-            console.log(`    URL: ${r.url}`);
-        }
-        console.log(`    Text: ${r.text.slice(0, 200)}${r.text.length > 200 ? "..." : ""}`);
-        console.log("-".repeat(80));
+    return { results, query, totalResults: results.length };
+}
+async function search() {
+    const { query, options } = parseArgs();
+    console.log(`Searching for: "${query}"`);
+    if (options.topK)
+        console.log(`  top-k: ${options.topK}`);
+    if (options.type)
+        console.log(`  type: ${options.type}`);
+    if (options.heading)
+        console.log(`  heading: ${options.heading}`);
+    if (options.contentType)
+        console.log(`  content-type: ${Array.isArray(options.contentType) ? options.contentType.join(",") : options.contentType}`);
+    console.log();
+    await ensureCollection();
+    const response = await searchContent(query, options);
+    console.log(`Found ${response.totalResults} results:\n`);
+    for (const [i, result] of response.results.entries()) {
+        console.log(`--- Result ${i + 1} (score: ${result.score.toFixed(4)}) ---`);
+        console.log(`Title: ${result.title}`);
+        if (result.url)
+            console.log(`URL: ${result.url}`);
+        console.log(`Type: ${result.type}`);
+        console.log(`Content-Type: ${result.content_type}`);
+        console.log(`Heading: ${result.heading_path.join(" > ")}`);
+        console.log(`\n${result.text}\n`);
     }
 }
 async function main() {
@@ -91,7 +79,7 @@ async function main() {
         throw new Error("QDRANT_URL environment variable is required.");
     }
     try {
-        await runSearch();
+        await search();
     }
     catch (error) {
         console.error("❌ エラーが発生しました:", error);