fix: FileTypeRouter matches literal MIME types exactly so "+" and "." stop being treated as regex#11648
Open
Aarkin7 wants to merge 3 commits into
Open
Conversation
…stop being treated as regex
…n, serde and pipeline socket names
|
@Aarkin7 is attempting to deploy a commit to the deepset Team on Vercel. A member of the Team first needs to authorize it. |
Member
|
While the bug is real, I have a few comments.
This example is wrong. I'd suggest implementing a simpler solution like this # run : exact literal match first, regex only as fallback
matched = False
if mime_type:
for raw, pattern in self.mime_type_patterns:
if mime_type == raw or pattern.fullmatch(mime_type):
mime_types[raw].append(source)
matched = True
break
if not matched:
mime_types["unclassified"].append(source)WDYT? This works for you? Another general note: good to add unit tests, but let's try to keep a good coverage without adding many duplicates. |
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.
Related Issues
Proposed Changes:
FileTypeRouter.init was compiling every entry in mime_types as a regex without re.escape, even though the docstring already promised exact matching for non-regex strings. Two real consequences:
Fix: classify each entry in mime_types at init. Strings made up only of IANA-valid characters ([a-zA-Z0-9.+_-] on both sides of /) are compiled with re.escape and matched literally; anything else (e.g. audio/.*) is still compiled as a regex, preserving the documented regex support.
Bucket key remains the user's original string, so output socket names, pipe.connect("router.image/svg+xml", ...), and to_dict / from_dict round-trips are unaffected.
How did you test it?
Added 8 new unit tests in test/components/routers/test_file_router.py:
Wider verification:
Notes for the reviewer
Checklist
fix:,feat:,build:,chore:,ci:,docs:,style:,refactor:,perf:,test:and added!in case the PR includes breaking changes.