Skip to content

Commit 058cc3a

Browse files
garotmgarotm
authored
Merge pull request #2 from fleXRPL/security/dependabot-alerts
security/dependabot-alerts - garotm - fix dependabot security alerts.
2 parents 9494c07 + 27ad78b commit 058cc3a

11 files changed

Lines changed: 1332 additions & 806 deletions

File tree

‎backend/dist/app.js‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
66
exports.createApp = createApp;
77
const express_1 = __importDefault(require("express"));
88
const cors_1 = __importDefault(require("cors"));
9+
const node_fs_1 = __importDefault(require("node:fs"));
10+
const node_path_1 = __importDefault(require("node:path"));
911
const zod_1 = require("zod");
1012
const db_1 = require("./db");
1113
const ingest_1 = require("./ingest");
14+
const llmDefaults_1 = require("./llmDefaults");
15+
const INGESTABLE_EXTENSIONS = new Set([".json", ".hl7", ".pdf", ".txt"]);
1216
function createApp(db) {
1317
const app = (0, express_1.default)();
1418
app.use((0, cors_1.default)({ origin: true }));
@@ -24,8 +28,8 @@ function createApp(db) {
2428
app.get("/api/settings", (_req, res) => {
2529
const rawWatch = (0, db_1.getSetting)(db, "watch_folder");
2630
const watch_folder = rawWatch && rawWatch.length > 0 ? rawWatch : null;
27-
const llm_base_url = (0, db_1.getSetting)(db, "llm_base_url") ?? "http://127.0.0.1:8080/v1";
28-
const llm_model = (0, db_1.getSetting)(db, "llm_model") ?? "local-model";
31+
const llm_base_url = (0, db_1.getSetting)(db, "llm_base_url") ?? llmDefaults_1.DEFAULT_LLM_BASE_URL;
32+
const llm_model = (0, db_1.getSetting)(db, "llm_model") ?? llmDefaults_1.DEFAULT_LLM_MODEL;
2933
res.json({
3034
watch_folder,
3135
llm_base_url,
@@ -49,8 +53,8 @@ function createApp(db) {
4953
const watch_folder = wf && wf.length > 0 ? wf : null;
5054
res.json({
5155
watch_folder,
52-
llm_base_url: (0, db_1.getSetting)(db, "llm_base_url") ?? "http://127.0.0.1:8080/v1",
53-
llm_model: (0, db_1.getSetting)(db, "llm_model") ?? "local-model",
56+
llm_base_url: (0, db_1.getSetting)(db, "llm_base_url") ?? llmDefaults_1.DEFAULT_LLM_BASE_URL,
57+
llm_model: (0, db_1.getSetting)(db, "llm_model") ?? llmDefaults_1.DEFAULT_LLM_MODEL,
5458
});
5559
});
5660
const IngestBody = zod_1.z.object({
@@ -94,6 +98,39 @@ function createApp(db) {
9498
summary_preview: row.summary_text ? row.summary_text.slice(0, 220) : null,
9599
});
96100
});
101+
app.delete("/api/documents/:id", (req, res) => {
102+
const { changes } = db.prepare("DELETE FROM documents WHERE id = ?").run(req.params.id);
103+
if (changes === 0) {
104+
res.status(404).json({ error: "not found" });
105+
return;
106+
}
107+
res.json({ deleted: req.params.id });
108+
});
109+
app.post("/api/scan", async (_req, res) => {
110+
const watchFolder = (0, db_1.getSetting)(db, "watch_folder");
111+
if (!watchFolder) {
112+
res.status(400).json({ error: "No watch folder configured" });
113+
return;
114+
}
115+
let queued = 0;
116+
try {
117+
const entries = node_fs_1.default.readdirSync(watchFolder);
118+
const files = entries
119+
.filter((e) => INGESTABLE_EXTENSIONS.has(node_path_1.default.extname(e).toLowerCase()))
120+
.map((e) => node_path_1.default.join(watchFolder, e));
121+
for (const filePath of files) {
122+
void (0, ingest_1.ingestFile)(db, filePath).catch((err) => {
123+
console.error(`[Sift] scan ingest error ${filePath}:`, err);
124+
});
125+
queued++;
126+
}
127+
res.json({ queued, folder: watchFolder });
128+
}
129+
catch (e) {
130+
const msg = e instanceof Error ? e.message : String(e);
131+
res.status(500).json({ error: msg });
132+
}
133+
});
97134
app.post("/ingest", (req, res) => {
98135
const fileName = typeof req.body?.fileName === "string" ? req.body.fileName : "";
99136
console.log(`[Sift] legacy ingest ping: ${fileName}`);

‎backend/dist/ingest.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
44
};
55
Object.defineProperty(exports, "__esModule", { value: true });
66
exports.ingestFile = ingestFile;
7-
const fs_1 = __importDefault(require("fs"));
8-
const path_1 = __importDefault(require("path"));
7+
const node_fs_1 = __importDefault(require("node:fs"));
8+
const node_path_1 = __importDefault(require("node:path"));
99
const uuid_1 = require("uuid");
1010
const fhir_1 = require("./pipelines/fhir");
1111
const hl7_1 = require("./pipelines/hl7");
1212
const pdf_1 = require("./pipelines/pdf");
1313
const db_1 = require("./db");
1414
const llm_1 = require("./llm");
15+
const llmDefaults_1 = require("./llmDefaults");
1516
function detectKind(filePath, rawText) {
16-
const ext = path_1.default.extname(filePath).toLowerCase();
17+
const ext = node_path_1.default.extname(filePath).toLowerCase();
1718
if (ext === ".json" || ext === ".xml") {
1819
const t = rawText.trimStart();
19-
if (t.startsWith("{") && (t.includes('"resourceType"') || t.includes('"resourceType"')))
20+
if (t.startsWith("{") && t.includes('"resourceType"'))
2021
return "fhir";
2122
}
2223
if (ext === ".hl7" || ext === ".txt") {
@@ -64,30 +65,33 @@ async function buildContext(kind, filePath, rawText) {
6465
};
6566
}
6667
async function ingestFile(db, filePath) {
67-
const normalized = path_1.default.resolve(filePath);
68-
if (!fs_1.default.existsSync(normalized)) {
68+
const normalized = node_path_1.default.resolve(filePath);
69+
if (!node_fs_1.default.existsSync(normalized)) {
6970
throw new Error(`File not found: ${normalized}`);
7071
}
71-
const stat = fs_1.default.statSync(normalized);
72+
const stat = node_fs_1.default.statSync(normalized);
7273
if (!stat.isFile()) {
7374
throw new Error(`Not a file: ${normalized}`);
7475
}
7576
const id = (0, uuid_1.v4)();
76-
const fileName = path_1.default.basename(normalized);
77-
const ext = path_1.default.extname(normalized).toLowerCase();
77+
const fileName = node_path_1.default.basename(normalized);
78+
const ext = node_path_1.default.extname(normalized).toLowerCase();
7879
let rawText = "";
7980
if (ext !== ".pdf") {
8081
try {
81-
rawText = fs_1.default.readFileSync(normalized, "utf8");
82+
rawText = node_fs_1.default.readFileSync(normalized, "utf8");
8283
}
8384
catch {
8485
rawText = "";
8586
}
8687
}
8788
const kind = ext === ".pdf" ? "pdf" : detectKind(normalized, rawText);
89+
// Write a 'processing' row immediately so the UI shows the file right away.
90+
db.prepare(`INSERT INTO documents (id, file_path, file_name, source_type, status)
91+
VALUES (?, ?, ?, ?, 'processing')`).run(id, normalized, fileName, kind);
8892
const ctx = await buildContext(kind, normalized, rawText);
89-
const llmBase = (0, db_1.getSetting)(db, "llm_base_url") ?? process.env.SIFT_LLM_BASE_URL ?? "http://127.0.0.1:8080/v1";
90-
const llmModel = (0, db_1.getSetting)(db, "llm_model") ?? process.env.SIFT_LLM_MODEL ?? "gpt-oss-20b";
93+
const llmBase = (0, db_1.getSetting)(db, "llm_base_url") ?? process.env.SIFT_LLM_BASE_URL ?? llmDefaults_1.DEFAULT_LLM_BASE_URL;
94+
const llmModel = (0, db_1.getSetting)(db, "llm_model") ?? process.env.SIFT_LLM_MODEL ?? llmDefaults_1.DEFAULT_LLM_MODEL;
9195
let summary;
9296
let confidence = ctx.baseConfidence;
9397
let err = null;
@@ -106,8 +110,8 @@ async function ingestFile(db, filePath) {
106110
summary = (0, llm_1.heuristicSummary)(ctx.label, ctx.preview);
107111
confidence = Math.max(0.15, confidence - 0.25);
108112
}
109-
db.prepare(`INSERT INTO documents (
110-
id, file_path, file_name, source_type, status, raw_preview, summary_text, confidence, error_message
111-
) VALUES (?, ?, ?, ?, 'complete', ?, ?, ?, ?)`).run(id, normalized, fileName, kind, ctx.preview.slice(0, 65000), summary, confidence, err);
113+
db.prepare(`UPDATE documents
114+
SET status = 'complete', raw_preview = ?, summary_text = ?, confidence = ?, error_message = ?
115+
WHERE id = ?`).run(ctx.preview.slice(0, 65000), summary, confidence, err, id);
112116
return { documentId: id, status: "complete" };
113117
}

‎backend/dist/llmDefaults.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
3+
exports.DEFAULT_LLM_MODEL = exports.DEFAULT_LLM_BASE_URL = void 0;
4+
/** Defaults aligned with Ollama’s OpenAI-compatible API (`/v1/chat/completions` on port 11434). */
5+
exports.DEFAULT_LLM_BASE_URL = "http://127.0.0.1:11434/v1";
6+
/** Common tag; change in Settings to match `ollama list` (e.g. `llama3.2`, `mistral`, `qwen2.5:14b`). */
7+
exports.DEFAULT_LLM_MODEL = "gemma4:26b";

0 commit comments

Comments
 (0)