Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleHub
提交
940b6457
P
PaddleHub
项目概览
PaddlePaddle
/
PaddleHub
1 年多 前同步成功
通知
283
Star
12117
Fork
2091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
200
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
200
Issue
200
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
940b6457
编写于
6月 12, 2019
作者:
B
BinLong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix codestyle errors
上级
3533a84e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
13 deletion
+14
-13
paddlehub/commands/show.py
paddlehub/commands/show.py
+2
-2
paddlehub/common/hub_server.py
paddlehub/common/hub_server.py
+10
-8
paddlehub/common/server_config.py
paddlehub/common/server_config.py
+2
-3
未找到文件。
paddlehub/commands/show.py
浏览文件 @
940b6457
...
...
@@ -125,8 +125,8 @@ class ShowCommand(BaseCommand):
cwd
=
os
.
getcwd
()
module_dir
=
default_module_manager
.
search_module
(
module_name
)
module_dir
=
(
os
.
path
.
join
(
cwd
,
module_name
),
None
)
if
not
module_dir
else
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
浏览文件 @
940b6457
...
...
@@ -47,7 +47,7 @@ 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
()
...
...
@@ -59,7 +59,6 @@ class HubServer(object):
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
)
...
...
@@ -93,11 +92,12 @@ class HubServer(object):
payload
=
{
'word'
:
resource_key
}
if
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
)
if
r
[
'status'
]
==
0
and
len
(
r
[
'data'
])
>
0
:
return
[(
item
[
'name'
],
item
[
'type'
],
item
[
'version'
],
item
[
'summary'
])
for
item
in
r
[
'data'
]]
return
[(
item
[
'name'
],
item
[
'type'
],
item
[
'version'
],
item
[
'summary'
])
for
item
in
r
[
'data'
]]
except
:
pass
...
...
@@ -143,7 +143,8 @@ class HubServer(object):
payload
[
'type'
]
=
resource_type
if
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
)
if
r
[
'status'
]
==
0
and
len
(
r
[
'data'
])
>
0
:
return
r
[
'data'
][
0
]
...
...
@@ -206,12 +207,13 @@ class HubServer(object):
data
=
json
.
loads
(
r
.
text
)
cache_path
=
os
.
path
.
join
(
hub
.
CACHE_HOME
,
RESOURCE_LIST_FILE
)
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
except
:
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
(
file_url
,
save_path
=
hub
.
CACHE_HOME
)
if
not
result
:
...
...
paddlehub/common/server_config.py
浏览文件 @
940b6457
...
...
@@ -12,9 +12,8 @@
# 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"
:
HUB_SERVERS
,
"resource_storage_server_url"
:
"https://bj.bcebos.com/paddlehub/"
"server_url"
:
HUB_SERVERS
,
"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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录