Skip to content

Commit

Permalink
_convert_=all required in hydra instantiation due to third party libr…
Browse files Browse the repository at this point in the history
…aries not respecting list like types
  • Loading branch information
RichJackson committed Jul 8, 2024
1 parent 8c8694d commit 610d577
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions kazu/krt/ontology_update_editor/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class OntologyUpdateManager:

def __init__(self, parser_name: str):
self.original_parser_cfg: DictConfig = self.name_to_parser_cfg()[parser_name]
self.parser = instantiate(self.original_parser_cfg)
self.parser = instantiate(self.original_parser_cfg, _convert_="all")
self.new_parser_cfg: DictConfig = self.original_parser_cfg.copy()

def get_downloader_args_and_types(self) -> dict[str, type]:
Expand Down Expand Up @@ -72,7 +72,7 @@ def modify_parser_cfg_with_new_args(self) -> None:
:return:
"""
parser = instantiate(self.new_parser_cfg)
parser = instantiate(self.new_parser_cfg, _convert_="all")
new_in_path = parser.ontology_downloader.download(parser.in_path, skip_download=True)
with open_dict(self.new_parser_cfg):
self.new_parser_cfg.data_origin = parser.ontology_downloader.version(parser.in_path)
Expand All @@ -83,7 +83,7 @@ def instantiate_parser_with_new_config(self) -> OntologyParser:
:return:
"""
return cast(OntologyParser, instantiate(self.new_parser_cfg))
return cast(OntologyParser, instantiate(self.new_parser_cfg, _convert_="all"))

@functools.cache
def get_or_build_upgrade_report(self) -> OntologyUpgradeReport:
Expand Down
2 changes: 1 addition & 1 deletion kazu/krt/resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def save(self) -> Iterable[str]:
def _load_pipeline() -> Pipeline:
load_config.clear() # type: ignore[attr-defined]
cfg = load_config()
pipeline: Pipeline = instantiate(cfg.Pipeline)
pipeline: Pipeline = instantiate(cfg.Pipeline, _convert_="all")
return pipeline

def clear_invalid_caches(self) -> None:
Expand Down
2 changes: 1 addition & 1 deletion kazu/krt/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def load_parsers() -> list[OntologyParser]:
cfg = load_config()
parsers = []
for parser in cfg.ontologies.parsers.values():
parsers.append(instantiate(parser))
parsers.append(instantiate(parser, _convert_="all"))
return parsers


Expand Down

0 comments on commit 610d577

Please sign in to comment.