ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-06-26 18:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix available versions loading

Browse Source
This commit is contained in:
allegroai 2020-09-15 18:14:05 +03:00
parent 2a249c41f0
commit 6bc9d705a0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trains/backend_api/api_proxy.py
View File

@ -1,7 +1,7 @@
import importlib import importlib
import pkgutil import pkgutil
import re import re
from typing import Any from typing import Any, Optional
from .session import Session from .session import Session
from ..utilities.check_updates import Version from ..utilities.check_updates import Version
@ -21,14 +21,15 @@ class ApiServiceProxy(object):
if not self.__dict__.get("__wrapped__") or self.__dict__.get("__wrapped_version__") != Session.api_version: if not self.__dict__.get("__wrapped__") or self.__dict__.get("__wrapped_version__") != Session.api_version:
if not ApiServiceProxy._available_versions: if not ApiServiceProxy._available_versions:
from ..backend_api import services services = self._import_module(self._main_services_module, None)
ApiServiceProxy._available_versions = [ ApiServiceProxy._available_versions = sorted(
Version(name[1:].replace("_", ".")) Version(name[1:].replace("_", "."))
for name in [ for name in [
module_name module_name
for _, module_name, _ in pkgutil.iter_modules(services.__path__) for _, module_name, _ in pkgutil.iter_modules(services.__path__)
if re.match(r"^v[0-9]+_[0-9]+$", module_name) if re.match(r"^v[0-9]+_[0-9]+$", module_name)
]] ]
)
# get the most advanced service version that supports our api # get the most advanced service version that supports our api
version = [str(v) for v in ApiServiceProxy._available_versions if Session.check_min_api_version(v)][-1] version = [str(v) for v in ApiServiceProxy._available_versions if Session.check_min_api_version(v)][-1]
@ -41,7 +42,7 @@ class ApiServiceProxy(object):
return getattr(self.__dict__["__wrapped__"], attr) return getattr(self.__dict__["__wrapped__"], attr)
def _import_module(self, name, package): def _import_module(self, name, package):
# type: (str, str) -> Any # type: (str, Optional[str]) -> Any
# noinspection PyBroadException # noinspection PyBroadException
try: try:
return importlib.import_module(name, package=package) return importlib.import_module(name, package=package)
@ -53,7 +54,7 @@ class ExtApiServiceProxy(ApiServiceProxy):
_extra_services_modules = [] _extra_services_modules = []
def _import_module(self, name, _): def _import_module(self, name, _):
# type: (str, str) -> Any # type: (str, Optional[str]) -> Any
for module_path in self._get_services_modules(): for module_path in self._get_services_modules():
try: try:
return importlib.import_module(name, package=module_path) return importlib.import_module(name, package=module_path)