@s-hirano-ist/s-scripts 1.26.8 → 4.0.1

package/dist/ingest-images.js

@@ -1,188 +1,37 @@
 #!/usr/bin/env node
-import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
-import { createPrismaClient } from "@s-hirano-ist/s-database";
-import { createWebpThumbnail, readImageMetadata, } from "@s-hirano-ist/s-image-processing/node";
-import { createPushoverService } from "@s-hirano-ist/s-notification";
-import { createMinioClient } from "@s-hirano-ist/s-storage";
+import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  runContentImport,
+  sharpImageProcessor
+} from "./chunk-XG6LAGZO.js";
+import "./chunk-KKZP7ZF3.js";
+import "./chunk-F4J6JBR4.js";
+import "./chunk-M275YZQP.js";
+import "./chunk-7PVU2Z32.js";
+import {
+  globPaths
+} from "./chunk-AJMTRCPJ.js";
+import "./chunk-JZOR5GA2.js";
+
+// src/ingest-images.ts
 import { readFile, stat } from "node:fs/promises";
-import { basename, extname } from "node:path";
-import { globPaths } from "./lib/glob-paths.js";
-const SCRIPT_NAME = "ingest-images";
-const ORIGINAL_IMAGE_PATH = "images/original";
-const THUMBNAIL_IMAGE_PATH = "images/thumbnail";
-const THUMBNAIL_SIZE = 192;
-function getContentType(filePath) {
-    const ext = extname(filePath).toLowerCase();
-    switch (ext) {
-        case ".jpg":
-        case ".jpeg":
-            return "image/jpeg";
-        case ".png":
-            return "image/png";
-        case ".webp":
-            return "image/webp";
-        default:
-            return null;
-    }
-}
-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,
-        MINIO_BUCKET_NAME: process.env.MINIO_BUCKET_NAME,
+import { basename } from "node:path";
+async function* source(root) {
+  for (const path of await globPaths(`${root}/image/dump/*`)) {
+    const format = /\.(jpg|jpeg|png|webp)$/iu.exec(path)?.[1]?.toLowerCase();
+    if (!format) continue;
+    const bytes = await readFile(path);
+    const metadata = await sharpImageProcessor.getMetadata(bytes);
+    yield {
+      values: {
+        path: basename(path),
+        fileSize: (await stat(path)).size,
+        contentType: `image/${format === "jpg" ? "jpeg" : format}`,
+        width: metadata.width ?? null,
+        height: metadata.height ?? null
+      },
+      media: { path: basename(path), bytes }
     };
-    if (Object.values(env).some((v) => !v)) {
-        throw new Error("Required environment variables are not set.");
-    }
-    if (process.env.MINIO_USE_SSL === "true" &&
-        (!process.env.CF_ACCESS_CLIENT_ID || !process.env.CF_ACCESS_CLIENT_SECRET)) {
-        throw new Error("CF_ACCESS_CLIENT_ID and CF_ACCESS_CLIENT_SECRET are required when MINIO_USE_SSL is true.");
-    }
-    const contentsPath = process.env.S_CONTENTS_PATH ?? process.cwd();
-    const prisma = createPrismaClient(env.DATABASE_URL ?? "");
-    const notificationService = createPushoverService({
-        url: env.PUSHOVER_URL ?? "",
-        userKey: env.PUSHOVER_USER_KEY ?? "",
-        appToken: env.PUSHOVER_APP_TOKEN ?? "",
-    });
-    const minioClient = createMinioClient();
-    const bucketName = env.MINIO_BUCKET_NAME ?? "";
-    const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
-    const exported = makeExportedStatus();
-    const filePaths = new Set();
-    async function ingestImages() {
-        const files = await globPaths(`${contentsPath}/image/dump/*`);
-        const imageFiles = files.filter((f) => getContentType(f) !== null);
-        console.log(`📁 ${imageFiles.length} 件の画像ファイルを検出しました。`);
-        const existingImages = await prisma.image.findMany({
-            where: { userId },
-            select: { id: true, path: true },
-        });
-        const existingImagesMap = new Map(existingImages.map((i) => [i.path, i]));
-        console.log(`📊 DB に ${existingImagesMap.size} 件の既存画像があります。`);
-        let insertedCount = 0;
-        let skippedCount = 0;
-        let errorCount = 0;
-        for (const filePath of imageFiles) {
-            const imagePath = basename(filePath);
-            filePaths.add(imagePath);
-            try {
-                if (existingImagesMap.has(imagePath)) {
-                    skippedCount++;
-                    continue;
-                }
-                const buffer = await readFile(filePath);
-                const fileStat = await stat(filePath);
-                const metadata = await readImageMetadata(buffer);
-                const contentType = getContentType(filePath);
-                if (!contentType) {
-                    console.log(`⏭️  スキップ（未対応形式）: ${imagePath}`);
-                    skippedCount++;
-                    continue;
-                }
-                if (dryRun) {
-                    console.log(`🔍 [dry-run] 挿入予定: ${imagePath}`);
-                    insertedCount++;
-                    continue;
-                }
-                // Upload original to MinIO if not exists
-                const originalKey = `${ORIGINAL_IMAGE_PATH}/${imagePath}`;
-                try {
-                    await minioClient.statObject(bucketName, originalKey);
-                    console.log(`📦 MinIO に既存（original）: ${imagePath}`);
-                }
-                catch {
-                    await minioClient.putObject(bucketName, originalKey, buffer);
-                    console.log(`📤 MinIO アップロード（original）: ${imagePath}`);
-                }
-                // Generate and upload thumbnail
-                const thumbnailBuffer = await createWebpThumbnail(buffer, {
-                    width: THUMBNAIL_SIZE,
-                    height: THUMBNAIL_SIZE,
-                });
-                const thumbnailKey = `${THUMBNAIL_IMAGE_PATH}/${imagePath}`;
-                await minioClient.putObject(bucketName, thumbnailKey, Buffer.from(thumbnailBuffer));
-                console.log(`📤 MinIO アップロード（thumbnail）: ${imagePath}`);
-                // Create DB record
-                await prisma.image.create({
-                    data: {
-                        id: String(makeId()),
-                        path: imagePath,
-                        contentType,
-                        fileSize: fileStat.size,
-                        width: metadata.width,
-                        height: metadata.height,
-                        status: exported.status,
-                        exportedAt: exported.exportedAt,
-                        userId,
-                        createdAt: new Date(),
-                    },
-                });
-                insertedCount++;
-                console.log(`✅ 挿入: ${imagePath}`);
-            }
-            catch (error) {
-                console.error(`❌ エラー（${imagePath}）:`, error);
-                errorCount++;
-            }
-        }
-        return { insertedCount, skippedCount, errorCount };
-    }
-    async function purgeImages() {
-        const exportedImages = await prisma.image.findMany({
-            where: { userId, status: exported.status },
-            select: { id: true, path: true },
-        });
-        const toDelete = exportedImages.filter((i) => !filePaths.has(i.path));
-        if (toDelete.length === 0) {
-            console.log("🗑️  削除対象なし");
-            return 0;
-        }
-        let deletedCount = 0;
-        for (const image of toDelete) {
-            try {
-                if (dryRun) {
-                    console.log(`🗑️  [dry-run] 削除予定: ${image.path}`);
-                }
-                else {
-                    await prisma.image.delete({ where: { id: image.id } });
-                    await minioClient.removeObject(bucketName, `${ORIGINAL_IMAGE_PATH}/${image.path}`);
-                    await minioClient.removeObject(bucketName, `${THUMBNAIL_IMAGE_PATH}/${image.path}`);
-                    console.log(`🗑️  削除: ${image.path}`);
-                }
-                deletedCount++;
-            }
-            catch (error) {
-                console.error(`❌ 削除エラー（${image.path}）:`, error);
-            }
-        }
-        return deletedCount;
-    }
-    try {
-        const { insertedCount, skippedCount, errorCount } = await ingestImages();
-        const deletedCount = await purgeImages();
-        console.log(`\n📊 結果: 挿入 ${insertedCount} 件, スキップ ${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: ${String(error)}`, {
-            caller: SCRIPT_NAME,
-        });
-        process.exit(1);
-    }
-    finally {
-        await prisma.$disconnect();
-    }
+  }
 }
-main().catch((error) => {
-    console.error(error);
-    process.exit(1);
-});
-//# sourceMappingURL=ingest-images.js.map
+await runContentImport("images", source);

package/dist/ingest-notes.js

@@ -1,179 +1,49 @@
 #!/usr/bin/env node
-import { makeExportedStatus, makeId, makeUserId, } from "@s-hirano-ist/s-core/shared-kernel/entities/common-entity";
-import { createPrismaClient } from "@s-hirano-ist/s-database";
-import { createPushoverService } from "@s-hirano-ist/s-notification";
-import { parseMarkdownFrontmatter } from "@s-hirano-ist/s-search/frontmatter";
+import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  runContentImport
+} from "./chunk-XG6LAGZO.js";
+import "./chunk-KKZP7ZF3.js";
+import "./chunk-F4J6JBR4.js";
+import "./chunk-M275YZQP.js";
+import "./chunk-7PVU2Z32.js";
+import {
+  parseMarkdownFrontmatter
+} from "./chunk-HDYQV2Y2.js";
+import {
+  globPaths
+} from "./chunk-AJMTRCPJ.js";
+import "./chunk-JZOR5GA2.js";
+
+// src/ingest-notes.ts
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
-import { globPaths } from "./lib/glob-paths.js";
-const SCRIPT_NAME = "ingest-notes";
 function parseFrontmatter(content) {
-    const parsed = parseMarkdownFrontmatter(content);
-    return {
-        body: parsed.content.trim(),
-        draft: typeof parsed.data.draft === "boolean" ? parsed.data.draft : undefined,
-        heading: typeof parsed.data.heading === "string" ? parsed.data.heading : undefined,
-    };
+  const parsed = parseMarkdownFrontmatter(content);
+  return {
+    body: parsed.content.trim(),
+    draft: typeof parsed.data.draft === "boolean" ? parsed.data.draft : void 0,
+    heading: typeof parsed.data.heading === "string" ? parsed.data.heading : void 0
+  };
 }
 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+/u, "");
