diff --git a/apps/api/package.json b/apps/api/package.json index 7f069bc4a..815a8e02b 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -26,6 +26,8 @@ "nuq-worker:production": "node --import ./dist/src/otel.js dist/src/services/worker/nuq-worker.js", "nuq-prefetch-worker": "tsc-watch --onSuccess \"node --import ./dist/src/otel.js dist/src/services/worker/nuq-prefetch-worker.js\"", "nuq-prefetch-worker:production": "node --import ./dist/src/otel.js dist/src/services/worker/nuq-prefetch-worker.js", + "extract-worker": "tsc-watch --onSuccess \"node --import ./dist/src/otel.js dist/src/services/extract-worker.js\"", + "extract-worker:production": "node --import ./dist/src/otel.js dist/src/services/extract-worker.js", "index-worker": "tsc-watch --onSuccess \"node --import ./dist/src/otel.js dist/src/services/indexing/index-worker.js\"", "index-worker:production": "node --import ./dist/src/otel.js dist/src/services/indexing/index-worker.js", "mongo-docker": "docker run -d -p 2717:27017 -v ./mongo-data:/data/db --name mongodb mongo:latest", diff --git a/apps/api/src/harness.ts b/apps/api/src/harness.ts index ab332818d..6a811aaab 100644 --- a/apps/api/src/harness.ts +++ b/apps/api/src/harness.ts @@ -39,8 +39,9 @@ const colors = { const processGroupColors: Record = { api: colors.green, worker: colors.blue, + extract: colors.magenta, nuq: colors.cyan, - index: colors.magenta, + index: colors.yellow, go: colors.yellow, command: colors.white, }; @@ -69,7 +70,6 @@ function formatDuration(nanoseconds: bigint): string { const stream = createWriteStream("firecrawl.log"); -// Get the port from environment variable, defaulting to 3002 const PORT = process.env.PORT ?? "3002"; const logger = { @@ -109,11 +109,11 @@ const logger = { }, processOutput(name: string, line: string, isReduceNoise: boolean) { const color = getProcessColor(name); - const label = `${color}${name.padEnd(12)}${colors.reset}`; + const label = `${color}${name.padEnd(14)}${colors.reset}`; if (!(line.includes("[nuq/metrics:") && isReduceNoise)) { console.log(`${label} ${line}`); } - stream.write(`${name.padEnd(12)} ${line}\n`); + stream.write(`${name.padEnd(14)} ${line}\n`); }, }; diff --git a/apps/api/src/lib/extract/extraction-service.ts b/apps/api/src/lib/extract/extraction-service.ts index c4952a160..d3570d362 100644 --- a/apps/api/src/lib/extract/extraction-service.ts +++ b/apps/api/src/lib/extract/extraction-service.ts @@ -79,7 +79,9 @@ export async function performExtraction( options: ExtractServiceOptions, ): Promise { const { request, teamId, subId, apiKeyId } = options; - const createdAt = options.createdAt ? new Date(options.createdAt) : new Date(); + const createdAt = options.createdAt + ? new Date(options.createdAt) + : new Date(); const urlTraces: URLTrace[] = []; let docsMap: Map = new Map(); let singleAnswerCompletions: completions | null = null; @@ -100,6 +102,7 @@ export async function performExtraction( const logger = _logger.child({ module: "extract", method: "performExtraction", + extractModel: "fire-1", extractId, teamId, }); diff --git a/apps/api/src/lib/extract/fire-0/extraction-service-f0.ts b/apps/api/src/lib/extract/fire-0/extraction-service-f0.ts index edaf96ca9..d79e64ce6 100644 --- a/apps/api/src/lib/extract/fire-0/extraction-service-f0.ts +++ b/apps/api/src/lib/extract/fire-0/extraction-service-f0.ts @@ -76,7 +76,9 @@ export async function performExtraction_F0( options: ExtractServiceOptions, ): Promise { const { request, teamId, subId, apiKeyId } = options; - const createdAt = options.createdAt ? new Date(options.createdAt) : new Date(); + const createdAt = options.createdAt + ? new Date(options.createdAt) + : new Date(); const urlTraces: URLTrace[] = []; let docsMap: Map = new Map(); let singleAnswerCompletions: completions | null = null; @@ -91,6 +93,7 @@ export async function performExtraction_F0( const logger = _logger.child({ module: "extract", method: "performExtraction", + extractModel: "fire-0", extractId, teamId, });