mirror of
				https://github.com/avatao-content/baseimage-tutorial-framework
				synced 2025-11-04 11:52:54 +00:00 
			
		
		
		
	Remove controller stuff, tidy code based on pylint suggestions
This commit is contained in:
		@@ -3,4 +3,3 @@
 | 
			
		||||
 | 
			
		||||
from .event_handler_connector import EventHandlerConnector, EventHandlerUplinkConnector, EventHandlerDownlinkConnector
 | 
			
		||||
from .tfw_server import TFWServer
 | 
			
		||||
# from .controller_responder import ControllerResponder  # TODO: readd once controller stuff is resolved
 | 
			
		||||
 
 | 
			
		||||
@@ -1,38 +0,0 @@
 | 
			
		||||
# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
 | 
			
		||||
# All Rights Reserved. See LICENSE file for details.
 | 
			
		||||
 | 
			
		||||
from tfw.networking import deserialize_all, serialize_all, ControllerConnector
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ControllerResponder:
 | 
			
		||||
    def __init__(self, fsm):
 | 
			
		||||
        self.fsm = fsm
 | 
			
		||||
        self.token = None
 | 
			
		||||
        self.controller_connector = ControllerConnector()
 | 
			
		||||
        self.controller_connector.register_callback(self.handle_controller_request)
 | 
			
		||||
        self.controller_request_handlers = {
 | 
			
		||||
            'solution_check': self.handle_solution_check_request,
 | 
			
		||||
            'test': self.handle_test_request,
 | 
			
		||||
            'token': self.handle_token_request
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    def handle_controller_request(self, stream, msg_parts):
 | 
			
		||||
        key, data = deserialize_all(*msg_parts)
 | 
			
		||||
        response = self.controller_request_handlers[key](data)
 | 
			
		||||
        stream.send_multipart(serialize_all(self.token, response))
 | 
			
		||||
 | 
			
		||||
    def handle_test_request(self, data):
 | 
			
		||||
        # pylint: disable=unused-argument,no-self-use
 | 
			
		||||
        return 'OK'
 | 
			
		||||
 | 
			
		||||
    def handle_token_request(self, data):
 | 
			
		||||
        if self.token is None:
 | 
			
		||||
            self.token = data
 | 
			
		||||
        return {'token': self.token}
 | 
			
		||||
 | 
			
		||||
    def handle_solution_check_request(self, data):
 | 
			
		||||
        # pylint: disable=unused-argument
 | 
			
		||||
        return {
 | 
			
		||||
            'solved': self.fsm.is_solved(),
 | 
			
		||||
            'message': 'solved' if self.fsm.is_solved() else 'not solved'
 | 
			
		||||
        }
 | 
			
		||||
@@ -25,12 +25,11 @@ class TFWServer:
 | 
			
		||||
        self._uplink_connector = ServerUplinkConnector()
 | 
			
		||||
 | 
			
		||||
        self.application = Application([(
 | 
			
		||||
            r'/ws', ZMQWebSocketProxy,{
 | 
			
		||||
            r'/ws', ZMQWebSocketProxy, {
 | 
			
		||||
                'event_handler_connector': self._event_handler_connector,
 | 
			
		||||
                'message_handlers': [self.handle_trigger, self.handle_recover],
 | 
			
		||||
                'frontend_message_handlers': [self.save_frontend_messages]
 | 
			
		||||
            })]
 | 
			
		||||
        )
 | 
			
		||||
            })])
 | 
			
		||||
 | 
			
		||||
        self._frontend_messages = FrontendMessageStorage()
 | 
			
		||||
 | 
			
		||||
@@ -68,7 +67,7 @@ class MessageStorage(ABC):
 | 
			
		||||
    def filter_message(self, message):
 | 
			
		||||
        raise NotImplementedError
 | 
			
		||||
 | 
			
		||||
    def transform_message(self, message):
 | 
			
		||||
    def transform_message(self, message):   # pylint: disable=no-self-use
 | 
			
		||||
        yield message
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,6 +12,7 @@ LOG = logging.getLogger(__name__)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ZMQWebSocketProxy(WebSocketHandler):
 | 
			
		||||
    # pylint: disable=abstract-method
 | 
			
		||||
    instances = set()
 | 
			
		||||
 | 
			
		||||
    def initialize(self, **kwargs): # pylint: disable=arguments-differ
 | 
			
		||||
@@ -83,6 +84,7 @@ class ZMQWebSocketProxy(WebSocketHandler):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class TFWProxy:
 | 
			
		||||
    # pylint: disable=protected-access
 | 
			
		||||
    def __init__(self, to_source, to_destination):
 | 
			
		||||
        self.to_source = to_source
 | 
			
		||||
        self.to_destination = to_destination
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user