Skip to content

Keep short non-ASCII UTF-8 text from being guessed as UTF-16 #2674

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.

Sign up for GitHub

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

Open
Franco Ceballos Rastello (xThreeh) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep short non-ASCII UTF-8 text from being guessed as UTF-16 #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/markitdown/src/markitdown/_markitdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,15 @@ def _get_stream_info_guesses(
if charset_result is not None:
charset = self._normalize_charset(charset_result.encoding)

# The detector can read a short non-ASCII UTF-8 sample as
# UTF-16 and garble it. Bytes that decode as UTF-8 are UTF-8.
if not stream_page.isascii():
try:
stream_page.decode("utf-8")
charset = "utf-8"
except UnicodeDecodeError:
pass

# Normalize the first extension listed
guessed_extension = None
if len(result.prediction.output.extensions) > 0:
Expand Down
12 changes: 12 additions & 0 deletions packages/markitdown/tests/test_module_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,18 @@ def test_split_utf8_json_preserves_content(
assert result.markdown == data.decode("utf-8")


@pytest.mark.parametrize("text", ["ok ✓", "AAAㇰ"])
def test_short_utf8_text_is_not_guessed_as_utf16(
markitdown: MarkItDown, text: str
) -> None:
# charset_normalizer reads these short UTF-8 samples as UTF-16-BE.
stream = io.BytesIO(text.encode("utf-8"))

result = markitdown.convert_stream(stream, stream_info=StreamInfo(extension=".txt"))

assert result.markdown == text


@pytest.mark.parametrize(
"sample,tail",
[
Expand Down