diff --git a/api/schedule/clean_messages.py b/api/schedule/clean_messages.py index 7bd64cc5e..65038dce4 100644 --- a/api/schedule/clean_messages.py +++ b/api/schedule/clean_messages.py @@ -47,7 +47,6 @@ def clean_messages(): if not messages: break for message in messages: - plan_sandbox_clean_message_day = message.created_at app = db.session.query(App).filter_by(id=message.app_id).first() if not app: logger.warning( diff --git a/api/schedule/queue_monitor_task.py b/api/schedule/queue_monitor_task.py index 64fd992aa..4072d9db8 100644 --- a/api/schedule/queue_monitor_task.py +++ b/api/schedule/queue_monitor_task.py @@ -44,10 +44,10 @@ def queue_monitor_task(): if queue_length >= threshold: warning_msg = f"Queue {queue_name} task count exceeded the limit.: {queue_length}/{threshold}" - logger.warning(click.style(warning_msg, fg="red")) - alter_emails = dify_config.QUEUE_MONITOR_ALERT_EMAILS - if alter_emails: - to_list = alter_emails.split(",") + logging.warning(click.style(warning_msg, fg="red")) + alert_emails = dify_config.QUEUE_MONITOR_ALERT_EMAILS + if alert_emails: + to_list = alert_emails.split(",") email_service = get_email_i18n_service() for to in to_list: try: diff --git a/api/services/model_provider_service.py b/api/services/model_provider_service.py index 67c3f0d6b..9e9422f9f 100644 --- a/api/services/model_provider_service.py +++ b/api/services/model_provider_service.py @@ -1,7 +1,7 @@ import logging from typing import Optional -from core.entities.model_entities import ModelStatus, ModelWithProviderEntity, ProviderModelWithStatusEntity +from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity from core.model_runtime.entities.model_entities import ModelType, ParameterRule from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory from core.provider_manager import ProviderManager @@ -380,7 +380,7 @@ class ModelProviderService: provider_configurations = self.provider_manager.get_configurations(tenant_id) # Get provider available models - models = provider_configurations.get_models(model_type=ModelType.value_of(model_type)) + models = provider_configurations.get_models(model_type=ModelType.value_of(model_type), only_active=True) # Group models by provider provider_models: dict[str, list[ModelWithProviderEntity]] = {} @@ -391,9 +391,6 @@ class ModelProviderService: if model.deprecated: continue - if model.status != ModelStatus.ACTIVE: - continue - provider_models[model.provider.provider].append(model) # convert to ProviderWithModelsResponse list diff --git a/api/services/ops_service.py b/api/services/ops_service.py index 7a9db7273..2596e9f71 100644 --- a/api/services/ops_service.py +++ b/api/services/ops_service.py @@ -134,12 +134,21 @@ class OpsService: # get project url if tracing_provider in ("arize", "phoenix"): - project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider) + try: + project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider) + except Exception: + project_url = None elif tracing_provider == "langfuse": - project_key = OpsTraceManager.get_trace_config_project_key(tracing_config, tracing_provider) - project_url = f"{tracing_config.get('host')}/project/{project_key}" + try: + project_key = OpsTraceManager.get_trace_config_project_key(tracing_config, tracing_provider) + project_url = f"{tracing_config.get('host')}/project/{project_key}" + except Exception: + project_url = None elif tracing_provider in ("langsmith", "opik"): - project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider) + try: + project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider) + except Exception: + project_url = None else: project_url = None diff --git a/api/services/webapp_auth_service.py b/api/services/webapp_auth_service.py index 8d21335c8..085a5039f 100644 --- a/api/services/webapp_auth_service.py +++ b/api/services/webapp_auth_service.py @@ -113,7 +113,7 @@ class WebAppAuthService: @classmethod def _get_account_jwt_token(cls, account: Account) -> str: - exp_dt = datetime.now(UTC) + timedelta(hours=dify_config.ACCESS_TOKEN_EXPIRE_MINUTES * 24) + exp_dt = datetime.now(UTC) + timedelta(minutes=dify_config.ACCESS_TOKEN_EXPIRE_MINUTES * 24) exp = int(exp_dt.timestamp()) payload = { diff --git a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py index ee1ba2b25..2196da8b3 100644 --- a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py +++ b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py @@ -1067,7 +1067,7 @@ class TestModelProviderService: # Verify mock interactions mock_provider_manager.get_configurations.assert_called_once_with(tenant.id) - mock_provider_configurations.get_models.assert_called_once_with(model_type=ModelType.LLM) + mock_provider_configurations.get_models.assert_called_once_with(model_type=ModelType.LLM, only_active=True) def test_get_model_parameter_rules_success(self, db_session_with_containers, mock_external_service_dependencies): """