Fix all flake8 issues

Author: v1kko

libmuscle/python/libmuscle/manager/instance_manager.py

@@ -61,7 +61,7 @@ def run(self) -> None:
 class InstanceManager:
     """Instantiates and manages running instances"""
     def __init__(
-            self, configuration: Configuration, run_dir: RunDir, 
+            self, configuration: Configuration, run_dir: RunDir,
             instance_registry: InstanceRegistry, mlp_location: str) -> None:
         """Create an InstanceManager.
 
@@ -83,7 +83,7 @@ def __init__(
 
         self._instantiator = NativeInstantiator(
                 self._resources_in, self._requests_out, self._results_in,
-                self._log_records_in, self._run_dir.path, 
+                self._log_records_in, self._run_dir.path,
                 mlp_location=self._mlp_location)
         self._instantiator.start()
 

libmuscle/python/libmuscle/manager/instantiator.py

@@ -105,13 +105,15 @@ def __init__(
         self.stdout_path = stdout_path
         self.stderr_path = stderr_path
 
+
 class MonitorRequest(InstantiatorRequest):
     """Requests monitoring a process."""
     def __init__(self, instance: str, hostname: str, pid: int) -> None:
         self.instance = instance
         self.hostname = hostname
         self.pid = pid
 
+
 class CancelAllRequest(InstantiatorRequest):
     """Requests stopping all running processes."""
     pass

libmuscle/python/libmuscle/manager/manager.py

@@ -89,10 +89,9 @@ def __init__(
         self._server = MMPServer(
                 self._logger, self._profile_store, self._configuration,
                 self._instance_registry, self._topology_store,
-                self._snapshot_registry, self._deadlock_detector, run_dir, 
+                self._snapshot_registry, self._deadlock_detector, run_dir,
                 instance_manager=self._instance_manager)
 
-
         if self._instance_manager:
             self._instance_manager.set_manager_location(
                     self.get_server_location())

libmuscle/python/libmuscle/manager/mlp_server.py

@@ -3,17 +3,15 @@
 from typing import Any, Dict, List, Tuple, cast
 
 import msgpack
-from ymmsl import Operator, Port, Reference
+from ymmsl import Reference
 
-from libmuscle.logging import LogLevel
 from libmuscle.manager.logger import Logger
 from libmuscle.manager.profile_store import ProfileStore
 from libmuscle.mcp.protocol import RequestType, ResponseType
 from libmuscle.mcp.tcp_transport_server import TcpTransportServer
 from libmuscle.mcp.transport_server import RequestHandler
-from libmuscle.profiling import (
-        ProfileEvent, ProfileEventType, ProfileTimestamp)
-from libmuscle.timestamp import Timestamp
+from libmuscle.profiling import (ProfileTimestamp, ProfileEvent,
+                                 ProfileEventType)
 
 
 _logger = logging.getLogger(__name__)
@@ -73,19 +71,20 @@ def _report_usage_events(
 
             status (ResponseType): SUCCESS
         """
-        events : List[Tuple[str, ProfileEvent]] = []
+        events: List[Tuple[str, ProfileEvent]] = []
         for instance_id, (cpu_usage, memory_usage) in usage.items():
             time = ProfileTimestamp()
             prof_event = ProfileEvent(ProfileEventType.RESOURCE_USAGE,
-            start_time=time, stop_time=time,
-            cpu_percent=cpu_usage, memory_usage=memory_usage)
+                                      start_time=time, stop_time=time,
+                                      cpu_percent=cpu_usage, memory_usage=memory_usage)
             events.append((instance_id, prof_event))
 
         for event in events:
             self._profile_store.add_event(Reference(event[0]), event[1])
 
         return [ResponseType.SUCCESS.value]
 
+
 class MLPServer:
     """The MUSCLE Logging Protocol server.
 

libmuscle/python/libmuscle/manager/mmp_server.py

@@ -179,8 +179,9 @@ def _register_instance(
         instance = Reference(instance_id)
 
         if self._instance_manager:
-            self._instance_manager._requests_out.put(MonitorRequest(instance_id, hostname, pid))
-        
+            self._instance_manager._requests_out.put(
+                    MonitorRequest(instance_id, hostname, pid))
+
         try:
             self._instance_registry.add(instance, locations, port_objs, pid, hostname)
 

libmuscle/python/libmuscle/manager/profile_store.py

@@ -110,7 +110,8 @@ def add_event(
         Args:
             event: The event to add.
         """
