Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions modelkit/core/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ def __setitem__(self, key: str, value: ModelDependency) -> None:

def get(
self, key: str, model_type: Optional[Type[ModelDependency]] = None
) -> ModelDependency:
m = self.models[key]
) -> ModelDependency | None:
m = self.models.get(key)
if m is None:
return None
if model_type and not isinstance(m, model_type):
raise ValueError(f"Model `{m}` is not an instance of {model_type}")
return cast(ModelDependency, m)
Expand Down
29 changes: 29 additions & 0 deletions tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,35 @@ def _predict(self, item):
lib.get("some_model_dep")


def test_model_dependencies_get_None():
class SomeModel(Model):
CONFIGURATIONS = {"some_model": {}}

def _predict(self, item):
return item

class SomeModelDep(Model):
CONFIGURATIONS = {
"some_model_dep_0": {"model_dependencies": {"some_model": "some_model"}},
"some_model_dep_1": {"model_dependencies": {}},
}

def _load(self):
self.some_model = self.model_dependencies.get("some_model")

def _predict(self, item):
return item

lib = ModelLibrary(
models=[SomeModel, SomeModelDep],
required_models=["some_model_dep_0", "some_model_dep_1"],
)
some_model_dep_0 = lib.get("some_model_dep_0")
some_model_dep_1 = lib.get("some_model_dep_1")
assert type(some_model_dep_0.some_model) == SomeModel
assert some_model_dep_1.some_model is None


def test_asset_dependencies():
"""
Test that MyAsset can have model dependencies of any kind
Expand Down