提交 dc9f9650 编写于 作者: B BinLong

fix some compitable problems

上级 b5ac4f26
...@@ -23,6 +23,7 @@ import re ...@@ -23,6 +23,7 @@ import re
import requests import requests
import json import json
import yaml import yaml
import random
from random import randint from random import randint
from paddlehub.common import utils from paddlehub.common import utils
...@@ -53,11 +54,12 @@ class HubServer(object): ...@@ -53,11 +54,12 @@ class HubServer(object):
self._load_resource_list_file_if_valid() self._load_resource_list_file_if_valid()
def get_server_url(self): def get_server_url(self):
random.seed(int(time.time()))
HS_ENV = os.environ.get('HUB_SERVER') HS_ENV = os.environ.get('HUB_SERVER')
if HS_ENV: if HS_ENV:
HUB_SERVERS = HS_ENV.split(';') HUB_SERVERS = HS_ENV.split(';')
return HUB_SERVERS[uniform(0, len(self.server_url))] return HUB_SERVERS[random.randint(0, len(HUB_SERVERS) - 1)]
return self.server_url[uniform(0, len(self.server_url))] return self.server_url[random.randint(0, len(self.server_url) - 1)]
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)
...@@ -99,7 +101,10 @@ class HubServer(object): ...@@ -99,7 +101,10 @@ class HubServer(object):
return [(item['name'], item['type'], item['version'], return [(item['name'], item['type'], item['version'],
item['summary']) for item in r['data']] item['summary']) for item in r['data']]
except: except:
pass if self.config.get('debug', False):
raise
else:
pass
if update or not self.resource_list_file: if update or not self.resource_list_file:
self.request() self.request()
...@@ -149,7 +154,10 @@ class HubServer(object): ...@@ -149,7 +154,10 @@ class HubServer(object):
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]
except: except:
pass if self.config.get('debug', False):
raise
else:
pass
if update or not self.resource_list_file: if update or not self.resource_list_file:
self.request() self.request()
...@@ -210,7 +218,10 @@ class HubServer(object): ...@@ -210,7 +218,10 @@ class HubServer(object):
yaml.safe_dump({'resource_list': data['data']}, fp) yaml.safe_dump({'resource_list': data['data']}, fp)
return True return True
except: except:
pass if self.config.get('debug', False):
raise
else:
pass
file_url = self.config[ file_url = self.config[
'resource_storage_server_url'] + RESOURCE_LIST_FILE 'resource_storage_server_url'] + RESOURCE_LIST_FILE
......
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
# 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://gzbh-aip-paddlehub01.gzbh.baidu.com:8889/paddlehub"]
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/",
"debug": False
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册