-        _logger.debug(f"Add profile event for instance {instance_id}, cpu: {event.cpu_percent}, memory: {event.memory_usage}")
+        _logger.debug(f"Add profile event for instance {instance_id}, \
+                      cpu: {event.cpu_percent}, memory: {event.memory_usage}")
 
         self._queue.put((instance_id, [event]))
         if _SYNCHED:

libmuscle/python/libmuscle/manager/test/test_mlp_request_handler.py

@@ -1,7 +1,6 @@
 import msgpack
 from ymmsl import Reference
 
-from libmuscle.logging import LogLevel
 from libmuscle.manager.mlp_server import MLPRequestHandler
 from libmuscle.mcp.protocol import RequestType, ResponseType
 
@@ -11,13 +10,12 @@ def test_create_servicer(logger, profile_store):
 
 
 def test_report_usage(logger, profile_store):
-    profile_store.store_instances([Reference('instance1'),Reference('instance2'),Reference('instance3')])
+    profile_store.store_instances([Reference('instance1'), Reference('instance2')])
     handler = MLPRequestHandler(logger, profile_store)
 
     usage = {
             "instance1": (0.1, 1024),
             "instance2": (0.2, 2048),
-            "instance3": (0.3, 3072),
             }
 
     request = [
@@ -29,4 +27,4 @@ def test_report_usage(logger, profile_store):
 
     decoded_result = msgpack.unpackb(result, raw=False)
 
-    assert decoded_result[0] == ResponseType.SUCCESS.value
+    assert decoded_result[0] == ResponseType.SUCCESS.value

libmuscle/python/libmuscle/manager/test/test_profile_database.py

@@ -75,8 +75,8 @@ def t(offset: int) -> ProfileTimestamp:
                     ProfileEventType.RECEIVE_WAIT, t(2600), t(2870),
                     Port('in', Operator.O_I), None, None, 1000000, 0.0),
                 ProfileEvent(
-                   ProfileEventType.RESOURCE_USAGE, start_time=t(2700), stop_time=t(2800),
-                   cpu_percent=12.5, memory_usage=1024000),
+                   ProfileEventType.RESOURCE_USAGE, start_time=t(2700),
+                   stop_time=t(2800), cpu_percent=12.5, memory_usage=1024000),
                 ProfileEvent(ProfileEventType.SHUTDOWN_WAIT, t(10000), t(11000)),
                 ProfileEvent(ProfileEventType.DEREGISTER, t(11000), t(11100))]
 
@@ -141,14 +141,14 @@ def test_time_taken(db_file):
         assert 200.0 == db.time_taken(etype='DEREGISTER', aggregate='sum')
         assert 600.0 == db.time_taken(etype='SEND', aggregate='sum')
 
+
 def test_resource_usage_event(db_file):
     with ProfileDatabase(db_file) as db:
         cur = db._get_cursor()
-        cur.execute(f"SELECT * FROM usage_events WHERE event_type_oid = '{ProfileEventType.RESOURCE_USAGE.value}'")
+        cur.execute(f"SELECT * FROM usage_events WHERE event_type_oid = \
+                    '{ProfileEventType.RESOURCE_USAGE.value}'")
         rows = cur.fetchall()
         assert len(rows) == 1
         # Check columns (cpu_percent is 2nd to last, memory_usage is last)
         assert rows[0][-2] == 12.5
         assert rows[0][-1] == 1024000
-
-

libmuscle/python/libmuscle/mlp_client.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Tuple
+from typing import Any, Dict, List, Tuple
 from logging import Logger
 
 import msgpack
@@ -30,7 +30,8 @@ def close(self) -> None:
         self._transport_client.close()
 
     def report_usage(self, pids: List[Tuple[str, int]], logger: Logger) -> None:
-        """Report usage of resources of processes with given (instance_id, pid) on this node.
+        """Report usage of resources of processes with given (instance_id, pid)
+        on this node.
 
         Args:
             pids: List of (instance_id, pid) tuples

libmuscle/python/libmuscle/native_instantiator/agent/__main__.py

@@ -31,7 +31,7 @@ def __init__(self, node_name: str, server_location: str, mlp_location: str) -> N
         self._process_manager = ProcessManager()
 
         self._node_name = node_name
-        self._monitor_pids : List[Tuple[str, int]] = []
+        self._monitor_pids: List[Tuple[str, int]] = []
 
         _logger.info(f'Connecting to manager at {server_location}')
         self._server = MAPClient(self._node_name, server_location)
@@ -65,7 +65,6 @@ def run(self) -> None:
                 shutting_down = True
                 _logger.info('Agent shutting down')
 
-
             finished = self._process_manager.get_finished()
             if finished:
                 for name, exit_code in finished: