@duckcodeailabs/dql-cli 1.6.34 → 1.7.0

package/dist/notebook-datasets.js

@@ -0,0 +1,484 @@
+import { createHash, randomUUID } from "node:crypto";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
+import { basename, extname, join, relative, resolve } from "node:path";
+import { dump as dumpYaml, load as loadYaml } from "js-yaml";
+export class NotebookDatasetWorkspace {
+    projectRoot;
+    executor;
+    localRoot;
+    datasetRoot;
+    stagedRoot;
+    databasePath;
+    localConnection;
+    constructor(projectRoot, executor, moduleSearchPaths) {
+        this.projectRoot = projectRoot;
+        this.executor = executor;
+        this.localRoot = join(projectRoot, ".dql", "local");
+        this.datasetRoot = join(this.localRoot, "datasets");
+        this.stagedRoot = join(this.datasetRoot, "staged");
+        this.databasePath = join(this.localRoot, "notebook.duckdb");
+        this.localConnection = {
+            driver: "duckdb",
+            filepath: this.databasePath,
+            ...(moduleSearchPaths?.length ? { moduleSearchPaths } : {}),
+        };
+        mkdirSync(this.stagedRoot, { recursive: true });
+    }
+    list() {
+        const byId = new Map();
+        for (const dataset of [
+            ...this.readProjectRegistry().datasets,
+            ...this.readLocalRegistry().datasets,
+        ]) {
+            byId.set(dataset.id, dataset);
+        }
+        return [...byId.values()].sort((a, b) => b.refreshedAt.localeCompare(a.refreshedAt));
+    }
+    get(id) {
+        return this.list().find((dataset) => dataset.id === id);
+    }
+    async initialize() {
+        for (const dataset of this.list()) {
+            if (dataset.expiresAt &&
+                !dataset.pinned &&
+                Date.parse(dataset.expiresAt) < Date.now()) {
+                this.remove(dataset.id);
+                continue;
+            }
+            if (existsSync(this.absolutePath(dataset)))
+                await this.registerView(dataset);
+        }
+    }
+    async import(input) {
+        const storageMode = input.storageMode ?? "local";
+        const originalPath = input.sourcePath
+            ? resolve(input.sourcePath)
+            : undefined;
+        if (!input.content &&
+            !input.contentBase64 &&
+            (!originalPath || !existsSync(originalPath))) {
+            throw new Error("Choose a readable CSV file or provide uploaded file contents.");
+        }
+        const filename = safeFilename(input.filename ?? (originalPath ? basename(originalPath) : "dataset.csv"));
+        const format = datasetFormat(filename);
+        const sourceBuffer = input.content ??
+            (input.contentBase64
+                ? Buffer.from(input.contentBase64, "base64")
+                : readFileSync(originalPath));
+        const fingerprint = createHash("sha256").update(sourceBuffer).digest("hex");
+        const duplicate = this.list().find((dataset) => dataset.fileFingerprint === fingerprint);
+        if (duplicate)
+            return { dataset: duplicate, duplicate: true };
+        const alias = uniqueAlias(input.alias ?? input.name ?? filename.replace(/\.[^.]+$/, ""), this.list());
+        const id = `${alias}_${fingerprint.slice(0, 10)}`;
+        let sourcePath;
+        let linked = false;
+        if (storageMode === "project") {
+            const targetDir = join(this.projectRoot, "data");
+            mkdirSync(targetDir, { recursive: true });
+            const target = uniqueFilePath(join(targetDir, filename));
+            if (input.content || input.contentBase64)
+                writeFileSync(target, sourceBuffer);
+            else
+                copyFileSync(originalPath, target);
+            sourcePath = relative(this.projectRoot, target).replaceAll("\\", "/");
+        }
+        else if (input.link && originalPath) {
+            sourcePath = originalPath;
+            linked = true;
+        }
+        else {
+            const target = uniqueFilePath(join(this.datasetRoot, filename));
+            writeFileSync(target, sourceBuffer);
+            sourcePath = relative(this.projectRoot, target).replaceAll("\\", "/");
+        }
+        const absolutePath = resolveStoredPath(this.projectRoot, sourcePath);
+        const now = new Date().toISOString();
+        const profile = await this.inspect(absolutePath, format);
+        const stat = statSync(absolutePath);
+        const dataset = {
+            id,
+            name: input.name?.trim() || filename.replace(/\.[^.]+$/, ""),
+            alias,
+            description: input.description?.trim() || undefined,
+            owner: input.owner?.trim() || undefined,
+            tags: cleanStrings(input.tags),
+            sourcePath,
+            storageMode,
+            format,
+            fileFingerprint: fingerprint,
+            sizeBytes: stat.size,
+            modifiedAt: stat.mtime.toISOString(),
+            importedAt: now,
+            refreshedAt: now,
+            profile,
+            trustState: storageMode === "project" ? "project_controlled" : "local_ad_hoc",
+            ...(linked ? { linked: true } : {}),
+        };
+        this.upsert(dataset);
+        await this.registerView(dataset);
+        return { dataset, duplicate: false };
+    }
+    async refresh(id) {
+        const current = this.require(id);
+        const path = this.absolutePath(current);
+        if (!existsSync(path))
+            throw new Error(`Dataset file is missing: ${current.sourcePath}`);
+        const buffer = readFileSync(path);
+        const fingerprint = createHash("sha256").update(buffer).digest("hex");
+        const nextProfile = await this.inspect(path, current.format);
+        const stat = statSync(path);
+        const previousColumns = new Map(current.profile.columns.map((column) => [column.name, column.type]));
+        const nextColumns = new Map(nextProfile.columns.map((column) => [column.name, column.type]));
+        const added = [...nextColumns.keys()].filter((name) => !previousColumns.has(name));
+        const removed = [...previousColumns.keys()].filter((name) => !nextColumns.has(name));
+        const changed = [...nextColumns.entries()]
+            .filter(([name, type]) => previousColumns.has(name) &&
+            !current.schemaOverrides?.[name] &&
+            previousColumns.get(name) !== type)
+            .map(([column, after]) => ({
+            column,
+            before: previousColumns.get(column),
+            after,
+        }));
+        const profiledWithOverrides = current.schemaOverrides
+            ? {
+                ...nextProfile,
+                columns: nextProfile.columns.map((column) => ({
+                    ...column,
+                    type: current.schemaOverrides?.[column.name] ?? column.type,
+                })),
+            }
+            : nextProfile;
+        const next = {
+            ...current,
+            fileFingerprint: fingerprint,
+            sizeBytes: stat.size,
+            modifiedAt: stat.mtime.toISOString(),
+            refreshedAt: new Date().toISOString(),
+            profile: profiledWithOverrides,
+            ...(added.length || removed.length || changed.length
+                ? {
+                    schemaDrift: {
+                        detectedAt: new Date().toISOString(),
+                        added,
+                        removed,
+                        changed,
+                    },
+                }
+                : { schemaDrift: undefined }),
+        };
+        this.upsert(next);
+        await this.registerView(next);
+        return next;
+    }
+    rename(id, name, alias) {
+        const current = this.require(id);
+        const nextAlias = alias
+            ? uniqueAlias(alias, this.list().filter((dataset) => dataset.id !== id))
+            : current.alias;
+        const next = {
+            ...current,
+            name: name.trim() || current.name,
+            alias: nextAlias,
+        };
+        this.upsert(next);
+        return next;
+    }
+    async updateSchema(id, overrides) {
+        const current = this.require(id);
+        const columnNames = new Set(current.profile.columns.map((column) => column.name));
+        const clean = Object.fromEntries(Object.entries(overrides)
+            .filter(([name, type]) => columnNames.has(name) && validDuckDbType(type))
+            .map(([name, type]) => [name, type.trim().toUpperCase()]));
+        const next = {
+            ...current,
+            schemaOverrides: clean,
+            profile: {
+                ...current.profile,
+                columns: current.profile.columns.map((column) => ({
+                    ...column,
+                    type: clean[column.name] ?? column.type,
+                })),
+            },
+        };
+        this.upsert(next);
+        await this.registerView(next);
+        return next;
+    }
+    pin(id, pinned) {
+        const current = this.require(id);
+        const next = {
+            ...current,
+            pinned,
+            ...(pinned ? { expiresAt: undefined } : {}),
+        };
+        this.upsert(next);
+        return next;
+    }
+    remove(id) {
+        const dataset = this.get(id);
+        if (!dataset)
+            return;
+        const local = this.readLocalRegistry();
+        const project = this.readProjectRegistry();
+        local.datasets = local.datasets.filter((item) => item.id !== id);
+        project.datasets = project.datasets.filter((item) => item.id !== id);
+        this.writeLocalRegistry(local);
+        this.writeProjectRegistry(project);
+        if (!dataset.linked && dataset.storageMode !== "project") {
+            const path = this.absolutePath(dataset);
+            if (existsSync(path))
+                rmSync(path, { force: true });
+        }
+        void this.executor
+            .executeQuery(`DROP VIEW IF EXISTS ${quoteIdentifier(dataset.alias)}`, [], {}, this.localConnection)
+            .catch(() => undefined);
+    }
+    async stageRows(input) {
+        if (input.rows.length === 0)
+            throw new Error("The warehouse query returned no rows to stage.");
+        const alias = uniqueAlias(input.name || "staged_result", this.list());
+        const id = `${alias}_${randomUUID().slice(0, 10)}`;
+        const jsonPath = join(this.stagedRoot, `${id}.ndjson`);
+        const parquetPath = join(this.stagedRoot, `${id}.parquet`);
+        const body = input.rows.map((row) => JSON.stringify(row, bigintReplacer)).join("\n") +
+            "\n";
+        writeFileSync(jsonPath, body, "utf-8");
+        await this.executor.executeQuery(`COPY (SELECT * FROM read_json_auto(${quoteLiteral(jsonPath.replaceAll("\\", "/"))})) TO ${quoteLiteral(parquetPath.replaceAll("\\", "/"))} (FORMAT PARQUET)`, [], {}, this.localConnection);
+        rmSync(jsonPath, { force: true });
+        const buffer = readFileSync(parquetPath);
+        const now = new Date();
+        const profile = await this.inspect(parquetPath, "parquet");
+        const dataset = {
+            id,
+            name: input.name || "Staged warehouse result",
+            alias,
+            tags: ["staged"],
+            sourcePath: relative(this.projectRoot, parquetPath).replaceAll("\\", "/"),
+            storageMode: "staged",
+            format: "parquet",
+            fileFingerprint: createHash("sha256").update(buffer).digest("hex"),
+            sizeBytes: buffer.byteLength,
+            modifiedAt: statSync(parquetPath).mtime.toISOString(),
+            importedAt: now.toISOString(),
+            refreshedAt: now.toISOString(),
+            profile,
+            trustState: "review_required",
+            expiresAt: new Date(now.getTime() + (input.expiresInDays ?? 7) * 86_400_000).toISOString(),
+            lineage: input.lineage,
+        };
+        this.upsert(dataset);
+        await this.registerView(dataset);
+        return dataset;
+    }
+    async registerView(dataset) {
+        const reader = readerFor(dataset.format);
+        const source = `${reader}(${quoteLiteral(this.absolutePath(dataset).replaceAll("\\", "/"))})`;
+        const projection = dataset.schemaOverrides && Object.keys(dataset.schemaOverrides).length > 0
+            ? dataset.profile.columns
+                .map((column) => dataset.schemaOverrides?.[column.name]
+                ? `TRY_CAST(${quoteIdentifier(column.name)} AS ${dataset.schemaOverrides[column.name]}) AS ${quoteIdentifier(column.name)}`
+                : quoteIdentifier(column.name))
+                .join(", ")
+            : "*";
+        await this.executor.executeQuery(`CREATE OR REPLACE VIEW ${quoteIdentifier(dataset.alias)} AS SELECT ${projection} FROM ${source}`, [], {}, this.localConnection);
+    }
+    async inspect(path, format) {
+        const relation = `${readerFor(format)}(${quoteLiteral(path.replaceAll("\\", "/"))})`;
+        const [description, countResult, previewResult] = await Promise.all([
+            this.executor.executeQuery(`DESCRIBE SELECT * FROM ${relation}`, [], {}, this.localConnection),
+            this.executor.executeQuery(`SELECT COUNT(*) AS row_count FROM ${relation}`, [], {}, this.localConnection),
+            this.executor.executeQuery(`SELECT * FROM ${relation} LIMIT 100`, [], {}, this.localConnection),
+        ]);
+        const preview = (previewResult.rows ?? []);
+        const rowCount = Number(countResult.rows?.[0]
+            ?.row_count ?? preview.length);
+        const columns = (description.rows ?? []).map((raw) => {
+            const row = raw;
+            const name = String(row.column_name ?? row.name ?? "column");
+            const type = String(row.column_type ?? row.type ?? "VARCHAR");
+            const values = preview.map((item) => item[name]);
+            const nullCount = values.filter((value) => value === null || value === undefined || value === "").length;
+            const nonNull = values.filter((value) => value !== null && value !== undefined && value !== "");
+            const distinct = new Set(nonNull.map((value) => String(value))).size;
+            const flags = [];
+            if (/(^id$|_id$|^key$|_key$)/i.test(name) ||
+                (nonNull.length >= 20 && distinct === nonNull.length))
+                flags.push("identifier");
+            if (/date|time|timestamp/i.test(name) || /DATE|TIME/i.test(type))
+                flags.push("date");
+            if (/INT|DECIMAL|DOUBLE|FLOAT|NUMERIC|REAL/i.test(type))
+                flags.push("measure");
+            if (values.length > 0 && nullCount / values.length >= 0.5)
+                flags.push("null_heavy");
+            if (/email|phone|address|ssn|social.security|dob|birth|first_name|last_name/i.test(name))
+                flags.push("sensitive");
+            return {
+                name,
+                type,
+                nullable: String(row.null ?? row.nullable ?? "YES").toUpperCase() !== "NO",
+                nullCount,
+                distinctCount: distinct,
+                sampleValues: nonNull.slice(0, 5),
+                flags,
+            };
+        });
+        const warnings = [];
+        if (columns.some((column) => column.flags?.includes("sensitive")))
+            warnings.push("Potential sensitive fields detected. Samples are redacted from AI context by default.");
+        if (columns.some((column) => column.flags?.includes("null_heavy")))
+            warnings.push("One or more columns are at least 50% null in the bounded preview.");
+        return {
+            rowCount,
+            sampledRows: preview.length,
+            columns,
+            warnings,
+            preview,
+        };
+    }
+    require(id) {
+        const dataset = this.get(id);
+        if (!dataset)
+            throw new Error(`Dataset not found: ${id}`);
+        return dataset;
+    }
+    absolutePath(dataset) {
+        return resolveStoredPath(this.projectRoot, dataset.sourcePath);
+    }
+    upsert(dataset) {
+        if (dataset.storageMode === "project") {
+            const registry = this.readProjectRegistry();
+            registry.datasets = [
+                ...registry.datasets.filter((item) => item.id !== dataset.id),
+                dataset,
+            ];
+            this.writeProjectRegistry(registry);
+        }
+        else {
+            const registry = this.readLocalRegistry();
+            registry.datasets = [
+                ...registry.datasets.filter((item) => item.id !== dataset.id),
+                dataset,
+            ];
+            this.writeLocalRegistry(registry);
+        }
+    }
+    readLocalRegistry() {
+        const path = join(this.datasetRoot, "registry.json");
+        if (!existsSync(path))
+            return { version: 1, datasets: [] };
+        try {
+            const parsed = JSON.parse(readFileSync(path, "utf-8"));
+            return {
+                version: 1,
+                datasets: Array.isArray(parsed.datasets) ? parsed.datasets : [],
+            };
+        }
+        catch {
+            return { version: 1, datasets: [] };
+        }
+    }
+    writeLocalRegistry(registry) {
+        mkdirSync(this.datasetRoot, { recursive: true });
+        writeFileSync(join(this.datasetRoot, "registry.json"), JSON.stringify(registry, null, 2) + "\n", "utf-8");
+    }
+    readProjectRegistry() {
+        const path = join(this.projectRoot, "data", "sources.yml");
+        if (!existsSync(path))
+            return { version: 1, datasets: [] };
+        try {
+            const parsed = loadYaml(readFileSync(path, "utf-8"));
+            return {
+                ...(parsed && typeof parsed === "object" ? parsed : {}),
+                version: 1,
+                datasets: Array.isArray(parsed?.datasets) ? parsed.datasets : [],
+            };
+        }
+        catch {
+            return { version: 1, datasets: [] };
+        }
+    }
+    writeProjectRegistry(registry) {
+        const dir = join(this.projectRoot, "data");
+        mkdirSync(dir, { recursive: true });
+        const path = join(dir, "sources.yml");
+        if (registry.datasets.length === 0 && !existsSync(path))
+            return;
+        writeFileSync(path, dumpYaml(registry, { noRefs: true, lineWidth: 120, sortKeys: false }), "utf-8");
+    }
+}
+function resolveStoredPath(projectRoot, path) {
+    return resolve(path.startsWith("/") ? path : join(projectRoot, path));
+}
+function datasetFormat(filename) {
+    const extension = extname(filename).toLowerCase();
+    if (extension === ".csv")
+        return "csv";
+    if (extension === ".parquet")
+        return "parquet";
+    if (extension === ".json" ||
+        extension === ".jsonl" ||
+        extension === ".ndjson")
+        return "json";
+    throw new Error("CSV is supported now. Parquet and JSON are accepted for compatible files.");
+}
+function readerFor(format) {
+    return format === "parquet"
+        ? "read_parquet"
+        : format === "json"
+            ? "read_json_auto"
+            : "read_csv_auto";
+}
+function safeFilename(value) {
+    const cleaned = basename(value).replace(/[^A-Za-z0-9._-]+/g, "_");
+    return cleaned || "dataset.csv";
+}
+function safeAlias(value) {
+    const alias = value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9_]+/g, "_")
+        .replace(/^_+|_+$/g, "");
+    return alias || "dataset";
+}
+function uniqueAlias(value, existing) {
+    const base = safeAlias(value);
+    const used = new Set(existing.map((dataset) => dataset.alias.toLowerCase()));
+    if (!used.has(base))
+        return base;
+    let index = 2;
+    while (used.has(`${base}_${index}`))
+        index += 1;
+    return `${base}_${index}`;
+}
+function uniqueFilePath(path) {
+    if (!existsSync(path))
+        return path;
+    const extension = extname(path);
+    const stem = path.slice(0, -extension.length);
+    let index = 2;
+    while (existsSync(`${stem}_${index}${extension}`))
+        index += 1;
+    return `${stem}_${index}${extension}`;
+}
+function quoteIdentifier(value) {
+    return `"${value.replaceAll('"', '""')}"`;
+}
+function quoteLiteral(value) {
+    return `'${value.replaceAll("'", "''")}'`;
+}
+function cleanStrings(value) {
+    return Array.isArray(value)
+        ? value
+            .filter((item) => typeof item === "string" && item.trim().length > 0)
+            .map((item) => item.trim())
+        : [];
+}
+function bigintReplacer(_key, value) {
+    return typeof value === "bigint" ? Number(value) : value;
+}
+function validDuckDbType(value) {
+    return /^(VARCHAR|TEXT|BOOLEAN|BOOL|TINYINT|SMALLINT|INTEGER|INT|BIGINT|HUGEINT|UTINYINT|USMALLINT|UINTEGER|UBIGINT|REAL|FLOAT|DOUBLE|DECIMAL(?:\(\d{1,3},\s*\d{1,3}\))?|DATE|TIME|TIMESTAMP|TIMESTAMPTZ|JSON)$/i.test(value.trim());
+}
+//# sourceMappingURL=notebook-datasets.js.map

