Repository navigation
fix: cherry-pick RAG upload timeout and Service API document fixes - #45019
Merged
Merged
Conversation
hyoban
requested review from
JohnJyong,
QuantumGhost,
crazywoola and
laipz8200
as code owners
October 29, 2026 02:34
github-actions
Bot
added
size:L
Contributor
Pyrefly Type Coverage
|
hyoban
force-pushed
the
pick/1.18.0-fix.2-service-api
branch
from
October 29, 2026 02:36
369f0e9 to
4f0a8cf
Compare
hyoban
changed the title
lyzno1
approved these changes
Oct 29, 2026
hyoban
force-pushed
the
pick/1.18.0-fix.2-service-api
branch
from
October 29, 2026 02:42
4f0a8cf to
612c8a6
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks three changes from
mainintohotfix/1.18.0-fix.2, in the same order as on main, created withgit cherry-pick -x:fix(web): stop aborting new RAG document uploads after 30sfix(api): restore Service API file document writes: applied cleanly.feat(api): expose logical document deletion through Service APIConflict resolution:
oxlint-suppressions.jsonkeeps the hotfix branch version. The hotfix branch has nobetter-tailwindcss/enforce-logical-propertiessuppressions, so there was nogolden-question-dialog.tsxentry to remove.packages/contracts/generated/api/service/errors.gen.tsdoes not exist on the hotfix branch, so it was dropped. I then rangen-api-contracton the hotfix branch and confirmed that the regenerated contracts exactly match the pickedorpc.gen.ts/types.gen.ts/zod.gen.ts. Git matched the main testtest_resources.pyto the hotfix test filetest_knowledge_fs_service_contracts.pyas a rename, so the new test case was added there.Please keep the three commits separate when merging (rebase or merge commit) so each one keeps its cherry-pick provenance.
Verification:
pnpm vitest run features/new-rag/documents/__tests__/page.spec.tsx: 262 passedpytest tests/unit_tests/controllers/service_api/dataset/test_document.py tests/unit_tests/controllers/test_knowledge_fs_service_contracts.py: 147 passedknowledge-fs-logical-document-delete-contract.smoke.test.ts: 2 passedvp linton changed web files,ruff check/ruff format --checkon changed Python files: clean.github/scripts/check-hotfix-cherry-picks.shrun locally: 3 commits, provenance verifiedSupersedes #45010, #45016 and #45017.