Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(helper): add version check for client and server #696

Merged
merged 5 commits into from
Apr 26, 2022
Merged
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
7 changes: 7 additions & 0 deletions client/clip_client/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
__version__ = '0.3.1'

import os

from .client import Client

if 'NO_VERSION_CHECK' not in os.environ:
from .helper import is_latest_version

is_latest_version(github_repo='clip-as-service')
56 changes: 56 additions & 0 deletions client/clip_client/helper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import json
import sys
import threading
from distutils.version import LooseVersion
from urllib.request import Request, urlopen

import pkg_resources
from rich import print
from rich.panel import Panel


def _version_check(package: str = None, github_repo: str = None):
try:

if not package:
package = vars(sys.modules[__name__])['__package__']
if not github_repo:
github_repo = package

cur_ver = LooseVersion(pkg_resources.get_distribution(package).version)
req = Request(
f'https://pypi.python.org/pypi/{package}/json',
headers={'User-Agent': 'Mozilla/5.0'},
)
with urlopen(
req, timeout=5
) as resp: # 'with' is important to close the resource after use
j = json.load(resp)
releases = j.get('releases', {})
latest_release_ver = list(
sorted(LooseVersion(v) for v in releases.keys() if '.dev' not in v)
)[-1]
if cur_ver < latest_release_ver:
print(
Panel(
f'You are using [b]{package} {cur_ver}[/b], but [bold green]{latest_release_ver}[/] is available. '
f'You may upgrade it via [b]pip install -U {package}[/b]. [link=https://github.com/jina-ai/{github_repo}/blob/main/CHANGELOG.md]Read Changelog here[/link].',
title=':new: New version available!',
width=50,
)
)
except Exception:
# no network, too slow, PyPi is down
pass


def is_latest_version(package: str = None, github_repo: str = None) -> None:
"""Check if there is a latest version from Pypi, set env `NO_VERSION_CHECK` to disable it.

:param package: package name if none auto-detected
:param github_repo: repo name that contains CHANGELOG if none then the same as package name
"""

threading.Thread(
target=_version_check, daemon=True, args=(package, github_repo)
).start()
12 changes: 9 additions & 3 deletions server/clip_server/__main__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import sys
import os
import inspect
from jina import Flow
import os
import sys

if __name__ == '__main__':
if 'NO_VERSION_CHECK' not in os.environ:
from .helper import is_latest_version

is_latest_version(github_repo='clip-as-service')

from jina import Flow

f = Flow.load_config(
'torch-flow.yml' if len(sys.argv) == 1 else sys.argv[1],
extra_search_paths=[os.path.dirname(inspect.getfile(inspect.currentframe()))],
Expand Down
55 changes: 55 additions & 0 deletions server/clip_server/helper.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import json
import os
import sys
import threading
from distutils.version import LooseVersion
from urllib.request import Request, urlopen

import pkg_resources
from rich import print
from rich.panel import Panel

__resources_path__ = os.path.join(
os.path.dirname(
Expand All @@ -9,3 +17,50 @@
),
'resources',
)


def _version_check(package: str = None, github_repo: str = None):
try:

if not package:
package = vars(sys.modules[__name__])['__package__']
if not github_repo:
github_repo = package

cur_ver = LooseVersion(pkg_resources.get_distribution(package).version)
req = Request(
f'https://pypi.python.org/pypi/{package}/json',
headers={'User-Agent': 'Mozilla/5.0'},
)
with urlopen(
req, timeout=5
) as resp: # 'with' is important to close the resource after use
j = json.load(resp)
releases = j.get('releases', {})
latest_release_ver = list(
sorted(LooseVersion(v) for v in releases.keys() if '.dev' not in v)
)[-1]
if cur_ver < latest_release_ver:
print(
Panel(
f'You are using [b]{package} {cur_ver}[/b], but [bold green]{latest_release_ver}[/] is available. '
f'You may upgrade it via [b]pip install -U {package}[/b]. [link=https://github.com/jina-ai/{github_repo}/blob/main/CHANGELOG.md]Read Changelog here[/link].',
title=':new: New version available!',
width=50,
)
)
except Exception:
# no network, too slow, PyPi is down
pass


def is_latest_version(package: str = None, github_repo: str = None) -> None:
"""Check if there is a latest version from Pypi, set env `NO_VERSION_CHECK` to disable it.

:param package: package name if none auto-detected
:param github_repo: repo name that contains CHANGELOG if none then the same as package name
"""

threading.Thread(
target=_version_check, daemon=True, args=(package, github_repo)
).start()