Skip to content

Commit 9f0bbdd

Browse files
authored
Merge pull request #426 from stratosphereips/ondra-refactor-package-structure
Ondra refactor package structure
2 parents 65390ea + 0b139ef commit 9f0bbdd

File tree

74 files changed

+2498
-1314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2498
-1314
lines changed

.dockerignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55
.pytest_cache
66
.ruff_cache
77
.vscode
8+
__pycache__
9+
build/
810
dist/
911
docs/
1012
examples/
1113
figures/
1214
logs/
13-
mlruns/
15+
netsecgame.egg-info/
1416
notebooks/
1517
NetSecGameAgents/
18+
site/
1619
tests/
1720
trajectories/
1821
readme_images/

AIDojoCoordinator/docs/Components.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

AIDojoCoordinator/docs/Coordinator.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

AIDojoCoordinator/docs/Trajectory_analysis.md

Lines changed: 0 additions & 31 deletions
This file was deleted.
-433 KB
Binary file not shown.
-506 KB
Binary file not shown.

AIDojoCoordinator/worlds/__init__.py

Whitespace-only changes.

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM python:3.12.10-slim
33

44
# Set the working directory in the container
5-
ENV DESTINATION_DIR=/aidojo
5+
ENV DESTINATION_DIR=/netsecgame
66

77

88
# Install system dependencies
@@ -20,13 +20,13 @@ WORKDIR ${DESTINATION_DIR}
2020

2121
# Install any necessary Python dependencies
2222
# If a requirements.txt file is in the repository
23-
RUN if [ -f pyproject.toml ]; then pip install . ; fi
23+
RUN if [ -f pyproject.toml ]; then pip install .[server] ; fi
2424

2525
# Expose the port the coordinator will run on
2626
EXPOSE 9000
2727

2828
# Run the Python script when the container launches (with default arguments --task_config=netsecenv_conf.yaml --game_port=9000 --game_host=0.0.0.0)
29-
ENTRYPOINT ["python3", "-m", "AIDojoCoordinator.worlds.NSEGameCoordinator", "--task_config=netsecenv_conf.yaml", "--game_port=9000", "--game_host=0.0.0.0"]
29+
ENTRYPOINT ["python3", "-m", "netsecgame.game.worlds.NetSecGame", "--task_config=netsecenv_conf.yaml", "--game_port=9000", "--game_host=0.0.0.0"]
3030

3131
# Default command arguments (can be overridden at runtime)
3232
CMD ["--debug_level=INFO"]

MANIFEST.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
exclude netsecgame/game/worlds/CYSTCoordinator.py
2+
exclude netsecgame/game/worlds/RealWorldNetSecGame.py
3+
exclude netsecgame/utils/trajectory_analysis.py
4+
exclude netsecgame/utils/actions_parser.py
5+
exclude netsecgame/utils/gamaplay_graphs.py
6+
exclude netsecgame/utils/log_parser.py

0 commit comments

Comments
 (0)