adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/release/v0.3.1' into fix/Timebomb_031

Browse Source
This commit is contained in:
Timebomb2018
2026-04-22 14:16:12 +08:00
parent 398aebd0c5 2f7fd85ab1
commit d6af459ca8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/app/config/default_free_plan.py
View File

@@ -62,7 +62,7 @@ def _build_default_free_plan():
"memory_engine_quota": 1, "memory_engine_quota": 1,
"end_user_quota": 1, "end_user_quota": 1,
"ontology_project_quota": 3, "ontology_project_quota": 3,
"model_quota": 1, "model_quota": 4,
"api_ops_rate_limit": 50, "api_ops_rate_limit": 50,
}, },
} }

11
api/app/core/quota_manager.py
View File

@@ -179,11 +179,18 @@ class QuotaUsageRepository:
def count_end_users(self, tenant_id: UUID) -> int: def count_end_users(self, tenant_id: UUID) -> int:
from app.models.end_user_model import EndUser from app.models.end_user_model import EndUser
from app.models.workspace_model import Workspace from app.models.workspace_model import Workspace
return self.db.query(EndUser).join( from app.models.user_model import User
trial_user_ids = [
str(u.id) for u in self.db.query(User.id).filter(User.tenant_id == tenant_id).all()
]
query = self.db.query(EndUser).join(
Workspace, EndUser.workspace_id == Workspace.id Workspace, EndUser.workspace_id == Workspace.id
).filter( ).filter(
Workspace.tenant_id == tenant_id Workspace.tenant_id == tenant_id
).count() )
if trial_user_ids:
query = query.filter(~EndUser.other_id.in_(trial_user_ids))
return query.count()
def count_models(self, tenant_id: UUID) -> int: def count_models(self, tenant_id: UUID) -> int:
from app.models.models_model import ModelConfig from app.models.models_model import ModelConfig