build(deps): update pydantic requirement from <3.0.0,>=2.0.3 to >=2.13.4,<3.0.0

.env.example

@@ -17,3 +17,14 @@ BV_CHALLENGE_API_PORT=10001
 # BV_CHALLENGE_API_DOCS_OPENAPI_URL="{api_prefix}/openapi.json"
 # BV_CHALLENGE_API_DOCS_DOCS_URL="{api_prefix}/docs"
 # BV_CHALLENGE_API_DOCS_REDOC_URL="{api_prefix}/redoc"
+
+## -- MDM challenge / Simple Bot configs -- ##
+CHALLENGE_HTTPS_PROXY_PORT=10443
+MDM_CHALLENGE_BASE_URL="http://challenge-api:10001"
+# MDM_CHALLENGE_SIMPLE_BOT_URL="https://simplebot.theredteam.io"
+# MDM_CHALLENGE_BOT_DIR="/app/rest.vm-runner/bot"
+# MDM_CHALLENGE_SIMPLE_BOT_NETWORK_NAME="bot-simple-network"
+# MDM_CHALLENGE_CHALLENGE_NETWORK_NAME="bot-challenge-network"
+# MDM_CHALLENGE_MINER_IMAGE_TAG="redteamsubnet/bv-miner:latest"
+# MDM_CHALLENGE_SIMPLE_BOT_POLL_MAX_ATTEMPTS=5
+# MDM_CHALLENGE_SIMPLE_BOT_POLL_INTERVAL_SEC=2

.gitignore

@@ -535,3 +535,16 @@ volumes/configs/**/*.DS_Store
 volumes/configs/**/*Thumbs.db
 volumes/configs/**/*~
 volumes/configs/**/*._*
+
+# Internal design docs (kept local, not published)
+docs/superpowers/
+
+# Internal benchmark/test bot fixtures (reveal scoring expectations — keep local)
+benchmarks/
+tests/fixtures/bots/
+
+# Private detector source (compiled to the rt_bv_score wheel — never publish source)
+private/
+# Rust build artifacts
+target/
+Cargo.lock

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/modules/rest.mdm-sn-container-runner"]
+	path = src/modules/rest.mdm-sn-container-runner
+	url = git@github.com:RedTeamSubnet/rest.hb-bot-executer.git

compose.yml

@@ -4,10 +4,15 @@ services:
     build:
       context: ./src/bv_challenge/challenge
     restart: unless-stopped
+    networks:
+      - bot-virus-challenge-net
     environment:
       TERM: ${TERM:-xterm}
       TZ: ${TZ:-Asia/Seoul}
       BV_CHALLENGE_API_PORT: ${BV_CHALLENGE_API_PORT:-10001}
