afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pygui: changes to improve grpc event handling

Browse source
This commit is contained in:
Blake Harnden 2020-05-14 17:57:32 -07:00
parent df03f1e173
commit 3b1a9bc3e3
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
daemon/core/gui/coreclient.py
View file

@ -4,10 +4,9 @@ Incorporate grpc into python tkinter GUI
import json import json
import logging import logging
import os import os
from functools import partial
from pathlib import Path from pathlib import Path
from tkinter import messagebox from tkinter import messagebox
from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Optional from typing import TYPE_CHECKING, Dict, Iterable, List, Optional
import grpc import grpc
@ -85,7 +84,7 @@ class CoreClient:
self.cancel_events() self.cancel_events()
self._client.create_session(self.session_id) self._client.create_session(self.session_id)
self.handling_events = self._client.events( self.handling_events = self._client.events(
self.session_id, self.handle_stream(self.handle_events) self.session_id, self.handle_events
) )
if throughputs_enabled: if throughputs_enabled:
self.enable_throughputs() self.enable_throughputs()
@ -127,9 +126,6 @@ class CoreClient:
for observer in self.app.guiconfig.observers: for observer in self.app.guiconfig.observers:
self.custom_observers[observer.name] = observer self.custom_observers[observer.name] = observer
def handle_stream(self, func: Callable) -> Callable:
return partial(self.app.after, 0, func)
def handle_events(self, event: core_pb2.Event): def handle_events(self, event: core_pb2.Event):
if event.session_id != self.session_id: if event.session_id != self.session_id:
logging.warning( logging.warning(
@ -140,7 +136,7 @@ class CoreClient:
return return
if event.HasField("link_event"): if event.HasField("link_event"):
self.handle_link_event(event.link_event) self.app.after(0, self.handle_link_event, event.link_event)
elif event.HasField("session_event"): elif event.HasField("session_event"):
logging.info("session event: %s", event) logging.info("session event: %s", event)
session_event = event.session_event session_event = event.session_event
@ -159,7 +155,7 @@ class CoreClient:
else: else:
logging.warning("unknown session event: %s", session_event) logging.warning("unknown session event: %s", session_event)
elif event.HasField("node_event"): elif event.HasField("node_event"):
self.handle_node_event(event.node_event) self.app.after(0, self.handle_node_event, event.node_event)
elif event.HasField("config_event"): elif event.HasField("config_event"):
logging.info("config event: %s", event) logging.info("config event: %s", event)
elif event.HasField("exception_event"): elif event.HasField("exception_event"):
@ -203,7 +199,7 @@ class CoreClient:
def enable_throughputs(self): def enable_throughputs(self):
self.handling_throughputs = self.client.throughputs( self.handling_throughputs = self.client.throughputs(
self.session_id, self.handle_stream(self.handle_throughputs) self.session_id, self.handle_throughputs
) )
def cancel_throughputs(self): def cancel_throughputs(self):
@ -225,7 +221,7 @@ class CoreClient:
) )
return return
logging.debug("handling throughputs event: %s", event) logging.debug("handling throughputs event: %s", event)
self.app.canvas.set_throughputs(event) self.app.after(0, self.app.canvas.set_throughputs, event)
def handle_exception_event(self, event: core_pb2.ExceptionEvent): def handle_exception_event(self, event: core_pb2.ExceptionEvent):
logging.info("exception event: %s", event) logging.info("exception event: %s", event)