update interfaces

paddlehub/commands/list.py

@@ -41,7 +41,7 @@ class ListCommand(BaseCommand):
         tp = TablePrinter(
             titles=["ModuleName", "Path"], placeholders=placeholders)
         for module_name, module_dir in all_modules.items():
-            tp.add_line(contents=[module_name, module_dir])
+            tp.add_line(contents=[module_name, module_dir[0]])
         print(tp.get_text())
         return True
 

paddlehub/commands/show.py

@@ -103,7 +103,7 @@ class ShowCommand(BaseCommand):
             colors=["light_red", None],
             aligns=["^", "<"])
         tp.add_line(
-            contents=["Location", module_dir],
+            contents=["Location", module_dir[0]],
             colors=["light_red", None],
             aligns=["^", "<"])
         print(tp.get_text())
@@ -125,9 +125,9 @@ class ShowCommand(BaseCommand):
 
         cwd = os.getcwd()
         module_dir = default_module_manager.search_module(module_name)
-        module_dir = os.path.join(cwd,
-                                  module_name) if not module_dir else module_dir
-        if not module_dir or not os.path.exists(module_dir):
+        module_dir = (os.path.join(cwd,
+                                  module_name), None) if not module_dir else module_dir
+        if not module_dir or not os.path.exists(module_dir[0]):
             print("%s is not existed!" % module_name)
             return True
 

paddlehub/common/hub_server.py

@@ -24,6 +24,7 @@ import requests
 import json
 import yaml
 
+from random import randint
 from paddlehub.common import utils
 from paddlehub.common.downloader import default_downloader
 from paddlehub.common.server_config import default_server_config
@@ -46,11 +47,19 @@ class HubServer(object):
 
         with open(config_file_path) as fp:
             self.config = json.load(fp)
-
+        
         utils.check_url(self.config['server_url'])
         self.server_url = self.config['server_url']
         self._load_resource_list_file_if_valid()
 
+    def get_server_url(self):
+        HS_ENV = os.environ.get('HUB_SERVER')
+        if HS_ENV:
+            HUB_SERVERS = HS_ENV.split(';')
+            return HUB_SERVERS[uniform(0, len(self.server_url))]
+        return self.server_url[uniform(0, len(self.server_url))]
+
+
     def resource_list_file_path(self):
         return os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE)
 
@@ -84,7 +93,7 @@ class HubServer(object):
             payload = {'word': resource_key}
             if resource_type:
                 payload['type'] = resource_type
-            r = requests.get(self.server_url + '/' + 'search', params=payload)
+            r = requests.get(self.get_server_url() + '/' + 'search', params=payload)
             r = json.loads(r.text)
             if r['status'] == 0 and len(r['data']) > 0:
                 return [(item['name'], item['type'], item['version'], item['summary'])
@@ -134,7 +143,7 @@ class HubServer(object):
                 payload['type'] = resource_type
             if version:
                 payload['version'] = version
-            r = requests.get(self.server_url + '/' + 'search', params=payload)
+            r = requests.get(self.get_server_url() + '/' + 'search', params=payload)
             r = json.loads(r.text)
             if r['status'] == 0 and len(r['data']) > 0:
                 return r['data'][0]
@@ -193,7 +202,7 @@ class HubServer(object):
         if not os.path.exists(hub.CACHE_HOME):
             utils.mkdir(hub.CACHE_HOME)
         try:
-            r = requests.get(self.server_url + '/' + 'search')
+            r = requests.get(self.get_server_url() + '/' + 'search')
             data = json.loads(r.text)
             cache_path = os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE)
             with open(cache_path, 'w+') as fp:

paddlehub/common/server_config.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+HUB_SERVERS = ["http://hub.paddlepaddle.org:8888"]
 default_server_config = {
-    "server_url" : "http://hub.paddlepaddle.org:8888",
-    "resource_storage_server_url" : "https//bj.bcebos.com/paddlehub"
+    "server_url" : HUB_SERVERS,
+    "resource_storage_server_url" : "https://bj.bcebos.com/paddlehub/"
 }

paddlehub/module/manager.py

@@ -79,7 +79,7 @@ class LocalModuleManager(object):
                         module_name, module_version)
                 tips = "Module %s already installed in %s" % (module_tag,
                         module_dir)
-                return True, tips, module_dir
+                return True, tips, self.modules_dict[module_name]
 
         search_result = hub.default_hub_server.get_module_url(
             module_name, version=module_version)
@@ -115,7 +115,7 @@ class LocalModuleManager(object):
             tips = "Successfully installed %s" % module_name
             if installed_module_version:
                 tips += "-%s" % installed_module_version
-            return True, tips, module_dir
+            return True, tips, (module_dir, installed_module_version)
         tips = "Download %s-%s failed" % (module_name, module_version)
         return False, tips, module_dir
 

paddlehub/module/module.py

@@ -121,7 +121,7 @@ class Module(object):
         if name:
             self._init_with_name(name=name, version=version)
         elif module_dir:
-            self._init_with_module_file(module_dir=module_dir)
+            self._init_with_module_file(module_dir=module_dir[0])
         elif signatures:
             if processor:
                 if not issubclass(processor, BaseProcessor):
@@ -149,7 +149,7 @@ class Module(object):
             logger.error(tips)
             exit(1)
         logger.info(tips)
-        self._init_with_module_file(module_dir)
+        self._init_with_module_file(module_dir[0])
 
     def _init_with_url(self, url):
         utils.check_url(url)