refactor: adjust imports/types according to prev decisions

src/lifeblood/basenode_serializer_v2.py

@@ -4,7 +4,7 @@
 from .basenode_serialization import NodeSerializerBase, IncompatibleDeserializationMethod, FailedToApplyNodeState, FailedToApplyParameters
 from .basenode import BaseNode
 from .enums import NodeParameterType
-from .uidata import ParameterFullValue
+from .node_parameters import ParameterFullValue
 
 from typing import Optional, Tuple, Union
 

src/lifeblood/core_nodes/environment_resolver_setter.py

@@ -3,8 +3,6 @@
 from lifeblood.processingcontext import ProcessingContext
 from lifeblood.enums import NodeParameterType
 from lifeblood.environment_resolver import EnvironmentResolverArguments
-from lifeblood.uidata import NodeUi, MultiGroupLayout, Parameter
-from lifeblood.node_visualization_classes import NodeColorScheme
 
 from typing import Iterable
 

src/lifeblood/core_nodes/mod_attrib.py

@@ -1,10 +1,6 @@
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult
-from lifeblood.taskspawn import TaskSpawn
-from lifeblood.exceptions import NodeNotReadyToProcess
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi, MultiGroupLayout, Parameter
-from lifeblood.node_visualization_classes import NodeColorScheme
 
 from typing import Iterable
 

src/lifeblood/core_nodes/parent_children_waiter.py

@@ -1,20 +1,13 @@
 import dataclasses
 from dataclasses import dataclass
-from lifeblood.attribute_serialization import deserialize_attributes_core
-from lifeblood.node_plugin_base import BaseNode, ProcessingError
+from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult
-from lifeblood.taskspawn import TaskSpawn
 from lifeblood.exceptions import NodeNotReadyToProcess
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi
-from lifeblood.processingcontext import ProcessingContext
 
 from threading import Lock
 
-from typing import Any, Dict, Iterable, List, Optional,  Set, TypedDict , TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lifeblood.scheduler import Scheduler
+from typing import Dict, Iterable, List, Set
 
 
 def node_class():

src/lifeblood/core_nodes/python.py

@@ -1,16 +1,13 @@
 import re
-import time
 
 from lifeblood.node_plugin_base import BaseNodeWithTaskRequirements
-from lifeblood.invocationjob import InvocationJob, InvocationEnvironment
+from lifeblood.invocationjob import InvocationJob
 from lifeblood.processingcontext import ProcessingContext
 from lifeblood.nodethings import ProcessingResult, ProcessingError
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
+
+from typing import Iterable
 
-from types import MappingProxyType
-from typing import TYPE_CHECKING, Iterable
-if TYPE_CHECKING:
-    from lifeblood.scheduler import Scheduler
 
 
 def node_class():

src/lifeblood/core_nodes/rename_attrib.py

@@ -1,9 +1,6 @@
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingError
-from lifeblood.taskspawn import TaskSpawn
-from lifeblood.exceptions import NodeNotReadyToProcess
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi
 
 from typing import Iterable
 

src/lifeblood/core_nodes/split_waiter.py

@@ -1,18 +1,12 @@
 from dataclasses import dataclass
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult
-from lifeblood.taskspawn import TaskSpawn
 from lifeblood.exceptions import NodeNotReadyToProcess
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi
-from lifeblood.processingcontext import ProcessingContext
 
 from threading import Lock
 
-from typing import Dict, TypedDict, Set, Iterable, Optional, Any, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lifeblood.scheduler import Scheduler
+from typing import Dict, Set, Iterable, Optional
 
 
 @dataclass

src/lifeblood/core_nodes/switch.py

@@ -1,9 +1,7 @@
 from lifeblood.node_plugin_base import BaseNode
-from lifeblood.nodethings import ProcessingResult, ProcessingError
+from lifeblood.nodethings import ProcessingResult
 from lifeblood.processingcontext import ProcessingContext
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi, Parameter, VerticalParametersLayout, ParameterHierarchyItem, ParametersLayoutBase
-from lifeblood.node_visualization_classes import NodeColorScheme
 
 from typing import Iterable
 

src/lifeblood/core_nodes/test.py

@@ -3,11 +3,9 @@
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.invocationjob import InvocationJob, InvocationEnvironment
 from lifeblood.nodethings import ProcessingResult
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
 
-from typing import TYPE_CHECKING, Iterable
-if TYPE_CHECKING:
-    from lifeblood.scheduler import Scheduler
+from typing import Iterable
 
 
 def node_class():

src/lifeblood/core_nodes/wait_for_task.py

