Refactor project structure

src/event_handlers/event_handler_base.py

@@ -1,53 +0,0 @@
-import json
-
-from server_connector import ServerConnector
-
-
-class EventHandlerBase:
-    def __init__(self, anchor):
-        self.server_connector = ServerConnector()
-        self.anchor = anchor
-        self.subscriptions = set()
-        self.subscribe(self.anchor)
-        self.subscribe('reset')
-        self.server_connector.register_callback(self.event_handler_callback)
-
-    def event_handler_callback(self, msg_parts):
-        anchor, message = msg_parts
-        data_json = json.loads(message)
-        response = self.handle_event(anchor, data_json) if anchor != b'reset' else self.handle_reset(data_json)
-        if response is None: return
-        encoded_response = json.dumps(response).encode('utf-8')
-        self.server_connector.send(anchor, encoded_response)
-
-    def handle_event(self, anchor, data_json):
-        raise NotImplementedError
-
-    def handle_reset(self, data_json):
-        return None
-
-    def message_other(self, anchor, data):
-        encoded_anchor = anchor.encode('utf-8')
-        message = {
-            'anchor': anchor,
-            'data': data
-        }
-        encoded_message = json.dumps(message).encode('utf-8')
-        self.server_connector.send(encoded_anchor, encoded_message)
-
-    def subscribe(self, anchor):
-        if anchor not in self.subscriptions:
-            self.subscriptions.add(anchor)
-            self.server_connector.subscribe(anchor)
-
-    def unsubscribe(self, anchor):
-        try:
-            self.subscriptions.remove(anchor)
-            self.server_connector.unsubscribe(anchor)
-        except KeyError:
-            pass
-
-    def unsubscribe_all(self):
-        for sub in self.subscriptions:
-            self.server_connector.unsubscribe(anchor=sub)
-        self.subscriptions.clear()

src/event_handlers/message_sender.py

@@ -1,21 +0,0 @@
-import json
-from datetime import datetime
-
-from server_connector import ServerUplinkConnector
-
-
-class MessageSender:
-    def __init__(self, custom_anchor=None):
-        self.server_connector = ServerUplinkConnector()
-        if isinstance(custom_anchor, str):
-            custom_anchor = custom_anchor.encode('utf-8')
-        self.anchor = custom_anchor or b'message'
-
-    def send(self, originator, message):
-        response = {
-            'originator': originator,
-            'timestamp': datetime.now().isoformat(),
-            'message': message
-        }
-        encoded_response = json.dumps(response).encode('utf-8')
-        self.server_connector.send(self.anchor, encoded_response)

src/event_handlers/server_connector.py

@@ -1,37 +0,0 @@
-from functools import partial
-
-import zmq
-from zmq.eventloop import ioloop
-from zmq.eventloop.zmqstream import ZMQStream
-
-from config import PUBLISHER_PORT, RECEIVER_PORT
-from util import ZMQConnectorBase
-
-ioloop.install()
-
-
-class ServerDownlinkConnector(ZMQConnectorBase):
-    def __init__(self, zmq_context=None):
-        super(ServerDownlinkConnector, self).__init__(zmq_context)
-        self._zmq_sub_socket = self._zmq_context.socket(zmq.SUB)
-        self._zmq_sub_socket.connect('tcp://localhost:{}'.format(PUBLISHER_PORT))
-        self._zmq_sub_stream = ZMQStream(self._zmq_sub_socket)
-
-        self.subscribe = partial(self._zmq_sub_socket.setsockopt_string, zmq.SUBSCRIBE)
-        self.unsubscribe = partial(self._zmq_sub_socket.setsockopt_string, zmq.UNSUBSCRIBE)
-        self.register_callback = self._zmq_sub_stream.on_recv
-
-
-class ServerUplinkConnector(ZMQConnectorBase):
-    def __init__(self, zmq_context=None):
-        super(ServerUplinkConnector, self).__init__(zmq_context)
-        self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH)
-        self._zmq_push_socket.connect('tcp://localhost:{}'.format(RECEIVER_PORT))
-
-    def send(self, anchor, response):
-        self._zmq_push_socket.send_multipart([anchor, response])
-
-
-class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector):
-    def __init__(self, zmq_context=None):
-        super(ServerConnector, self).__init__(zmq_context)

src/event_handlers/source_code_event_handler.py

@@ -3,9 +3,9 @@ from os.path import splitext
 from contextlib import suppress
 from xmlrpc.client import Fault as SupervisorFault
 
-from util import SupervisorMixin
-from config import LOGIN_APP_DIR
-from event_handler_base import EventHandlerBase
+from tfw.util import SupervisorMixin
+from tfw.config import LOGIN_APP_DIR
+from tfw.event_handler_base import EventHandlerBase
 
 
 class SourceCodeEventHandler(EventHandlerBase, SupervisorMixin):

src/event_handlers/source_code_server/server.py

@@ -3,7 +3,7 @@ import json
 from tornado.ioloop import IOLoop
 from tornado.web import RequestHandler, Application
 
-from config import LOGIN_APP_PORT
+from tfw.config import LOGIN_APP_PORT
 from login_component import authorize_login
 
 

src/event_handlers/terminado_event_handler.py

@@ -1,9 +1,9 @@
 from shutil import rmtree, copytree
 
-from event_handler_base import EventHandlerBase
-from util import SupervisorMixin
-from config import TERMINADO_DIR
-from config.logs import logging
+from tfw.event_handler_base import EventHandlerBase
+from tfw.util import SupervisorMixin
+from tfw.config import TERMINADO_DIR
+from tfw.config.logs import logging
 log = logging.getLogger(__name__)
 
 

src/event_handlers/terminado_server/server.py

@@ -2,8 +2,8 @@ from tornado.ioloop import IOLoop
 from tornado.web import Application
 from terminado import TermSocket, UniqueTermManager
 
-from config import TERMINADO_PORT, TERMINADO_WD
-from config.logs import logging
+from tfw.config import TERMINADO_PORT, TERMINADO_WD
+from tfw.config.logs import logging
 log = logging.getLogger(__name__)