#2869 - New Year, new changes. Actioning review comments and some changes following self-review and catchup

tests/integration_tests/game_layer/actions/test_application_request_permission.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.server import Server

tests/integration_tests/game_layer/actions/test_c2_suite_actions.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.base import UserManager

tests/integration_tests/game_layer/actions/test_file_request_permission.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/actions/test_folder_request_permission.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/actions/test_nic_request_permission.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 

tests/integration_tests/game_layer/actions/test_node_request_permission.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/actions/test_service_request_permission.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.server import Server

tests/integration_tests/game_layer/actions/test_terminal_actions.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 import pytest
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.base import UserManager
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/observations/test_nic_observations.py

@@ -7,7 +7,7 @@ import yaml
 from gymnasium import spaces
 
 from primaite.game.agent.observations.nic_observations import NICObservation
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.simulator.network.hardware.base import NetworkInterface
 from primaite.simulator.network.hardware.nodes.host.computer import Computer

tests/integration_tests/game_layer/test_RNG_seed.py

@@ -5,7 +5,7 @@ import pytest
 import yaml
 
 from primaite.config.load import data_manipulation_config_path
-from primaite.game.agent.scripted_agents.interface import AgentHistoryItem
+from primaite.game.agent.interface import AgentHistoryItem
 from primaite.session.environment import PrimaiteGymEnv
 
 

tests/integration_tests/game_layer/test_actions.py

@@ -17,7 +17,7 @@ from typing import Tuple
 import pytest
 import yaml
 
-from primaite.game.agent.scripted_agents.interface import ProxyAgent
+from primaite.game.agent.interface import ProxyAgent
 from primaite.game.game import PrimaiteGame
 from primaite.session.environment import PrimaiteGymEnv
 from primaite.simulator.file_system.file_system_item_abc import FileSystemItemHealthStatus

tests/integration_tests/game_layer/test_rewards.py

@@ -3,7 +3,7 @@ import pytest
 import yaml
 
 from primaite.game.agent.rewards import ActionPenalty, GreenAdminDatabaseUnreachablePenalty, WebpageUnavailablePenalty
-from primaite.game.agent.scripted_agents.interface import AgentHistoryItem
+from primaite.game.agent.interface import AgentHistoryItem
 from primaite.game.game import PrimaiteGame
 from primaite.interface.request import RequestResponse
 from primaite.session.environment import PrimaiteGymEnv