List wildcard #114

milhauzindahauz · 2022-09-12T21:52:30Z

implements #113

type_util.py - add wildcard index, add only dicts check __init__.py - clean naive test run keylist_dict.py - add condition for wildcard key keylist_util.py - enhance condition for wildcard

tests - modify test

codecov · 2022-09-13T05:36:11Z

Codecov Report

Base: 96.96% // Head: 96.59% // Decreases project coverage by -0.36% ⚠️

Coverage data is based on head (71d23c0) compared to base (e7a5bfd).
Patch coverage: 92.53% of modified lines in pull request are covered.

❗ Current head 71d23c0 differs from pull request most recent head b928196. Consider uploading reports for the commit b928196 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #114      +/-   ##
==========================================
- Coverage   96.96%   96.59%   -0.37%     
==========================================
  Files          57       57              
  Lines        1678     1793     +115     
==========================================
+ Hits         1627     1732     +105     
- Misses         51       61      +10

Flag	Coverage Δ
unittests	`96.59% <92.53%> (-0.37%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
benedict/__init__.py	`100.00% <ø> (ø)`
benedict/dicts/__init__.py	`100.00% <ø> (ø)`
benedict/dicts/keylist/keylist_util.py	`94.91% <90.90%> (-5.09%)`	⬇️
benedict/utils/type_util.py	`98.30% <92.30%> (-1.70%)`	⬇️
benedict/dicts/keylist/keylist_dict.py	`97.39% <93.33%> (-2.61%)`	⬇️
benedict/dicts/keypath/keypath_util.py	`100.00% <100.00%> (ø)`

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

fabiocaccamo

Thank you very much the good PR and the effort.

This PR brings wildcard * support to lists when using keypaths, with this feature all methods that accept a key should works as correctly and as expected when a * is present, but there are not tests at all for all other methods except for the rename method.

As this is an important feature that involves the whole library it needs to be tested well against all methods, a couple of new test cases are mandatory:

tests.dicts.test_keypath_dict_list_wildcard (core operations)
tests.dicts.test_benedict_wildcard (methods implementation)

benedict/__init__.py

benedict/utils/type_util.py

benedict/dicts/keylist/keylist_dict.py

benedict/dicts/keylist/keylist_util.py

tests/dicts/test_benedict.py

benedict/dicts/keypath/keypath_util.py

remove unnecessary imports

simplify condition

rename function, rename variable

use util function

change conditions blocks

remove print function from test

fabiocaccamo

Could you provide also the test cases?

milhauzindahauz · 2022-09-13T14:38:57Z

Yes, will do that in the evening.

…

On Tue, Sep 13, 2022, 16:37 Fabio Caccamo ***@***.***> wrote: ***@***.**** requested changes on this pull request. Could you provide also the test cases? — Reply to this email directly, view it on GitHub <#114 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AEKTQBU6VMNI5S3JGPA34BTV6CGTXANCNFSM6AAAAAAQK3W7F4> . You are receiving this because you authored the thread.Message ID: ***@***.***>

add wildcard regex, change _split_key_indexes() to use it

fabiocaccamo

We should be ok with the changes, just need the tests.

I'm pretty sure that adding the tests against all methods there will be something to adjust.

milhauzindahauz · 2022-09-14T08:09:13Z

I am going through methods of benedict class. I am trying to figure out all the methods for tests.

fixes TypeError benedict methods (e.g. swap())

build few tests, move wildcard test to separate test file

benedict/utils/type_util.py

benedict/dicts/keylist/keylist_dict.py

tests/dicts/test_benedict_wildcard.py

tests/dicts/test_benedict.py

add is_list to is_list_of_dicts

change tests

tests/dicts/test_benedict_wildcard.py

milhauzindahauz · 2022-09-14T13:43:07Z

Feel free to check it and let me know what you want to do with it. Cause there is TypeError if I remember it correctly.

…

On Wed, Sep 14, 2022, 15:40 Fabio Caccamo ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In tests/dicts/test_benedict_wildcard.py <#114 (comment)> : > + self.assertEqual(b, result) + + def test_swap_wildcard(self): + self.d = { + "a": [ + {"x": 1, "y": 1}, + {"x": 2, "y": 2}, + ], + "x": [ + {"a": 10, "b": 10}, + {"a": 11, "b": 11}, + ], + } + b = benedict(d) + b = benedict(b.clone()) + b.swap("a[*].x", "x[*].a") I'm curious to see what happens using keypaths that end with [*] without a final dict key. — Reply to this email directly, view it on GitHub <#114 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AEKTQBXQ3I6GVTDRT4BBGFDV6HITHANCNFSM6AAAAAAQK3W7F4> . You are receiving this because you authored the thread.Message ID: ***@***.***>

tests/dicts/keypath/test_keypath_dict_list_wildcard.py

fix test

add condition for wildcard in keys

milhauzindahauz · 2022-09-15T10:10:47Z

@fabiocaccamo,

if you want to cover this more thoroughly by test, can you help me and compile the list of methods you want to cover?
Thanks

benedict/dicts/keylist/keylist_dict.py

fabiocaccamo · 2022-09-15T11:01:13Z

@milhauzindahauz I would absolutely cover all methods with at least a couple of different cases (eg. wildcard alone / at the beginning / in the middle / at the end of keypaths), this library is widely used, I don't want to see tens of issues open after this feature will be released.

for more information, see https://pre-commit.ci

change pop behavior for wildcard. Change test to match it.

milhauzindahauz · 2022-10-18T17:00:38Z

Apologies for the pre-commit errors but there is configured max-line-length for flake8 in setup.cfg. But it seems to me that black is using the default value in the CI. Am I wrong?

fix missed patch

enhance test

remove dead code

add test for uncovered code

simplify code, remove unnecessary logic for wildcard index

fabiocaccamo · 2022-10-19T07:28:00Z

Apologies for the pre-commit errors but there is configured max-line-length for flake8 in setup.cfg. But it seems to me that black is using the default value in the CI. Am I wrong?

Thank you for noticing it, probably there is a conflict between Black, .flake8 config file and setup.cfg.

make test more complex, simplify condition to fix bug

milhauzindahauz · 2022-10-19T07:51:26Z

Apologies for the pre-commit errors but there is configured max-line-length for flake8 in setup.cfg. But it seems to me that black is using the default value in the CI. Am I wrong?

Thank you for noticing it, probably there is a conflict between Black, .flake8 config file and setup.cfg.

black doesn't support setup.cfg. I configured manually according to setup.cfg. It's my mistake. But I suggest to change it to blacks default value 88 in setup.cfg to avoid the mismatch.

tests/dicts/keypath/test_keypath_dict_list_wildcard.py

use generators for wildcard on upper levels introduce low_level_generator remove dead code refactor generators add test for pop call on complex data structure use generators for wildcard on upper levels

for more information, see https://pre-commit.ci

remove unused code

reduce complexity

remove death code

remove unused variable

milhauzindahauz

I don't have anything else to this feature.

fabiocaccamo · 2022-11-10T11:27:59Z

benedict/dicts/keylist/keylist_util.py

+                elif __item:
+                    yield __item
+        elif type_util.is_dict(_item) and index in _item:
+            yield _item[index]


If _item is tuple, it will not enter any of the conditions above.

I don't understand the purpose of this method, could you explain it please?

this method is allowing to travers through complex list and return references to objects on the lowest level of them.

fabiocaccamo

The PR doesn't pass tests.

milhauzindahauz · 2022-11-14T08:04:43Z

The PR doesn't pass tests.

I will need to make changes, again.

milhauzindahauz added 2 commits September 12, 2022 23:49

add wildcard for rename

98f1bf6

type_util.py - add wildcard index, add only dicts check __init__.py - clean naive test run keylist_dict.py - add condition for wildcard key keylist_util.py - enhance condition for wildcard

wildcard

d69450a

tests - modify test

milhauzindahauz mentioned this pull request Sep 13, 2022

Wildcard support for renaming #113

Open

fabiocaccamo requested changes Sep 13, 2022

View reviewed changes

milhauzindahauz added 6 commits September 13, 2022 16:33

wildcard

4f8e893

remove unnecessary imports

wildcard

7e26ee2

simplify condition

wildcard

6987943

rename function, rename variable

wildcard

c85c1a4

use util function

wildcard

baf4f70

change conditions blocks

wildcard

9eba3fc

remove print function from test

fabiocaccamo requested changes Sep 13, 2022

View reviewed changes

milhauzindahauz added 2 commits September 13, 2022 21:32

wildcard

95e3ee8

add wildcard regex, change _split_key_indexes() to use it

fix typos

48070d3

fabiocaccamo requested changes Sep 14, 2022

View reviewed changes

milhauzindahauz added 2 commits September 14, 2022 11:14

wildcard

1c7da03

fixes TypeError benedict methods (e.g. swap())

wildcard

6dfff10

build few tests, move wildcard test to separate test file

fabiocaccamo requested changes Sep 14, 2022

View reviewed changes

benedict/utils/type_util.py Outdated Show resolved Hide resolved

benedict/dicts/keylist/keylist_dict.py Outdated Show resolved Hide resolved

tests/dicts/test_benedict_wildcard.py Outdated Show resolved Hide resolved

tests/dicts/test_benedict.py Outdated Show resolved Hide resolved

milhauzindahauz added 2 commits September 14, 2022 14:54

wildcard

4de87dd

add is_list to is_list_of_dicts

wildcard

df926ca

change tests

fabiocaccamo reviewed Sep 14, 2022

View reviewed changes

tests/dicts/test_benedict_wildcard.py Show resolved Hide resolved

fabiocaccamo requested changes Sep 14, 2022

View reviewed changes

tests/dicts/keypath/test_keypath_dict_list_wildcard.py Outdated Show resolved Hide resolved

milhauzindahauz added 2 commits September 15, 2022 11:58

wildcard

409d742

fix test

wildcard

38931d6

add condition for wildcard in keys

fabiocaccamo requested changes Sep 15, 2022

View reviewed changes

benedict/dicts/keylist/keylist_dict.py Outdated Show resolved Hide resolved

pre-commit-ci bot and others added 2 commits October 18, 2022 13:49

[pre-commit.ci] auto fixes from pre-commit.com hooks

6f610ec

for more information, see https://pre-commit.ci

wildcard

bd0d7fd

change pop behavior for wildcard. Change test to match it.

milhauzindahauz added 5 commits October 18, 2022 19:26

wildcard

17edc65

fix missed patch

wildcard

1db0e6c

enhance test

wildcard

53331f2

remove dead code

wildcard

a94bf27

add test for uncovered code

wildcard

6f8487a

simplify code, remove unnecessary logic for wildcard index

wildcard

f54e3d0

make test more complex, simplify condition to fix bug

fabiocaccamo requested changes Oct 19, 2022

View reviewed changes

tests/dicts/keypath/test_keypath_dict_list_wildcard.py Show resolved Hide resolved

milhauzindahauz and others added 8 commits October 30, 2022 09:47

wildcard

9d5560b

use generators for wildcard on upper levels introduce low_level_generator remove dead code refactor generators add test for pop call on complex data structure use generators for wildcard on upper levels

.gitignore - add folder for JB IDEs

7ac667c

Merge branch 'master' into list-wildcard

6788e78

[pre-commit.ci] auto fixes from pre-commit.com hooks

71d23c0

for more information, see https://pre-commit.ci

wildcard

8842f01

remove unused code

wildcard

a43563d

reduce complexity

wildcard

fa32b00

remove death code

wildcard

b928196

remove unused variable

milhauzindahauz requested a review from fabiocaccamo November 7, 2022 11:02

milhauzindahauz commented Nov 7, 2022

View reviewed changes

fabiocaccamo approved these changes Nov 10, 2022

View reviewed changes

fabiocaccamo requested changes Nov 11, 2022

View reviewed changes

fabiocaccamo assigned fabiocaccamo and milhauzindahauz and unassigned fabiocaccamo Dec 1, 2022

fabiocaccamo deleted the branch fabiocaccamo:master January 18, 2023 09:32

fabiocaccamo closed this Jan 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

List wildcard #114

List wildcard #114

milhauzindahauz commented Sep 12, 2022

codecov bot commented Sep 13, 2022 •

edited

Loading

fabiocaccamo left a comment

fabiocaccamo left a comment

milhauzindahauz commented Sep 13, 2022 via email

fabiocaccamo left a comment

milhauzindahauz commented Sep 14, 2022

milhauzindahauz commented Sep 14, 2022 via email

milhauzindahauz commented Sep 15, 2022

fabiocaccamo commented Sep 15, 2022

milhauzindahauz commented Oct 18, 2022

fabiocaccamo commented Oct 19, 2022

milhauzindahauz commented Oct 19, 2022

milhauzindahauz left a comment

fabiocaccamo Nov 10, 2022

fabiocaccamo Nov 10, 2022

milhauzindahauz Nov 14, 2022

fabiocaccamo left a comment

milhauzindahauz commented Nov 14, 2022

List wildcard #114

List wildcard #114

Conversation

milhauzindahauz commented Sep 12, 2022

codecov bot commented Sep 13, 2022 • edited Loading

Codecov Report

fabiocaccamo left a comment

Choose a reason for hiding this comment

fabiocaccamo left a comment

Choose a reason for hiding this comment

milhauzindahauz commented Sep 13, 2022 via email

fabiocaccamo left a comment

Choose a reason for hiding this comment

milhauzindahauz commented Sep 14, 2022

milhauzindahauz commented Sep 14, 2022 via email

milhauzindahauz commented Sep 15, 2022

fabiocaccamo commented Sep 15, 2022

milhauzindahauz commented Oct 18, 2022

fabiocaccamo commented Oct 19, 2022

milhauzindahauz commented Oct 19, 2022

milhauzindahauz left a comment

Choose a reason for hiding this comment

fabiocaccamo Nov 10, 2022

Choose a reason for hiding this comment

fabiocaccamo Nov 10, 2022

Choose a reason for hiding this comment

milhauzindahauz Nov 14, 2022

Choose a reason for hiding this comment

fabiocaccamo left a comment

Choose a reason for hiding this comment

milhauzindahauz commented Nov 14, 2022

codecov bot commented Sep 13, 2022 •

edited

Loading