diff --git a/ena-submission/scripts/deposition_dry_run.py b/ena-submission/scripts/deposition_dry_run.py index 1ef80b0bd..3822d734f 100644 --- a/ena-submission/scripts/deposition_dry_run.py +++ b/ena-submission/scripts/deposition_dry_run.py @@ -25,18 +25,6 @@ datefmt="%H:%M:%S", ) -with open("config/config.yaml", encoding="utf-8") as f: - config = yaml.safe_load(f) - -with open("config/defaults.yaml", encoding="utf-8") as f: - defaults = yaml.safe_load(f) - -# Merge configs, using defaults only as fallback -# Write to results/config.yaml -for key, value in defaults.items(): - if not key in config: - config[key] = value - @dataclass class Config: @@ -71,7 +59,6 @@ def local_ena_submission_generator( center_name, mode, log_level, - config_file, ): """ Produce output of submission pipeline locally @@ -79,10 +66,21 @@ def local_ena_submission_generator( logger.setLevel(log_level) logging.getLogger("requests").setLevel(logging.INFO) - with open(config_file, encoding="utf-8") as file: - full_config = yaml.safe_load(file) - relevant_config = {key: full_config.get(key, []) for key in Config.__annotations__} - config = Config(**relevant_config) + with open("config/config.yaml", encoding="utf-8") as f: + config = yaml.safe_load(f) + + with open("config/defaults.yaml", encoding="utf-8") as f: + defaults = yaml.safe_load(f) + + # Merge configs, using defaults only as fallback + # Write to results/config.yaml + for key, value in defaults.items(): + if not key in config: + config[key] = value + + full_config = config + relevant_config = {key: full_config.get(key, []) for key in Config.__annotations__} + config = Config(**relevant_config) logger.debug(f"Config: {config}") diff --git a/ena-submission/scripts/upload_external_metadata_to_loculus.py b/ena-submission/scripts/upload_external_metadata_to_loculus.py index b66f05142..632030aee 100644 --- a/ena-submission/scripts/upload_external_metadata_to_loculus.py +++ b/ena-submission/scripts/upload_external_metadata_to_loculus.py @@ -82,9 +82,11 @@ def get_external_metadata(db_config: SimpleConnectionPool, entry: dict[str, Any] db_config, table_name="assembly_table", conditions=seq_key ) if len(corresponding_assembly) == 1: - data["externalMetadata"]["gcaAccession"] = corresponding_assembly[0]["result"][ - "gca_accession" - ] + # TODO(https://github.com/loculus-project/loculus/issues/2945): + # Add gcaAccession to values.yaml + # data["externalMetadata"]["gcaAccession"] = corresponding_assembly[0]["result"][ + # "gca_accession" + # ] insdc_accession_keys = [ key for key in corresponding_assembly[0]["result"]