mal-simulator 2.5.0__tar.gz → 2.6.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. {mal_simulator-2.5.0/mal_simulator.egg-info → mal_simulator-2.6.0}/PKG-INFO +1 -1
  2. {mal_simulator-2.5.0 → mal_simulator-2.6.0/mal_simulator.egg-info}/PKG-INFO +1 -1
  3. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/__init__.py +2 -2
  4. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/config/agent_settings.py +1 -1
  5. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/config/sim_settings.py +1 -1
  6. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/graph_env.py +2 -2
  7. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/pyproject.toml +1 -1
  8. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/tests/test_mal_simulator.py +1 -0
  9. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/AUTHORS +0 -0
  10. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/LICENSE +0 -0
  11. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/README.md +0 -0
  12. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/mal_simulator.egg-info/SOURCES.txt +0 -0
  13. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/mal_simulator.egg-info/dependency_links.txt +0 -0
  14. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/mal_simulator.egg-info/entry_points.txt +0 -0
  15. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/mal_simulator.egg-info/requires.txt +0 -0
  16. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/mal_simulator.egg-info/top_level.txt +0 -0
  17. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/__main__.py +0 -0
  18. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/config/__init__.py +0 -0
  19. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/config/agent_settings_factories.py +0 -0
  20. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/config/node_property_rule.py +0 -0
  21. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/__init__.py +0 -0
  22. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/base_classes.py +0 -0
  23. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/__init__.py +0 -0
  24. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/mal_spaces.py +0 -0
  25. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/serialization.py +0 -0
  26. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/utils.py +0 -0
  27. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/graph/wrapper.py +0 -0
  28. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/legacy/__init__.py +0 -0
  29. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/legacy/gym_envs.py +0 -0
  30. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/envs/legacy/malsim_vectorized_obs_env.py +0 -0
  31. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/__init__.py +0 -0
  32. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/agent_state.py +0 -0
  33. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/agent_states.py +0 -0
  34. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/attack_surface.py +0 -0
  35. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/attacker_state.py +0 -0
  36. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/attacker_state_factories.py +0 -0
  37. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/attacker_step.py +0 -0
  38. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/defender_state.py +0 -0
  39. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/defender_state_factories.py +0 -0
  40. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/defender_step.py +0 -0
  41. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/defense_surface.py +0 -0
  42. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/false_alerts.py +0 -0
  43. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/graph_processing.py +0 -0
  44. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/graph_state.py +0 -0
  45. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/graph_utils.py +0 -0
  46. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/node_getters.py +0 -0
  47. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/observability.py +0 -0
  48. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/reset_agent.py +0 -0
  49. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/rewards.py +0 -0
  50. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/run_simulation.py +0 -0
  51. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/simulator.py +0 -0
  52. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/simulator_state.py +0 -0
  53. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/state_query.py +0 -0
  54. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/mal_simulator/ttc_utils.py +0 -0
  55. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/__init__.py +0 -0
  56. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/attackers/__init__.py +0 -0
  57. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/attackers/searchers.py +0 -0
  58. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/attackers/shortest_path.py +0 -0
  59. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/attackers/ttc_soft_min.py +0 -0
  60. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/decision_agent.py +0 -0
  61. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/defenders/__init__.py +0 -0
  62. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/defenders/heuristic_agent.py +0 -0
  63. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/keyboard_input.py +0 -0
  64. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/passive_agent.py +0 -0
  65. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/random_agent.py +0 -0
  66. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/policies/utils/path_finding.py +0 -0
  67. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/scenario/__init__.py +0 -0
  68. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/scenario/scenario.py +0 -0
  69. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/types.py +0 -0
  70. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/malsim/visualization/malsim_gui_client.py +0 -0
  71. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/setup.cfg +0 -0
  72. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/tests/test_graph_processing.py +0 -0
  73. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/tests/test_main.py +0 -0
  74. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/tests/test_scenario.py +0 -0
  75. {mal_simulator-2.5.0 → mal_simulator-2.6.0}/tests/test_ttc_utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mal-simulator
