daemon: moved grpc wrapper classes to core.grpc.wrappers

daemon/core/gui/coreclient.py

@@ -21,19 +21,7 @@ from core.api.grpc import (
     services_pb2,
     wlan_pb2,
 )
-from core.gui import appconfig
-from core.gui.appconfig import BACKGROUNDS_PATH, XMLS_PATH, CoreServer, Observer
-from core.gui.dialogs.emaneinstall import EmaneInstallDialog
-from core.gui.dialogs.error import ErrorDialog
-from core.gui.dialogs.mobilityplayer import MobilityPlayer
-from core.gui.dialogs.sessions import SessionsDialog
-from core.gui.graph.edges import CanvasEdge
-from core.gui.graph.node import CanvasNode
-from core.gui.graph.shape import AnnotationData, Shape
-from core.gui.graph.shapeutils import ShapeType
-from core.gui.interface import InterfaceManager
-from core.gui.nodeutils import NodeDraw, NodeUtils
-from core.gui.wrappers import (
+from core.api.grpc.wrappers import (
     ConfigOption,
     ConfigService,
     ExceptionEvent,
@@ -52,6 +40,18 @@ from core.gui.wrappers import (
     SessionState,
     ThroughputsEvent,
 )
+from core.gui import appconfig
+from core.gui.appconfig import BACKGROUNDS_PATH, XMLS_PATH, CoreServer, Observer
+from core.gui.dialogs.emaneinstall import EmaneInstallDialog
+from core.gui.dialogs.error import ErrorDialog
+from core.gui.dialogs.mobilityplayer import MobilityPlayer
+from core.gui.dialogs.sessions import SessionsDialog
+from core.gui.graph.edges import CanvasEdge
+from core.gui.graph.node import CanvasNode
+from core.gui.graph.shape import AnnotationData, Shape
+from core.gui.graph.shapeutils import ShapeType
+from core.gui.interface import InterfaceManager
+from core.gui.nodeutils import NodeDraw, NodeUtils
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/alerts.py

@@ -5,10 +5,10 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING, Dict, Optional
 
+from core.api.grpc.wrappers import ExceptionEvent, ExceptionLevel
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import CodeText
-from core.gui.wrappers import ExceptionEvent, ExceptionLevel
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/configserviceconfig.py

@@ -8,15 +8,15 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Set
 
 import grpc
 
-from core.gui.dialogs.dialog import Dialog
-from core.gui.themes import FRAME_PAD, PADX, PADY
-from core.gui.widgets import CodeText, ConfigFrame, ListboxScroll
-from core.gui.wrappers import (
+from core.api.grpc.wrappers import (
     ConfigOption,
     ConfigServiceData,
     Node,
     ServiceValidationMode,
 )
+from core.gui.dialogs.dialog import Dialog
+from core.gui.themes import FRAME_PAD, PADX, PADY
+from core.gui.widgets import CodeText, ConfigFrame, ListboxScroll
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/emaneconfig.py

@@ -8,11 +8,11 @@ from typing import TYPE_CHECKING, Dict, List, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import ConfigOption, Node
 from core.gui.dialogs.dialog import Dialog
 from core.gui.images import ImageEnum, Images
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import ConfigFrame
-from core.gui.wrappers import ConfigOption, Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/hooks.py

@@ -2,10 +2,10 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING, Optional
 
+from core.api.grpc.wrappers import Hook, SessionState
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import CodeText, ListboxScroll
-from core.gui.wrappers import Hook, SessionState
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/linkconfig.py

@@ -5,11 +5,11 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING, Optional
 
+from core.api.grpc.wrappers import Interface, Link, LinkOptions
 from core.gui import validation
 from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
-from core.gui.wrappers import Interface, Link, LinkOptions
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/mobilityconfig.py

@@ -7,10 +7,10 @@ from typing import TYPE_CHECKING, Dict, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import ConfigOption, Node
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import ConfigFrame
-from core.gui.wrappers import ConfigOption, Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/mobilityplayer.py

@@ -4,10 +4,10 @@ from typing import TYPE_CHECKING, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import MobilityAction, Node
 from core.gui.dialogs.dialog import Dialog
 from core.gui.images import ImageEnum
 from core.gui.themes import PADX, PADY
-from core.gui.wrappers import MobilityAction, Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/nodeconfig.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Dict, Optional
 import netaddr
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import Node
 from core.gui import nodeutils, validation
 from core.gui.appconfig import ICONS_PATH
 from core.gui.dialogs.dialog import Dialog
@@ -15,7 +16,6 @@ from core.gui.images import Images
 from core.gui.nodeutils import NodeUtils
 from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import ListboxScroll, image_chooser
-from core.gui.wrappers import Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/nodeconfigservice.py

@@ -6,11 +6,11 @@ import tkinter as tk
 from tkinter import messagebox, ttk
 from typing import TYPE_CHECKING, Optional, Set
 
+from core.api.grpc.wrappers import Node
 from core.gui.dialogs.configserviceconfig import ConfigServiceConfigDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import CheckboxList, ListboxScroll
-from core.gui.wrappers import Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/nodeservice.py

@@ -5,11 +5,11 @@ import tkinter as tk
 from tkinter import messagebox, ttk
 from typing import TYPE_CHECKING, Optional, Set
 
+from core.api.grpc.wrappers import Node
 from core.gui.dialogs.dialog import Dialog
 from core.gui.dialogs.serviceconfig import ServiceConfigDialog
 from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import CheckboxList, ListboxScroll
-from core.gui.wrappers import Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/serviceconfig.py

@@ -7,12 +7,12 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
 import grpc
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import Node, NodeServiceData, ServiceValidationMode
 from core.gui.dialogs.copyserviceconfig import CopyServiceConfigDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.images import ImageEnum, Images
 from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import CodeText, ListboxScroll
-from core.gui.wrappers import Node, NodeServiceData, ServiceValidationMode
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/sessionoptions.py

@@ -5,10 +5,10 @@ from typing import TYPE_CHECKING, Dict, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import ConfigOption
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import ConfigFrame
-from core.gui.wrappers import ConfigOption
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/sessions.py

@@ -5,11 +5,11 @@ from typing import TYPE_CHECKING, List, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import SessionState, SessionSummary
 from core.gui.dialogs.dialog import Dialog
 from core.gui.images import ImageEnum, Images
 from core.gui.task import ProgressTask
 from core.gui.themes import PADX, PADY
-from core.gui.wrappers import SessionState, SessionSummary
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/dialogs/wlanconfig.py

@@ -4,10 +4,10 @@ from typing import TYPE_CHECKING, Dict, Optional
 
 import grpc
 
+from core.api.grpc.wrappers import ConfigOption, Node
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 from core.gui.widgets import ConfigFrame
-from core.gui.wrappers import ConfigOption, Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/frames/link.py

@@ -1,9 +1,9 @@
 import tkinter as tk
 from typing import TYPE_CHECKING, Optional
 
+from core.api.grpc.wrappers import Interface
 from core.gui.frames.base import DetailsFrame, InfoFrameBase
 from core.gui.utils import bandwidth_text
-from core.gui.wrappers import Interface
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/frames/node.py

@@ -1,9 +1,9 @@
 import tkinter as tk
 from typing import TYPE_CHECKING
 
+from core.api.grpc.wrappers import NodeType
 from core.gui.frames.base import DetailsFrame, InfoFrameBase
 from core.gui.nodeutils import NodeUtils
-from core.gui.wrappers import NodeType
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/graph/edges.py

@@ -3,13 +3,13 @@ import math
 import tkinter as tk
 from typing import TYPE_CHECKING, Optional, Tuple
 
+from core.api.grpc.wrappers import Interface, Link
 from core.gui import themes
 from core.gui.dialogs.linkconfig import LinkConfigurationDialog
 from core.gui.frames.link import EdgeInfoFrame, WirelessEdgeInfoFrame
 from core.gui.graph import tags
 from core.gui.nodeutils import NodeUtils
 from core.gui.utils import bandwidth_text, delay_jitter_text
-from core.gui.wrappers import Interface, Link
 
 if TYPE_CHECKING:
     from core.gui.graph.graph import CanvasGraph

daemon/core/gui/graph/graph.py

@@ -7,6 +7,14 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
 from PIL import Image
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import (
+    Interface,
+    Link,
+    LinkType,
+    Node,
+    Session,
+    ThroughputsEvent,
+)
 from core.gui.dialogs.shapemod import ShapeDialog
 from core.gui.graph import tags
 from core.gui.graph.edges import (
@@ -22,7 +30,6 @@ from core.gui.graph.shape import Shape
 from core.gui.graph.shapeutils import ShapeType, is_draw_shape, is_marker
 from core.gui.images import ImageEnum, TypeToImage
 from core.gui.nodeutils import NodeDraw, NodeUtils
-from core.gui.wrappers import Interface, Link, LinkType, Node, Session, ThroughputsEvent
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/graph/node.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Dict, List, Set
 import grpc
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import Interface, Node, NodeType
 from core.gui import nodeutils, themes
 from core.gui.dialogs.emaneconfig import EmaneConfigDialog
 from core.gui.dialogs.mobilityconfig import MobilityConfigDialog
@@ -20,7 +21,6 @@ from core.gui.graph.edges import CanvasEdge, CanvasWirelessEdge
 from core.gui.graph.tooltip import CanvasTooltip
 from core.gui.images import ImageEnum, Images
 from core.gui.nodeutils import ANTENNA_SIZE, NodeUtils
-from core.gui.wrappers import Interface, Node, NodeType
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/images.py

@@ -5,8 +5,8 @@ from typing import Dict, Optional, Tuple
 from PIL import Image
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import NodeType
 from core.gui.appconfig import LOCAL_ICONS_PATH
-from core.gui.wrappers import NodeType
 
 
 class Images:

daemon/core/gui/interface.py

@@ -4,9 +4,9 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple
 import netaddr
 from netaddr import EUI, IPNetwork
 
+from core.api.grpc.wrappers import Interface, Link, Node
 from core.gui.graph.node import CanvasNode
 from core.gui.nodeutils import NodeUtils
-from core.gui.wrappers import Interface, Link, Node
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/nodeutils.py

@@ -3,9 +3,9 @@ from typing import List, Optional, Set
 
 from PIL.ImageTk import PhotoImage
 
+from core.api.grpc.wrappers import Node, NodeType
 from core.gui.appconfig import CustomNode, GuiConfig
 from core.gui.images import ImageEnum, Images, TypeToImage
-from core.gui.wrappers import Node, NodeType
 
 ICON_SIZE: int = 48
 ANTENNA_SIZE: int = 32

daemon/core/gui/statusbar.py

@@ -5,9 +5,9 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING, List, Optional
 
+from core.api.grpc.wrappers import ExceptionEvent, ExceptionLevel
 from core.gui.dialogs.alerts import AlertsDialog
 from core.gui.themes import Styles
-from core.gui.wrappers import ExceptionEvent, ExceptionLevel
 
 if TYPE_CHECKING:
     from core.gui.app import Application

daemon/core/gui/widgets.py

@@ -5,10 +5,10 @@ from pathlib import Path
 from tkinter import filedialog, font, ttk
 from typing import TYPE_CHECKING, Any, Callable, Dict, Set, Type
 
+from core.api.grpc.wrappers import ConfigOption, ConfigOptionType
 from core.gui import appconfig, themes, validation
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import FRAME_PAD, PADX, PADY
-from core.gui.wrappers import ConfigOption, ConfigOptionType
 
 if TYPE_CHECKING:
     from core.gui.app import Application