From 7426e54e6c5d97ff4f64774469edf426515f5450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20M=C3=B3ricz?= Date: Tue, 3 Jun 2025 16:12:31 +0200 Subject: [PATCH] further fixes --- apps/api/src/__tests__/queue-concurrency-integration.test.ts | 2 +- apps/api/src/__tests__/snips/scrape.test.ts | 4 ++-- apps/api/src/lib/deep-research/deep-research-service.ts | 2 +- apps/api/src/scraper/scrapeURL/engines/index.ts | 2 ++ apps/api/src/scraper/scrapeURL/engines/index/index.ts | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/api/src/__tests__/queue-concurrency-integration.test.ts b/apps/api/src/__tests__/queue-concurrency-integration.test.ts index 650a8bb1..0f427e48 100644 --- a/apps/api/src/__tests__/queue-concurrency-integration.test.ts +++ b/apps/api/src/__tests__/queue-concurrency-integration.test.ts @@ -65,7 +65,7 @@ describe("Queue Concurrency Integration", () => { fastMode: false, blockAds: true, maxAge: 0, - dontStoreInCache: false, + storeInCache: true, }; beforeEach(() => { diff --git a/apps/api/src/__tests__/snips/scrape.test.ts b/apps/api/src/__tests__/snips/scrape.test.ts index 67c9f490..07c47ec6 100644 --- a/apps/api/src/__tests__/snips/scrape.test.ts +++ b/apps/api/src/__tests__/snips/scrape.test.ts @@ -97,8 +97,8 @@ describe("Scrape tests", () => { }, 30000); }); - describe("Index", () => { - it.concurrent("caches properly", async () => { + describe.only("Index", () => { + it.only("caches properly", async () => { const id = crypto.randomUUID(); const url = "https://firecrawl.dev/?testId=" + id; diff --git a/apps/api/src/lib/deep-research/deep-research-service.ts b/apps/api/src/lib/deep-research/deep-research-service.ts index 52668839..4c788fe7 100644 --- a/apps/api/src/lib/deep-research/deep-research-service.ts +++ b/apps/api/src/lib/deep-research/deep-research-service.ts @@ -132,7 +132,7 @@ export async function performDeepResearch(options: DeepResearchServiceOptions) { fastMode: false, blockAds: false, maxAge: 0, - dontStoreInCache: false, + storeInCache: true, __experimental_cache: true, }, }, logger, costTracking, acuc?.flags ?? null); diff --git a/apps/api/src/scraper/scrapeURL/engines/index.ts b/apps/api/src/scraper/scrapeURL/engines/index.ts index 79e70f1f..68468258 100644 --- a/apps/api/src/scraper/scrapeURL/engines/index.ts +++ b/apps/api/src/scraper/scrapeURL/engines/index.ts @@ -191,6 +191,7 @@ export const engineOptions: { skipTlsVerification: true, useFastMode: true, stealthProxy: false, + disableAdblock: false, }, quality: 999, // index should always be tried second ? - MG }, @@ -244,6 +245,7 @@ export const engineOptions: { skipTlsVerification: true, useFastMode: true, stealthProxy: false, + disableAdblock: false, }, quality: -1, }, diff --git a/apps/api/src/scraper/scrapeURL/engines/index/index.ts b/apps/api/src/scraper/scrapeURL/engines/index/index.ts index 79093a68..321b9321 100644 --- a/apps/api/src/scraper/scrapeURL/engines/index/index.ts +++ b/apps/api/src/scraper/scrapeURL/engines/index/index.ts @@ -6,7 +6,7 @@ import { EngineError, IndexMissError } from "../../error"; import crypto from "crypto"; export async function sendDocumentToIndex(meta: Meta, document: Document) { - const shouldCache = !meta.options.dontStoreInCache + const shouldCache = meta.options.storeInCache && meta.winnerEngine !== "cache" && meta.winnerEngine !== "index" && meta.winnerEngine !== "index;documents"