🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
chore(api): reduce legacy public API rate limits (#19555)
Max Deichmann59816c5b2911
diff --git a/web/src/__tests__/server/rate-limit.servertest.ts b/web/src/__tests__/server/rate-limit.servertest.tsindex 24b637f5a1..b7fe6d742a 100644--- a/web/src/__tests__/server/rate-limit.servertest.ts+++ b/web/src/__tests__/server/rate-limit.servertest.ts@@ -422,19 +422,21 @@ describe("RateLimitService", () => {it("should apply public-api-legacy rate limits by cloud plan", async () => {const cases = [- { plan: "cloud:hobby" as const, points: 5 },- { plan: "cloud:core" as const, points: 15 },- { plan: "cloud:pro" as const, points: 40 },- { plan: "cloud:team" as const, points: 40 },- { plan: "cloud:enterprise" as const, points: 40 },+ { plan: "cloud:hobby" as const, points: 150, durationInSec: 3600 },+ { plan: "cloud:core" as const, points: 450, durationInSec: 3600 },+ { plan: "cloud:pro" as const, points: 1_200, durationInSec: 3600 },+ { plan: "cloud:team" as const, points: 1_200, durationInSec: 3600 },+ { plan: "cloud:enterprise" as const, points: 1_200, durationInSec: 3600 },];const rateLimitService = RateLimitService.getInstance(redis as Redis);for (const testCase of cases) {- await redis.del(- `${RATE_LIMIT_REDIS_KEY_PREFIX}:public-api-legacy:${orgId}`,- );+ const activeKey = `${RATE_LIMIT_REDIS_KEY_PREFIX}:public-api-legacy:${testCase.durationInSec}:${orgId}`;+ const previousWindowKey = `${RATE_LIMIT_REDIS_KEY_PREFIX}:public-api-legacy:${orgId}`;++ await redis.del(activeKey);+ await redis.set(previousWindowKey, "1", "EX", 60);const scope = {orgId: orgId,@@ -459,6 +461,16 @@ describe("RateLimitService", () => {isFirstInDuration: true,});expect(result?.isRateLimited()).toBe(false);++ const ttlInSec = await redis.ttl(activeKey);++ expect(ttlInSec).toBeGreaterThan(0);+ expect(ttlInSec).toBeLessThanOrEqual(testCase.durationInSec);+ expect(ttlInSec).toBeGreaterThan(testCase.durationInSec - 60);++ const previousWindowTtl = await redis.ttl(previousWindowKey);+ expect(previousWindowTtl).toBeGreaterThan(0);+ expect(previousWindowTtl).toBeLessThanOrEqual(60);}});diff --git a/web/src/features/public-api/server/RateLimitService.ts b/web/src/features/public-api/server/RateLimitService.tsindex c8d0c7ec64..b1ec4ef926 100644--- a/web/src/features/public-api/server/RateLimitService.ts+++ b/web/src/features/public-api/server/RateLimitService.ts@@ -130,7 +130,12 @@ export class RateLimitService {points: effectiveConfig.points, // Number of pointsduration: effectiveConfig.durationInSec, // Per second(s)- keyPrefix: this.rateLimitPrefix(resource), // must be unique for limiters with different purpose+ // Legacy reads include the window so a 60s config and a 3600s config+ // do not increment the same counter.+ keyPrefix:+ resource === "public-api-legacy"+ ? `${this.rateLimitPrefix(resource)}:${effectiveConfig.durationInSec}`+ : this.rateLimitPrefix(resource),storeClient: RateLimitService.redis,rejectIfRedisNotReady: true,});@@ -337,8 +342,8 @@ const getPlanBasedRateLimitConfig = (case "public-api-legacy":return {resource: "public-api-legacy",- points: 5,- durationInSec: 60,+ points: 150,+ durationInSec: 3600, // 150 requests per hour};case "datasets":return {@@ -438,8 +443,8 @@ const getPlanBasedRateLimitConfig = (case "public-api-legacy":return {resource: "public-api-legacy",- points: 15,- durationInSec: 60,+ points: 450,+ durationInSec: 3600, // 450 requests per hour};case "datasets":return {@@ -539,8 +544,8 @@ const getPlanBasedRateLimitConfig = (case "public-api-legacy":return {resource: "public-api-legacy",- points: 40,- durationInSec: 60,+ points: 1_200,+ durationInSec: 3600, // 1,200 requests per hour};case "datasets":return {