From cbd3ffe0562bc8f2ce819a0e253ac7c9d1c69b54 Mon Sep 17 00:00:00 2001 From: Yi Xiao <54782454+YIXIAO0@users.noreply.github.com> Date: Wed, 9 Oct 2024 18:26:38 +0800 Subject: [PATCH 1/5] Fix the margin for the rerank switch in retrieval setting (#9124) --- .../dataset-config/params-config/config-content.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx index f99496b14f..7f83a14d58 100644 --- a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx +++ b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx @@ -243,7 +243,7 @@ const ConfigContent: FC = ({ /> ) } -
{t('common.modelProvider.rerankModel.key')}
+
{t('common.modelProvider.rerankModel.key')}
From 7a1da2409d222257912adf16277dc34112819e46 Mon Sep 17 00:00:00 2001 From: pinsily <13160724868@163.com> Date: Wed, 9 Oct 2024 21:09:36 +0800 Subject: [PATCH 2/5] add generate conversation name error log (#9117) --- api/core/app/task_pipeline/message_cycle_manage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/core/app/task_pipeline/message_cycle_manage.py b/api/core/app/task_pipeline/message_cycle_manage.py index 5872e00740..3a1d1b227f 100644 --- a/api/core/app/task_pipeline/message_cycle_manage.py +++ b/api/core/app/task_pipeline/message_cycle_manage.py @@ -82,8 +82,8 @@ class MessageCycleManage: try: name = LLMGenerator.generate_conversation_name(app_model.tenant_id, query) conversation.name = name - except: - pass + except Exception as e: + logging.exception(f"generate conversation name failed: {e}") db.session.merge(conversation) db.session.commit() From 511ffa46989399c3211d4564df5be1b2dd69d1d7 Mon Sep 17 00:00:00 2001 From: Hash Brown Date: Wed, 9 Oct 2024 21:10:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20follow-up=20(suggested=20questions)?= =?UTF-8?q?=20does=20not=20refer=20to=20the=20most=20recen=E2=80=A6=20(#91?= =?UTF-8?q?22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/core/memory/token_buffer_memory.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py index 60b36c50f0..72da3b0c6f 100644 --- a/api/core/memory/token_buffer_memory.py +++ b/api/core/memory/token_buffer_memory.py @@ -58,7 +58,11 @@ class TokenBufferMemory: # instead of all messages from the conversation, we only need to extract messages # that belong to the thread of last message thread_messages = extract_thread_messages(messages) - thread_messages.pop(0) + + # for newly created message, its answer is temporarily empty, we don't need to add it to memory + if thread_messages and not thread_messages[-1].answer: + thread_messages.pop() + messages = list(reversed(thread_messages)) message_file_parser = MessageFileParser(tenant_id=app_record.tenant_id, app_id=app_record.id) From cb35e84f512eb9ce1c23417d718130ce2223c4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=9E=E6=B3=95=E6=93=8D=E4=BD=9C?= Date: Wed, 9 Oct 2024 21:11:13 +0800 Subject: [PATCH 4/5] fix: docker env typo (#9119) --- docker/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index ddb6ded206..c1a76d7f88 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -204,7 +204,7 @@ x-shared-env: &shared-api-worker-env CODE_MAX_NUMBER_ARRAY_LENGTH: ${CODE_MAX_NUMBER_ARRAY_LENGTH:-1000} WORKFLOW_MAX_EXECUTION_STEPS: ${WORKFLOW_MAX_EXECUTION_STEPS:-500} WORKFLOW_MAX_EXECUTION_TIME: ${WORKFLOW_MAX_EXECUTION_TIME:-1200} - WORKFLOW_CALL_MAX_DEPTH: ${WORKFLOW_MAX_EXECUTION_TIME:-5} + WORKFLOW_CALL_MAX_DEPTH: ${WORKFLOW_CALL_MAX_DEPTH:-5} SSRF_PROXY_HTTP_URL: ${SSRF_PROXY_HTTP_URL:-http://ssrf_proxy:3128} SSRF_PROXY_HTTPS_URL: ${SSRF_PROXY_HTTPS_URL:-http://ssrf_proxy:3128} HTTP_REQUEST_NODE_MAX_BINARY_SIZE: ${HTTP_REQUEST_NODE_MAX_BINARY_SIZE:-10485760} From b279d1904085d0265c4b0a0ef5843bc11b22c837 Mon Sep 17 00:00:00 2001 From: Bowen Liang Date: Wed, 9 Oct 2024 21:12:50 +0800 Subject: [PATCH 5/5] chore: avoid star imports usage (#9123) --- api/pyproject.toml | 2 -- api/services/account_service.py | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api/pyproject.toml b/api/pyproject.toml index 48418974d4..956d4dbd11 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -45,8 +45,6 @@ ignore = [ "E721", # type-comparison "E722", # bare-except "E731", # lambda-assignment - "F403", # undefined-local-with-import-star - "F405", # undefined-local-with-import-star-usage "F821", # undefined-name "F841", # unused-variable "FURB113", # repeated-append diff --git a/api/services/account_service.py b/api/services/account_service.py index c3d3354a1d..05b505f8a6 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -1,4 +1,5 @@ import base64 +import json import logging import secrets import uuid @@ -12,12 +13,22 @@ from werkzeug.exceptions import Unauthorized from configs import dify_config from constants.languages import language_timezone_mapping, languages from events.tenant_event import tenant_was_created +from extensions.ext_database import db from extensions.ext_redis import redis_client from libs.helper import RateLimiter, TokenManager from libs.passport import PassportService from libs.password import compare_password, hash_password, valid_password from libs.rsa import generate_key_pair -from models.account import * +from models.account import ( + Account, + AccountIntegrate, + AccountStatus, + Tenant, + TenantAccountJoin, + TenantAccountJoinRole, + TenantAccountRole, + TenantStatus, +) from models.model import DifySetup from services.errors.account import ( AccountAlreadyInTenantError,