Skip to content

New pic #4858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
May 30, 2025
Merged

New pic #4858

merged 28 commits into from
May 30, 2025

Conversation

ctrlz526
Copy link

知识库导入图片

Copy link

cla-assistant bot commented May 21, 2025

CLA assistant check
All committers have signed the CLA.

Copy link

cla-assistant bot commented May 21, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ c121914yu
❌ ctrlz526
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_45d5a4cb497f1fff09d13ae5f52fbe88e56e3d41

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_45d5a4cb497f1fff09d13ae5f52fbe88e56e3d41

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_59347f25e843055ef21c70578b6152900c056902

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_59347f25e843055ef21c70578b6152900c056902

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_75d0e7c0dcd72f65ab8fdb3cac6805b24bb206da

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_75d0e7c0dcd72f65ab8fdb3cac6805b24bb206da

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_aa7c498ba040190c4b75b4c651b0d7f9bb0b0f47

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_aa7c498ba040190c4b75b4c651b0d7f9bb0b0f47

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_aa7c498ba040190c4b75b4c651b0d7f9bb0b0f47

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_0a930f59e4f2eaefe759038acb76d6f10f14bdd1

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_0a930f59e4f2eaefe759038acb76d6f10f14bdd1

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_0a930f59e4f2eaefe759038acb76d6f10f14bdd1

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_52abcd91efd8719a507cea45406f3fc9d88cb3ba

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_52abcd91efd8719a507cea45406f3fc9d88cb3ba

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_b39c5f6e96ad40b9efddeb43c6ccdb0f85634d71

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_87d0338b940df0c9f123f4c5f6fb02e7f49cf933

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_87d0338b940df0c9f123f4c5f6fb02e7f49cf933

Copy link

Deployment Status: ✅ Success
🔗 Preview URL: https://a1ac917b.fastgpt-8gr.pages.dev

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_6c811cec4aa40ca01879e824fa4ae61be7c28e61

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_6c811cec4aa40ca01879e824fa4ae61be7c28e61

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_6c811cec4aa40ca01879e824fa4ae61be7c28e61

@c121914yu c121914yu changed the base branch from main to test-images-dataset May 29, 2025 14:15
Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_8148348347cf80f100baa78db39e3a775ba702eb

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_8148348347cf80f100baa78db39e3a775ba702eb

Copy link

Preview mcp_server Image: ghcr.io/labring/fastgpt-pr:fatsgpt_mcp_server_6f16b0b899b0892996799bb193deaa82547ed595

Copy link

Preview sandbox Image: ghcr.io/labring/fastgpt-pr:fatsgpt_sandbox_6f16b0b899b0892996799bb193deaa82547ed595

Copy link

Preview fastgpt Image: ghcr.io/labring/fastgpt-pr:fatsgpt_6f16b0b899b0892996799bb193deaa82547ed595

@c121914yu c121914yu merged commit b4f6684 into labring:test-images-dataset May 30, 2025
4 checks passed
c121914yu added a commit that referenced this pull request May 30, 2025
* 更新数据集相关类型,添加图像文件ID和预览URL支持;优化数据集导入功能,新增图像数据集处理组件;修复部分国际化文本;更新文件上传逻辑以支持新功能。

* 与原先代码的差别

* 新增 V4.9.10 更新说明,支持 PG 设置`systemEnv.hnswMaxScanTuples`参数,优化 LLM stream 调用超时,修复全文检索多知识库排序问题。同时更新数据集索引,移除 datasetId 字段以简化查询。

* 更换成fileId_image逻辑,并增加训练队列匹配的逻辑

* 新增图片集合判断逻辑,优化预览URL生成流程,确保仅在数据集为图片集合时生成预览URL,并添加相关日志输出以便调试。

* Refactor Docker Compose configuration to comment out exposed ports for production environments, update image versions for pgvector, fastgpt, and mcp_server, and enhance Redis service with a health check. Additionally, standardize dataset collection labels in constants and improve internationalization strings across multiple languages.

* Enhance TrainingStates component by adding internationalization support for the imageParse training mode and update defaultCounts to include imageParse mode in trainingDetail API.

* Enhance dataset import context by adding additional steps for image dataset import process and improve internationalization strings for modal buttons in the useEditTitle hook.

* Update DatasetImportContext to conditionally render MyStep component based on data source type, improving the import process for non-image datasets.

* Refactor image dataset handling by improving internationalization strings, enhancing error messages, and streamlining the preview URL generation process.

* 图片上传到新建的 dataset_collection_images 表,逻辑跟随更改

* 修改了除了controller的其他部分问题

* 把图片数据集的逻辑整合到controller里面

* 补充i18n

* 补充i18n

* resolve评论:主要是上传逻辑的更改和组件复用

* 图片名称的图标显示

* 修改编译报错的命名问题

* 删除不需要的collectionid部分

* 多余文件的处理和改动一个删除按钮

* 除了loading和统一的imageId,其他都resolve掉的

* 处理图标报错

* 复用了MyPhotoView并采用全部替换的方式将imageFileId变成imageId

* 去除不必要文件修改

* 报错和字段修改

* 增加上传成功后删除临时文件的逻辑以及回退一些修改

* 删除path字段,将图片保存到gridfs内,并修改增删等操作的代码

* 修正编译错误

---------

Co-authored-by: archer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants