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

Fix tasks for batch-to-eopatch pipeline #15

Merged
merged 2 commits into from Feb 17, 2022
Merged

Fix tasks for batch-to-eopatch pipeline #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e21d6b
fix task names
Feb 17, 2022
8ef550b
fix defaults in execute
Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions eogrow/pipelines/batch_to_eopatch.py
View file
Open in desktop
Expand Up @@ -13,11 +13,11 @@
MergeEOPatchesTask,
MergeFeatureTask,
OverwritePermission,
RemoveFeature,
RemoveFeatureTask,
SaveTask,
)
from eolearn.features import LinearFunctionTask
from eolearn.io import ImportFromTiff
from eolearn.io import ImportFromTiffTask

from ..core.pipeline import Pipeline
from ..core.schemas import BaseSchema
Expand Down Expand Up @@ -133,7 +133,9 @@ def _get_tiff_mapping_node(self, mapping: FeatureMappingSchema, previous_node: E
FeatureType.MASK_TIMELESS if feature_type.is_discrete() else FeatureType.DATA_TIMELESS
), feature[1]

import_task = ImportFromTiff(tmp_timeless_feature, folder=self._processing_folder, config=self.sh_config)
import_task = ImportFromTiffTask(
tmp_timeless_feature, folder=self._processing_folder, config=self.sh_config
)
# Filename is written into the dependency name to be used later for execution arguments:
import_node = EONode(import_task, inputs=[previous_node], name=f"{batch_file} import")

Expand All @@ -152,7 +154,7 @@ def _get_tiff_mapping_node(self, mapping: FeatureMappingSchema, previous_node: E
merge_feature_task = MergeFeatureTask(input_features=tmp_features, output_feature=final_feature)
merge_node = EONode(merge_feature_task, inputs=[previous_node])

end_node = EONode(RemoveFeature(tmp_features), inputs=[merge_node])
end_node = EONode(RemoveFeatureTask(tmp_features), inputs=[merge_node])

if mapping.multiply_factor is not None:
multiply_task = LinearFunctionTask(final_feature, slope=mapping.multiply_factor)
Expand All @@ -173,7 +175,7 @@ def get_execution_arguments(self, workflow: EOWorkflow) -> List[Dict[EONode, Dic

for name, single_exec_dict in zip(self.patch_list, exec_args):
for node in nodes:
if isinstance(node.task, ImportFromTiff):
if isinstance(node.task, ImportFromTiffTask):
filename = node.name.split()[0]
path = f"{name}/{filename}"
single_exec_dict[node] = dict(filename=path)
Expand Down
2 changes: 1 addition & 1 deletion eogrow/tasks/batch_to_eopatch.py
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ def _parse_timestamps(userdata: dict, userdata_timestamp_reader: str) -> list:

return [parse_time(time_string, force_datetime=True, ignoretz=True) for time_string in time_strings]

def execute(self, eopatch: Optional[EOPatch], *, folder: str) -> EOPatch:
def execute(self, eopatch: Optional[EOPatch] = None, *, folder: str = "") -> EOPatch:
"""Adds metadata to the given EOPatch

:param eopatch: Name of the eopatch to process
Expand Down