From 71d0cc9d920a000588d3e31ffb02b52899a2f7b6 Mon Sep 17 00:00:00 2001
From: wuzewu <wuzewu@baidu.com>
Date: Fri, 26 Feb 2021 15:51:52 +0800
Subject: [PATCH] Add verification of PaddlePaddle version and fix PaddleX
 download problem.

---
 paddlehub/__init__.py      | 11 +++++++++--
 paddlehub/utils/paddlex.py |  7 +++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/paddlehub/__init__.py b/paddlehub/__init__.py
index d2fdbf52..00662f9f 100644
--- a/paddlehub/__init__.py
+++ b/paddlehub/__init__.py
@@ -13,12 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+__version__ = '2.0.1'
+
+import paddle
+from packaging.version import Version
+_paddle_version = Version(paddle.__version__)
+if _paddle_version < Version('2.0.0'):
+    raise RuntimeError(
+        'Version mismatch in PaddleHub and PaddlePaddle, you need to upgrade PaddlePaddle to version 2.0.0 or above.')
+
 import sys
 
 from easydict import EasyDict
 
-__version__ = '2.0.0'
-
 from paddlehub import env
 from paddlehub.config import config
 from paddlehub import datasets
diff --git a/paddlehub/utils/paddlex.py b/paddlehub/utils/paddlex.py
index 3e8a5b50..326388fc 100644
--- a/paddlehub/utils/paddlex.py
+++ b/paddlehub/utils/paddlex.py
@@ -16,7 +16,7 @@
 import os
 import shutil
 
-from paddlehub.server.server import module_server
+from paddlehub.server.server import module_server, CacheUpdater
 from paddlehub.utils import log, utils, xarfile
 
 
@@ -35,12 +35,15 @@ class ResourceNotFoundError(Exception):
 
 def download(name: str, save_path: str, version: str = None):
     '''The download interface provided to PaddleX for downloading the specified model and resource files.'''
+
+    CacheUpdater("x_download", name, version).start()
+
     file = os.path.join(save_path, name)
     file = os.path.realpath(file)
     if os.path.exists(file):
         return
 
-    resources = module_server.search_resouce(name=name, version=version, type='Model')
+    resources = module_server.search_resource(name=name, version=version, type='Model')
     if not resources:
         raise ResourceNotFoundError(name, version)
 
-- 
GitLab