new_workspace function is now available from the websocket call

dedop/cli/main.py

@@ -17,7 +17,7 @@
 
 from dedop.model.processor import BaseProcessor, ProcessorException
 from dedop.proc.sar import L1BProcessor
-from dedop.ui.workspace import WorkspaceError, WorkspaceManager
+from dedop.ui.workspace_manager import WorkspaceError, WorkspaceManager
 from dedop.util.config import DEFAULT_CONFIG_FILE, get_config_path, get_config_value
 from dedop.util.monitor import Monitor
 from dedop.version import __version__

dedop/conf/defaults.py

@@ -2,6 +2,7 @@
 
 DEFAULT_DATA_DIR_NAME = '.dedop'
 DEFAULT_DATA_PATH = os.path.join(os.path.expanduser('~'), DEFAULT_DATA_DIR_NAME)
+DEFAULT_WORKSPACE_PATH = os.path.join(DEFAULT_DATA_PATH, 'workspaces')
 
 #: allow a 100 ms period between two progress messages sent to the client
 WEBAPI_PROGRESS_DEFER_PERIOD = 0.5

dedop/webapi/main.py

@@ -6,6 +6,7 @@
 from tornado.web import Application
 
 from dedop.conf.defaults import WEBAPI_PROGRESS_DEFER_PERIOD, WEBAPI_LOG_FILE_PREFIX
+from dedop.ui.workspace_manager import WorkspaceManager
 from dedop.version import __version__
 from dedop.webapi.websocket import WebSocketService
 
@@ -22,7 +23,7 @@ def get(self):
 
 
 def service_factory(application):
-    return WebSocketService()
+    return WebSocketService(application.workspace_manager)
 
 
 # All JSON REST responses should have same structure, namely a dictionary as follows:
@@ -40,6 +41,7 @@ def create_application():
         (url_pattern('/app'), JsonRcpWebSocketHandler, dict(service_factory=service_factory,
                                                             report_defer_period=WEBAPI_PROGRESS_DEFER_PERIOD)),
     ])
+    application.workspace_manager = WorkspaceManager()
     return application
 
 

dedop/webapi/websocket.py

@@ -1,3 +1,7 @@
+from dedop.conf.defaults import DEFAULT_WORKSPACE_PATH
+from dedop.ui.workspace_manager import WorkspaceManager
+
+
 class WebSocketService:
     """
     Object which implements Cate's server-side methods.
@@ -8,12 +12,16 @@ class WebSocketService:
     :param: workspace_manager The current workspace manager.
     """
 
-    def __init__(self):
-        print("WebSocketService created")
+    def __init__(self, workspace_manager: WorkspaceManager):
+        self.workspace_manager = workspace_manager
 
     def test_action(self, param1: str) -> dict:
         return {
             "status": "ok",
             "content": "successful test",
             "arg": param1
         }
+
+    def new_workspace(self, workspace_name, base_dir=DEFAULT_WORKSPACE_PATH) -> dict:
+        workspace = self.workspace_manager.create_workspace(base_dir, workspace_name)
+        return workspace.to_json_dict()

tests/cli/test_workspace.py

@@ -1,7 +1,7 @@
 import os.path
 from unittest import TestCase
 
-from dedop.ui.workspace import WorkspaceManager, WorkspaceError
+from dedop.ui.workspace_manager import WorkspaceManager, WorkspaceError
 from dedop.util.monitor import ConsoleMonitor
 
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), '..', '..', 'test_data')