diff --git a/Common/build_manager.py b/Common/build_manager.py index 2c058acd..a7d621fc 100644 --- a/Common/build_manager.py +++ b/Common/build_manager.py @@ -194,7 +194,7 @@ def determine_graph_version(self, graph_spec: GraphSpec): for source in graph_spec.sources: if not source.source_version: source.source_version = self.source_data_manager.get_latest_source_version(source.id) - self.logger.info(f'Source version - {source.id}: {source.version}') + self.logger.info(f'Using {source.id} version: {source.version}') # for sub-graphs, if a graph version isn't specified, # use the graph spec for that subgraph to determine a graph version @@ -203,7 +203,7 @@ def determine_graph_version(self, graph_spec: GraphSpec): subgraph_graph_spec = self.graph_specs.get(subgraph.id, None) if subgraph_graph_spec: subgraph.graph_version = self.determine_graph_version(subgraph_graph_spec) - self.logger.info(f'found subgraph version, {graph_spec.graph_id}: {subgraph.graph_version}') + self.logger.info(f'Using subgraph {graph_spec.graph_id} version: {subgraph.graph_version}') else: raise GraphSpecError(f'Subgraph {subgraph.id} requested for graph {graph_spec.graph_id} ' f'but the version was not specified and could not be determined without ' @@ -228,7 +228,6 @@ def determine_graph_version(self, graph_spec: GraphSpec): self.logger.info(f'Version determined for graph {graph_spec.graph_id}: {graph_version} ({composite_version_string})') return graph_version - def build_dependencies(self, graph_spec: GraphSpec): graph_id = graph_spec.graph_id for subgraph_source in graph_spec.subgraphs: @@ -550,10 +549,9 @@ def parse_data_source_spec(self, source_yml): def get_graph_dir_path(self, graph_id: str, graph_version: str): return os.path.join(self.graphs_dir, graph_id, graph_version) - def get_graph_output_url(self, graph_id: str, graph_version: str): - graph_output_url = os.environ.get('ORION_OUTPUT_URL', "https://localhost/") - if graph_output_url[-1] != '/': - graph_output_url += '/' + @staticmethod + def get_graph_output_url(graph_id: str, graph_version: str): + graph_output_url = os.environ.get('ORION_OUTPUT_URL', "https://localhost/").removesuffix('/') return f'{graph_output_url}{graph_id}/{graph_version}/' @staticmethod diff --git a/Common/load_manager.py b/Common/load_manager.py index b4f4b168..9ee9092c 100644 --- a/Common/load_manager.py +++ b/Common/load_manager.py @@ -506,7 +506,6 @@ def run_qc_and_metadata_stage(self, normalization_scheme: NormalizationScheme): # source data QC should go here - self.logger.info(f'Generating release for {source_id}') source_metadata = self.get_source_metadata(source_id, source_version) loader = SOURCE_DATA_LOADER_CLASSES[source_id](test_mode=self.test_mode) source_meta_information = loader.get_source_meta_information() @@ -515,6 +514,7 @@ def run_qc_and_metadata_stage(self, supplementation_version=supplementation_version, normalization_version=normalization_version, source_meta_information=source_meta_information) + self.logger.info(f'Generating release version for {source_id}: {release_version}') return release_version def get_source_metadata(self, source_id: str, source_version):