Make Portal communication optional

5genesis · Sep 3, 2021 · 38f5141 · 38f5141
1 parent 3386c5c
commit 38f5141
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/Executor/executor_base.py b/Executor/executor_base.py
@@ -15,7 +15,7 @@ class ExecutorBase(Child):
     def __init__(self, params: Dict, name: str, tempFolder: TemporaryDirectory = None):
         if self.portal is None:
             config = Config()
-            self.portal = PortalApi(config.Portal.Host, config.Portal.Port)
+            self.portal = PortalApi(config.Portal)
 
         now = datetime.now(timezone.utc)
         super().__init__(f"{name}{now.strftime('%y%m%d%H%M%S%f')}", tempFolder)

diff --git a/Experiment/experiment_run.py b/Experiment/experiment_run.py
@@ -39,7 +39,7 @@ def __init__(self, id: int, params: Dict):
         if ExperimentRun.portal is None or ExperimentRun.grafana is None:
             from Helper import DashboardGenerator  # Delayed to avoid cyclic imports
             config = Config()
-            ExperimentRun.portal = PortalApi(config.Portal.Host, config.Portal.Port)
+            ExperimentRun.portal = PortalApi(config.Portal)
             ExperimentRun.grafana = DashboardGenerator(config.Grafana.Enabled, config.Grafana.Host,
                                                        config.Grafana.Port, config.Grafana.Bearer,
                                                        config.Grafana.ReportGenerator)

diff --git a/Helper/config.py b/Helper/config.py
@@ -171,7 +171,14 @@ def Validation(self) -> List[Tuple['Level', str]]:
 
 class Portal(restApi):
     def __init__(self, data: Dict):
-        super().__init__(data, 'Portal', {})
+        defaults = {
+            'Enabled': (False, Level.WARNING)
+        }
+        super().__init__(data, 'Portal', defaults)
+
+    @property
+    def Enabled(self):
+        return self._keyOrDefault('Enabled')
 
 
 class SliceManager(restApi):

diff --git a/Helper/default_config b/Helper/default_config
@@ -5,6 +5,7 @@ Logging:
   AppLevel: INFO
   LogLevel: DEBUG
 Portal:
+  Enabled: False
   Host: '127.0.0.1'
   Port: 5000
 SliceManager:

diff --git a/Interfaces/portal.py b/Interfaces/portal.py
@@ -2,18 +2,20 @@
 import json
 from threading import Thread
 from typing import Optional, Union
+from Helper.config import Portal as PortalConfig
 
 
 class PortalApi(RestClient):
-    def __init__(self, host, port):
-        super().__init__(host, port, '/api')
+    def __init__(self, config: PortalConfig):
+        self.Enabled = config.Enabled
+        super().__init__(config.Host, config.Port, '/api')
 
     def UpdateExecutionData(self, executionId: int,
                             status: Optional[str] = None, dashboardUrl: Optional[str] = None,
                             percent: Optional[int] = None, message: Optional[str] = None):
-
-        Thread(target=self.updateAsync,
-               args=(executionId, status, dashboardUrl, percent, message)).start()
+        if self.Enabled:
+            Thread(target=self.updateAsync,
+                   args=(executionId, status, dashboardUrl, percent, message)).start()
 
     def updateAsync(self, executionId: int,
                     status: Optional[str], dashboardUrl: Optional[str],