package/dist/notebook-datasets.js.map

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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckcodeailabs/dql-cli",
-  "version": "1.6.34",
+  "version": "1.7.0",
   "description": "Public CLI for parsing, formatting, testing, and certifying DQL blocks",
   "license": "Apache-2.0",
   "type": "module",
@@ -25,15 +25,15 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.104.2",
-    "@duckcodeailabs/dql-agent": "^1.6.34",
-    "@duckcodeailabs/dql-compiler": "^1.6.34",
-    "@duckcodeailabs/dql-connectors": "^1.6.34",
-    "@duckcodeailabs/dql-core": "^1.6.34",
-    "@duckcodeailabs/dql-governance": "^1.6.34",
-    "@duckcodeailabs/dql-mcp": "^1.6.34",
-    "@duckcodeailabs/dql-notebook": "^1.6.34",
-    "@duckcodeailabs/dql-project": "^1.6.34",
-    "@duckcodeailabs/dql-slack": "^1.6.34",
+    "@duckcodeailabs/dql-agent": "^1.7.0",
+    "@duckcodeailabs/dql-compiler": "^1.7.0",
+    "@duckcodeailabs/dql-connectors": "^1.7.0",
+    "@duckcodeailabs/dql-core": "^1.7.0",
+    "@duckcodeailabs/dql-governance": "^1.7.0",
+    "@duckcodeailabs/dql-mcp": "^1.7.0",
+    "@duckcodeailabs/dql-notebook": "^1.7.0",
+    "@duckcodeailabs/dql-project": "^1.7.0",
+    "@duckcodeailabs/dql-slack": "^1.7.0",
     "isomorphic-git": "^1.27.0",
     "js-yaml": "^4.1.0",
     "node-cron": "^3.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckcodeailabs/dql-cli",
