fix imports for Server

src/engine/src/core/server/Server.py → src/engine/src/core/Server.py

@@ -34,7 +34,7 @@
 )
 from owe_python_sdk.schema import WorkflowSubmissionRequest, EmptyObject
 
-from core.server import WorkerPool
+from core.workers import WorkerPool
 from core.workflows import WorkflowExecutor
 from utils import bytes_to_json, load_plugins, lbuffer_str as lbuf
 from errors import NoAvailableWorkers, WorkflowTerminated

src/engine/src/core/workers/__init__.py

@@ -0,0 +1,2 @@
+from core.workers.Worker import Worker
+from core.workers.WorkerPool import WorkerPool

src/engine/src/core/workflows/WorkflowExecutor.py

@@ -29,7 +29,7 @@
 )
 from core.middleware.archivers import S3Archiver, IRODSArchiver
 from conf.constants import BASE_WORK_DIR
-from core.server import Worker
+from core.workers import Worker
 from core.state import Hook, method_hook
 
 from core.workflows import params_validator

src/engine/src/main.py

@@ -1,6 +1,6 @@
 import sys, logging
 
-from core.server import Server
+from core.Server import Server
 
 
 # Set all third-party library loggers to critical

src/engine/src/tests/testserver.py

@@ -1,13 +1,13 @@
 import sys
 import unittest
 
-# from core.server import Server
+from core.Server import Server
 
 
 class TestServer(unittest.TestCase):
     def testServerInit(self):
-        # self.server = Server()
-        # self.assertEqual(self.server, type(Server))
+        self.server = Server()
+        self.assertEqual(type(self.server), Server)
         pass
 
 if __name__ == "__main__":