mirror of
https://github.com/hwchase17/langchain.git
synced 2025-09-24 03:52:10 +00:00
Added autodetect_encoding option to csvLoader (#11327)
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
import csv
|
||||
from io import TextIOWrapper
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from langchain.docstore.document import Document
|
||||
from langchain.document_loaders.base import BaseLoader
|
||||
from langchain.document_loaders.helpers import detect_file_encodings
|
||||
from langchain.document_loaders.unstructured import (
|
||||
UnstructuredFileLoader,
|
||||
validate_unstructured_version,
|
||||
@@ -36,6 +38,7 @@ class CSVLoader(BaseLoader):
|
||||
source_column: Optional[str] = None,
|
||||
csv_args: Optional[Dict] = None,
|
||||
encoding: Optional[str] = None,
|
||||
autodetect_encoding: bool = False,
|
||||
):
|
||||
"""
|
||||
|
||||
@@ -46,33 +49,58 @@ class CSVLoader(BaseLoader):
|
||||
csv_args: A dictionary of arguments to pass to the csv.DictReader.
|
||||
Optional. Defaults to None.
|
||||
encoding: The encoding of the CSV file. Optional. Defaults to None.
|
||||
autodetect_encoding: Whether to try to autodetect the file encoding.
|
||||
"""
|
||||
self.file_path = file_path
|
||||
self.source_column = source_column
|
||||
self.encoding = encoding
|
||||
self.csv_args = csv_args or {}
|
||||
self.autodetect_encoding = autodetect_encoding
|
||||
|
||||
def load(self) -> List[Document]:
|
||||
"""Load data into document objects."""
|
||||
|
||||
docs = []
|
||||
with open(self.file_path, newline="", encoding=self.encoding) as csvfile:
|
||||
csv_reader = csv.DictReader(csvfile, **self.csv_args) # type: ignore
|
||||
for i, row in enumerate(csv_reader):
|
||||
content = "\n".join(f"{k.strip()}: {v.strip()}" for k, v in row.items())
|
||||
try:
|
||||
source = (
|
||||
row[self.source_column]
|
||||
if self.source_column is not None
|
||||
else self.file_path
|
||||
)
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
f"Source column '{self.source_column}' not found in CSV file."
|
||||
)
|
||||
metadata = {"source": source, "row": i}
|
||||
doc = Document(page_content=content, metadata=metadata)
|
||||
docs.append(doc)
|
||||
try:
|
||||
with open(self.file_path, newline="", encoding=self.encoding) as csvfile:
|
||||
docs = self.__read_file(csvfile)
|
||||
except UnicodeDecodeError as e:
|
||||
if self.autodetect_encoding:
|
||||
detected_encodings = detect_file_encodings(self.file_path)
|
||||
for encoding in detected_encodings:
|
||||
try:
|
||||
with open(
|
||||
self.file_path, newline="", encoding=encoding.encoding
|
||||
) as csvfile:
|
||||
docs = self.__read_file(csvfile)
|
||||
break
|
||||
except UnicodeDecodeError:
|
||||
continue
|
||||
else:
|
||||
raise RuntimeError(f"Error loading {self.file_path}") from e
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Error loading {self.file_path}") from e
|
||||
|
||||
return docs
|
||||
|
||||
def __read_file(self, csvfile: TextIOWrapper) -> List[Document]:
|
||||
docs = []
|
||||
csv_reader = csv.DictReader(csvfile, **self.csv_args) # type: ignore
|
||||
for i, row in enumerate(csv_reader):
|
||||
content = "\n".join(f"{k.strip()}: {v.strip()}" for k, v in row.items())
|
||||
try:
|
||||
source = (
|
||||
row[self.source_column]
|
||||
if self.source_column is not None
|
||||
else self.file_path
|
||||
)
|
||||
except KeyError:
|
||||
raise ValueError(
|
||||
f"Source column '{self.source_column}' not found in CSV file."
|
||||
)
|
||||
metadata = {"source": source, "row": i}
|
||||
doc = Document(page_content=content, metadata=metadata)
|
||||
docs.append(doc)
|
||||
|
||||
return docs
|
||||
|
||||
|
@@ -2,12 +2,12 @@ from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from langchain.document_loaders import DirectoryLoader, TextLoader
|
||||
from langchain.document_loaders import CSVLoader, DirectoryLoader, TextLoader
|
||||
from langchain.document_loaders.helpers import detect_file_encodings
|
||||
|
||||
|
||||
@pytest.mark.requires("chardet")
|
||||
def test_loader_detect_encoding() -> None:
|
||||
def test_loader_detect_encoding_text() -> None:
|
||||
"""Test text loader."""
|
||||
path = Path(__file__).parent.parent / "examples"
|
||||
files = path.glob("**/*.txt")
|
||||
@@ -16,7 +16,7 @@ def test_loader_detect_encoding() -> None:
|
||||
str(path),
|
||||
glob="**/*.txt",
|
||||
loader_kwargs={"autodetect_encoding": True},
|
||||
loader_cls=TextLoader,
|
||||
loader_cls=TextLoader, # type: ignore
|
||||
)
|
||||
|
||||
with pytest.raises((UnicodeDecodeError, RuntimeError)):
|
||||
@@ -26,6 +26,43 @@ def test_loader_detect_encoding() -> None:
|
||||
assert len(docs) == len(list(files))
|
||||
|
||||
|
||||
@pytest.mark.requires("chardet")
|
||||
def test_loader_detect_encoding_csv() -> None:
|
||||
"""Test csv loader."""
|
||||
path = Path(__file__).parent.parent / "examples"
|
||||
files = path.glob("**/*.csv")
|
||||
|
||||
# Count the number of lines.
|
||||
row_count = 0
|
||||
for file in files:
|
||||
encodings = detect_file_encodings(str(file))
|
||||
for encoding in encodings:
|
||||
try:
|
||||
row_count += sum(1 for line in open(file, encoding=encoding.encoding))
|
||||
break
|
||||
except UnicodeDecodeError:
|
||||
continue
|
||||
# CSVLoader uses DictReader, and one line per file is a header,
|
||||
# so subtract the number of files.
|
||||
row_count -= 1
|
||||
|
||||
loader = DirectoryLoader(
|
||||
str(path), glob="**/*.csv", loader_cls=CSVLoader # type: ignore
|
||||
)
|
||||
loader_detect_encoding = DirectoryLoader(
|
||||
str(path),
|
||||
glob="**/*.csv",
|
||||
loader_kwargs={"autodetect_encoding": True},
|
||||
loader_cls=CSVLoader, # type: ignore
|
||||
)
|
||||
|
||||
with pytest.raises((UnicodeDecodeError, RuntimeError)):
|
||||
loader.load()
|
||||
|
||||
docs = loader_detect_encoding.load()
|
||||
assert len(docs) == row_count
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="slow test")
|
||||
@pytest.mark.requires("chardet")
|
||||
def test_loader_detect_encoding_timeout(tmpdir: str) -> None:
|
||||
|
@@ -0,0 +1,11 @@
|
||||
<EFBFBD>sID,<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD><EFBFBD>,<EFBFBD>ڋq<EFBFBD><EFBFBD>,<EFBFBD>ڋqID,<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD>i,<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD>{<7B><>,<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>J<EFBFBD>e<EFBFBD>S<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
1,"Eldon <20>X<EFBFBD>^<5E>b<EFBFBD>J<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B>I<EFBFBD>p<EFBFBD>x<EFBFBD>[<5B>X<EFBFBD>A<EFBFBD>v<EFBFBD><76><EFBFBD>`<60>i",<EFBFBD><EFBFBD><EFBFBD>n<EFBFBD><EFBFBD><EFBFBD>h<EFBFBD>E<EFBFBD>}<7D>b<EFBFBD>L<EFBFBD><4C><EFBFBD>^<5E>C<EFBFBD>A,3,-213.25,38.94,35,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>ۊǂƐ<EFBFBD><EFBFBD><EFBFBD>,0.8
|
||||
2,"1.7<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>B<EFBFBD>[<5B>g<EFBFBD>̃R<CC83><52><EFBFBD>p<EFBFBD>N<EFBFBD>g<EFBFBD>u<EFBFBD>L<EFBFBD><4C><EFBFBD>[<5B>u<EFBFBD>v<EFBFBD>I<EFBFBD>t<EFBFBD>B<EFBFBD>X<EFBFBD>①<EFBFBD><E291A0>",<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>[<5B>E<EFBFBD>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>`,293,457.81,208.16,68.02,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>Ɠd<EFBFBD><EFBFBD><EFBFBD>i,0.58
|
||||
3,"Cardinal Slant-D? <20><><EFBFBD><EFBFBD><EFBFBD>O <20>o<EFBFBD>C<EFBFBD><43><EFBFBD>_<EFBFBD>[<5B>A<EFBFBD>w<EFBFBD>r<EFBFBD>[<5B>Q<EFBFBD>[<5B>W <20>r<EFBFBD>j<EFBFBD>[<5B><>",<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>[<5B>E<EFBFBD>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>`,293,46.71,8.69,2.99,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>o<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>уo<D183>C<EFBFBD><43><EFBFBD>_<EFBFBD>[<5B>t<EFBFBD><74><EFBFBD>i,0.39
|
||||
4,"R380",<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>_<EFBFBD><5F>,483,1198.97,195.99,3.99,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>d<EFBFBD>b<EFBFBD>ƒʐM,0.58
|
||||
5,"<EFBFBD>z<EFBFBD>[<5B><><EFBFBD>Y HEPA <20><><EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>@",<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>E<EFBFBD>\<5C><><EFBFBD>e<EFBFBD><65>,515,30.94,21.78,5.94,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>Ɠd<EFBFBD><EFBFBD><EFBFBD>i,0.5
|
||||
6,"GE <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̉<EFBFBD><CC89><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>d<EFBFBD><64>",<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>E<EFBFBD>\<5C><><EFBFBD>e<EFBFBD><65>,515,4.43,6.64,4.95,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>I<EFBFBD>t<EFBFBD>B<EFBFBD>X<EFBFBD>Ƌ<EFBFBD>,0.37
|
||||
7,"<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>t<EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD>D<EFBFBD>o<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>[<5B>A<EFBFBD><41><EFBFBD>x<EFBFBD><78><EFBFBD>z<EFBFBD><7A><EFBFBD>_<EFBFBD>[",<EFBFBD>J<EFBFBD>[<5B><><EFBFBD>E<EFBFBD>W<EFBFBD><57><EFBFBD>N<EFBFBD>\<5C><>,613,-54.04,7.3,7.72,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>o<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>уo<D183>C<EFBFBD><43><EFBFBD>_<EFBFBD>[<5B>t<EFBFBD><74><EFBFBD>i,0.38
|
||||
8,"SAFCO <20><><EFBFBD>o<EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD>X<EFBFBD>N<EFBFBD>T<EFBFBD>C<EFBFBD>h<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43> <20><><EFBFBD>C<EFBFBD><43><EFBFBD>[<5B>t<EFBFBD><74><EFBFBD>[<5B><>",<EFBFBD>J<EFBFBD>[<5B><><EFBFBD>E<EFBFBD>W<EFBFBD><57><EFBFBD>N<EFBFBD>\<5C><>,613,127.70,42.76,6.22,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>ۊǂƐ<EFBFBD><EFBFBD><EFBFBD>,
|
||||
9,"SAFCO <20>Ɩ<EFBFBD><C696>p<EFBFBD><70><EFBFBD>C<EFBFBD><43><EFBFBD>[<5B>V<EFBFBD>F<EFBFBD><46><EFBFBD>t <20>u<EFBFBD><75><EFBFBD>b<EFBFBD>N",<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD>J<EFBFBD>E<EFBFBD>t<EFBFBD>F<EFBFBD>f<EFBFBD><EFBFBD>,643,-695.26,138.14,35,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD>ۊǂƐ<EFBFBD><EFBFBD><EFBFBD>,
|
||||
10,"<EFBFBD>[<5B><><EFBFBD>b<EFBFBD>N<EFBFBD>X 198",<EFBFBD>h<EFBFBD><EFBFBD><EFBFBD>V<EFBFBD>[<5B>E<EFBFBD>o<EFBFBD>b<EFBFBD>_<EFBFBD>[<5B>Y,678,-226.36,4.98,8.33,<EFBFBD>k<EFBFBD>i<EFBFBD>u<EFBFBD>b<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>B,<EFBFBD><EFBFBD>,0.38
|
|
11
libs/langchain/tests/unit_tests/examples/example-utf8.csv
Normal file
11
libs/langchain/tests/unit_tests/examples/example-utf8.csv
Normal file
@@ -0,0 +1,11 @@
|
||||
"Row ID","Product Name","Customer Name","Customer ID","Sales","Price","Shipping Cost","Province","Product Category","Discount"
|
||||
1,"Eldon Base for stackable storage shelf, platinum",Muhammed MacIntyre,3,-213.25,38.94,35,Nunavut,Storage & Organization,0.8
|
||||
2,"1.7 Cubic Foot Compact ""Cube"" Office Refrigerators",Barry French,293,457.81,208.16,68.02,Nunavut,Appliances,0.58
|
||||
3,"Cardinal Slant-D® Ring Binder, Heavy Gauge Vinyl",Barry French,293,46.71,8.69,2.99,Nunavut,Binders and Binder Accessories,0.39
|
||||
4,R380,Clay Rozendal,483,1198.97,195.99,3.99,Nunavut,Telephones and Communication,0.58
|
||||
5,Holmes HEPA Air Purifier,Carlos Soltero,515,30.94,21.78,5.94,Nunavut,Appliances,0.5
|
||||
6,G.E. Longer-Life Indoor Recessed Floodlight Bulbs,Carlos Soltero,515,4.43,6.64,4.95,Nunavut,Office Furnishings,0.37
|
||||
7,"Angle-D Binders with Locking Rings, Label Holders",Carl Jackson,613,-54.04,7.3,7.72,Nunavut,Binders and Binder Accessories,0.38
|
||||
8,"SAFCO Mobile Desk Side File, Wire Frame",Carl Jackson,613,127.70,42.76,6.22,Nunavut,Storage & Organization,
|
||||
9,"SAFCO Commercial Wire Shelving, Black",Monica Federle,643,-695.26,138.14,35,Nunavut,Storage & Organization,
|
||||
10,Xerox 198,Dorothy Badders,678,-226.36,4.98,8.33,Nunavut,Paper,0.38
|
|
Reference in New Issue
Block a user