@@ -2,11 +2,8 @@
 import shlex
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingContext
-from lifeblood.taskspawn import TaskSpawn
 from lifeblood.exceptions import NodeNotReadyToProcess
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi, MultiGroupLayout, Parameter
-from lifeblood.node_visualization_classes import NodeColorScheme
 
 from typing import Dict, Iterable, List, Optional, Set
 

src/lifeblood/core_nodes/wedge.py

@@ -1,7 +1,6 @@
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingError
 from lifeblood.enums import NodeParameterType
-from lifeblood.uidata import NodeUi, MultiGroupLayout, Parameter
 
 from typing import Iterable
 

src/lifeblood/node_plugin_base.py

@@ -10,7 +10,7 @@
 from .invocationjob import ResourceRequirement, ResourceRequirements
 from .nodethings import ProcessingResult, ProcessingError  # unused import - for easy reexport to plugins
 from .worker_resource_definition import WorkerResourceDefinition, WorkerResourceDataType, WorkerDeviceTypeDefinition
-from .uidata import NodeUi
+from .node_ui import NodeUi
 from .scheduler.scheduler import Scheduler
 
 from typing import Dict, Optional, Tuple, Union
@@ -142,7 +142,7 @@ def set_parent(self, graph_holder: NodeGraphHolderBase, node_id_in_graph: int):
 
     def __apply_requirements(self, task_dict: dict, node_config: dict, result: ProcessingResult):
         if result.invocation_job is not None:
-            context = ProcessingContext(self, task_dict, node_config)
+            context = ProcessingContext(self.name(), self.label(), self.get_ui(), task_dict, node_config)
             raw_groups = context.param_value('__requirements__.worker_groups').strip()
             reqs = result.invocation_job.requirements()
             if raw_groups != '':

src/lifeblood/node_type_metadata.py

@@ -2,7 +2,7 @@
 from .node_dataprovider_base import NodeDataProvider
 from .plugin_info import PluginInfo
 
-from typing import Optional, TYPE_CHECKING, Tuple, Set
+from typing import Optional, Tuple, Set
 
 
 class NodeTypePluginMetadata:

src/lifeblood/pulse_checker.py

@@ -1,7 +1,6 @@
 import asyncio
 from .logging import get_logger
-#from .scheduler_task_protocol import SchedulerTaskClient
-from .scheduler_message_processor import SchedulerWorkerControlClient
+from .scheduler_message_processor_client import SchedulerWorkerControlClient
 from .net_messages.address import AddressChain
 from .net_messages.message_processor import MessageProcessorBase
 from .net_messages.exceptions import MessageTransferError

src/lifeblood/stock_nodes/ffmpeg.py

@@ -5,9 +5,8 @@
 
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingError
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
 from lifeblood.invocationjob import InvocationJob
-from lifeblood.invocationjob import InvocationJob, InvocationEnvironment
 
 from typing import Iterable
 

src/lifeblood/stock_nodes/file_watcher.py

@@ -4,10 +4,9 @@
 
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingError
-from lifeblood.uidata import NodeParameterType
 from lifeblood.processingcontext import ProcessingContext
 from lifeblood.invocationjob import InvocationJob, InvocationRequirements
-from lifeblood.enums import WorkerType
+from lifeblood.enums import WorkerType, NodeParameterType
 
 from typing import Iterable
 

src/lifeblood/stock_nodes/fileop.py

@@ -4,7 +4,7 @@
 from lifeblood.nodethings import ProcessingResult, ProcessingError
 from lifeblood.invocationjob import InvocationJob
 from lifeblood.processingcontext import ProcessingContext
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
 
 from typing import Iterable
 

src/lifeblood/stock_nodes/filepattern.py

@@ -6,7 +6,7 @@
 from lifeblood.nodethings import ProcessingResult, ProcessingError
 from lifeblood.invocationjob import InvocationJob
 from lifeblood.processingcontext import ProcessingContext
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
 from lifeblood.enums import WorkerType
 from lifeblood.text import match_pattern
 

src/lifeblood/stock_nodes/imagemagik.py

@@ -1,13 +1,11 @@
 import os
 import shlex
 import re
-from math import sqrt, floor, ceil
 
 from lifeblood.node_plugin_base import BaseNode
 from lifeblood.nodethings import ProcessingResult, ProcessingError
-from lifeblood.uidata import NodeParameterType
+from lifeblood.enums import NodeParameterType
 from lifeblood.invocationjob import InvocationJob
-from lifeblood.invocationjob import InvocationJob, InvocationEnvironment
 
 from typing import Iterable