Skip to content

Commit d488325

Browse files
Fix login tokens and fix task clean_messages create_time. (#24574)
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 372074e commit d488325

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

api/schedule/clean_messages.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def clean_messages():
4747
if not messages:
4848
break
4949
for message in messages:
50-
plan_sandbox_clean_message_day = message.created_at
5150
app = db.session.query(App).filter_by(id=message.app_id).first()
5251
if not app:
5352
logger.warning(

api/schedule/queue_monitor_task.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ def queue_monitor_task():
4444

4545
if queue_length >= threshold:
4646
warning_msg = f"Queue {queue_name} task count exceeded the limit.: {queue_length}/{threshold}"
47-
logger.warning(click.style(warning_msg, fg="red"))
48-
alter_emails = dify_config.QUEUE_MONITOR_ALERT_EMAILS
49-
if alter_emails:
50-
to_list = alter_emails.split(",")
47+
logging.warning(click.style(warning_msg, fg="red"))
48+
alert_emails = dify_config.QUEUE_MONITOR_ALERT_EMAILS
49+
if alert_emails:
50+
to_list = alert_emails.split(",")
5151
email_service = get_email_i18n_service()
5252
for to in to_list:
5353
try:

api/services/model_provider_service.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22
from typing import Optional
33

4-
from core.entities.model_entities import ModelStatus, ModelWithProviderEntity, ProviderModelWithStatusEntity
4+
from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
55
from core.model_runtime.entities.model_entities import ModelType, ParameterRule
66
from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
77
from core.provider_manager import ProviderManager
@@ -380,7 +380,7 @@ def get_models_by_model_type(self, tenant_id: str, model_type: str) -> list[Prov
380380
provider_configurations = self.provider_manager.get_configurations(tenant_id)
381381

382382
# Get provider available models
383-
models = provider_configurations.get_models(model_type=ModelType.value_of(model_type))
383+
models = provider_configurations.get_models(model_type=ModelType.value_of(model_type), only_active=True)
384384

385385
# Group models by provider
386386
provider_models: dict[str, list[ModelWithProviderEntity]] = {}
@@ -391,9 +391,6 @@ def get_models_by_model_type(self, tenant_id: str, model_type: str) -> list[Prov
391391
if model.deprecated:
392392
continue
393393

394-
if model.status != ModelStatus.ACTIVE:
395-
continue
396-
397394
provider_models[model.provider.provider].append(model)
398395

399396
# convert to ProviderWithModelsResponse list

api/services/ops_service.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,21 @@ def create_tracing_app_config(cls, app_id: str, tracing_provider: str, tracing_c
134134

135135
# get project url
136136
if tracing_provider in ("arize", "phoenix"):
137-
project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider)
137+
try:
138+
project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider)
139+
except Exception:
140+
project_url = None
138141
elif tracing_provider == "langfuse":
139-
project_key = OpsTraceManager.get_trace_config_project_key(tracing_config, tracing_provider)
140-
project_url = f"{tracing_config.get('host')}/project/{project_key}"
142+
try:
143+
project_key = OpsTraceManager.get_trace_config_project_key(tracing_config, tracing_provider)
144+
project_url = f"{tracing_config.get('host')}/project/{project_key}"
145+
except Exception:
146+
project_url = None
141147
elif tracing_provider in ("langsmith", "opik"):
142-
project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider)
148+
try:
149+
project_url = OpsTraceManager.get_trace_config_project_url(tracing_config, tracing_provider)
150+
except Exception:
151+
project_url = None
143152
else:
144153
project_url = None
145154

api/services/webapp_auth_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def create_end_user(cls, app_code, email) -> EndUser:
113113

114114
@classmethod
115115
def _get_account_jwt_token(cls, account: Account) -> str:
116-
exp_dt = datetime.now(UTC) + timedelta(hours=dify_config.ACCESS_TOKEN_EXPIRE_MINUTES * 24)
116+
exp_dt = datetime.now(UTC) + timedelta(minutes=dify_config.ACCESS_TOKEN_EXPIRE_MINUTES * 24)
117117
exp = int(exp_dt.timestamp())
118118

119119
payload = {

api/tests/test_containers_integration_tests/services/test_model_provider_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ def test_get_models_by_model_type_success(self, db_session_with_containers, mock
10671067

10681068
# Verify mock interactions
10691069
mock_provider_manager.get_configurations.assert_called_once_with(tenant.id)
1070-
mock_provider_configurations.get_models.assert_called_once_with(model_type=ModelType.LLM)
1070+
mock_provider_configurations.get_models.assert_called_once_with(model_type=ModelType.LLM, only_active=True)
10711071

10721072
def test_get_model_parameter_rules_success(self, db_session_with_containers, mock_external_service_dependencies):
10731073
"""

0 commit comments

Comments
 (0)