Commit Graph

1387 Commits

Author SHA1 Message Date
Timebomb2018
46dfd92a9f feat(api-key): adjust default rate limit and daily request limit values 2026-04-22 20:23:05 +08:00
Timebomb2018
b0bb5e883c refactor(workflow/llm): replace regex substitution with string replace for context rendering 2026-04-22 20:05:45 +08:00
Timebomb2018
d6af459ca8 Merge branch 'refs/heads/release/v0.3.1' into fix/Timebomb_031 2026-04-22 14:16:12 +08:00
山程漫悟
2f7fd85ab1 Merge pull request #964 from SuanmoSuanyangTechnology/fix/wxy_031
feat(plan): bump free plan model quota from 1 to 4
2026-04-22 14:15:49 +08:00
Timebomb2018
398aebd0c5 Merge branch 'refs/heads/release/v0.3.1' into fix/Timebomb_031 2026-04-22 14:13:04 +08:00
wwq
eaa4058c56 fix(quota_manager): exclude trial users from tenant terminal user count
- Deduct trial user records when aggregating the total number of terminal users for a tenant.
2026-04-22 14:12:44 +08:00
Timebomb2018
21b25bfef7 feat(workflow): support MCP tool type with operation-to-tool_name mapping 2026-04-22 14:12:35 +08:00
Mark
537f6a1812 Merge branch 'release/v0.3.1' of github.com:SuanmoSuanyangTechnology/MemoryBear into release/v0.3.1
* 'release/v0.3.1' of github.com:SuanmoSuanyangTechnology/MemoryBear:
  fix(web): stream add default error message
  fix(quota): restrict quota check to new terminal user creation only
  fix(api): fix API Key rate limiting and terminal user quota checks
  feat(exception): enhance I18nException response format and add error code mapping
  feat(quota): add quota checks during app duplication and import operations
  fix(知识服务): 添加工作空间模型配置的校验
  refactor(knowledge_service): 简化模型绑定逻辑,直接使用工作区配置
  fix(知识服务): 修复创建知识库时未检查视觉模型存在的错误
  refactor(knowledge_service): 优化模型绑定逻辑,使用ID查询并简化回退机制
