Use TypedDict to annotate disk-related serializations #2935
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
correctmost
commented
Nov 25, 2024
| @@ -96,7 +103,7 @@ def parse_arg(cls, disk_config: dict[str, Any]) -> DiskLayoutConfiguration | Non | |||
| return config | |||
|
|
|||
| for entry in disk_config.get('device_modifications', []): | |||
| device_path = Path(entry.get('device', None)) if entry.get('device', None) else None | |||
There was a problem hiding this comment.
I removed the conditional get to avoid this error:
error: Argument 1 to "Path" has incompatible type "str | None"; expected "str | PathLike[str]" [arg-type]
| return { | ||
| 'value': self.value, | ||
| 'unit': self.unit.name, | ||
| 'sector_size': self.sector_size.json() if self.sector_size else None |
There was a problem hiding this comment.
It doesn't seem like self.sector_size can be None given the __post_init__ code above. I changed the code to avoid this mypy error:
error: Incompatible types (expression has type "_SectorSizeSerialization | None", TypedDict item "sector_size" has type "_SectorSizeSerialization") [typeddict-item]
| lvm_pvs = [] | ||
| for mod in disk_config.device_modifications: | ||
| for part in mod.partitions: | ||
| if part.obj_id in arg.get('lvm_pvs', []): | ||
| # FIXME: 'lvm_pvs' does not seem like it can ever exist in the 'arg' serialization | ||
| if part.obj_id in arg.get('lvm_pvs', []): # type: ignore[operator] |
There was a problem hiding this comment.
I don't think this arg.get('lvm_pvs', []) call can ever succeed.
It looks like the LvmVolumeGroup data needs to be checked instead.
svartkanin
approved these changes
Nov 30, 2024
castillofrancodamian
pushed a commit
to castillofrancodamian/archinstall
that referenced
this pull request
Dec 21, 2024
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.
PR Description:
This PR reduces the number of
Anyinstances in the code. I think mypy is now catching a real bug inLvmConfiguration.parse_argtoo.