diff --git a/paddlehub/__init__.py b/paddlehub/__init__.py index 84981a6b4cd84f8c400cc5e386d52ff22857a9b9..1e105e3171177ad42aec0c034f19e00263ae296d 100644 --- a/paddlehub/__init__.py +++ b/paddlehub/__init__.py @@ -22,6 +22,7 @@ __version__ = '2.0.0-alpha0' from paddlehub.config import config from paddlehub.utils import log, parser, utils from paddlehub.utils.paddlex import download, ResourceNotFoundError +from paddlehub.server import server_check from paddlehub.server.server_source import ServerConnectionError from paddlehub.module import Module from paddlehub.text.bert_tokenizer import BertTokenizer diff --git a/paddlehub/commands/config.py b/paddlehub/commands/config.py index e68703682c7f0b8f7fb2af6b35a76853f3a7db61..948cbb6829b1b7603ad919e5a00eb4cf7e2f604e 100644 --- a/paddlehub/commands/config.py +++ b/paddlehub/commands/config.py @@ -51,7 +51,7 @@ class ConfigCommand: hubconf.reset() print(hubconf) elif arg.startswith("server=="): - hubconf.server_url = arg.split("==")[1] + hubconf.server = arg.split("==")[1] elif arg.startswith("log.level=="): hubconf.log_level = arg.split("==")[1] elif arg.startswith("log.enable=="): diff --git a/paddlehub/server/__init__.py b/paddlehub/server/__init__.py index c5e20a7681609e37a61dc516474987251197a4f4..5ef3d8282628168f92bfc64e106e354a73095f62 100644 --- a/paddlehub/server/__init__.py +++ b/paddlehub/server/__init__.py @@ -13,6 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .server_source import ServerSource -from .git_source import GitSource -from .server import module_server +from paddlehub.server.server_source import ServerSource +from paddlehub.server.git_source import GitSource +from paddlehub.server.server import module_server +from paddlehub.utils import log + + +def server_check() -> bool: + '''Check whether localhost can access the PaddleHub default server normally.''' + if module_server.get_source_by_key('default_hub_server').is_connected(): + log.logger.info('Request Hub-Server successfully.') + return True + + log.logger.info('Request Hub-Server unsuccessfully.') + return False diff --git a/paddlehub/server/server_source.py b/paddlehub/server/server_source.py index a47bce33c8b376a50c6a4426b50676b21174f89c..3ea285625bc65aa7f9ae1da589efa3d3fdaeb2ce 100644 --- a/paddlehub/server/server_source.py +++ b/paddlehub/server/server_source.py @@ -119,6 +119,9 @@ class ServerSource(object): except requests.exceptions.ConnectionError as e: raise ServerConnectionError(self._url) + def is_connected(self): + return self.check(self._url) + @classmethod def check(cls, url: str) -> bool: '''