2026-04-22 11:47:47 +08:00
Mark
1ea0f308ba [fix] celery task 2026-04-22 11:47:32 +08:00
wwq
77c023102e feat(plan): bump free plan model quota from 1 to 4
- Increase the model quota for the free tier from 1 to 4.
2026-04-22 11:10:41 +08:00
Mark
158507cf8e Merge pull request #962 from SuanmoSuanyangTechnology/fix/wxy_031
fix(quota): restrict quota check to new terminal user creation only
2026-04-21 21:20:24 +08:00
wwq
5e0d30dde8 fix(quota): restrict quota check to new terminal user creation only
- Avoid redundant quota checks for existing users on every request to optimize performance.
2026-04-21 21:16:35 +08:00
Mark
363d775270 Merge pull request #961 from SuanmoSuanyangTechnology/fix/wxy_031
fix(api): fix API Key rate limiting and terminal user quota checks
2026-04-21 20:57:25 +08:00
wwq
ad4121b0d8 fix(api): fix API Key rate limiting and terminal user quota checks
- Revert API Key rate limit handling to throw an error instead of auto-capping when exceeding the plan limit.
- Optimize terminal user quota check logic to validate only during new user creation, avoiding redundant checks.
- Add method to query terminal users by `workspace_id` and `other_id`.
2026-04-21 20:48:06 +08:00
山程漫悟
671df83bcd Merge pull request #958 from SuanmoSuanyangTechnology/fix/wxy_031
feat(exception): enhance I18nException response format and add error code mapping
2026-04-21 18:26:01 +08:00
wwq
8bb5a66401 feat(exception): enhance I18nException response format and add error code mapping
- Standardize error response format to include business error codes, timestamps, and other fields.
- Add ERROR_CODE_TO_BIZ_CODE mapping table for error code conversion.
- Introduce QUOTA_EXCEEDED and RATE_LIMIT_EXCEEDED business error codes.
2026-04-21 18:16:38 +08:00
wwq
4c9f327833 feat(quota): add quota checks during app duplication and import operations
- Integrate quota check decorators into app duplication, workflow import save, and app import actions.
- Explicitly validate application quotas for new app imports.
2026-04-21 18:15:31 +08:00
山程漫悟
6bd528eace Merge pull request #956 from SuanmoSuanyangTechnology/fix/wxy_031
refactor(knowledge_service): optimize model binding logic using ID lookup and streamlined fallback
2026-04-21 17:36:12 +08:00
Mark
2b5bece9b6 [modify] nfs read error 2026-04-21 17:34:03 +08:00
Mark
ea0e65f1ec [modify] fix tasks 2026-04-21 17:29:35 +08:00
wwq
cb2a7aa60a fix(知识服务): 添加工作空间模型配置的校验
在创建知识时检查工作空间是否配置了必要的模型,未配置时抛出异常提示用户
2026-04-21 17:18:11 +08:00
wwq
402c8aef5d refactor(knowledge_service): 简化模型绑定逻辑,直接使用工作区配置
移除_get_model_by_id_or_fallback方法,直接使用工作区配置的模型ID
对于image2text模型,放宽类型限制并移除composite检查
2026-04-21 17:04:42 +08:00
wwq
eb98a69a84 fix(知识服务): 修复创建知识库时未检查视觉模型存在的错误
当租户下没有可用的视觉模型时,抛出明确异常提示
2026-04-21 16:50:43 +08:00
wwq
152a84aff3 refactor(knowledge_service): 优化模型绑定逻辑,使用ID查询并简化回退机制
将模型绑定逻辑从按名称查询改为按ID查询,提高准确性
简化回退机制,直接查询租户下最新创建的模型
统一处理图像转文本模型的查询方式
2026-04-21 16:45:14 +08:00
山程漫悟
35c2d9d0d3 Merge pull request #950 from SuanmoSuanyangTechnology/fix/wxy_031
feat(model_parsing): add model reference resolution for LLM and relat…
2026-04-21 15:09:49 +08:00
wwq
6de5d413c4 fix(app_dsl_service): 修复模型和知识库引用解析逻辑
改进模型引用解析,优先使用ID匹配并处理异常情况
优化知识库引用解析,移除不必要的"None"字符串检查
统一返回字符串类型的ID,保持类型一致性
2026-04-21 15:03:18 +08:00
Mark
aecb0f6497 Merge branch 'feature/rag2' into release/v0.3.1
* feature/rag2:
  [modify] fix
  [modify] Optimize ES connections and add rerank security checks
