Skip to content
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

refactor(referencefs): override _open only for fsspec<2025.2.0 #884

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ dependencies = [
"tqdm",
"numpy>=1,<3",
"pandas>=2.0.0",
"packaging",
"pyarrow",
"typing-extensions",
"python-dateutil>=2",
"attrs>=21.3.0",
"fsspec>=2024.2.0",
"s3fs>=2024.2.0",
"gcsfs>=2024.2.0",
"adlfs>=2024.2.0",
Expand Down
Empty file added src/datachain/fs/__init__.py
Empty file.
21 changes: 21 additions & 0 deletions src/datachain/fs/reference.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import fsspec
from packaging.version import Version, parse

# fsspec==2025.2.0 added support for a proper `open()` in `ReferenceFileSystem`.
# Remove this module when `fsspec` minimum version requirement can be bumped.
if parse(fsspec.__version__) < Version("2025.2.0"):
from fsspec.core import split_protocol
from fsspec.implementations import reference

class ReferenceFileSystem(reference.ReferenceFileSystem):
def _open(self, path, mode="rb", *args, **kwargs):
# overriding because `fsspec`'s `ReferenceFileSystem._open`
# reads the whole file in-memory.
(uri,) = self.references[path]
protocol, _ = split_protocol(uri)
return self.fss[protocol].open(uri, mode, *args, **kwargs)
else:
from fsspec.implementations.reference import ReferenceFileSystem # type: ignore[no-redef] # noqa: I001

Check warning on line 18 in src/datachain/fs/reference.py

View check run for this annotation

Codecov / codecov/patch

src/datachain/fs/reference.py#L18

Added line #L18 was not covered by tests


__all__ = ["ReferenceFileSystem"]
12 changes: 1 addition & 11 deletions src/datachain/lib/arrow.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
from itertools import islice
from typing import TYPE_CHECKING, Any, Optional

import fsspec.implementations.reference
import orjson
import pyarrow as pa
from fsspec.core import split_protocol
from pyarrow.dataset import CsvFileFormat, dataset
from tqdm.auto import tqdm

from datachain.fs.reference import ReferenceFileSystem
from datachain.lib.data_model import dict_to_data_model
from datachain.lib.file import ArrowRow, File
from datachain.lib.model_store import ModelStore
Expand All @@ -27,15 +26,6 @@
DATACHAIN_SIGNAL_SCHEMA_PARQUET_KEY = b"DataChain SignalSchema"


class ReferenceFileSystem(fsspec.implementations.reference.ReferenceFileSystem):
def _open(self, path, mode="rb", *args, **kwargs):
# overriding because `fsspec`'s `ReferenceFileSystem._open`
# reads the whole file in-memory.
(uri,) = self.references[path]
protocol, _ = split_protocol(uri)
return self.fss[protocol].open(uri, mode, *args, **kwargs)


class ArrowGenerator(Generator):
DEFAULT_BATCH_SIZE = 2**17 # same as `pyarrow._dataset._DEFAULT_BATCH_SIZE`

Expand Down