From d745c2e8e3f2c2e2470a594b7d83da1a7ded77ee Mon Sep 17 00:00:00 2001 From: Yansong Zhang <916125788@qq.com> Date: Fri, 26 Sep 2025 12:49:35 +0800 Subject: [PATCH] add paid credit --- api/core/hosting_configuration.py | 2 +- api/core/provider_manager.py | 4 ++-- api/core/workflow/nodes/llm/llm_utils.py | 4 ++-- api/services/credit_pool_service.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/core/hosting_configuration.py b/api/core/hosting_configuration.py index ed08ecf57b..92babd5056 100644 --- a/api/core/hosting_configuration.py +++ b/api/core/hosting_configuration.py @@ -202,7 +202,7 @@ class HostingConfiguration: if dify_config.HOSTED_ANTHROPIC_PAID_ENABLED: paid_quota = PaidHostingQuota() paid_models = self.parse_restrict_models_from_env("HOSTED_ANTHROPIC_PAID_MODELS") - quotas.append(paid_quota,restrict_models=paid_models) + quotas.append(paid_quota, restrict_models=paid_models) if len(quotas) > 0: credentials = { diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py index 900de079b6..2adeb9f625 100644 --- a/api/core/provider_manager.py +++ b/api/core/provider_manager.py @@ -930,7 +930,7 @@ class ProviderManager: raise ValueError("quota_used is None") if provider_record.quota_limit is None: raise ValueError("quota_limit is None") - if provider_quota.quota_type == ProviderQuotaType.TRIAL and trail_pool is not None: + if provider_quota.quota_type == ProviderQuotaType.TRIAL and trail_pool is not None: quota_configuration = QuotaConfiguration( quota_type=provider_quota.quota_type, quota_unit=provider_hosting_configuration.quota_unit or QuotaUnit.TOKENS, @@ -940,7 +940,7 @@ class ProviderManager: restrict_models=provider_quota.restrict_models, ) - elif provider_quota.quota_type == ProviderQuotaType.PAID and paid_pool is not None: + elif provider_quota.quota_type == ProviderQuotaType.PAID and paid_pool is not None: quota_configuration = QuotaConfiguration( quota_type=provider_quota.quota_type, quota_unit=provider_hosting_configuration.quota_unit or QuotaUnit.TOKENS, diff --git a/api/core/workflow/nodes/llm/llm_utils.py b/api/core/workflow/nodes/llm/llm_utils.py index 054fbe033d..194ad43151 100644 --- a/api/core/workflow/nodes/llm/llm_utils.py +++ b/api/core/workflow/nodes/llm/llm_utils.py @@ -6,7 +6,7 @@ from sqlalchemy.orm import Session from configs import dify_config from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity -from core.entities.provider_entities import QuotaUnit +from core.entities.provider_entities import ProviderQuotaType, QuotaUnit from core.file.models import File from core.memory.token_buffer_memory import TokenBufferMemory from core.model_manager import ModelInstance, ModelManager @@ -23,7 +23,7 @@ from libs.datetime_utils import naive_utc_now from models.model import Conversation from models.provider import Provider, ProviderType from models.provider_ids import ModelProviderID -from core.entities.provider_entities import ProviderQuotaType + from .exc import InvalidVariableTypeError, LLMModeRequiredError, ModelNotExistError diff --git a/api/services/credit_pool_service.py b/api/services/credit_pool_service.py index fc2d875bd0..108ee05e45 100644 --- a/api/services/credit_pool_service.py +++ b/api/services/credit_pool_service.py @@ -2,12 +2,12 @@ import logging from typing import Optional from sqlalchemy import update +from sqlalchemy.orm import Session from configs import dify_config from core.errors.error import QuotaExceededError from extensions.ext_database import db from models import TenantCreditPool -from sqlalchemy.orm import Session logger = logging.getLogger(__name__)