Skip to content

Commit 95cf94d

Browse files
committed
dont resolve all uris
1 parent 0d76ad8 commit 95cf94d

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

bioimageio/core/build_spec/build_model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,6 @@ def build_model(
891891
kwargs["maintainers"] = [model_spec.raw_nodes.Maintainer(**m) for m in maintainers]
892892

893893
if parent is not None:
894-
assert len(parent) == 2
895894
kwargs["parent"] = parent
896895

897896
if training_data is not None:

bioimageio/core/resource_io/utils.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ def transform_LocalImportableModule(self, node: raw_nodes.LocalImportableModule)
6767

6868
return nodes.ImportedSource(factory=getattr(module, node.callable_name))
6969

70-
@staticmethod
71-
def transform_ImportableModule(node):
72-
raise RuntimeError(
73-
"Encountered raw_nodes.ImportableModule in _SourceNodeTransformer. Apply _UriNodeTransformer first!"
74-
)
75-
7670
@staticmethod
7771
def transform_ResolvedImportableSourceFile(node: raw_nodes.ResolvedImportableSourceFile) -> nodes.ImportedSource:
7872
module_path = resolve_source(node.source_file)
@@ -83,12 +77,6 @@ def transform_ResolvedImportableSourceFile(node: raw_nodes.ResolvedImportableSou
8377
importlib_spec.loader.exec_module(dep) # type: ignore # todo: possible to use "loader.load_module"?
8478
return nodes.ImportedSource(factory=getattr(dep, node.callable_name))
8579

86-
@staticmethod
87-
def transform_ImportablePath(node):
88-
raise RuntimeError(
89-
"Encountered raw_nodes.ImportableSourceFile in _SourceNodeTransformer. Apply _UriNodeTransformer first!"
90-
)
91-
9280

9381
class RawNodeTypeTransformer(NodeTransformer):
9482
def __init__(self, nodes_module: ModuleType):
@@ -117,9 +105,11 @@ def all_sources_available(
117105
return True
118106

119107

120-
def resolve_raw_resource_description(raw_rd: GenericRawRD, nodes_module: typing.Any) -> GenericResolvedNode:
121-
"""resolve all uris and sources"""
122-
rd = UriNodeTransformer(root_path=raw_rd.root_path).transform(raw_rd)
108+
def resolve_raw_resource_description(
109+
raw_rd: GenericRawRD, nodes_module: typing.Any, uri_only_if_in_package: bool = True
110+
) -> GenericResolvedNode:
111+
"""resolve all uris and paths (that are included when packaging)"""
112+
rd = UriNodeTransformer(root_path=raw_rd.root_path, uri_only_if_in_package=uri_only_if_in_package).transform(raw_rd)
123113
rd = SourceNodeTransformer().transform(rd)
124114
rd = RawNodeTypeTransformer(nodes_module).transform(rd)
125115
return rd

0 commit comments

Comments
 (0)