diff --git a/backend/ee/onyx/server/usage_limits.py b/backend/ee/onyx/server/usage_limits.py index abc4485ff61..8170c1a129d 100644 --- a/backend/ee/onyx/server/usage_limits.py +++ b/backend/ee/onyx/server/usage_limits.py @@ -1,8 +1,5 @@ """EE Usage limits - trial detection via billing information.""" -from datetime import datetime -from datetime import timezone - from ee.onyx.server.tenants.billing import fetch_billing_information from ee.onyx.server.tenants.models import BillingInformation from ee.onyx.server.tenants.models import SubscriptionStatusResponse @@ -31,13 +28,7 @@ def is_tenant_on_trial(tenant_id: str) -> bool: return True if isinstance(billing_info, BillingInformation): - # Check if trial is active - if billing_info.trial_end is not None: - now = datetime.now(timezone.utc) - # Trial active if trial_end is in the future - # and subscription status indicates trialing - if billing_info.trial_end > now and billing_info.status == "trialing": - return True + return billing_info.status == "trialing" return False diff --git a/backend/shared_configs/configs.py b/backend/shared_configs/configs.py index 1077dbbc3c4..8198ddc7fce 100644 --- a/backend/shared_configs/configs.py +++ b/backend/shared_configs/configs.py @@ -236,10 +236,10 @@ async def async_return_default_schema(*args: Any, **kwargs: Any) -> str: # Per-week chunks indexed limits USAGE_LIMIT_CHUNKS_INDEXED_TRIAL = int( - os.environ.get("USAGE_LIMIT_CHUNKS_INDEXED_TRIAL", "10000") + os.environ.get("USAGE_LIMIT_CHUNKS_INDEXED_TRIAL", 100_000) ) USAGE_LIMIT_CHUNKS_INDEXED_PAID = int( - os.environ.get("USAGE_LIMIT_CHUNKS_INDEXED_PAID", "50000") + os.environ.get("USAGE_LIMIT_CHUNKS_INDEXED_PAID", 1_000_000) ) # Per-week API calls using API keys or Personal Access Tokens