third/dify-plus
1
0
Fork 0
mirror of https://github.com/YFGaia/dify-plus.git synced 2026-06-14 20:41:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,738 Commits 8 Branches 10 Tags
main
Commit Graph

56 Commits

Author SHA1 Message Date
npc0-hue 7947b7976b feat: 1.12.1初步合并 
Merge upstream release cd03e0a (hotfix/1.12.1-fix.0) into main

# Conflicts:
#	api/.env.example
#	api/controllers/service_api/app/annotation.py
#	api/controllers/service_api/app/completion.py
#	api/controllers/service_api/app/conversation.py
#	api/controllers/service_api/app/message.py
#	api/core/file/file_manager.py
#	api/core/rag/datasource/retrieval_service.py
#	api/extensions/ext_celery.py
#	api/libs/gmpy2_pkcs10aep_cipher.py
#	api/uv.lock
#	web/pnpm-lock.yaml
#	web/service/client.ts
 2026-02-09 09:51:18 +08:00
Asuka Minato 7828508b30 refactor: remove all reqparser (#29289) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
 2026-02-01 13:43:14 +09:00
npc0-hue 9ed0d7c891 fix: 上下文，聊天计费，额度 2026-01-21 18:10:18 +08:00
npc0-hue 84d6d2840b feat: 合并更新到1.11.2 2026-01-15 18:02:46 +08:00
Asuka Minato 2cef879209 refactor: more ns.model to BaseModel (#30445) 2026-01-04 17:12:28 +08:00
Asuka Minato 05fe92a541 refactor: port reqparse to BaseModel (#28993) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-12-08 15:31:19 +09:00
Asuka Minato 4488c090b2 fluent api (#27093) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-10-19 12:54:41 +09:00
npc0-hue f26fe2f4d2 Merge tag '1.8.1' into merge-tag-1.8.1 
# Conflicts:
#	.gitignore
#	README.md
#	api/.env.example
#	api/Dockerfile
#	api/commands.py
#	api/configs/app_config.py
#	api/controllers/console/__init__.py
#	api/controllers/console/apikey.py
#	api/controllers/console/app/statistic.py
#	api/controllers/service_api/app/app.py
#	api/controllers/service_api/app/audio.py
#	api/controllers/service_api/app/completion.py
#	api/controllers/service_api/app/conversation.py
#	api/controllers/service_api/app/file.py
#	api/controllers/service_api/app/message.py
#	api/controllers/service_api/app/workflow.py
#	api/controllers/service_api/wraps.py
#	api/controllers/web/completion.py
#	api/core/app/apps/advanced_chat/app_generator.py
#	api/core/app/apps/advanced_chat/generate_task_pipeline.py
#	api/core/app/apps/agent_chat/app_generator.py
#	api/core/app/apps/workflow/app_generator.py
#	api/core/app/apps/workflow/generate_task_pipeline.py
#	api/core/app/task_pipeline/workflow_cycle_manage.py
#	api/core/helper/code_executor/code_executor.py
#	api/core/tools/builtin_tool/providers/code/tools/simple_code.py
#	api/core/workflow/nodes/code/code_node.py
#	api/docker/entrypoint.sh
#	api/events/event_handlers/__init__.py
#	api/extensions/ext_celery.py
#	api/extensions/ext_commands.py
#	api/models/model.py
#	api/models/workflow.py
#	api/poetry.lock
#	api/pyproject.toml
#	api/services/app_service.py
#	api/services/feature_service.py
#	api/services/workspace_service.py
#	web/.env.example
#	web/Dockerfile
#	web/app/(commonLayout)/apps/Apps.tsx
#	web/app/components/apps/app-card.tsx
#	web/app/components/base/chat/embedded-chatbot/index.tsx
#	web/app/components/base/mermaid/index.tsx
#	web/app/components/develop/index.tsx
#	web/app/components/develop/secret-key/secret-key-modal.tsx
#	web/app/components/develop/secret-key/style.module.css
#	web/app/components/develop/template/template.zh.mdx
#	web/app/components/explore/app-list/index.tsx
#	web/app/components/explore/category.tsx
#	web/app/components/explore/sidebar/index.tsx
#	web/app/components/header/account-dropdown/index.tsx
#	web/app/components/header/index.tsx
#	web/app/components/share/utils.ts
#	web/app/layout.tsx
#	web/app/signin/components/mail-and-password-auth.tsx
#	web/app/signin/normal-form.tsx
#	web/app/signin/page.module.css
#	web/context/app-context.tsx
#	web/i18n/i18next-config.ts
#	web/i18n/ja-JP/login.ts
#	web/i18n/ko-KR/login.ts
#
    if dify_config.WORKFLOW_LOG_CLEANUP_ENABLED:
        # 2:00 AM every day
        imports.append("schedule.clean_workflow_runlogs_precise")
        beat_schedule["clean_workflow_runlogs_precise"] = {
            "task": "schedule.clean_workflow_runlogs_precise.clean_workflow_runlogs_precise",
            "schedule": crontab(minute="0", hour="2"),
        }	web/package.json
#	web/pnpm-lock.yaml
#	web/types/feature.ts
 2025-09-25 15:55:13 +08:00
Yongtao Huang 76ce0afec0 Refactor: use logger = logging.getLogger(__name__) in logging (#24515) 
Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-08-26 18:10:31 +08:00
Yongtao Huang fa753239ad Refactor: use logger = logging.getLogger(__name__) in logging (#24515) 
Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-08-26 18:10:31 +08:00
-LAN- d08f6cd27e feat: API docs for service api (#24425) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
 2025-08-25 09:26:54 +08:00
-LAN- b7466f8b65 feat: API docs for service api (#24425) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
 2025-08-25 09:26:54 +08:00
Asuka Minato a864ed1985 try flask_restful -> flask_restx (#24310) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
 2025-08-24 13:45:47 +08:00
Asuka Minato 18dce66443 try flask_restful -> flask_restx (#24310) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
 2025-08-24 13:45:47 +08:00
Yongtao Huang fe215b8318 Refactor: remove redundant full module paths in exception handlers (#23076) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-07-29 09:40:51 +08:00
Yongtao Huang 57e0a12ccd Refactor: remove redundant full module paths in exception handlers (#23076) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-07-29 09:40:51 +08:00
Ganondorf 504d152bbe add endpoint of get feedbacks (#18697) 
Co-authored-by: lizb <lizb@sugon.com>
 2025-05-13 10:35:14 +08:00
Ganondorf c76d763639 add endpoint of get feedbacks (#18697) 
Co-authored-by: lizb <lizb@sugon.com>
 2025-05-13 10:35:14 +08:00
Bowen Liang 5a3baa271f chore: avoid repeated type ignore noqa by adding flask_restful and flask_login in mypy import exclusions (#19224) 2025-05-06 11:58:49 +08:00
Bowen Liang 8537abfff8 chore: avoid repeated type ignore noqa by adding flask_restful and flask_login in mypy import exclusions (#19224) 2025-05-06 11:58:49 +08:00
crazywoola a39b287150 fix: 17712-get-messages-api-encountered-internal-server-error (#17716) 2025-04-10 11:09:38 +08:00
crazywoola 63ba607738 fix: 17712-get-messages-api-encountered-internal-server-error (#17716) 2025-04-10 11:09:38 +08:00
FamousMai 73e81323fc 合并dify1.2.0版本代码 
# Conflicts:
#	api/controllers/service_api/app/workflow.py
#	api/controllers/service_api/wraps.py
#	web/.env.example
#	web/app/components/share/utils.ts
#	web/app/signin/page.module.css
#	web/context/debug-configuration.ts
 2025-04-09 19:57:08 +08:00
liguochuan 11e95d2a61 Fix (api): Fix the processing logic of the retriever_resources field. (#17304) 
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-04-02 12:44:29 +08:00
FamousMai 4dd8a527d2 Merge branch 'main' into main_merge_dify_1.1.3 
* main:
  fix：docker compose加上sandbox-full镜像
  fix：更换镜像地址
  fix: 管理中心admin，初始化数据漏了新加的菜单数据权限
  fix：修复上传图片等api因加密钥计费导致报错问题
  fix: 更新镜像，还有修复一些初始化的bug
  ci: 测试使用gitlab-ci，去构建推送镜像
  ci: 测试使用gitlab-ci，去构建推送镜像
  ci: 测试使用gitlab-ci，去构建推送镜像
  feat：docker-compose镜像版本更新

# Conflicts:
#	docker/docker-compose.dify-plus.yaml
 2025-04-01 15:51:03 +08:00
FamousMai 9b7182270e fix：修复上传图片等api因加密钥计费导致报错问题 2025-04-01 11:04:04 +08:00
FamousMai 81dbfd6748 feat: 合并dify1.1.3版本 
# Conflicts:
#	README.md
#	api/.env.example
#	api/controllers/console/__init__.py
#	api/controllers/console/apikey.py
#	api/controllers/console/explore/completion.py
#	api/controllers/console/explore/workflow.py
#	api/controllers/service_api/app/workflow.py
#	api/controllers/service_api/wraps.py
#	api/controllers/web/workflow.py
#	api/core/model_runtime/model_providers/bedrock/get_bedrock_client.py
#	api/core/model_runtime/model_providers/bedrock/llm/llm.py
#	api/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml
#	api/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py
#	api/models/model.py
#	api/poetry.lock
#	api/pyproject.toml
#	web/.env.example
#	web/Dockerfile
#	web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx
#	web/app/components/app/overview/appCard.tsx
#	web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
#	web/app/components/base/chat/embedded-chatbot/index.tsx
#	web/app/components/base/mermaid/index.tsx
#	web/app/components/develop/index.tsx
#	web/app/components/develop/secret-key/secret-key-modal.tsx
#	web/app/components/explore/app-list/index.tsx
#	web/app/components/explore/item-operation/index.tsx
#	web/app/components/explore/sidebar/app-nav-item/index.tsx
#	web/app/components/explore/sidebar/index.tsx
#	web/app/components/header/account-setting/index.tsx
#	web/app/components/header/index.tsx
#	web/app/components/share/text-generation/index.tsx
#	web/app/components/tools/provider/detail.tsx
#	web/app/layout.tsx
#	web/package.json
#	web/service/base.ts
#	web/yarn.lock
 2025-03-28 16:35:13 +08:00
FamousMai b5aa970766 feat: 新增sandbox-full支持 2025-03-28 15:18:33 +08:00
Mars 1fab02c25a fix:message api doc (#15568) 
Co-authored-by: mars <linjx2@by-health.com>
 2025-03-12 12:38:23 +08:00
Mars 126202648f fix message sort (#15231) 2025-03-07 19:36:44 +08:00
Hundredwz 284707c3a8 perf(message): optimize message loading and reduce SQL queries (#13720) 2025-02-15 12:19:01 +08:00
jiangbo721 4e7e172ff3 Chore/format code (#13691) 
Co-authored-by: 刘江波 <jiangbo721@163.com>
 2025-02-14 13:38:17 +08:00
-LAN- 4bd8df1fd3 fix: update MessageService.create_feedback to use keyword arguments f… (#12134) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
 2024-12-26 23:26:44 +08:00
yihong 1d3f218662 fix: like failed close #12057 (#12058) 
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
 2024-12-25 10:57:52 +08:00
yihong 56e15d09a9 feat: mypy for all type check (#10921) 2024-12-24 18:38:51 +08:00
liuhaoran 6b49889041 fix: messagefeedbackapi support content (#11716) 
Signed-off-by: weiyang <24080293@smb956101.com>
Co-authored-by: weiyang <24080293@smb956101.com>
 2024-12-22 10:45:55 +08:00
-LAN- 06d2520db2 fix(api): replace Raw field with FilesContainedField in MessageListApi inputs (#10472) 2024-11-08 19:48:34 +08:00
crazywoola 98bf7710e4 fix: fields.Nested(message_file_fields) (#9632) 2024-10-22 15:37:53 +08:00
-LAN- e61752bd3a feat/enhance the multi-modal support (#8818) 2024-10-21 10:43:49 +08:00
Hash Brown 8c51d06222 feat: regenerate in Chat, agent and Chatflow app (#7661) 2024-09-22 03:15:11 +08:00
Bowen Liang a1104ab97e chore: refurish python code by applying Pylint linter rules (#8322) 2024-09-13 22:42:08 +08:00
-LAN- 13be84e4d4 chore(api/controllers): Apply Ruff Formatter. (#7645) 2024-08-26 15:29:10 +08:00
lichao 13d061911b Error Exception Message Of "Message Not Exists.", Should be "Suggested Questions Is Disabled." (#7219) 2024-08-13 15:17:18 +08:00
crazywoola 16fec084f5 Fix/4630 bug api suggested (#4633) 2024-05-24 11:11:12 +08:00
takatost 7753ba2d37 FEAT: NEW WORKFLOW ENGINE (#3160) 
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
Co-authored-by: jyong <jyong@dify.ai>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: jyong <718720800@qq.com>
 2024-04-08 18:51:46 +08:00
takatost 0828873b52 fix: missing default user for APP service api (#2606) 2024-02-28 16:09:56 +08:00
Bowen Liang 063191889d chore: apply ruff's pyupgrade linter rules to modernize Python code with targeted version (#2419) 2024-02-09 15:21:33 +08:00
Bowen Liang 843280f82b enhancement: introduce Ruff for Python linter for reordering and removing unused imports with automated pre-commit and sytle check (#2366) 2024-02-06 13:21:13 +08:00
Yeuoly 7cb75cb2e7 feat: add tool labels (#2178) 2024-01-24 20:14:45 +08:00
Yeuoly 86286e1ac8 Feat/assistant app (#2086) 
Co-authored-by: chenhe <guchenhe@gmail.com>
Co-authored-by: Pascal M <11357019+perzeuss@users.noreply.github.com>
 2024-01-23 19:58:23 +08:00