graphics scene refactor: break scene_ops<-->graphics_scene dep loop

src/lifeblood_viewer/editor_scene_integration.py

@@ -6,10 +6,10 @@
 
 from typing import Optional, TYPE_CHECKING
 if TYPE_CHECKING:
-    from .graphics_scene import QGraphicsImguiScene
+    from .graphics_scene_with_data_controller import QGraphicsImguiSceneWithDataController
 
 
-def fetch_and_open_log_viewer(scene: "QGraphicsImguiScene", invoc_id: int, parent_widget: QWidget, *, update_interval: Optional[float] = None):
+def fetch_and_open_log_viewer(scene: "QGraphicsImguiSceneWithDataController", invoc_id: int, parent_widget: QWidget, *, update_interval: Optional[float] = None):
     if update_interval is None:
         scene.fetch_log_run_callback(invoc_id, _open_log_viewer, parent_widget)
     else:

src/lifeblood_viewer/fancy_scene_item_factory.py

@@ -1,5 +1,4 @@
-from .graphics_items import Node, Task, NodeConnection
-from .graphics_scene_base import GraphicsSceneBase
+from .graphics_items import Node, Task, NodeConnection, GraphicsSceneBase
 from lifeblood.ui_protocol_data import TaskData
 
 from .scene_data_controller import SceneDataController

src/lifeblood_viewer/graphics_items/__init__.py

@@ -1,4 +1,5 @@
 # export inner classes
 from .graphics_items import Node, Task, NodeConnection
+from .graphics_scene_container import GraphicsSceneWithNodesAndTasks, GraphicsSceneBase
 from .network_item import NetworkItem, NetworkItemWithUI
 from .network_item_watchers import NetworkItemWatcher, WatchableNetworkItem, WatchableNetworkItemProxy

src/lifeblood_viewer/graphics_items/graphics_items.py

@@ -5,7 +5,7 @@
 
 from .network_item_watchers import NetworkItemWatcher, WatchableNetworkItem, WatchableNetworkItemProxy
 from .scene_network_item import SceneNetworkItem, SceneNetworkItemWithUI
-from ..graphics_scene_base import GraphicsSceneBase
+from .graphics_scene_base import GraphicsSceneBase
 
 from lifeblood.uidata import NodeUi
 from lifeblood.ui_protocol_data import TaskData, TaskDelta, DataNotSet, IncompleteInvocationLogData, InvocationLogData

src/lifeblood_viewer/graphics_scene_base.py → src/lifeblood_viewer/graphics_items/graphics_scene_base.py

@@ -1,4 +1,4 @@
-from .graphics_items.network_item import NetworkItem
+from .network_item import NetworkItem
 
 from PySide2.QtWidgets import QGraphicsScene, QWidget
 

src/lifeblood_viewer/graphics_items/pretty_items/decorated_node.py

@@ -1,7 +1,7 @@
 from .node_decorator_base import NodeDecorator, NodeDecoratorFactoryBase
 from .drawable_node import DrawableNode
 
-from lifeblood_viewer.graphics_scene_base import GraphicsSceneBase
+from ..graphics_scene_base import GraphicsSceneBase
 
 from typing import Iterable, List, Optional, Tuple
 

src/lifeblood_viewer/graphics_items/pretty_items/drawable_node.py

@@ -1,10 +1,10 @@
 from lifeblood import logging
 from lifeblood.enums import TaskState
 from ..graphics_items import Node, Task
+from ..graphics_scene_base import GraphicsSceneBase
 from ..node_connection_snap_point import NodeConnSnapPoint
 from .drawable_task import DrawableTask
 
-from lifeblood_viewer.graphics_scene_base import GraphicsSceneBase
 
 from PySide2.QtCore import Qt, QPointF, QRectF
 from PySide2.QtGui import QBrush, QColor, QLinearGradient, QPainter, QPainterPath, QPen

src/lifeblood_viewer/graphics_items/pretty_items/drawable_task.py

@@ -4,8 +4,8 @@
 from lifeblood.ui_protocol_data import TaskData
 from .task_animation import TaskAnimation
 from ..graphics_items import Node, Task
+from ..graphics_scene_container import GraphicsSceneWithNodesAndTasks
 
-from lifeblood_viewer.graphics_scene_container import GraphicsSceneWithNodesAndTasks
 
 from PySide2.QtCore import QAbstractAnimation, Slot, QPointF, QRectF, QSizeF, QSequentialAnimationGroup
 from PySide2.QtGui import QBrush, QColor, QPainter, QPainterPath, QPen

src/lifeblood_viewer/graphics_items/pretty_items/fancy_items/scene_node.py

@@ -7,11 +7,11 @@
 from ...utils import call_later
 from ..decorated_node import DecoratedNode
 from ..node_connection_create_preview import NodeConnectionCreatePreview
+from ...graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from ...node_connection_snap_point import NodeConnSnapPoint
 
 from lifeblood_viewer.scene_data_controller import SceneDataController
 from lifeblood_viewer.code_editor.editor import StringParameterEditor
-from lifeblood_viewer.graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from lifeblood_viewer.graphics_scene_viewing_widget import GraphicsSceneViewingWidgetBase
 from ..node_decorator_base import NodeDecoratorFactoryBase
 

src/lifeblood_viewer/graphics_items/pretty_items/fancy_items/scene_node_connection.py

@@ -1,12 +1,12 @@
 from math import sqrt
 from lifeblood import logging
-from lifeblood_viewer.graphics_items import Node, NodeConnection
+from ...graphics_items import Node, NodeConnection
 from ...utils import call_later, length2
 from ..node_connection_create_preview import NodeConnectionCreatePreview
+from ...graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from ...node_connection_snap_point import NodeConnSnapPoint
 
 from lifeblood_viewer.scene_data_controller import SceneDataController
-from lifeblood_viewer.graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from lifeblood_viewer.graphics_scene_viewing_widget import GraphicsSceneViewingWidgetBase
 
 from PySide2.QtCore import Qt, Slot, QPointF, QRectF

src/lifeblood_viewer/graphics_items/pretty_items/fancy_items/scene_task.py

@@ -6,13 +6,13 @@
 from .scene_task_preview import SceneTaskPreview
 from ..drawable_task import DrawableTask
 from ...graphics_items import Node
+from ...graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from ...network_item_watchers import NetworkItemWatcher
 
 from ...utils import call_later
 
 from lifeblood_viewer.editor_scene_integration import fetch_and_open_log_viewer
 from lifeblood_viewer.scene_data_controller import SceneDataController
-from lifeblood_viewer.graphics_scene_container import GraphicsSceneWithNodesAndTasks
 from lifeblood_viewer.graphics_scene_viewing_widget import GraphicsSceneViewingWidgetBase
 
 from PySide2.QtCore import Qt, QPointF

src/lifeblood_viewer/graphics_items/pretty_items/node_connection_create_preview.py

@@ -1,4 +1,4 @@
-from lifeblood_viewer.graphics_items import Node
+from ..graphics_items import Node
 from ..utils import length2
 from ..node_connection_snap_point import NodeConnSnapPoint
 

src/lifeblood_viewer/graphics_items/scene_network_item.py

@@ -1,6 +1,6 @@
 from .network_item import NetworkItemWithUI, NetworkItem
 from .qextended_graphics_item import QGraphicsItemExtended
-from ..graphics_scene_base import GraphicsSceneBase
+from .graphics_scene_base import GraphicsSceneBase
 
 from PySide2.QtWidgets import QGraphicsItem