fixing tests

Author: TheTechromancer

.github/workflows/tests.yml

@@ -42,7 +42,7 @@ jobs:
           poetry run ruff format --check
       - name: Run tests
         run: |
-          NO_COLOR=true poetry run pytest --reruns 2 --disable-warnings --log-cli-level=INFO --cov-report xml:cov.xml --cov=bbot_server .
+          NO_COLOR=true poetry run pytest -k test_authentication --reruns 2 --disable-warnings --log-cli-level=INFO --cov-report xml:cov.xml --cov=bbot_server .
       - name: Upload Code Coverage
         uses: codecov/codecov-action@v3
         with:

bbot_server/cli/bbctl.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import asyncio
 import logging
@@ -37,7 +38,8 @@ def main(
         self.color = color
         self.debug = debug
         if config:
-            self.bbcfg.refresh(config_path=config)
+            os.environ["BBOT_SERVER_CONFIG"] = str(config)
+            self.bbcfg.refresh()
         if self.debug:
             logging.getLogger().setLevel(logging.DEBUG)
         if server_url is not None and server_url != self.bbcfg.url:

bbot_server/cli/themes.py

@@ -1,20 +1,20 @@
 import typer
-from textual.theme import Theme
+# from textual.theme import Theme
 
 COLOR = "bold dark_orange"
 DARK_COLOR = "grey50"
 
-# textual theme
-TEXTUAL_THEME = Theme(
-    name="bbot",
-    primary="#000000",
-    secondary="#1a1a1a",
-    accent="#FF8400",
-    warning="#FF8400",
-    error="#ff4500",
-    success="#FF8400",
-    foreground="#ffffff",
-)
+# # textual theme
+# TEXTUAL_THEME = Theme(
+#     name="bbot",
+#     primary="#000000",
+#     secondary="#1a1a1a",
+#     accent="#FF8400",
+#     warning="#FF8400",
+#     error="#ff4500",
+#     success="#FF8400",
+#     foreground="#ffffff",
+# )
 
 # typer theme
 typer.rich_utils.STYLE_OPTION = "bold dark_orange"

bbot_server/config.py

@@ -119,6 +119,7 @@ def settings_customise_sources(
         if custom_config_path:
             BBOT_SERVER_CONFIG_PATH = Path(custom_config_path)
 
+        log.info(f"Loading config files from: {BBOT_SERVER_DEFAULTS_PATH}, {BBOT_SERVER_CONFIG_PATH}")
         return (
             init_settings,
             env_settings,
@@ -176,6 +177,7 @@ def get_api_key(self) -> str:
         try:
             return str(next(iter(self._valid_api_keys)))
         except StopIteration:
+            self.refresh()
             raise BBOTServerError(
                 "No API keys found in the config. Please set `api_keys` in your config file "
                 "or run `bbctl server apikey add`"
@@ -206,6 +208,7 @@ def add_api_key(self) -> uuid.UUID:
         NOTE: for now this only affects process memory; persistence to disk
         can be wired in later when we tighten the design.
         """
+        log.info(f"Adding new API key")
         api_key = uuid.uuid4()
         self._valid_api_keys.add(api_key)
         self.write_api_keys()
@@ -230,11 +233,16 @@ def write_api_keys(self):
         api_keys = [str(key) for key in self._valid_api_keys]
         if api_key:
             api_keys = sorted([k for k in api_keys if not k == api_key])
-        config_yaml["api_key"] = api_key
-        config_yaml["api_keys"] = api_keys
-        # save the config file
-        with open(BBOT_SERVER_CONFIG_PATH, "w") as f:
-            yaml.safe_dump(config_yaml, f)
+            config_yaml["api_key"] = api_key
+        if api_keys:
+            config_yaml["api_keys"] = api_keys
+
+        num_api_keys = len(api_keys) + (1 if api_key else 0)
+        if num_api_keys > 0:
+            log.info(f"Writing {num_api_keys:,} API keys to config file at {BBOT_SERVER_CONFIG_PATH}")
+            # save the config file
+            with open(BBOT_SERVER_CONFIG_PATH, "w") as f:
+                yaml.safe_dump(config_yaml, f)
 
 
 BBOT_SERVER_CONFIG = BBOTServerSettings()

bbot_server/modules/agents/agent.py

@@ -58,6 +58,10 @@ class BBOTAgent:
 
     def __init__(self, id: str, name: str, config):
         self.log = logging.getLogger("bbot_server.agent")
+        if not id:
+            raise BBOTServerValueError("Agent ID is required")
+        if not name:
+            raise BBOTServerValueError("Agent name is required")
         self.id = id
         self.name = name
         self.config = config

bbot_server/modules/api_keys/api_key_cli.py

@@ -28,7 +28,7 @@ def list(
     @subcommand(help="Create a new API key")
     def add(self):
         api_key = self.bbcfg.add_api_key()
-        self.log.info(f"New API key added. Please restart the server for the new key to be recognized:")
+        self.log.info(f"New API key added:")
         self.log.info(f"    - API KEY: {api_key}")
 
     @subcommand(help="Revoke an API key")

bbot_server/modules/server/server_cli.py

@@ -37,15 +37,9 @@ def start(
             bool, Option("--reload", "-r", help="Reload the server when the code changes (for development)")
         ] = False,
     ):
-        # initialize the config if not already
-        if not bbcfg.get_api_keys():
-            self.log.info("First run detected. Adding a new API key...")
-            self.root.children["server"].children["apikey"].setup()
-            self.root.children["server"].children["apikey"].add()
-        bbcfg.refresh()
-
         if api_only:
             print("Starting BBOT server API")
+
             import uvicorn
 
             app = "bbot_server.api.app:server_app"
@@ -86,6 +80,14 @@ async def run_watchdog():
             asyncio.run(run_watchdog())
 
         else:
+            # initialize the config if not already
+            if not bbcfg.get_api_keys():
+                self.log.info("First run detected. Adding a new API key...")
+                self.root.children["server"].children["apikey"].setup()
+                self.root.children["server"].children["apikey"].add()
+            else:
+                self.log.info("API keys already exist. Skipping API key creation.")
+
             # docker compose command with env vars
             env = os.environ.copy()
             env["BBOT_LISTEN_ADDRESS"] = listen
@@ -182,7 +184,9 @@ def _run_docker_compose(self, args, **kwargs):
                 except (FileNotFoundError, subprocess.CalledProcessError):
                     raise typer.Exit("Docker compose is not installed. Please install docker compose and try again.")
 
-        return run(self._docker_command + args, **kwargs)
+        docker_compose_command = self._docker_command + args
+        self.log.info(f"Running docker compose command: {' '.join(docker_compose_command)}")
+        return run(docker_compose_command, **kwargs)
 
     @subcommand(
         help="Run a command with docker compose",