#2887 - Resolve conflicts from merge

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

@@ -824,7 +824,7 @@ class User(SimComponent):
         return self.model_dump()
 
 
-class UserManager(Service):
+class UserManager(Service, identifier="UserManager"):
     """
     Manages users within the PrimAITE system, handling creation, authentication, and administration.
 
@@ -833,11 +833,18 @@ class UserManager(Service):
     :param disabled_admins: A dictionary of currently disabled admin users by their usernames
     """
 
+    class ConfigSchema(Service.ConfigSchema):
+        """ConfigSchema for UserManager."""
+
+        type: str = "UserManager"
+
+    config: "UserManager.ConfigSchema" = Field(default_factory=lambda: UserManager.ConfigSchema())
+
     users: Dict[str, User] = {}
 
     def __init__(self, **kwargs):
         """
-        Initializes a UserManager instanc.
+        Initializes a UserManager instance.
 
         :param username: The username for the default admin user
         :param password: The password for the default admin user
@@ -1130,13 +1137,20 @@ class RemoteUserSession(UserSession):
         return state
 
 
-class UserSessionManager(Service):
+class UserSessionManager(Service, identifier="UserSessionManager"):
     """
     Manages user sessions on a Node, including local and remote sessions.
 
     This class handles authentication, session management, and session timeouts for users interacting with the Node.
     """
 
+    class ConfigSchema(Service.ConfigSchema):
+        """ConfigSchema for UserSessionManager."""
+
+        type: str = "UserSessionManager"
+
+    config: "UserSessionManager.ConfigSchema" = Field(default_factory=lambda: UserSessionManager.ConfigSchema())
+
     local_session: Optional[UserSession] = None
     """The current local user session, if any."""
 
@@ -1554,7 +1568,6 @@ class Node(SimComponent, ABC):
         red_scan_countdown: int = 0
         "Time steps until reveal to red scan is complete."
 
-
     @classmethod
     def from_config(cls, config: Dict) -> "Node":
         """Create Node object from a given configuration dictionary."""
@@ -1564,7 +1577,7 @@ class Node(SimComponent, ABC):
         obj = cls(config=cls.ConfigSchema(**config))
         return obj
 
-    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.
 
@@ -1572,10 +1585,10 @@ class Node(SimComponent, ABC):
         :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