-
Notifications
You must be signed in to change notification settings - Fork 0
update: add utils from code #35
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| __path__ = __import__("pkgutil").extend_path(__path__, __name__) | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| from .search import find_by_key_or_regex | ||
| from .string import camel_to_snake, snake_to_camel | ||
|
|
||
| from .object import calculate_hash_from_object, remove_timestampable_keys, sort_keys_deep | ||
| from .string import remove_comments_from_source_code, remove_empty_lines_from_string |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import pytest | ||
| from pydantic import BaseModel | ||
| from typing import Optional | ||
|
|
||
| from mat3ra.utils.object import ( | ||
| calculate_hash_from_object, | ||
| remove_timestampable_keys, | ||
| sort_keys_deep, | ||
| ) | ||
| from mat3ra.utils.string import remove_comments_from_source_code, remove_empty_lines_from_string | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "obj,expected", | ||
| [ | ||
| ({"b": 2, "a": 1}, "608de49a4600dbb5b173492759792e4a"), | ||
| ({"z": {"b": 2, "a": 1}, "a": [{"d": 4, "c": 3}, 2]}, "a3f68f53e4bcec2a1b1a058b4a5c12ba"), | ||
| ({"a": None, "b": 1}, "b0ef272d275f68e05645af0b4fac87da"), | ||
| ({"msg": "Δ", "a": 1}, "f838bafaab72679f8607ebc879ab24a7"), | ||
| ], | ||
| ) | ||
| def test_calculate_hash_from_object_matches_js(obj, expected): | ||
| assert calculate_hash_from_object(obj) == expected | ||
|
|
||
|
|
||
| def test_sort_keys_deep_sorts_dict_keys_recursively(): | ||
| assert sort_keys_deep({"b": 2, "a": 1, "z": {"b": 2, "a": 1}}) == {"a": 1, "b": 2, "z": {"a": 1, "b": 2}} | ||
|
|
||
|
|
||
| def test_sort_keys_deep_pydantic_exclude_unset_include_none(): | ||
| class Model(BaseModel): | ||
| a: int = 1 | ||
| b: Optional[int] = None | ||
| c: Optional[int] = None | ||
|
|
||
| m = Model(c=None) | ||
| assert sort_keys_deep(m) == {"c": None} | ||
| assert calculate_hash_from_object(m) == "adcbf5dd65a518bdff3a02349d151b25" | ||
|
|
||
|
|
||
| def test_remove_timestampable_keys(): | ||
| assert remove_timestampable_keys( | ||
| {"a": 1, "createdAt": "x", "updatedAt": "y", "removedAt": "z"} | ||
| ) == {"a": 1} | ||
|
|
||
|
|
||
| def test_comment_and_empty_line_stripping_matches_js(): | ||
| text = "# comment\n\nx=1\n # indented\n#!/bin/bash\n echo hi # inline\n" | ||
| without_comments = remove_comments_from_source_code(text) | ||
| assert "#!/" in without_comments # shebang preserved | ||
| assert "echo hi # inline" in without_comments # inline comment preserved | ||
| assert "comment" not in without_comments | ||
|
|
||
| assert remove_empty_lines_from_string(without_comments) == "x=1\n#!/bin/bash\n echo hi # inline" |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests??