Use get_package_version

This commit is contained in:
Paul O'Leary McCann 2023-01-26 19:45:08 +09:00
parent 320a966bd1
commit 0c368a894d

View File

@ -3,12 +3,12 @@ import requests
import sys import sys
from wasabi import msg from wasabi import msg
import typer import typer
import importlib.metadata as importlib_metadata
from ._util import app, Arg, Opt, WHEEL_SUFFIX, SDIST_SUFFIX from ._util import app, Arg, Opt, WHEEL_SUFFIX, SDIST_SUFFIX
from .. import about from .. import about
from ..util import is_package, get_minor_version, run_command from ..util import is_package, get_minor_version, run_command
from ..util import is_prerelease_version, get_installed_models from ..util import is_prerelease_version, get_installed_models
from ..util import get_package_version
@app.command( @app.command(
@ -67,7 +67,7 @@ def download(
# If we already have this version installed, skip downloading # If we already have this version installed, skip downloading
installed = get_installed_models() installed = get_installed_models()
if model_name in installed: if model_name in installed:
installed_version = importlib_metadata.version(model_name) installed_version = get_package_version(model_name)
if installed_version == version: if installed_version == version:
msg.warn(f"{model_name} v{version} already installed, skipping") msg.warn(f"{model_name} v{version} already installed, skipping")
return return