oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2533: precommit

Browse Source
This commit is contained in:
Czar Echavez
2024-04-30 15:50:53 +01:00
parent 59990813f5
commit ab3d23785d
3 changed files with 55 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/primaite/utils/cli/dev_cli.py
View File

@@ -1,5 +1,3 @@
from typing import List
import click import click
import typer import typer
from rich import print from rich import print
@@ -81,17 +79,14 @@ def config_callback(
"-level", "-level",
click_type=click.Choice(LogLevel._member_names_, case_sensitive=False), click_type=click.Choice(LogLevel._member_names_, case_sensitive=False),
help="The level of system logs to output.", help="The level of system logs to output.",
show_default=False show_default=False,
) ),
] = None, ] = None,
output_sys_logs: Annotated[ output_sys_logs: Annotated[
bool, bool,
typer.Option( typer.Option(
"--output-sys-logs/--no-sys-logs", "--output-sys-logs/--no-sys-logs", "-sys/-nsys", help="Output system logs to file.", show_default=False
"-sys/-nsys", ),
help="Output system logs to file.",
show_default=False
)
] = None, ] = None,
output_pcap_logs: Annotated[ output_pcap_logs: Annotated[
bool, bool,
@@ -99,17 +94,14 @@ def config_callback(
"--output-pcap-logs/--no-pcap-logs", "--output-pcap-logs/--no-pcap-logs",
"-pcap/-npcap", "-pcap/-npcap",
help="Output network packet capture logs to file.", help="Output network packet capture logs to file.",
show_default=False show_default=False,
), ),
] = None, ] = None,
output_to_terminal: Annotated[ output_to_terminal: Annotated[
bool, bool,
typer.Option( typer.Option(
"--output-to-terminal/--no-terminal", "--output-to-terminal/--no-terminal", "-t/-nt", help="Output system logs to terminal.", show_default=False
"-t/-nt", ),
help="Output system logs to terminal.",
show_default=False
)
] = None, ] = None,
): ):
"""Configure the development tools and environment.""" """Configure the development tools and environment."""
@@ -122,7 +114,6 @@ def config_callback(
config_dict["developer_mode"]["sys_log_level"] = ctx.params.get("sys_log_level") config_dict["developer_mode"]["sys_log_level"] = ctx.params.get("sys_log_level")
print(f"PrimAITE dev-mode config updated sys_log_level={ctx.params.get('sys_log_level')}") print(f"PrimAITE dev-mode config updated sys_log_level={ctx.params.get('sys_log_level')}")
if output_sys_logs is not None: if output_sys_logs is not None:
config_dict["developer_mode"]["output_sys_logs"] = output_sys_logs config_dict["developer_mode"]["output_sys_logs"] = output_sys_logs
print(f"PrimAITE dev-mode config updated {output_sys_logs=}") print(f"PrimAITE dev-mode config updated {output_sys_logs=}")
@@ -177,9 +168,11 @@ def path(
config_dict["developer_mode"]["output_dir"] = None config_dict["developer_mode"]["output_dir"] = None
# update application config # update application config
update_primaite_config(config_dict) update_primaite_config(config_dict)
print(f"PrimAITE dev-mode output_dir [medium_turquoise]" print(
f"PrimAITE dev-mode output_dir [medium_turquoise]"
f"{str(_PRIMAITE_ROOT.parent.parent / 'simulation_output')}" f"{str(_PRIMAITE_ROOT.parent.parent / 'simulation_output')}"
f"[/medium_turquoise]") f"[/medium_turquoise]"
)
return return
if directory: if directory:

4
src/primaite/utils/cli/primaite_config_utils.py
View File

@@ -6,9 +6,7 @@ import yaml
from primaite import PRIMAITE_PATHS from primaite import PRIMAITE_PATHS
def get_primaite_config_dict( def get_primaite_config_dict(config_path: Optional[Path] = None) -> Dict:
config_path: Optional[Path] = None
) -> Dict:
""" """
Returns a dict containing the PrimAITE application config. Returns a dict containing the PrimAITE application config.

2
tests/integration_tests/cli/test_dev_cli.py
View File

@@ -5,7 +5,7 @@ from pathlib import Path
import pytest import pytest
from primaite import PRIMAITE_PATHS, _PRIMAITE_ROOT from primaite import _PRIMAITE_ROOT, PRIMAITE_PATHS
from primaite.utils.cli.primaite_config_utils import get_primaite_config_dict from primaite.utils.cli.primaite_config_utils import get_primaite_config_dict
from tests.integration_tests.cli import cli from tests.integration_tests.cli import cli