+      BV_CHALLENGE_API_BOT_RUNNER_URL: ${BV_CHALLENGE_API_BOT_RUNNER_URL:-http://bot-runner:8000}
+      BV_CHALLENGE_API_BOT_RUNNER_SESSION_COUNT: ${BV_CHALLENGE_API_BOT_RUNNER_SESSION_COUNT:-2}
+      BV_CHALLENGE_API_BOT_RUNNER_REQUEST_TIMEOUT_SEC: ${BV_CHALLENGE_API_BOT_RUNNER_REQUEST_TIMEOUT_SEC:-900}
     env_file:
       - path: .env
         required: false
@@ -17,4 +22,50 @@ services:
       - "./volumes/storage/rest-bv-challenge/data:${BV_CHALLENGE_API_DATA_DIR:-/var/lib/rest-bv-challenge}"
     ports:
       - "${BV_CHALLENGE_API_PORT:-10001}:${BV_CHALLENGE_API_PORT:-10001}"
-    tty: true
+
+  bot-runner:
+    image: redteamsubnet61/bot_virus_bot_runner:latest
+    build:
+      context: ./src/modules/rest.mdm-sn-container-runner
+    restart: unless-stopped
+    networks:
+      - bot-virus-challenge-net
+    environment:
+      TERM: ${TERM:-xterm}
+      TZ: ${TZ:-UTC}
+      VM_RUNNER_API_PORT: ${VM_RUNNER_API_PORT:-8000}
+      DOCKER_HOST: unix:///docker-socket/docker.sock
+      CHALLENGE_HTTPS_PROXY_PORT: ${CHALLENGE_HTTPS_PROXY_PORT:-10443}
+    env_file:
+      - path: .env
+        required: false
+    volumes:
+      - "./volumes/storage/rest-mdm-sn-container-runner/logs:${VM_RUNNER_API_LOGS_DIR:-/var/log/rest.vm-runner}"
+      - "./volumes/storage/rest-mdm-sn-container-runner/data:${VM_RUNNER_API_DATA_DIR:-/var/lib/rest.vm-runner}"
+      - "bot-runner-dind-socket:/docker-socket"
+    ports:
+      - "${VM_RUNNER_API_PORT:-8000}:${VM_RUNNER_API_PORT:-8000}"
+
+  bot-runner-dind:
+    image: redteamsubnet61/bot_virus_bot_runner_dind:latest
+    build:
+      context: ./src/modules/rest.mdm-sn-container-runner
+      dockerfile: Dockerfile.dind
+    restart: unless-stopped
+    networks:
+      - bot-virus-challenge-net
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR: ""
+      CHALLENGE_HTTPS_PROXY_PORT: ${CHALLENGE_HTTPS_PROXY_PORT:-10443}
+    volumes:
+      - "bot-runner-dind-socket:/docker-socket"
+      - "bot-runner-dind-data:/var/lib/docker"
+
+networks:
+  bot-virus-challenge-net:
+    name: bot-virus-challenge-net
+    driver: bridge
+volumes:
+  bot-runner-dind-socket:
+  bot-runner-dind-data:

pyproject.toml

@@ -32,14 +32,16 @@ classifiers = [
 ]
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
-# [tool.setuptools.packages.find]
-# where = ["src"]
-# include = ["bv_challenge*"]
-# namespaces = false
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["src"]
+include = ["bv_challenge*"]
 
 [tool.setuptools.dynamic]
-version = { attr = "bv_challenge.__version__.__version__" }
-dependencies = { file = "./requirements.txt" }
+version = { attr = "bv_challenge.__version__" }
+dependencies = { file = ["requirements.txt"] }
 
 [tool.setuptools.dynamic.optional-dependencies]
 # Options dependencies for DEVELOPMENT
@@ -62,8 +64,8 @@ dev = { file = [
 # venv = ".venv"
 
 [project.urls]
-Homepage = "https://github.com/RedTeamSubnet/challenge-template"
+Homepage = "https://github.com/RedTeamSubnet/bot-virus-challenge"
 Documentation = "https://docs.theredteam.io"
-Repository = "https://github.com/RedTeamSubnet/challenge-template.git"
-Issues = "https://github.com/RedTeamSubnet/challenge-template/issues"
-Changelog = "https://github.com/RedTeamSubnet/challenge-template/blob/main/CHANGELOG.md"
+Repository = "https://github.com/RedTeamSubnet/bot-virus-challenge.git"
+Issues = "https://github.com/RedTeamSubnet/bot-virus-challenge/issues"
+Changelog = "https://github.com/RedTeamSubnet/bot-virus-challenge/blob/main/CHANGELOG.md"

requirements.txt

@@ -1,4 +1,5 @@
 python-dotenv>=1.0.1,<2.0.0
-pydantic[email,timezone]>=2.0.3,<3.0.0
+pydantic[email,timezone]>=2.13.4,<3.0.0
 pydantic-settings>=2.2.1,<3.0.0
-# redteam_core @ git+https://github.com/RedTeamSubnet/RedTeam.git@v4.2.2
+./requirements/rt_bv_score-0.1.0-cp310-abi3-manylinux_2_34_x86_64.whl
+./requirements/vault_unlock-0.1.0-cp310-abi3-manylinux_2_34_x86_64.whl

scripts/bump-version.sh

@@ -26,7 +26,7 @@ fi
 
 ## --- Variables --- ##
 # Load from environment variables:
-VERSION_FILE_PATH="${VERSION_FILE_PATH:-./VERSION.txt}"
+VERSION_FILE_PATH="${VERSION_FILE_PATH:-./src/bv_challenge/__version__.py}"
 
 
 _BUMP_TYPE=""
@@ -130,7 +130,7 @@ main()
 
 	echo "[INFO]: Bumping version to '${_new_version}'..."
 	# Update the version file with the new version:
-	echo "${_new_version}" > "${VERSION_FILE_PATH}" || exit 2
+	echo -e "__version__ = \"${_new_version}\"" > "${VERSION_FILE_PATH}" || exit 2
 	echo "[OK]: New version: '${_new_version}'"
 
 	./scripts/sync-versions.sh -a || exit 2

scripts/get-version.sh

@@ -15,12 +15,12 @@ cd "${_PROJECT_DIR}" || exit 2
 
 ## --- Variables --- ##
 # Load from environment variables:
-VERSION_FILE_PATH="${VERSION_FILE_PATH:-./VERSION.txt}"
+VERSION_FILE_PATH="${VERSION_FILE_PATH:-./src/bv_challenge/__version__.py}"
 ## --- Variables --- ##
 
 
 if [ -n "${VERSION_FILE_PATH}" ] && [ -f "${VERSION_FILE_PATH}" ]; then
-	_current_version=$(cat "${VERSION_FILE_PATH}") || exit 2
+	_current_version=$(< "${VERSION_FILE_PATH}" grep "__version__ = " | awk -F' = ' '{print $2}' | tr -d '"') || exit 2
 else
 	_current_version="0.0.0"
 fi

src/bv_challenge/challenge/.dockerignore

@@ -551,6 +551,7 @@ README.md
 **/compose.sh
 **/compose.override.y*ml
 **/Dockerfile*
+!bot/Dockerfile
 **/Makefile
 **/mkdocs.yml
 **/pm2-process.json*

src/bv_challenge/challenge/Dockerfile

@@ -29,6 +29,7 @@ RUN --mount=type=cache,target=/root/.cache,sharing=locked \
 # COPY ./requirements* ./
 RUN	--mount=type=cache,target=/root/.cache,sharing=locked \
 	--mount=type=bind,source=requirements.txt,target=requirements.txt \
+	--mount=type=bind,source=requirements,target=requirements \
 	python3 -m uv pip install --prefix=/install -r ./requirements.txt
 
 
@@ -140,6 +141,8 @@ FROM base AS app
 
 WORKDIR "${BV_CHALLENGE_API_DIR}"
 COPY --chown=${UID}:${GID} ./api ${BV_CHALLENGE_API_DIR}/api
+COPY --chown=${UID}:${GID} ./bot ${BV_CHALLENGE_API_DIR}/bot
+COPY --chown=${UID}:${GID} ./templates ${BV_CHALLENGE_API_DIR}/templates
 COPY --chown=${UID}:${GID} --chmod=770 ./scripts/*.sh /usr/local/bin/
 
 # VOLUME ["${BV_CHALLENGE_API_DATA_DIR}"]

src/bv_challenge/challenge/api/__init__.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
 from api.__version__ import __version__
 
+
 __all__ = ["__version__"]

src/bv_challenge/challenge/api/__main__.py

@@ -1,6 +1,25 @@
+# -*- coding: utf-8 -*-
+
+## Third-party libraries
+from fastapi import FastAPI
+
+## Internal modules
+from api.bootstrap import create_app, run_server
 from api.logger import logger
-from api.main import main
+
+
+app: FastAPI = create_app()
+
+
+def main() -> None:
+    """Main function."""
+
+    run_server(app="api.__main__:app")
+    return
+
 
 if __name__ == "__main__":
-    logger.info("Starting server from '__main__.py'...")
+    logger.info(f"Starting server from '__main__.py'...")
     main()
+
+__all__ = ["app"]

src/bv_challenge/challenge/api/__version__.py

@@ -1 +1 @@
-__version__ = "0.0.0"
+__version__ = "0.0.2"

src/bv_challenge/challenge/api/bootstrap.py

@@ -1,17 +1,16 @@
-# Standard libraries
-from typing import Any
-from collections.abc import Callable
+# -*- coding: utf-8 -*-
 
-# Third-party libraries
+## Standard libraries
+import os
+from typing import Union
+
+## Third-party libraries
 import uvicorn
 from uvicorn._types import ASGIApplication
 from pydantic import validate_call
 from fastapi import FastAPI
 
-from beans_logging_fastapi import add_logger
-
-# Internal modules
-from api.__version__ import __version__
+## Internal modules
 from api.config import config
 from api.lifespan import lifespan, pre_init
 from api.middleware import add_middlewares
@@ -31,19 +30,13 @@ def create_app() -> FastAPI:
     pre_init()
 
     app = FastAPI(
-        title=config.api.title,
-        version=__version__,
+        title=config.api.name,
+        version=config.version,
         lifespan=lifespan,
         default_response_class=BaseResponse,
         **config.api.docs.model_dump(exclude={"enabled"}),
     )
 
-    add_logger(
-        app=app,
-        config=config.api.logger,
-        has_proxy_headers=config.api.uvicorn.proxy_headers,
-    )
-
     add_middlewares(app=app)
     add_routers(app=app)
     add_mounts(app=app)
@@ -53,21 +46,35 @@ def create_app() -> FastAPI:
 
 
 @validate_call(config={"arbitrary_types_allowed": True})
-def run_server(app: FastAPI | ASGIApplication | Callable[..., Any] | str) -> None:
+def run_server(app: Union[ASGIApplication, str] = "main:app") -> None:
     """Run uvicorn server.
 
     Args:
-        app (FastAPI            |
-             ASGIApplication    |
-             Callable[..., Any] |
-             str                 , required): FastAPI application instance or ASGI application or import string.
+        app (Union[ASGIApplication, str], optional): ASGI application instance or module path.
     """
 
+    _ssl_keyfile: Union[str, None] = None
+    _ssl_certfile: Union[str, None] = None
+
+    if config.api.security.ssl.enabled:
+        _ssl_keyfile = os.path.join(
+            config.api.paths.ssl_dir, config.api.security.ssl.key_fname
+        )
+        _ssl_certfile = os.path.join(
+            config.api.paths.ssl_dir, config.api.security.ssl.cert_fname
+        )
+
     uvicorn.run(
         app=app,
         host=config.api.bind_host,
         port=config.api.port,
-        **config.api.uvicorn.model_dump(),
+        access_log=False,
+        server_header=False,
+        proxy_headers=config.api.behind_proxy,
+        forwarded_allow_ips=config.api.security.forwarded_allow_ips,
+        ssl_keyfile=_ssl_keyfile,
+        ssl_certfile=_ssl_certfile,
+        **config.api.dev.model_dump(),
     )
 
     return

src/bv_challenge/challenge/api/config.py

@@ -1,46 +1,24 @@
-import os
-from typing import TypeVar, Any
+# -*- coding: utf-8 -*-
 
-from pydantic import validate_call
+import pathlib
 
-from potato_util.io import read_all_configs
+from onion_config import ConfigLoader
+from beans_logging import logger
 
-from api.core.constants import ENV_PREFIX_API, API_SLUG
 from api.core.configs import MainConfig
-from api.logger import logger
 
-ConfigType = TypeVar("ConfigType", bound=MainConfig)
 
+config: MainConfig
+try:
+    _parent_dir = pathlib.Path(__file__).parent.resolve()
+    _config_loader = ConfigLoader(
+        config_schema=MainConfig, configs_dirs=[str(_parent_dir / "configs")]
+    )
+    # Main config object:
+    config: MainConfig = _config_loader.load()
+except Exception:
+    logger.exception("Failed to load config:")
+    raise SystemExit(1)
 
-@validate_call
-def load_config(
-    configs_dir: str = os.path.join("/etc", API_SLUG),
-    env_name: str = f"{ENV_PREFIX_API}CONFIGS_DIR",
-    config_schema: type[ConfigType] = MainConfig,
-) -> ConfigType:
-    _configs_dir_env = os.getenv(env_name, "")
-    if _configs_dir_env:
-        configs_dir = _configs_dir_env
 
-    _config_dict: dict[str, Any] = {}
-    if os.path.isdir(configs_dir):
-        _config_dict = read_all_configs(configs_dir=configs_dir)
-
-    _config: ConfigType | None = None
-    try:
-        _config = config_schema(**_config_dict)
-    except Exception:
-        logger.exception("Failed to load config:")
-        raise SystemExit(1)
-
-    return _config
-
-
-config = load_config()
-
-
-__all__ = [
-    "MainConfig",
-    "load_config",
-    "config",
-]
+__all__ = ["config"]