Fix types/handling, simplify catch-all return

This commit is contained in:
Adriane Boyd 2023-03-06 12:25:31 +01:00
parent e106e502bb
commit fa04172830

View File

@ -138,13 +138,11 @@ def info_installed_model_url(model: str) -> Optional[str]:
""" """
try: try:
dist = importlib_metadata.distribution(model) dist = importlib_metadata.distribution(model)
data = json.loads(dist.read_text("direct_url.json")) text = dist.read_text("direct_url.json")
return data["url"] if isinstance(text, str):
except importlib_metadata.PackageNotFoundError: data = json.loads(text)
# no such package return data["url"]
return None finally:
except Exception:
# something else, like no file or invalid JSON
return None return None