-    }
-    return { title, markdown };
+  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+/u, "");
+  }
+  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();
-    const prisma = createPrismaClient(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 globPaths(`${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} 件の既存ノートがあります。`);
-        async function upsertNote(parsed) {
-            fileTitles.add(parsed.title);
-            const existing = existingNotesMap.get(parsed.title);
-            if (existing) {
-                if (existing.markdown === parsed.markdown) {
-                    // console.log(`⏭️  スキップ（変更なし）: ${parsed.title}`);
-                    return "skipped";
-                }
-                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}`);
-                }
-                return "updated";
-            }
-            if (dryRun) {
-                console.log(`🔍 [dry-run] 挿入予定: ${parsed.title}`);
-                return "inserted";
-            }
-            await prisma.note.create({
-                data: {
-                    id: String(makeId()),
-                    title: parsed.title,
-                    markdown: parsed.markdown,
-                    status: exported.status,
-                    exportedAt: exported.exportedAt,
-                    userId,
-                    createdAt: new Date(),
-                },
-            });
-            console.log(`✅ 挿入: ${parsed.title}`);
-            return "inserted";
-        }
-        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;
-                }
-                const result = await upsertNote(parsed);
-                if (result === "inserted")
-                    insertedCount++;
-                else if (result === "updated")
-                    updatedCount++;
-                else
-                    skippedCount++;
-            }
-            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: ${String(error)}`, {
-            caller: SCRIPT_NAME,
-        });
-        process.exit(1);
-    }
-    finally {
-        await prisma.$disconnect();
-    }
+async function* source(root) {
+  for (const path of await globPaths(`${root}/markdown/note/*.md`)) {
+    const values = parseNoteFile(path, await readFile(path, "utf-8"));
+    if (values) yield { values };
+  }
 }
-main().catch((error) => {
-    console.error(error);
-    process.exit(1);
-});
-//# sourceMappingURL=ingest-notes.js.map
+await runContentImport("notes", source);

package/dist/rag/delete-collection.js

@@ -1,27 +1,37 @@
 #!/usr/bin/env node
-import { deleteCollection, getQdrantClient, } from "@s-hirano-ist/s-search/qdrant-client";
+import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  deleteCollection,
+  getQdrantClient
+} from "../chunk-J4VLH4VA.js";
+import "../chunk-JZOR5GA2.js";
+
+// src/rag/delete-collection.ts
 async function main() {
-    const collectionName = process.argv[2];
-    if (!collectionName) {
-        console.error("Usage: rag-delete-collection <collection-name>\nExample: rag-delete-collection knowledge_v1");
-        process.exit(1);
-    }
-    if (!process.env.QDRANT_URL) {
-        throw new Error("QDRANT_URL environment variable is required.");
-    }
-    const qdrant = getQdrantClient();
-    const collections = await qdrant.getCollections();
-    const exists = collections.collections.some((c) => c.name === collectionName);
-    if (!exists) {
-        console.log(`Collection "${collectionName}" does not exist. Nothing to delete.`);
-        return;
-    }
-    console.log(`Deleting collection "${collectionName}"...`);
-    await deleteCollection(collectionName);
-    console.log(`Collection "${collectionName}" deleted successfully.`);
+  const collectionName = process.argv[2];
+  if (!collectionName) {
+    console.error(
+      "Usage: rag-delete-collection <collection-name>\nExample: rag-delete-collection knowledge_v1"
+    );
+    process.exit(1);
+  }
+  if (!process.env.QDRANT_URL) {
+    throw new Error("QDRANT_URL environment variable is required.");
+  }
+  const qdrant = getQdrantClient();
+  const collections = await qdrant.getCollections();
+  const exists = collections.collections.some((c) => c.name === collectionName);
+  if (!exists) {
+    console.log(
+      `Collection "${collectionName}" does not exist. Nothing to delete.`
+    );
+    return;
+  }
+  console.log(`Deleting collection "${collectionName}"...`);
+  await deleteCollection(collectionName);
+  console.log(`Collection "${collectionName}" deleted successfully.`);
 }
 main().catch((error) => {
-    console.error("Failed to delete collection:", error);
-    process.exit(1);
+  console.error("Failed to delete collection:", error);
+  process.exit(1);
 });
-//# sourceMappingURL=delete-collection.js.map