refactor(Taxonomy): replace TAXONOMY_URLS with TAXONOMY_MAPPING and a single method to build the url #475
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
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 |
|---|---|---|
|
|
@@ -891,28 +891,47 @@ class DatasetType(str, enum.Enum): | |
|
|
||
|
|
||
| class TaxonomyType(str, enum.Enum): | ||
| dataset_filename: str | ||
|
Contributor
There was a problem hiding this comment. @raphodn I'm really not a fan of storing additional data in an Enum.
Member
Author
There was a problem hiding this comment. Aaah i shouldn't have merged. Can i force push and drop the commit on the
Member
Author
There was a problem hiding this comment. It'd be better if every filename mapped perfectly to the enum, there's at least 1 plural exception 😅
|
||
|
|
||
| category = ("category", "categories.full.json") | ||
| ingredient = ("ingredient", "ingredients.full.json") | ||
| label = ("label", "labels.full.json") | ||
| brand = ("brand", "brands.full.json") | ||
| packaging_shape = ("packaging_shape", "packaging_shapes.full.json") | ||
| packaging_material = ("packaging_material", "packaging_materials.full.json") | ||
| packaging_recycling = ("packaging_recycling", "packaging_recycling.full.json") | ||
| country = ("country", "countries.full.json") | ||
| store = ("store", "stores.full.json") | ||
| nova_group = ("nova_group", "nova_groups.full.json") | ||
| packaging = ("packaging", "packaging.full.json") | ||
| additive = ("additive", "additives.full.json") | ||
| vitamin = ("vitamin", "vitamins.full.json") | ||
| mineral = ("mineral", "minerals.full.json") | ||
| amino_acid = ("amino_acid", "amino_acids.full.json") | ||
| nucleotide = ("nucleotide", "nucleotides.full.json") | ||
| allergen = ("allergen", "allergens.full.json") | ||
| state = ("state", "states.full.json") | ||
| data_quality = ("data_quality", "data_quality.full.json") | ||
| origin = ("origin", "origins.full.json") | ||
| language = ("language", "languages.full.json") | ||
| other_nutritional_substance = ( | ||
| "other_nutritional_substance", | ||
| "other_nutritional_substances.full.json", | ||
| ) | ||
|
|
||
| def __new__(cls, value: str, dataset_filename: str): | ||
| """ | ||
| Override __new__ to allow storing the dataset filename | ||
| associated with each taxonomy type. | ||
| """ | ||
| obj = str.__new__(cls, value) | ||
| obj._value_ = value | ||
| obj.dataset_filename = dataset_filename | ||
| return obj | ||
|
|
||
| @property | ||
| def dataset_path(self) -> str: | ||
| return f"data/taxonomies/{self.dataset_filename}" | ||
|
|
||
|
|
||
| class NutritionV3NutrientAggregated(BaseModel): | ||
|
|
||
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.
added to avoid
mypyerror