Skip to content

Commit bd1f4de

Browse files
committed
Fix load config
1 parent 6085a8d commit bd1f4de

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

remo/config.py

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ def set_remo_home_from_default_remo_config() -> bool:
2626
return True
2727

2828

29+
class ViewerOptions:
30+
electron = 'electron'
31+
browser = 'browser'
32+
jupyter = 'jupyter'
33+
34+
35+
class CloudPlatformOptions:
36+
colab = 'colab'
37+
38+
2939
class Config:
3040
"""
3141
Remo Config
@@ -47,16 +57,11 @@ class Config:
4757
'remo_home',
4858
'cloud_platform',
4959
]
50-
_default_port = 8123
51-
_default_server = 'http://localhost'
52-
_default_user_name = 'Admin User'
53-
_default_user_email = '[email protected]'
54-
_default_user_password = 'adminpass'
55-
_default_viewer = 'browser'
5660

5761
def __init__(self, config):
5862
for name in self.__slots__:
59-
setattr(self, name, config.get(name, getattr(self, '_default_{}'.format(name))))
63+
default_value = getattr(DefaultConfig, name)
64+
setattr(self, name, config.get(name, default_value))
6065

6166
def server_url(self):
6267
return '{}:{}'.format(self.server, self.port)
@@ -82,4 +87,17 @@ def default_path():
8287
def path(dir_path: str = None):
8388
if not dir_path:
8489
dir_path = get_remo_home()
85-
return str(os.path.join(dir_path, Config.name))
90+
return str(os.path.join(dir_path, Config.name))
91+
92+
93+
class DefaultConfig(Config):
94+
port = 8123
95+
server = 'http://localhost'
96+
user_name = 'Admin User'
97+
user_email = '[email protected]'
98+
user_password = 'adminpass'
99+
viewer = ViewerOptions.browser
100+
uuid = 'undefined'
101+
public_url = None
102+
remo_home = None
103+
cloud_platform = None

remo/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.1.8'
1+
__version__ = '0.1.9'

0 commit comments

Comments
 (0)