3
- Version: 2.5.0
3
+ Version: 2.6.0
4
4
  Summary: A MAL compliant simulator.
5
5
  Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Sandor Berglund <sandorb@kth.se>
6
6
  License: Apache Software License
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mal-simulator
3
- Version: 2.5.0
3
+ Version: 2.6.0
4
4
  Summary: A MAL compliant simulator.
5
5
  Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Sandor Berglund <sandorb@kth.se>
6
6
  License: Apache Software License
@@ -1,4 +1,4 @@
1
- # MAL Simulator v2.5.0
1
+ # MAL Simulator v2.6.0
2
2
  # Copyright 2025, Andrei Buhaiu.
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ from malsim.scenario import Scenario
26
26
  from malsim.config import AttackerSettings, DefenderSettings
27
27
 
28
28
  __title__ = 'malsim'
29
- __version__ = '2.5.0'
29
+ __version__ = '2.6.0'
30
30
  __authors__ = [
31
31
  'Andrei Buhaiu',
32
32
  'Joakim Loxdal',
@@ -58,7 +58,7 @@ class AttackerSettings(AgentRuntimeMixin, Generic[T]):
58
58
  rewards: NodePropertyRule[float] | None = None
59
59
  config: dict[str, Any] = field(default_factory=dict)
60
60
  type: AgentType = AgentType.ATTACKER
61
- reward_mode: RewardMode = RewardMode.CUMULATIVE
61
+ reward_mode: RewardMode = RewardMode.ONE_OFF
62
62
  # Goals affect simulation termination but is optional
63
63
  goals: Set[T] = field(default_factory=frozenset)
64
64
  # TTC distributions that override TTCs set in language
@@ -36,7 +36,7 @@ class AttackSurfaceSettings:
36
36
  skip_unviable: bool = True
37
37
  # attack_surface_skip_unnecessary
38
38
  # - if true do not add unnecessary nodes to the attack surface
39
- skip_unnecessary: bool = True
39
+ skip_unnecessary: bool = False
40
40
 
41
41
 
42
42
  @dataclass
@@ -92,7 +92,7 @@ class AttackerGraphEnv(gym.Env[MALObsInstance, np.int64]):
92
92
  scenario = Scenario.load_from_file(str(scenario), sim_settings=sim_settings)
93
93
 
94
94
  self.scenario = scenario
95
- self.sim = MalSimulator.from_scenario(scenario)
95
+ self.sim = MalSimulator.from_scenario(scenario, sim_settings=sim_settings)
96
96
  self.multi_env = MalSimGraph(self.sim, attacker_visible_defense_steps=False)
97
97
  self.agent_name = get_agent_name(scenario, AgentType.ATTACKER)
98
98
  self.observation_space = self.multi_env.observation_space(self.agent_name)
@@ -158,7 +158,7 @@ class DefenderGraphEnv(gym.Env[MALObsInstance, np.int64]):
158
158
  scenario = Scenario.load_from_file(str(scenario), sim_settings=sim_settings)
159
159
 
160
160
  self.scenario = scenario
161
- self.sim = MalSimulator.from_scenario(scenario)
161
+ self.sim = MalSimulator.from_scenario(scenario, sim_settings=sim_settings)
162
162
  self.multi_env = MalSimGraph(self.sim, attacker_visible_defense_steps=True)
163
163
  self.agent_name = get_agent_name(scenario, AgentType.DEFENDER)
164
164
  self.observation_space = self.multi_env.observation_space(self.agent_name)
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "mal-simulator"
3
- version = "2.5.0"
3
+ version = "2.6.0"
4
4
  authors = [
5
5
  { name="Andrei Buhaiu", email="buhaiu@kth.se" },
6
6
  { name="Joakim Loxdal", email="loxdal@kth.se" },
@@ -333,6 +333,7 @@ def test_node_full_names_to_simulator(
333
333
  {attack_graph.get_node_by_full_name(entry_point_full_name)}
334
334
  ),
335
335
  rewards=rewards,
336
+ reward_mode=RewardMode.CUMULATIVE,
336
337
  ),
337
338
  ),
338
339
  )
File without changes
File without changes
File without changes
File without changes