Merge branch 'refs/heads/dev' into feature/2735_Implement-UserManager-class-and-integrate-into-Node

src/primaite/VERSION

@@ -1 +1 @@
-3.1.0
+3.3.0-dev0

src/primaite/game/agent/rewards.py

@@ -8,6 +8,7 @@ weighed sum of the components.
 
 The reward function is typically specified using a config yaml file or a config dictionary. The following example shows
 the structure:
+
 ```yaml
     reward_function:
         reward_components:

src/primaite/notebooks/Action-masking.ipynb

@@ -6,6 +6,8 @@
    "source": [
     "# Action Masking\n",
     "\n",
+    "© Crown-owned copyright 2024, Defence Science and Technology Laboratory UK\n",
+    "\n",
     "PrimAITE environments support action masking. The action mask shows which of the agent's actions are applicable with the current environment state. For example, a node can only be turned on if it is currently turned off."
    ]
   },
@@ -210,7 +212,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,

src/primaite/utils/cli/dev_cli.py

@@ -76,7 +76,7 @@ def config_callback(
         LogLevel,
         typer.Option(
             "--sys-log-level",
-            "-level",
+            "-slevel",
             click_type=click.Choice(LogLevel._member_names_, case_sensitive=False),
             help="The level of system logs to output.",
             show_default=False,
@@ -86,7 +86,7 @@ def config_callback(
         LogLevel,
         typer.Option(
             "--agent-log-level",
-            "-level",
+            "-alevel",
             click_type=click.Choice(LogLevel._member_names_, case_sensitive=False),
             help="The level of agent behaviour logs to output.",
             show_default=False,