Merge branch 'main' into feat/attachments

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()

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)

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

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,

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}

web/app/components/app/configuration/dataset-config/params-config/config-content.tsx

@@ -243,7 +243,7 @@ const ConfigContent: FC<Props> = ({
                       />
                     )
                   }
-                  <div className='leading-[32px] text-text-secondary system-sm-semibold'>{t('common.modelProvider.rerankModel.key')}</div>
+                  <div className='leading-[32px] ml-1 text-text-secondary system-sm-semibold'>{t('common.modelProvider.rerankModel.key')}</div>
                   <Tooltip
                     popupContent={
                       <div className="w-[200px]">