Merge agents and actions branches + fix import / subclass errors

src/primaite/simulator/network/creation.py

@@ -1,7 +1,7 @@
 # © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from abc import ABC, abstractmethod
 from ipaddress import IPv4Address
-from typing import Any, ClassVar, Dict, Literal, Type
+from typing import Any, ClassVar, Dict, Literal, Optional, Type
 
 from pydantic import BaseModel, model_validator
 
@@ -49,7 +49,7 @@ class NetworkNodeAdder(BaseModel):
 
     _registry: ClassVar[Dict[str, Type["NetworkNodeAdder"]]] = {}
 
-    def __init_subclass__(cls, identifier: str, **kwargs: Any) -> None:
+    def __init_subclass__(cls, identifier: Optional[str], **kwargs: Any) -> None:
         """
         Register a network node adder class.
 
@@ -58,6 +58,8 @@ class NetworkNodeAdder(BaseModel):
         :raises ValueError: When attempting to register a name that is already reserved.
         """
         super().__init_subclass__(**kwargs)
+        if identifier is None:
+            return
         if identifier in cls._registry:
             raise ValueError(f"Duplicate node adder {identifier}")
         cls._registry[identifier] = cls

src/primaite/simulator/network/hardware/base.py

@@ -1545,7 +1545,7 @@ class Node(SimComponent):
     _identifier: ClassVar[str] = "unknown"
     """Identifier for this particular class, used for printing and logging. Each subclass redefines this."""
 
-    def __init_subclass__(cls, identifier: str = "default", **kwargs: Any) -> None:
+    def __init_subclass__(cls, identifier: Optional[str] = None, **kwargs: Any) -> None:
         """
         Register a node type.
 
@@ -1553,10 +1553,10 @@ class Node(SimComponent):
         :type identifier: str
         :raises ValueError: When attempting to register an node with a name that is already allocated.
         """
-        if identifier == "default":
+        super().__init_subclass__(**kwargs)
+        if identifier is None:
             return
         identifier = identifier.lower()
-        super().__init_subclass__(**kwargs)
         if identifier in cls._registry:
             raise ValueError(f"Tried to define new node {identifier}, but this name is already reserved.")
         cls._registry[identifier] = cls