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.

Sign up for GitHub

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

Jump to bottom

make models hashable (GSI-482) #2

Merged
merged 33 commits into from
Nov 20, 2023
Merged

make models hashable (GSI-482) #2

merged 33 commits into from
Nov 20, 2023

Conversation

KerstenBreuer
Copy link
Contributor 

- Made models hashable:
  - implemented pydantic-compatible FrozenDict
  - required to get rid of ContentSchema.path and SchemaPack.self_path as it is not possible to exclude properties from hash calculation in pydantic
  - ContentSchema.json_schema is now a string as FrozenDict does not ensure immutability of the values (i.e. if the values are dicts themselves)
- added equality checks
- check that content schemas can be embedded into schemapack definitions

KerstenBreuer and others added 28 commits November 7, 2023 16:26
@KerstenBreuer
adapt template
2b4e053
@KerstenBreuer
adapt description
4eec2e7
@KerstenBreuer
update readme
2552cc7
@KerstenBreuer
added examples for valid and invalid schemapack definitions
6bec4a3
@KerstenBreuer
added models
0f35763
@KerstenBreuer
added models
ce1674a
@KerstenBreuer
update template
36abd6a
@KerstenBreuer
frozendict
f646b50
@KerstenBreuer
frozendict
2ea64e3
@KerstenBreuer
draft
ea26a79
@KerstenBreuer @Cito
Update .devcontainer/Dockerfile
2def9bb 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/fixtures/examples/content_schemas/not_json_or_yaml.txt
791d6bc 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/fixtures/examples/schemapack/valid/rooted.schemapack.yaml
08bb269 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/fixtures/examples/schemapack/valid/non_rooted.schemapack…
c0b45c7 
….yaml

Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/fixtures/examples/schemapack/valid/with_relation_lookup.…
dee132f 
…schemapack.yaml

Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/test_load.py
9584985 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/fixtures/examples.py
42dc08e 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/test_load.py
2743234 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update tests/test_load.py
36ea997 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update src/schemapack/models.py
293e2d7 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update src/schemapack/models.py
523cfab 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update src/schemapack/models.py
5a0a184 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer
add suggestions
babe2f2
@KerstenBreuer
fix template
bc15ce4
@KerstenBreuer
Merge branch 'feature/parser_GSI-467' into feature/frozendict
04c59ce
@KerstenBreuer
make hashable
274298b
@KerstenBreuer
Merge remote-tracking branch 'origin/main' into feature/make_hashable…
ea11f9c 
…_GSI-482
@KerstenBreuer
update lock files
17a5379
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 16, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 6929890454

  • 37 of 39 (94.87%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+3.2%) to 94.33%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/schemapack/models.py 15 16 93.75%
src/schemapack/utils.py 21 22 95.45%
Totals Coverage Status
Change from base Build 6888420157: 3.2%
Covered Lines: 183
Relevant Lines: 194
💛 - Coveralls

TheByronHimes
TheByronHimes previously approved these changes Nov 16, 2023
View reviewed changes
Copy link

@TheByronHimes TheByronHimes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FrozenDict looks good

src/schemapack/utils.py Outdated Show resolved Hide resolved
Cito
Cito previously approved these changes Nov 20, 2023
View reviewed changes
Copy link

@Cito Cito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, made some comments below.

pyproject.toml Outdated Show resolved Hide resolved
tests/test_utils.py Show resolved Hide resolved
src/schemapack/models.py Outdated Show resolved Hide resolved
src/schemapack/models.py Show resolved Hide resolved
src/schemapack/models.py Outdated Show resolved Hide resolved
src/schemapack/utils.py Outdated Show resolved Hide resolved
tests/test_models.py Outdated Show resolved Hide resolved
tests/test_models.py Show resolved Hide resolved
@KerstenBreuer @Cito
Update src/schemapack/models.py
dbe4a42 
Co-authored-by: Christoph Zwerschke <cito@online.de>
KerstenBreuer and others added 3 commits November 20, 2023 12:56
@KerstenBreuer @Cito
Update src/schemapack/models.py
711ba17 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer @Cito
Update src/schemapack/utils.py
2f02894 
Co-authored-by: Christoph Zwerschke <cito@online.de>
@KerstenBreuer
remove self_path mention
1d61751
@KerstenBreuer KerstenBreuer merged commit 551f263 into main Nov 20, 2023
3 checks passed
@KerstenBreuer KerstenBreuer deleted the feature/make_hashable_GSI-482 branch November 20, 2023 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheByronHimes TheByronHimes TheByronHimes left review comments

@Cito Cito Cito approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KerstenBreuer @Cito @TheByronHimes