refactor: reuse Schema.to_<backend>() in from_numpy
#2024
Merged
Conversation
This file contains 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
dangotbanned
commented
Feb 16, 2025
| ) | ||
| elif is_sequence_but_not_str(schema): | ||
| native_frame = native_namespace.DataFrame(data, columns=list(schema)) | ||
| elif schema is None: | ||
| native_frame = native_namespace.DataFrame( | ||
| data, columns=["column_" + str(x) for x in range(data.shape[1])] | ||
| data, columns=[f"column_{x}" for x in range(data.shape[1])] |
There was a problem hiding this comment.
Identical line at
narwhals/narwhals/functions.py
Line 546 in 0b14b7d
dangotbanned
commented
Feb 16, 2025
Comment on lines
496
to
+501
| if implementation is Implementation.POLARS: | ||
| if isinstance(schema, (Mapping, Schema)): | ||
| from narwhals._polars.utils import ( | ||
| narwhals_to_native_dtype as polars_narwhals_to_native_dtype, | ||
| ) | ||
|
|
||
| backend_version = parse_version(native_namespace.__version__) | ||
| schema = { | ||
| name: polars_narwhals_to_native_dtype( # type: ignore[misc] | ||
| dtype, | ||
| version=version, | ||
| backend_version=backend_version, | ||
| ) | ||
| for name, dtype in schema.items() | ||
| } | ||
| elif schema is None: | ||
| native_frame = native_namespace.from_numpy(data) | ||
| elif not is_sequence_but_not_str(schema): | ||
| schema_pl: pl.Schema | Sequence[str] | None = Schema(schema).to_polars() | ||
| elif is_sequence_but_not_str(schema) or schema is None: | ||
| schema_pl = schema | ||
| else: |
There was a problem hiding this comment.
Thinking about normalizing to this before dispatching on implementation:
schema: nw.Schema | list[str] | NoneThat way the error message thats repeated 3x, can just be written and raised once:
narwhals/narwhals/functions.py
Lines 549 to 554 in 0b14b7d
There was a problem hiding this comment.
Would only really work for polars and pyarrow though
FBruzzesi
approved these changes
Feb 16, 2025
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.
What type of PR is this? (check all applicable)
Related issues
nw.(DType|Schema)conversion API #1912Checklist
If you have comments or can explain your changes, please do so below
Mentioned in #2023 (comment).
I made an attempt at (#2024 (comment)) and (#2024 (comment)) - but ended up at almost the same LOC 🤦♂️