Skip to content
This repository was archived by the owner on Mar 13, 2020. It is now read-only.

Commit 6e41346

Browse files
authored
Merge pull request #29 from PageUpPeopleOrg/feature/OSC-1279-log-progress
OSC-1279 - log progress by the way of X of Y at the start and end of each model
2 parents 93f58e2 + 029cbed commit 6e41346

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

rdl/DataLoadManager.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,25 @@ def start_imports(self, force_full_refresh_models):
4747
model_file = model_file_objs[0]
4848
all_model_files[model_file.stem] = (model_file, True)
4949

50-
for (model_file, request_full_refresh) in all_model_files.values():
51-
self.start_single_import(model_file, request_full_refresh)
50+
all_model_names = sorted(list(all_model_files.keys()))
51+
total_number_of_models = len(all_model_names)
52+
model_number = 0
53+
for model_name in all_model_names:
54+
(model_file, request_full_refresh) = all_model_files[model_name]
55+
model_number += 1 # avoid all_model_names.index(model_name) due to linear time-complexity in list length
56+
self.start_single_import(model_file, request_full_refresh, model_number, total_number_of_models)
5257

5358
self.logger.info("Execution completed.")
5459

55-
def start_single_import(self, model_file, requested_full_refresh):
60+
def start_single_import(self, model_file, requested_full_refresh, model_number, total_number_of_models):
5661
model_name = model_file.stem
5762
self.logger.debug(f"Model name: {model_name}")
5863

59-
self.logger.info(f"Processing model: {model_name}, requested_full_refresh: {requested_full_refresh}")
64+
max_model_number_len = len(str(total_number_of_models))
65+
66+
self.logger.info(f"{model_number:0{max_model_number_len}d} of {total_number_of_models}"
67+
f" STARTING {model_name},"
68+
f" requested_full_refresh={requested_full_refresh}")
6069

6170
model_file_full_path = str(model_file.absolute().resolve())
6271
self.logger.debug(f"Model file: {model_file_full_path}")
@@ -147,7 +156,9 @@ def start_single_import(self, model_file, requested_full_refresh):
147156
model_config['stage_table'])
148157
data_load_tracker.completed_successfully()
149158
self.data_load_tracker_repository.save(data_load_tracker)
150-
self.logger.info(f"Import Complete for: {model_name}. {data_load_tracker.get_statistics()}")
159+
self.logger.info(f"{model_number:0{max_model_number_len}d} of {total_number_of_models}"
160+
f" COMPLETED {model_name},"
161+
f" {data_load_tracker.get_statistics()}")
151162

152163
@staticmethod
153164
def is_full_refresh(*,

0 commit comments

Comments
 (0)