Commit Graph

479 Commits

Author SHA1 Message Date
FamousMai d53133ba65 feat:用户初始化总额度,放到配置里 2025-05-08 15:22:16 +08:00
npc0-hue 64c7f3de25 feat:新增oauth2.0登录 2025-04-19 12:17:18 +08:00
npc0-hue b65b809711 fix: 处理后台注册bug 2025-04-19 12:16:08 +08:00
FamousMai d4fbeeda86 fix: 修正api调用出错 2025-04-16 10:43:56 +08:00
FamousMai 8caeac58cd fix: 修复web页面应用打开404 2025-04-11 17:08:16 +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
crazywoola eb8584613b fix: Account.query => db.session.query(Account) (#17667) 2025-04-09 14:07:32 +08:00
Amir Mohsen Asaran f54905e685 feat: Integrate WaterCrawl.dev as a new knowledge base provider (#16396)
Co-authored-by: crazywoola <427733928@qq.com>
2025-04-07 12:43:23 +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
quicksand b146aaaeb7 optimize: plugin permission (#17507) 2025-04-07 10:17:53 +08:00
wlleiiwang 42a42a7962 FEAT: support Tencent vectordb to full text search (#16865)
Co-authored-by: wlleiiwang <wlleiiwang@tencent.com>
2025-04-07 09:50:03 +08:00
crazywoola 4902ddaf87 Feat/change workspace name (#17402) 2025-04-03 16:05:55 +08:00
crazywoola c92bc84316 Fix/15429 forgotpasswordresetapi session management (#17390) 2025-04-03 13:54:28 +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
1Ckpwee bda06df668 fix: add app quota check to import API (#17295)
Co-authored-by: crazywoola <427733928@qq.com>
2025-04-02 10:20:46 +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
Xiyuan Chen 9c4be5d098 Feat/education api (#17168) 2025-04-01 02:45:34 -04:00
FamousMai 9b7182270e fix:修复上传图片等api因加密钥计费导致报错问题 2025-04-01 11:04:04 +08:00
Panpan 24b1a625b3 feat: allow the embedding in websites to customize sys.user_id (#16062) 2025-03-31 18:55:42 +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
wanttobeamaster 7f70cadacb feat: support Tablestore vector database (#16601)
Co-authored-by: xiaozhiqing.xzq <xiaozhiqing.xzq@alibaba-inc.com>
2025-03-27 15:53:33 +08:00
hsiong 6157f57872 feat: Add OceanBase hybrid search features (#16652)
Co-authored-by: 李远军 <4842@9ji.com>
Co-authored-by: yourchanges <yourchanges@gmail.com>
2025-03-25 14:32:00 +08:00
GuanMu 360986f38d Feat add childchunk api (#16094) 2025-03-24 20:58:28 +08:00
lenbo 5eb0ca9b9d fix: fix inner API workspace Account.query error. (#16630) 2025-03-24 17:52:50 +08:00
L8ng 83cd14104d feat: datasets openapi list segements support paged resp (#16603) 2025-03-24 14:27:31 +08:00
jiangbo721 f31e3313b0 feat: Make the logic of APP filtering and creation the same (#16079)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-03-23 09:40:15 +08:00
Yingchun Lai f6ac98a37d fix: fix the app max_active_requests been overwritten bug (#16513) 2025-03-23 09:34:23 +08:00
-LAN- ac910ed200 feat: replace file content type to avoid load script in svg. (#16454)
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-03-21 17:44:13 +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
Jyong abeaea4f79 Support knowledge metadata filter (#15982) 2025-03-18 16:42:19 +08:00
Jyong b65f2eb55f fix embedding model name translate issue (#16111) 2025-03-18 16:41:35 +08:00
LittleFish-15 223ab5a38f feat: support openGauss vector database (#15865) 2025-03-17 19:42:54 +08:00
csurong c3774bef7e fix: api error of get all workspaces (#15880) 2025-03-17 11:22:27 +08:00
Joe 58f012f3de fix: no attribute error (#15597) 2025-03-12 15:27:42 +08:00
Joe 545e5cbcd6 fix: dataset editor (#15218) 2025-03-12 12:51:00 +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 1ffda0dd34 fix notion page display (#15508) 2025-03-11 18:40:02 +08:00
Jyong da01b460fe support workspace billing info (#15510) 2025-03-11 18:38:23 +08:00
kenwoodjw adda049265 fix kb permission (#15199)
Signed-off-by: kenwoodjw <blackxin55@gmail.com>
Signed-off-by: kenwoodjw <blackxin55+@gmail.com>
2025-03-10 23:47:45 +08:00
Jyong 9b2a9260ef Feat/new saas billing (#14996) 2025-03-10 19:50:11 +08:00