358 Commits

Author SHA1 Message Date
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
crazywoola eb8584613b fix: Account.query => db.session.query(Account) (#17667) 2025-04-09 14:07:32 +08:00
Jasonfish 0afad94378 fix: Correct "The job is not exist" to "The job does not exist" (#17516) 2025-04-07 12:32:25 +08:00
Jasonfish fd443941a2 feat(improve-api-endpoints): Added Datasets and Annotation APIs (#12237) 2025-04-07 10:36:58 +08:00
Jyong 0bf816f2e8 fix duplicate documents returned by Get document list service API (#17351) 2025-04-02 21:39:28 +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
非法操作 44f911a0a8 chore: docstring not match the function parameter (#17162) 2025-03-31 13:19:15 +08:00
jiangbo721 a1aa325ce3 Chore/code format and Repair commit_id 3254018d more deleted codes and Fix naming error ambiguity between workflow_run_id and workflow_id (#17075)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-03-29 14:15:53 +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
過世秋風 377d11d13b fix: WorkflowRunDetailApi created_at、finished_at types changed to timestamps (#16821) 2025-03-27 17:23:30 +08:00
GuanMu 360986f38d Feat add childchunk api (#16094) 2025-03-24 20:58:28 +08:00
L8ng 83cd14104d feat: datasets openapi list segements support paged resp (#16603) 2025-03-24 14:27:31 +08:00
L8ng 727caccfc9 fix: knowledge base openapi cannot delete metadata (#16365) 2025-03-20 21:36:09 +08:00
Jyong 2c9af712a2 Fix/create document by api with metadata (#16307)
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
2025-03-20 14:33:32 +08:00
Yeuoly c07af5a1a3 feat: tenant app invocations limiter (#16221) 2025-03-19 17:24:02 +08:00
Jyong 732c506e27 add metadata service api (#16211) 2025-03-19 17:12:48 +08:00
Jyong 3f44b690c2 check high-quality dataset with empty embedding model provider (#16181) 2025-03-19 15:16:05 +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
Jyong 9b2a9260ef Feat/new saas billing (#14996) 2025-03-10 19:50:11 +08:00
KVOJJJin 78d460a6d1 Feat: time period filter for workflow logs (#14271)
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2025-03-10 14:02:58 +08:00
Mars 126202648f fix message sort (#15231) 2025-03-07 19:36:44 +08:00
Yeuoly 9a417bfc5e fix: update database query and model definitions (#14415) 2025-02-26 18:45:12 +08:00
L8ng b15ff4eb8c fix: datasets documents update-by-file api missing assign field 'indexing_technique' internally (#14243) 2025-02-24 20:14:36 +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
aplio 1b6fd9dfe8 fix: set indexing technique from dataset during update-by-text (#13155) 2025-02-03 11:06:03 +08:00
aplio d73d191f99 feature. add feat to modify metadata via dataset api (#13116) 2025-02-02 15:27:12 +08:00
EricPan 05a0faff6a fix: app token's last_used_at can't be updated when last_used_at is null (#12770) 2025-01-22 11:01:45 +08:00
Bowen Liang 166221d784 chore(lint): fix quotes for f-string formatting by bumping ruff to 0.9.x (#12702) 2025-01-21 10:12:29 +08:00
Jyong 9a6b1dc3a1 Revert "Feat/new saas billing" (#12673) 2025-01-13 15:17:43 +08:00
yihong 4e101604c3 fix: ruff check for True if ... else (#12576)
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
2025-01-13 09:38:48 +08:00
Jyong d8f57bf899 Feat/new saas billing (#12591) 2025-01-12 14:50:46 +08:00
Jyong 14ee51aead Feat/add knowledge include all filter (#12537) 2025-01-09 20:21:25 +08:00
eux 20f090537f feat: add GET upload file API endpoint to dataset service api (#11899) 2025-01-09 14:52:09 +08:00
-LAN- 0eeacdc80c refactor: enhance API token validation with session locking and last used timestamp update (#12426)
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-01-07 18:04:41 +08:00
Yingchun Lai c135967e59 refactor: simplify some exception catch code (#12246) 2025-01-02 14:25:12 +08:00
Sean Sun f71af7c2a8 fix: DocumentAddByFileApi miss data_source_type field but there is a mandatory value check (#12273) 2025-01-02 14:24:15 +08:00
-LAN- be7877f526 fix: enhance file upload error handling and update base error class (#12132)
Signed-off-by: -LAN- <laipz8200@outlook.com>
2024-12-26 23:31:29 +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
Jyong 84ac004772 py lint (#12102)
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2024-12-26 00:16:35 +08:00
Jyong 9231fdbf4c Feat/support parent child chunk (#12092) 2024-12-25 19:49:07 +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- 3d07a94bd7 fix: refactor conversation pagination to use SQLAlchemy session manag… (#11956)
Signed-off-by: -LAN- <laipz8200@outlook.com>
2024-12-22 10:39:29 +08:00
Hiroshi Fujita 858db2f239 feat(api): include tags in app information response (#11242) 2024-12-02 10:25:01 +08:00
Bowen Liang 6c8e208ef3 chore: bump minimum supported Python version to 3.11 (#10386) 2024-11-24 13:28:46 +08:00