-  "version": "1.6.34",
+  "version": "1.7.0",
   "description": "Public CLI for parsing, formatting, testing, and certifying DQL blocks",
   "license": "Apache-2.0",
   "type": "module",
@@ -20,15 +20,15 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.104.2",
-    "@duckcodeailabs/dql-agent": "^1.6.34",
-    "@duckcodeailabs/dql-compiler": "^1.6.34",
-    "@duckcodeailabs/dql-connectors": "^1.6.34",
-    "@duckcodeailabs/dql-core": "^1.6.34",
-    "@duckcodeailabs/dql-governance": "^1.6.34",
-    "@duckcodeailabs/dql-mcp": "^1.6.34",
-    "@duckcodeailabs/dql-notebook": "^1.6.34",
-    "@duckcodeailabs/dql-project": "^1.6.34",
-    "@duckcodeailabs/dql-slack": "^1.6.34",
+    "@duckcodeailabs/dql-agent": "^1.7.0",
+    "@duckcodeailabs/dql-compiler": "^1.7.0",
+    "@duckcodeailabs/dql-connectors": "^1.7.0",
+    "@duckcodeailabs/dql-core": "^1.7.0",
+    "@duckcodeailabs/dql-governance": "^1.7.0",
+    "@duckcodeailabs/dql-mcp": "^1.7.0",
+    "@duckcodeailabs/dql-notebook": "^1.7.0",
+    "@duckcodeailabs/dql-project": "^1.7.0",
+    "@duckcodeailabs/dql-slack": "^1.7.0",
     "isomorphic-git": "^1.27.0",
     "js-yaml": "^4.1.0",
     "node-cron": "^3.0.3",