Skip to content

#324 removed local replacement from config #354

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

Merged
m-karo merged 1 commit into from
Jul 9, 2025
Merged

#324 removed local replacement from config #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/task_generator/manual_task_generator.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ TASK_REFERENCE_TIME =
TASK_VERSION =
TASK_MERGING_ENTITY =
RUN_REPLACEMENT =
RUN_REPLACEMENT_LOCAL =
RUN_SCALING =
UPLOAD_TO_OPDM =
UPLOAD_TO_MINIO =
Expand Down
4 changes: 1 addition & 3 deletions emf/model_merger/model_merger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
mas = task_properties["mas"]
version = task_properties["version"]
model_replacement = task_properties["replacement"]
model_replacement_local = task_properties["replacement_local"]
model_scaling = task_properties["scaling"]
model_upload_to_opdm = task_properties["upload_to_opdm"]
model_upload_to_minio = task_properties["upload_to_minio"]
Expand Down Expand Up @@ -194,7 +193,7 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
merged_model.excluded.extend([{'tso': tso, 'reason': 'missing-pdn'} for tso in missing_local_import])

# Perform local replacement if configured
if model_replacement_local and missing_local_import:
if model_replacement and missing_local_import:
try:
logger.info(f"Running replacement for local storage missing models: {missing_local_import}")
replacement_models_local = run_replacement(tso_list=missing_local_import,
Expand Down Expand Up @@ -492,7 +491,6 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
"post_temp_fixes": "True",
"fix_net_interchange2": "True",
"replacement": "True",
"replacement_local": "True",
"scaling": "True",
"upload_to_opdm": "False",
"upload_to_minio": "True",
Expand Down
1 change: 0 additions & 1 deletion emf/task_generator/manual_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
process_config_json[0]['runs'][0]['properties']['fix_net_interchange2'] = FIX_NET_INTERCHANGE2
process_config_json[0]['runs'][0]['properties']['version'] = TASK_VERSION
process_config_json[0]['runs'][0]['properties']['replacement'] = RUN_REPLACEMENT
process_config_json[0]['runs'][0]['properties']['replacement_local'] = RUN_REPLACEMENT_LOCAL
process_config_json[0]['runs'][0]['properties']['scaling'] = RUN_SCALING
process_config_json[0]['runs'][0]['properties']['upload_to_opdm'] = UPLOAD_TO_OPDM
process_config_json[0]['runs'][0]['properties']['upload_to_minio'] = UPLOAD_TO_MINIO
Expand Down
Loading