Allow removal of models with legacy relative path addressing (#5979)

* allow removal of models with legacy relative path addressing

* fix ruff error

---------

Co-authored-by: Lincoln Stein <lstein@gmail.com>
This commit is contained in:
Lincoln Stein 2024-03-17 14:07:35 -04:00 committed by GitHub
parent faa1ffb06f
commit b79f2f337e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -342,7 +342,7 @@ class ModelInstallService(ModelInstallServiceBase):
"""Unregister the model. Delete its files only if they are within our models directory."""
model = self.record_store.get_model(key)
models_dir = self.app_config.models_path
model_path = Path(model.path)
model_path = models_dir / Path(model.path) # handle legacy relative model paths
if model_path.is_relative_to(models_dir):
self.unconditionally_delete(key)
else:
@ -350,7 +350,7 @@ class ModelInstallService(ModelInstallServiceBase):
def unconditionally_delete(self, key: str) -> None: # noqa D102
model = self.record_store.get_model(key)
model_path = Path(model.path)
model_path = self.app_config.models_path / model.path
if model_path.is_dir():
rmtree(model_path)
else: