Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

refactor(billing): remove vestigial subId threading from extract paths (#4020)

firecrawl-spring[bot]acaa612f04b9
diff --git a/apps/api/src/controllers/v1/deep-research.ts b/apps/api/src/controllers/v1/deep-research.ts
index f6c45b3c7..49b2f8a1d 100644
--- a/apps/api/src/controllers/v1/deep-research.ts
+++ b/apps/api/src/controllers/v1/deep-research.ts
@@ -108,7 +108,6 @@ export async function deepResearchController(
const jobData = {
request: req.body,
teamId: req.auth.team_id,
- subId: req.acuc?.sub_id ?? undefined,
apiKeyId: req.acuc?.api_key_id ?? null,
researchId,
};
diff --git a/apps/api/src/controllers/v1/extract.ts b/apps/api/src/controllers/v1/extract.ts
index f5802f36c..75b72462b 100644
--- a/apps/api/src/controllers/v1/extract.ts
+++ b/apps/api/src/controllers/v1/extract.ts
@@ -201,7 +201,6 @@ export async function extractController(
originalRequest,
teamId: req.auth.team_id,
team_id: req.auth.team_id,
- subId: req.acuc?.sub_id,
extractId,
zeroDataRetention: getScrapeZDR(req.acuc?.flags) === "forced",
});
@@ -232,7 +231,6 @@ export async function extractController(
scrapeOptions,
},
teamId: req.auth.team_id,
- subId: req.acuc?.sub_id,
extractId,
agent: req.body.agent,
apiKeyId: req.acuc?.api_key_id ?? null,
diff --git a/apps/api/src/controllers/v1/generate-llmstxt.ts b/apps/api/src/controllers/v1/generate-llmstxt.ts
index 50210abce..c0c8f376f 100644
--- a/apps/api/src/controllers/v1/generate-llmstxt.ts
+++ b/apps/api/src/controllers/v1/generate-llmstxt.ts
@@ -55,7 +55,6 @@ export async function generateLLMsTextController(
const jobData = {
request: req.body,
teamId: req.auth.team_id,
- subId: req.acuc?.sub_id ?? undefined,
apiKeyId: req.acuc?.api_key_id ?? null,
generationId,
};
diff --git a/apps/api/src/controllers/v2/agent.ts b/apps/api/src/controllers/v2/agent.ts
index b8ff9ca88..9cd86ef7b 100644
--- a/apps/api/src/controllers/v2/agent.ts
+++ b/apps/api/src/controllers/v2/agent.ts
@@ -49,7 +49,6 @@ export async function agentController(
_logger.info("Agent starting...", {
request: req.body,
originalRequest,
- subId: req.acuc?.sub_id,
zeroDataRetention: getScrapeZDR(req.acuc?.flags) === "forced",
});
diff --git a/apps/api/src/controllers/v2/extract.ts b/apps/api/src/controllers/v2/extract.ts
index 3564cc7ec..59476f464 100644
--- a/apps/api/src/controllers/v2/extract.ts
+++ b/apps/api/src/controllers/v2/extract.ts
@@ -51,7 +51,6 @@ export async function extractController(
originalRequest,
teamId: req.auth.team_id,
team_id: req.auth.team_id,
- subId: req.acuc?.sub_id,
extractId,
zeroDataRetention: getScrapeZDR(req.acuc?.flags) === "forced",
});
@@ -151,7 +150,6 @@ export async function extractController(
const jobData = {
request: req.body,
teamId: req.auth.team_id,
- subId: req.acuc?.sub_id,
extractId,
agent: req.body.agent,
createdAt,
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 e42981f66..16b36b300 100644
--- a/apps/api/src/lib/deep-research/deep-research-service.ts
+++ b/apps/api/src/lib/deep-research/deep-research-service.ts
@@ -19,7 +19,6 @@ export interface DeepResearchServiceOptions {
systemPrompt: string;
formats: string[];
jsonOptions: ExtractOptions;
- subId?: string;
apiKeyId: number | null;
}
diff --git a/apps/api/src/lib/generate-llmstxt/generate-llmstxt-service.ts b/apps/api/src/lib/generate-llmstxt/generate-llmstxt-service.ts
index 46c61de90..71da9bb21 100644
--- a/apps/api/src/lib/generate-llmstxt/generate-llmstxt-service.ts
+++ b/apps/api/src/lib/generate-llmstxt/generate-llmstxt-service.ts
@@ -21,7 +21,6 @@ interface GenerateLLMsTextServiceOptions {
maxUrls: number;
showFullText: boolean;
cache?: boolean;
- subId?: string;
}
const descriptionSchema = z.object({
diff --git a/apps/api/src/services/extract-queue.ts b/apps/api/src/services/extract-queue.ts
index f7c518a3c..29ab3a750 100644
--- a/apps/api/src/services/extract-queue.ts
+++ b/apps/api/src/services/extract-queue.ts
@@ -10,7 +10,6 @@ export type ExtractJobData = {
extractId: string;
request: any;
teamId: string;
- subId?: string | null;
apiKeyId?: number | null;
agent?: any;
createdAt: number;
diff --git a/apps/api/src/services/queue-worker.ts b/apps/api/src/services/queue-worker.ts
index fa2366f59..feeb46d93 100644
--- a/apps/api/src/services/queue-worker.ts
+++ b/apps/api/src/services/queue-worker.ts
@@ -77,7 +77,6 @@ const processDeepResearchJobInternal = async (
query: job.data.request.query,
maxDepth: job.data.request.maxDepth,
timeLimit: job.data.request.timeLimit,
- subId: job.data.subId,
maxUrls: job.data.request.maxUrls,
analysisPrompt: job.data.request.analysisPrompt,
systemPrompt: job.data.request.systemPrompt,
@@ -152,7 +151,6 @@ const processGenerateLlmsTxtJobInternal = async (
url: job.data.request.url,
maxUrls: job.data.request.maxUrls,
showFullText: job.data.request.showFullText,
- subId: job.data.subId,
cache: job.data.request.cache,
apiKeyId: job.data.apiKeyId,
});