Austin/firecrawl
1
0
Fork 0
mirror of https://github.com/mendableai/firecrawl.git synced 2024-11-16 03:32:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Merge pull request #773 from mendableai/nsc/retries-acuc-price-credits-fallback"

Browse Source 
This reverts commit ba9ad1ef7f, reversing
changes made to 666082a7dd.
This commit is contained in:
rafaelsideguide 2024-10-14 10:32:09 -03:00
parent ba9ad1ef7f
commit a6888ce17b
2 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
apps/api/src/controllers/auth.ts
View File

@ -37,17 +37,12 @@ function normalizedApiIsUuid(potentialUuid: string): boolean {
return validate(potentialUuid); return validate(potentialUuid);
} }
export async function setCachedACUC( export async function setCachedACUC(api_key: string, acuc: AuthCreditUsageChunk | ((acuc: AuthCreditUsageChunk) => AuthCreditUsageChunk)) {
api_key: string,
acuc:
| AuthCreditUsageChunk
| ((acuc: AuthCreditUsageChunk) => AuthCreditUsageChunk)
) {
const cacheKeyACUC = `acuc_${api_key}`; const cacheKeyACUC = `acuc_${api_key}`;
const redLockKey = `lock_${cacheKeyACUC}`; const redLockKey = `lock_${cacheKeyACUC}`;
try { try {
await redlock.using([redLockKey], 10000, {}, async (signal) => { await redlock.using([redLockKey], 10000, {}, async signal => {
if (typeof acuc === "function") { if (typeof acuc === "function") {
acuc = acuc(JSON.parse(await getValue(cacheKeyACUC))); acuc = acuc(JSON.parse(await getValue(cacheKeyACUC)));
@ -73,10 +68,7 @@ export async function setCachedACUC(
} }
} }
export async function getACUC( export async function getACUC(api_key: string, cacheOnly = false): Promise<AuthCreditUsageChunk | null> {
api_key: string,
cacheOnly = false
): Promise<AuthCreditUsageChunk | null> {
const cacheKeyACUC = `acuc_${api_key}`; const cacheKeyACUC = `acuc_${api_key}`;
const cachedACUC = await getValue(cacheKeyACUC); const cachedACUC = await getValue(cacheKeyACUC);
@ -84,38 +76,18 @@ export async function getACUC(
if (cachedACUC !== null) { if (cachedACUC !== null) {
return JSON.parse(cachedACUC); return JSON.parse(cachedACUC);
} else if (!cacheOnly) { } else if (!cacheOnly) {
let data; const { data, error } =
let error; await supabase_service.rpc("auth_credit_usage_chunk_test_3", { input_key: api_key });
let retries = 0;
const maxRetries = 5; if (error) {
throw new Error("Failed to retrieve authentication and credit usage data: " + JSON.stringify(error));
while (retries < maxRetries) {
({ data, error } = await supabase_service.rpc(
"auth_credit_usage_chunk_test_3",
{ input_key: api_key }
));
if (!error) {
break;
}
Logger.warn(
`Failed to retrieve authentication and credit usage data after ${retries}, trying again...`
);
retries++;
if (retries === maxRetries) {
throw new Error(
"Failed to retrieve authentication and credit usage data after 3 attempts: " +
JSON.stringify(error)
);
}
// Wait for a short time before retrying
await new Promise((resolve) => setTimeout(resolve, 200));
} }
const chunk: AuthCreditUsageChunk | null = const chunk: AuthCreditUsageChunk | null = data.length === 0
data.length === 0 ? null : data[0].team_id === null ? null : data[0]; ? null
: data[0].team_id === null
? null
: data[0];
// NOTE: Should we cache null chunks? - mogery // NOTE: Should we cache null chunks? - mogery
if (chunk !== null) { if (chunk !== null) {
@ -160,11 +132,7 @@ export async function supaAuthenticateUser(
plan?: PlanType; plan?: PlanType;
chunk?: AuthCreditUsageChunk; chunk?: AuthCreditUsageChunk;
}> { }> {
const authHeader = const authHeader = req.headers.authorization ?? (req.headers["sec-websocket-protocol"] ? `Bearer ${req.headers["sec-websocket-protocol"]}` : null);
req.headers.authorization ??
(req.headers["sec-websocket-protocol"]
? `Bearer ${req.headers["sec-websocket-protocol"]}`
: null);
if (!authHeader) { if (!authHeader) {
return { success: false, error: "Unauthorized", status: 401 }; return { success: false, error: "Unauthorized", status: 401 };
} }
@ -194,7 +162,7 @@ export async function supaAuthenticateUser(
rateLimiter = getRateLimiter(RateLimiterMode.CrawlStatus, token); rateLimiter = getRateLimiter(RateLimiterMode.CrawlStatus, token);
} else { } else {
rateLimiter = getRateLimiter(RateLimiterMode.Preview, token); rateLimiter = getRateLimiter(RateLimiterMode.Preview, token);
} }
teamId = "preview"; teamId = "preview";
} else { } else {
normalizedApi = parseApi(token); normalizedApi = parseApi(token);

6
apps/api/src/services/billing/credit_billing.ts
View File

@ -55,13 +55,11 @@ export async function supaCheckTeamCredits(chunk: AuthCreditUsageChunk, team_id:
const creditsWillBeUsed = chunk.adjusted_credits_used + credits; const creditsWillBeUsed = chunk.adjusted_credits_used + credits;
// In case chunk.price_credits is undefined, set it to a large number to avoid mistakes
const totalPriceCredits = chunk.price_credits ?? 100000000;
// Removal of + credits // Removal of + credits
const creditUsagePercentage = creditsWillBeUsed / totalPriceCredits; const creditUsagePercentage = creditsWillBeUsed / chunk.price_credits;
// Compare the adjusted total credits used with the credits allowed by the plan // Compare the adjusted total credits used with the credits allowed by the plan
if (creditsWillBeUsed > totalPriceCredits) { if (creditsWillBeUsed > chunk.price_credits) {
sendNotification( sendNotification(
team_id, team_id,
NotificationType.LIMIT_REACHED, NotificationType.LIMIT_REACHED,