2026-04-21 13:44:39 +08:00
Timebomb2018
8011610acc fix(model_service): sync model capability and is_omni to associated api_keys 2026-04-21 12:15:14 +08:00
wwq
f1dc507b5c fix: 优化知识库和模型引用解析逻辑
移除对字符串长度的UUID验证,仅检查是否为有效UUID或非"None"字符串
2026-04-21 11:55:00 +08:00
wwq
20ddc76a4d feat(model_parsing): add model reference resolution for LLM and related node types
- Add model reference resolution for LLM, Question Classifier, and Parameter Extractor nodes.
- Support parsing various model reference formats, including dictionaries, UUID strings, and name strings, when `model_id` is present.
- Add warning logs for cases where model resolution fails.
2026-04-20 21:48:45 +08:00
山程漫悟
84ca98555d Merge pull request #948 from SuanmoSuanyangTechnology/fix/wxy_031
refactor(knowledge_service): refactor model binding logic into generic function
2026-04-20 21:28:03 +08:00
Timebomb2018
7f3c48ce2a Merge remote-tracking branch 'origin/release/v0.3.1' into fix/Timebomb_031 2026-04-20 20:48:46 +08:00
Timebomb2018
e5c16a2a24 refactor(model_service): remove hardcoded extra_params from model initialization 2026-04-20 20:48:00 +08:00
wwq
8887600f7d refactor(knowledge_service): refactor model binding logic into generic function
- Extract duplicate model binding logic into `_get_model_by_name_or_fallback`.
- Implement logic to prioritize workspace default configuration, falling back to the tenant's first available model if not found.
- Simplify binding code for embedding, rerank, and LLM models.
2026-04-20 19:01:06 +08:00
山程漫悟
df6eb74b28 Merge pull request #947 from wanxunyang/feature/add-quota-check-decorator
refactor(api_key): change rate limit handling to auto-cap at tenant l…
2026-04-20 18:48:15 +08:00
wwq
b4b9974064 refactor(api_key): change rate limit handling to auto-cap at tenant limit
- Replace exception throwing with automatic capping when rate limit exceeds tenant plan limit, improving user experience.
2026-04-20 18:45:17 +08:00
山程漫悟
d60f838fb8 Merge pull request #939 from wanxunyang/feature/add-quota-check-decorator
feat(quota): refactor quota management and rate limiting services
2026-04-20 18:36:33 +08:00
wwq
817aa78d03 fix(rate_limit): differentiate between tenant plan and API Key QPS limit errors
- Add logic to detect tenant plan QPS limits and return a specific error message when triggered.
- Simplify boolean check in model activation quota validation.
2026-04-20 18:34:18 +08:00
lanceyq
94d2d975ee fix(memory): use end_user.workspace_id instead of app.workspace_id in log message
Corrected variable reference in get_end_user_connected_config log statement. The previous code referenced app.workspace_id which could be incorrect or undefined in this context.
2026-04-20 18:26:20 +08:00
wwq
d59990d326 fix(rate_limit): differentiate between tenant plan and API Key QPS limit errors
- Add logic to detect tenant plan QPS limits and return a specific error message when triggered.
- Simplify boolean check in model activation quota validation.
2026-04-20 18:25:39 +08:00
wwq
3227c25b07 fix(quota): fix tenant ID retrieval and QPS counting logic
- Fix issue where tenant ID lookup from shared records failed to query the workspace correctly.
- Switch QPS counting from sliding window to simple counter to improve performance and simplify logic.
- Remove unnecessary `time` module import.
2026-04-20 18:10:28 +08:00
wwq
08b5c7bc8a perf(限流服务): 优化Redis查询以减少命令数量
使用zcount替代zremrangebyscore和zcard组合查询,减少一次Redis操作
2026-04-20 17:46:05 +08:00
wwq
b03300c804 refactor(rate_limit): refactor API Key rate limiting and remove tenant-level QPS check
- Streamline rate limit check flow by removing redundant tenant-level QPS checks.
- Restrict checks to API Key QPS and plan degradation protection only.
- Update constant naming and error message handling for consistency.
2026-04-20 17:18:05 +08:00
lanceyq
fb1160e833 fix(api): make unused message body parameter optional in create_end_user
Change Body(...) to Body(None) for the message parameter which is never
used directly (request body is read via request.json() instead).
The required marker caused unnecessary 422 validation errors.
2026-04-20 16:21:18 +08:00
wwq
c448cf0660 refactor(rate-limit): change rate limiting granularity from tenant to API Key
- Refactor rate limiting mechanism to limit per API Key instead of per tenant (workspace).
- Update error code logic and Redis key naming conventions.
- Adjust quota usage statistics to display the QPS of the API Key closest to its limit.
2026-04-20 16:13:30 +08:00
wwq
48f3d9b105 feat(quota): refactor quota management and rate limiting services
- Add `API_KEY_RATE_LIMIT_EXCEEDED` error code.
- Refactor `QuotaExceededError` to support resource type localization.
- Optimize rate limiting service by implementing the sliding window algorithm.
- Add rate limit validation for tenant plans.
- Unify quota check decorator to support both synchronous and asynchronous operations.
- Enhance quota usage statistics endpoints.
2026-04-20 15:10:12 +08:00
Ke Sun
7f1cf13b23 Merge pull request #932 from SuanmoSuanyangTechnology/fix/extract-metadata
refactor(memory): insert new metadata values at list head for recency…
2026-04-17 21:04:38 +08:00
Ke Sun
d4129edcf5 Merge pull request #923 from SuanmoSuanyangTechnology/feat/enduser-info-apikey
feat(memory): add V1 memory config management endpoints and memory read/write API
2026-04-17 21:03:10 +08:00
Timebomb2018
7b5d7696cb feat(workflow): support variable input type in if-else node conditions 2026-04-17 20:26:44 +08:00
山程漫悟
81d58b001f Merge pull request #931 from wanxunyang/develop-wxy
**fix(tenant_subscription): correct quota field name from quota to quotas**
2026-04-17 18:45:44 +08:00