Load data from config

Author: vmanilo

remo/__init__.py

@@ -5,7 +5,7 @@
 _sdk = None
 
 
-def connect(server: str = '', email: str = '', password: str = '', viewer: str = 'browser', remo_home: str = None):
+def connect(server: str = None, email: str = None, password: str = None, viewer: str = None, remo_home: str = None):
     """
     Connect to a remo server.
     If no parameters are passed, it connects to a local running remo server. To connect to a remote remo, specify connection details.
@@ -18,17 +18,23 @@ def connect(server: str = '', email: str = '', password: str = '', viewer: str =
         (optional) remo_home: location of remo home
     """
 
+    from .config import Config, set_remo_home, set_remo_home_from_default_remo_config
     if remo_home:
-        from .config import set_remo_home
         set_remo_home(remo_home)
+    else:
+        set_remo_home_from_default_remo_config()
 
+    config = Config.load()
     if not (server and email and password):
-        from .config import Config
-        config = Config.load()
-        server, email, password, viewer = config.server_url(), config.user_email, config.user_password, config.viewer
+        server, email, password = config.server_url(), config.user_email, config.user_password
+
+    if not viewer:
+        viewer = config.viewer
 
     global _sdk
     _sdk = SDK(server, email, password, viewer)
+    if config.public_url:
+        _sdk.set_public_url(config.public_url)
     # set access to public SDK methods
     import sys
 

remo/config.py

@@ -3,26 +3,50 @@
 from pathlib import Path
 
 REMO_HOME_ENV = 'REMO_HOME'
+default_remo_home = str(Path.home().joinpath('.remo'))
+default_colab_remo_home = '/gdrive/My Drive/RemoApp'
 
 
 def get_remo_home():
-    return os.getenv(REMO_HOME_ENV, str(Path.home().joinpath('.remo')))
+    for path in (os.getenv(REMO_HOME_ENV, default_remo_home), default_colab_remo_home):
+        if path and os.path.exists(path):
+            return path
 
 
 def set_remo_home(path: str):
-    if not os.path.exists(path):
-        os.makedirs(path)
+    os.makedirs(path, exist_ok=True)
     os.environ[REMO_HOME_ENV] = path
 
 
+def set_remo_home_from_default_remo_config() -> bool:
+    if os.path.exists(Config.default_path()):
+        config = Config.load(Config.default_path())
+        if config and config.remo_home:
+            set_remo_home(config.remo_home)
+            return True
+
+
 class Config:
     """
     Remo Config
 
     This class is used to initialise various settings.
     #TODO: add description of how those are initiliased from code vs from config file
     """
-    __slots__ = ['port', 'server', 'user_name', 'user_email', 'user_password', 'viewer']
+
+    name = 'remo.json'
+    __slots__ = [
+        'port',
+        'server',
+        'user_name',
+        'user_email',
+        'user_password',
+        'viewer',
+        'uuid',
+        'public_url',
+        'remo_home',
+        'cloud_platform',
+    ]
     _default_port = 8123
     _default_server = 'http://localhost'
     _default_user_name = 'Admin User'
@@ -40,7 +64,7 @@ def server_url(self):
     @staticmethod
     def load(config_path: str = None):
         if not config_path:
-            config_path = str(os.path.join(get_remo_home(), 'remo.json'))
+            config_path = str(os.path.join(get_remo_home(), Config.name))
 
         if not os.path.exists(config_path):
             raise Exception(f'Config file not found, file {config_path} not exists')
@@ -49,3 +73,13 @@ def load(config_path: str = None):
             config = json.load(cfg_file)
 
         return Config(config)
+
+    @staticmethod
+    def default_path():
+        return Config.path(default_remo_home)
+
+    @staticmethod
+    def path(dir_path: str = None):
+        if not dir_path:
+            dir_path = get_remo_home()
+        return str(os.path.join(dir_path, Config.name))

remo/version.py

@@ -1 +1 @@
-__version__ = '0.1.7'
+__version__ = '0.1.8'