Merge pull request #146 from ShenYuhan/release/v1.1.0

add user_home, fix ci

README.md

@@ -174,4 +174,3 @@ print(res)
                 目前版本支持以下模型：词法分析LAC；情感分析Senta；目标检测SSD；图像分类ResNet, MobileNet, NASNet等。
 
 * 迁移学习: 提供了基于预训练模型的Finetune API，用户通过少量代码即可完成迁移学习，包括BERT/ERNIE文本分类、序列标注、图像分类迁移等。
-

paddlehub/commands/config.py

+#coding:utf-8
+# Copyright (c) 2019  PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import json
+import os
+import re
+
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+from paddlehub.common.dir import CONF_HOME
+from paddlehub.common.server_config import default_server_config
+
+
+class ConfigCommand(BaseCommand):
+    name = "config"
+
+    def __init__(self, name):
+        super(ConfigCommand, self).__init__(name)
+        self.show_in_help = True
+        self.description = "Configure PaddleHub."
+        self.parser = argparse.ArgumentParser(
+            description=self.__class__.__doc__,
+            prog='%s %s [COMMAND]' % (ENTRY, name),
+            usage='%(prog)s',
+            add_help=True)
+        self.parser.add_argument("command")
+        self.parser.add_argument("option", nargs="?")
+        self.parser.add_argument("value", nargs="?")
+
+    @staticmethod
+    def show_config():
+        print("The current configuration is shown below.")
+        with open(os.path.join(CONF_HOME, "config.json"), "r") as fp:
+            print(json.dumps(json.load(fp), indent=4))
+
+    @staticmethod
+    def set_server_url(server_url):
+        with open(os.path.join(CONF_HOME, "config.json"), "r") as fp:
+            config = json.load(fp)
+            re_str = "^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$"
+            if re.match(re_str, server_url) is not None:
+                config["server_url"] = list([server_url])
+                ConfigCommand.set_config(config)
+            else:
+                print("The format of the input url is invalid.")
+
+    @staticmethod
+    def set_config(config):
+        with open(os.path.join(CONF_HOME, "config.json"), "w") as fp:
+            fp.write(json.dumps(config))
+        print("Set success! The current configuration is shown below.")
+        print(json.dumps(config, indent=4))
+
+    @staticmethod
+    def show_server_url():
+        with open(os.path.join(CONF_HOME, "config.json"), "r") as fp:
+            config = json.load(fp)
+            print(config["server_url"])
+
+    @staticmethod
+    def show_log_level():
+        with open(os.path.join(CONF_HOME, "config.json"), "r") as fp:
+            print(json.load(fp)["log_level"])
+
+    @staticmethod
+    def set_log_level(level):
+        if level not in [
+                "CRITICAL", "FATAL", "ERROR", "WARN", "WARNING", "INFO",
+                "DEBUG", "NOTSET"
+        ]:
+            print("Allowed values include: "
+                  "CRITICAL, FATAL, ERROR, WARN, WARNING, INFO, DEBUG, NOTSET")
+            return
+        with open(os.path.join(CONF_HOME, "config.json"), "r") as fp:
+            current_config = json.load(fp)
+        with open(os.path.join(CONF_HOME, "config.json"), "w") as fp:
+            current_config["log_level"] = level
+            fp.write(json.dumps(current_config))
+            print("Set success! The current configuration is shown below.")
+            print(json.dumps(current_config, indent=4))
+
+    @staticmethod
+    def show_help():
+        str = "config <option> <value>\n"
+        str += "\tShow hub server config without any option.\n"
+        str += "option:\n"
+        str += "reset\n"
+        str += "\tReset config as default.\n"
+        str += "server\n"
+        str += "\tShow server url.\n"
+        str += "server [URL]\n"
+        str += "\tSet hub server url as [URL].\n"
+        str += "log\n"
+        str += "\tShow log level.\n"
+        str += "log [LEVEL]\n"
+        str += "\tSet log level as [LEVEL:NOLOG, DEBUG, INFO, WARNING, ERROR, CRITICAL].\n"
+        print(str)
+
+    def execute(self, argv):
+        args = self.parser.parse_args()
+        if args.option is None:
+            ConfigCommand.show_config()
+        elif args.option == "reset":
+            ConfigCommand.set_config(default_server_config)
+        elif args.option == "server":
+            if args.value is not None:
+                ConfigCommand.set_server_url(args.value)
+            else:
+                ConfigCommand.show_server_url()
+        elif args.option == "log":
+            if args.value is not None:
+                ConfigCommand.set_log_level(args.value)
+            else:
+                ConfigCommand.show_log_level()
+        else:
+            ConfigCommand.show_help()
+        return True
+
+
+command = ConfigCommand.instance()

paddlehub/common/dir.py

@@ -16,9 +16,23 @@
 import os
 
 # TODO: Change dir.py's filename, this naming rule is not qualified
-USER_HOME = os.path.expanduser('~')
-HUB_HOME = os.path.join(USER_HOME, ".paddlehub")
-MODULE_HOME = os.path.join(HUB_HOME, "modules")
-CACHE_HOME = os.path.join(HUB_HOME, "cache")
-DATA_HOME = os.path.join(HUB_HOME, "dataset")
-CONF_HOME = os.path.join(HUB_HOME, "conf")
+
+
+def gen_user_home():
+    if "HUB_HOME" in os.environ:
+        home_path = os.environ["HUB_HOME"]
+        if os.path.exists(home_path) and os.path.isdir(home_path):
+            return home_path
+    return os.path.expanduser('~')
+
+
+def gen_hub_home():
+    return os.path.join(gen_user_home(), ".paddlehub")
+
+
+USER_HOME = gen_user_home()
+HUB_HOME = gen_hub_home()
+MODULE_HOME = os.path.join(gen_hub_home(), "modules")
+CACHE_HOME = os.path.join(gen_hub_home(), "cache")
+DATA_HOME = os.path.join(gen_hub_home(), "dataset")
+CONF_HOME = os.path.join(gen_hub_home(), "conf")