Skip to content

Commit

Permalink
Revert "Nick: extract api reference"
Browse files Browse the repository at this point in the history
This reverts commit 522c5b3.
  • Loading branch information
nickscamara committed Jan 27, 2025
1 parent 522c5b3 commit 61d7ba7
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 88 deletions.
2 changes: 0 additions & 2 deletions apps/api/src/controllers/v1/extract-status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export async function extractStatusController(
data = jobData[0].docs;
}

console.log(extract.sources);
return res.status(200).json({
success: extract.status === "failed" ? false : true,
data: data,
Expand All @@ -39,6 +38,5 @@ export async function extractStatusController(
expiresAt: (await getExtractExpiry(req.params.jobId)).toISOString(),
steps: extract.showSteps ? extract.steps : undefined,
llmUsage: extract.showLLMUsage ? extract.llmUsage : undefined,
sources: extract.sources,
});
}
4 changes: 0 additions & 4 deletions apps/api/src/controllers/v1/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@ export interface URLTrace {
};
relevanceScore?: number;
usedInCompletion?: boolean;
extractedFields?: string[];
}

export interface ExtractResponse {
Expand All @@ -548,9 +547,6 @@ export interface ExtractResponse {
id?: string;
warning?: string;
urlTrace?: URLTrace[];
sources?: {
[key: string]: string[];
};
}

export interface ExtractResponseRequestTest {
Expand Down
3 changes: 0 additions & 3 deletions apps/api/src/lib/extract/extract-redis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ export type StoredExtract = {
steps?: ExtractedStep[];
showLLMUsage?: boolean;
llmUsage?: number;
sources?: {
[key: string]: string[];
};
};

// Reduce TTL to 6 hours instead of 24
Expand Down
78 changes: 0 additions & 78 deletions apps/api/src/lib/extract/extraction-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ interface ExtractResult {
tokenUsageBreakdown?: TokenUsage[];
llmUsage?: number;
totalUrlsScraped?: number;
sources?: {
[key: string]: string[];
};
}

async function analyzeSchemaAndPrompt(
Expand Down Expand Up @@ -182,45 +179,6 @@ function getRootDomain(url: string): string {
}
}

// Add helper function to track sources
function trackFieldSources(data: any, url: string, parentPath: string = ''): string[] {
const extractedFields: string[] = [];

if (data && typeof data === 'object') {
Object.entries(data).forEach(([key, value]) => {
const currentPath = parentPath ? `${parentPath}.${key}` : key;

if (value !== null && value !== undefined) {
extractedFields.push(currentPath);

if (typeof value === 'object') {
extractedFields.push(...trackFieldSources(value, url, currentPath));
}
}
});
}

return extractedFields;
}

// Add helper to merge sources from multiple extractions
function mergeSources(sources: { [key: string]: string[] }[]): { [key: string]: string[] } {
const mergedSources: { [key: string]: string[] } = {};

sources.forEach(sourceMap => {
Object.entries(sourceMap).forEach(([field, urls]) => {
if (!mergedSources[field]) {
mergedSources[field] = [];
}
mergedSources[field].push(...urls);
// Deduplicate URLs
mergedSources[field] = [...new Set(mergedSources[field])];
});
});

return mergedSources;
}

export async function performExtraction(
extractId: string,
options: ExtractServiceOptions,
Expand All @@ -233,7 +191,6 @@ export async function performExtraction(
let multiEntityResult: any = {};
let singleAnswerResult: any = {};
let totalUrlsScraped = 0;
let extractionSources: { [key: string]: string[] } = {};

const logger = _logger.child({
module: "extract",
Expand Down Expand Up @@ -594,24 +551,6 @@ export async function performExtraction(
// return null;
// }

if (multiEntityCompletion?.extract) {
const extractedFields = trackFieldSources(multiEntityCompletion.extract, doc.metadata.url || doc.metadata.sourceURL!);

// Update URL trace with extracted fields
const trace = urlTraces.find(t => t.url === (doc.metadata.url || doc.metadata.sourceURL!));
if (trace) {
trace.extractedFields = extractedFields;
}

// Track sources for each field
extractedFields.forEach(field => {
if (!extractionSources[field]) {
extractionSources[field] = [];
}
extractionSources[field].push(doc.metadata.url || doc.metadata.sourceURL!);
});
}

return multiEntityCompletion.extract;
} catch (error) {
logger.error(`Failed to process document.`, { error, url: doc.metadata.url ?? doc.metadata.sourceURL! });
Expand Down Expand Up @@ -788,21 +727,6 @@ export async function performExtraction(
// }
// });
// }

if (singleAnswerCompletions?.extract) {
const singleAnswerSources: { [key: string]: string[] } = {};
const usedUrls = Array.from(docsMap.values())
.map(doc => doc.metadata.url || doc.metadata.sourceURL!)
.filter(Boolean);

const extractedFields = trackFieldSources(singleAnswerCompletions.extract, '');
extractedFields.forEach(field => {
singleAnswerSources[field] = usedUrls;
});

// Merge with multi-entity sources
extractionSources = mergeSources([extractionSources, singleAnswerSources]);
}
}

let finalResult = reqSchema
Expand Down Expand Up @@ -893,7 +817,6 @@ export async function performExtraction(
updateExtract(extractId, {
status: "completed",
llmUsage,
sources: extractionSources
}).catch((error) => {
logger.error(
`Failed to update extract ${extractId} status to completed: ${error}`,
Expand All @@ -911,6 +834,5 @@ export async function performExtraction(
urlTrace: request.urlTrace ? urlTraces : undefined,
llmUsage,
totalUrlsScraped,
sources: extractionSources
};
}
1 change: 0 additions & 1 deletion apps/api/src/services/rate-limiter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ export function getRateLimiterPoints(

const points: number =
rateLimitConfig[makePlanKey(plan)] || rateLimitConfig.default; // 5

return points;
}

Expand Down

0 comments on commit 61d7ba7

Please sign in to comment.