553 Adding files to Database when importing extrenal files #558
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
5 tasks
panosatha
changed the title
panosatha
reviewed
Oct 15, 2024
… save any attached input files in the database
…d-in-projection-folder
panosatha
reviewed
Oct 15, 2024
panosatha
reviewed
Oct 15, 2024
panosatha
reviewed
Oct 15, 2024
panosatha
requested changes
Oct 15, 2024
1. Made generic IObject/IObjectModel classes that all FloodAdapt Objects/ObjectModels should inherit from to reduce code duplication. 2. Implemented all save_additional functions + tests. 3. Added esolve_filepath() to resolve loading of external file attritbutes when they are set as a path vs a filename. 4. Cleanup: removed all occurences of storing a database path in an object. 5. Cleanup: moved all init code from functions like init_object_model and _init to the actual __init__
… the code to make all tests green
… a filename that is None
panosatha
reviewed
Oct 29, 2024
panosatha
reviewed
Oct 29, 2024
…tion-folder' of github.com:Deltares-research/FloodAdapt into 553-new-development-area-shapefile-not-copied-in-projection-folder
…d-in-projection-folder
…tion-folder' of github.com:Deltares-research/FloodAdapt into 553-new-development-area-shapefile-not-copied-in-projection-folder
…e can be duplicate names.
…ml, or that the user sets the cyc_file attribute to the path of their own .cyc file.
added .cyc file to test data
panosatha
reviewed
Nov 5, 2024
4 tasks
…d-in-projection-folder
|
Incorporated in the hazard refactor: #473 |
LuukBlom
deleted the
553-new-development-area-shapefile-not-copied-in-projection-folder
branch
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.
This PR implements the solution I had in mind for the hazard refactor already and some more.
It is a lot of files changed, but its mostly in importing and replacing.
I added an
IObjectModel&IObjectclass that every floodadapt object will inherit from containing the functions:load_fileload_dictsavesave_additionalwhere the first 3 are the same for all objects and already implemented in the base class.
savewill callsave_additionalfirst (to save any extra files to the database, then update the attrs before saving attrs to a toml file.save_additionalneeds to be implemented for each subclass it is relevant and save the relevant files.__init__needs to be implemented for each subclass as well as explained in theIObjectclass.I implemented the above for all classes in the backend + tests.
I also added flood_adapt\object_model\interface\path_builder.py to be able to build filepaths inside the database.
The database and dbs_classes use this module to create paths.
Meaning, other modules can also construct paths using that module, without requiring access to the whole database object.
I also moved function (get_object_ids) to a separate module since fiat_model uses it, but also some measures. Not sure about where to put it, but this is already better imo. flood_adapt.object_model.direct_impact.measure.measure_helpers::get_object_ids
Should be merged together with: https://github.com/Deltares-research/FloodAdapt-GUI/pull/447