AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-19 01:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/attachments

Browse Source
This commit is contained in:
StyleZhang 2024-10-10 10:02:35 +08:00
commit b463468a14
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/app/task_pipeline/message_cycle_manage.py
View File

@ -82,8 +82,8 @@ class MessageCycleManage:
try: try:
name = LLMGenerator.generate_conversation_name(app_model.tenant_id, query) name = LLMGenerator.generate_conversation_name(app_model.tenant_id, query)
conversation.name = name conversation.name = name
except: except Exception as e:
pass logging.exception(f"generate conversation name failed: {e}")
db.session.merge(conversation) db.session.merge(conversation)
db.session.commit() db.session.commit()

6
api/core/memory/token_buffer_memory.py
View File

@ -58,7 +58,11 @@ class TokenBufferMemory:
# instead of all messages from the conversation, we only need to extract messages # instead of all messages from the conversation, we only need to extract messages
# that belong to the thread of last message # that belong to the thread of last message
thread_messages = extract_thread_messages(messages) 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)) messages = list(reversed(thread_messages))
message_file_parser = MessageFileParser(tenant_id=app_record.tenant_id, app_id=app_record.id) message_file_parser = MessageFileParser(tenant_id=app_record.tenant_id, app_id=app_record.id)

2
api/pyproject.toml
View File

@ -45,8 +45,6 @@ ignore = [
"E721", # type-comparison "E721", # type-comparison
"E722", # bare-except "E722", # bare-except
"E731", # lambda-assignment "E731", # lambda-assignment
"F403", # undefined-local-with-import-star
"F405", # undefined-local-with-import-star-usage
"F821", # undefined-name "F821", # undefined-name
"F841", # unused-variable "F841", # unused-variable
"FURB113", # repeated-append "FURB113", # repeated-append

13
api/services/account_service.py
View File

@ -1,4 +1,5 @@
import base64 import base64
import json
import logging import logging
import secrets import secrets
import uuid import uuid
@ -12,12 +13,22 @@ from werkzeug.exceptions import Unauthorized
from configs import dify_config from configs import dify_config
from constants.languages import language_timezone_mapping, languages from constants.languages import language_timezone_mapping, languages
from events.tenant_event import tenant_was_created from events.tenant_event import tenant_was_created
from extensions.ext_database import db
from extensions.ext_redis import redis_client from extensions.ext_redis import redis_client
from libs.helper import RateLimiter, TokenManager from libs.helper import RateLimiter, TokenManager
from libs.passport import PassportService from libs.passport import PassportService
from libs.password import compare_password, hash_password, valid_password from libs.password import compare_password, hash_password, valid_password
from libs.rsa import generate_key_pair 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 models.model import DifySetup
from services.errors.account import ( from services.errors.account import (
AccountAlreadyInTenantError, AccountAlreadyInTenantError,

2
docker/docker-compose.yaml
View File

@ -204,7 +204,7 @@ x-shared-env: &shared-api-worker-env
CODE_MAX_NUMBER_ARRAY_LENGTH: ${CODE_MAX_NUMBER_ARRAY_LENGTH:-1000} CODE_MAX_NUMBER_ARRAY_LENGTH: ${CODE_MAX_NUMBER_ARRAY_LENGTH:-1000}
WORKFLOW_MAX_EXECUTION_STEPS: ${WORKFLOW_MAX_EXECUTION_STEPS:-500} WORKFLOW_MAX_EXECUTION_STEPS: ${WORKFLOW_MAX_EXECUTION_STEPS:-500}
WORKFLOW_MAX_EXECUTION_TIME: ${WORKFLOW_MAX_EXECUTION_TIME:-1200} 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_HTTP_URL: ${SSRF_PROXY_HTTP_URL:-http://ssrf_proxy:3128}
SSRF_PROXY_HTTPS_URL: ${SSRF_PROXY_HTTPS_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} HTTP_REQUEST_NODE_MAX_BINARY_SIZE: ${HTTP_REQUEST_NODE_MAX_BINARY_SIZE:-10485760}

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

@ -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 <Tooltip
popupContent={ popupContent={
<div className="w-[200px]"> <div className="w-[200px]">