提交 940b6457 编写于 作者: B BinLong

fix codestyle errors

上级 3533a84e
...@@ -125,8 +125,8 @@ class ShowCommand(BaseCommand): ...@@ -125,8 +125,8 @@ class ShowCommand(BaseCommand):
cwd = os.getcwd() cwd = os.getcwd()
module_dir = default_module_manager.search_module(module_name) module_dir = default_module_manager.search_module(module_name)
module_dir = (os.path.join(cwd, module_dir = (os.path.join(cwd, module_name),
module_name), None) if not module_dir else module_dir None) if not module_dir else module_dir
if not module_dir or not os.path.exists(module_dir[0]): if not module_dir or not os.path.exists(module_dir[0]):
print("%s is not existed!" % module_name) print("%s is not existed!" % module_name)
return True return True
......
...@@ -47,7 +47,7 @@ class HubServer(object): ...@@ -47,7 +47,7 @@ class HubServer(object):
with open(config_file_path) as fp: with open(config_file_path) as fp:
self.config = json.load(fp) self.config = json.load(fp)
utils.check_url(self.config['server_url']) utils.check_url(self.config['server_url'])
self.server_url = self.config['server_url'] self.server_url = self.config['server_url']
self._load_resource_list_file_if_valid() self._load_resource_list_file_if_valid()
...@@ -59,7 +59,6 @@ class HubServer(object): ...@@ -59,7 +59,6 @@ class HubServer(object):
return HUB_SERVERS[uniform(0, len(self.server_url))] return HUB_SERVERS[uniform(0, len(self.server_url))]
return self.server_url[uniform(0, len(self.server_url))] return self.server_url[uniform(0, len(self.server_url))]
def resource_list_file_path(self): def resource_list_file_path(self):
return os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE) return os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE)
...@@ -93,11 +92,12 @@ class HubServer(object): ...@@ -93,11 +92,12 @@ class HubServer(object):
payload = {'word': resource_key} payload = {'word': resource_key}
if resource_type: if resource_type:
payload['type'] = resource_type payload['type'] = resource_type
r = requests.get(self.get_server_url() + '/' + 'search', params=payload) r = requests.get(
self.get_server_url() + '/' + 'search', params=payload)
r = json.loads(r.text) r = json.loads(r.text)
if r['status'] == 0 and len(r['data']) > 0: if r['status'] == 0 and len(r['data']) > 0:
return [(item['name'], item['type'], item['version'], item['summary']) return [(item['name'], item['type'], item['version'],
for item in r['data']] item['summary']) for item in r['data']]
except: except:
pass pass
...@@ -143,7 +143,8 @@ class HubServer(object): ...@@ -143,7 +143,8 @@ class HubServer(object):
payload['type'] = resource_type payload['type'] = resource_type
if version: if version:
payload['version'] = version payload['version'] = version
r = requests.get(self.get_server_url() + '/' + 'search', params=payload) r = requests.get(
self.get_server_url() + '/' + 'search', params=payload)
r = json.loads(r.text) r = json.loads(r.text)
if r['status'] == 0 and len(r['data']) > 0: if r['status'] == 0 and len(r['data']) > 0:
return r['data'][0] return r['data'][0]
...@@ -206,12 +207,13 @@ class HubServer(object): ...@@ -206,12 +207,13 @@ class HubServer(object):
data = json.loads(r.text) data = json.loads(r.text)
cache_path = os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE) cache_path = os.path.join(hub.CACHE_HOME, RESOURCE_LIST_FILE)
with open(cache_path, 'w+') as fp: with open(cache_path, 'w+') as fp:
yaml.safe_dump({'resource_list' : data['data']}, fp) yaml.safe_dump({'resource_list': data['data']}, fp)
return True return True
except: except:
pass pass
file_url = self.config['resource_storage_server_url'] + RESOURCE_LIST_FILE file_url = self.config[
'resource_storage_server_url'] + RESOURCE_LIST_FILE
result, tips, self.resource_list_file = default_downloader.download_file( result, tips, self.resource_list_file = default_downloader.download_file(
file_url, save_path=hub.CACHE_HOME) file_url, save_path=hub.CACHE_HOME)
if not result: if not result:
......
...@@ -12,9 +12,8 @@ ...@@ -12,9 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
HUB_SERVERS = ["http://hub.paddlepaddle.org:8888"] HUB_SERVERS = ["http://hub.paddlepaddle.org:8888"]
default_server_config = { default_server_config = {
"server_url" : HUB_SERVERS, "server_url": HUB_SERVERS,
"resource_storage_server_url" : "https://bj.bcebos.com/paddlehub/" "resource_storage_server_url": "https://bj.bcebos.com/paddlehub/"
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册