2.9.7

Author: soad003

CHANGELOG.md

@@ -11,6 +11,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 Use one changelog file, but separate entries by track in each release window.
 
 
+## [2.9.7] 2026-02-25
+
+### Library (v2.9.7)
+
+#### changed
+- CLI config loading now treats `web`, `tagpack-tool`, and `tagstore` as optional-config command groups, allowing these commands to run without a valid `.graphsense.yaml`.
+- Top-level command detection in CLI config loading now skips global options (including `--config-file`) before resolving command-specific loading behavior.
+
+#### added
+- Integration tests for `graphsense-cli web openapi`, `graphsense-cli tagpack-tool --version`, and `graphsense-cli tagstore version` to verify behavior without a loaded GraphSense config file.
+
+### Web API + Python client (webapi-2.9.5)
+no changes
+
 ## [2.9.6] 2026-02-23
 
 ### Library (v2.9.6)

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PROJECT := graphsense-lib
 VENV := venv
-RELEASESEM := 'v2.9.7rc1'
+RELEASESEM := 'v2.9.7'
 WEBAPISEM := 'v2.9.5'
 
 -include .env

src/graphsenselib/cli/common.py

@@ -78,36 +78,45 @@ def inner(function):
 
 
 def try_load_config(filename: str):
-    if (
-        len(sys.argv) > 1
-        and sys.argv[1][0] == "-"
-        and sys.argv[1][1:] == "v" * len(sys.argv[1][1:])
-    ):
-        remaining_args = sys.argv[2:]
-    else:
-        remaining_args = sys.argv[1:]
-
-    is_tagpack_tool = len(remaining_args) > 0 and remaining_args[0] in [
+    remaining_args = sys.argv[1:]
+
+    global_options_with_values = {"--config-file"}
+    top_level_command = None
+    skip_next = False
+    for arg in remaining_args:
+        if skip_next:
+            skip_next = False
+            continue
+        if arg in global_options_with_values:
+            skip_next = True
+            continue
+        if arg.startswith("-"):
+            continue
+        top_level_command = arg
+        break
+
+    is_optional_config_command = top_level_command in [
         "tagpack-tool",
         "tagstore",
+        "web",
     ]
 
     app_config = get_config()
     f = filename or app_config.underlying_file
 
     try:
-        if is_tagpack_tool:
+        if is_optional_config_command:
             success, errors = app_config.load_partial(filename=filename)
 
             if not success:
                 logger.debug(
-                    f"Partial config loading for {remaining_args[0]} with {len(errors)} issues:"
+                    f"Partial config loading for {top_level_command} with {len(errors)} issues:"
                 )
                 for error in errors:
                     logger.debug(f"  - {error}")
                 logger.debug("Continuing with partial/default configuration...")
             else:
-                logger.debug(f"Config created successfully for {remaining_args[0]}")
+                logger.debug(f"Config created successfully for {top_level_command}")
         else:
             # Use strict loading for other tools
             app_config.load(filename=filename)
@@ -117,7 +126,7 @@ def try_load_config(filename: str):
                 md5hash = hashlib.md5(file.read()).hexdigest()
         else:
             md5hash = "no-config-file"
-            if not is_tagpack_tool:
+            if not is_optional_config_command:
                 raise Exception("No config file loaded")
 
         return app_config, md5hash

tests/cli/test_common.py

@@ -0,0 +1,81 @@
+import pytest
+
+from graphsenselib.cli.common import try_load_config
+
+
+class FakeConfig:
+    def __init__(self, underlying_file=None):
+        self.underlying_file = underlying_file
+        self.model_config = {
+            "default_files": ["~/.graphsense.yaml"],
+            "file_env_var": "GRAPHSENSE_CONFIG",
+        }
+        self.load_partial_called = False
+        self.load_called = False
+
+    def load_partial(self, filename=None):
+        self.load_partial_called = True
+        return True, []
+
+    def load(self, filename=None):
+        self.load_called = True
+
+    def generate_yaml(self, DEBUG=False):
+        return ""
+
+
+def test_try_load_config_web_is_optional(monkeypatch):
+    cfg = FakeConfig(underlying_file=None)
+
+    monkeypatch.setattr("graphsenselib.cli.common.get_config", lambda: cfg)
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        ["graphsense-cli", "web", "openapi"],
+    )
+
+    loaded_cfg, md5hash = try_load_config(filename=None)
+
+    assert loaded_cfg is cfg
+    assert md5hash == "no-config-file"
+    assert cfg.load_partial_called
+    assert not cfg.load_called
+
+
+def test_try_load_config_web_with_global_config_option(monkeypatch):
+    cfg = FakeConfig(underlying_file=None)
+
+    monkeypatch.setattr("graphsenselib.cli.common.get_config", lambda: cfg)
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        [
+            "graphsense-cli",
+            "--config-file",
+            "/does/not/exist.yaml",
+            "web",
+            "openapi",
+        ],
+    )
+
+    loaded_cfg, md5hash = try_load_config(filename="/does/not/exist.yaml")
+
+    assert loaded_cfg is cfg
+    assert md5hash == "no-config-file"
+    assert cfg.load_partial_called
+    assert not cfg.load_called
+
+
+def test_try_load_config_non_optional_command_is_strict(monkeypatch):
+    cfg = FakeConfig(underlying_file=None)
+
+    monkeypatch.setattr("graphsenselib.cli.common.get_config", lambda: cfg)
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        ["graphsense-cli", "rates", "coin-prices"],
+    )
+
+    with pytest.raises(SystemExit) as excinfo:
+        try_load_config(filename=None)
+
+    assert excinfo.value.code == 10
+    assert not cfg.load_partial_called
+    assert cfg.load_called

tests/cli/test_web_cli_integration.py

@@ -0,0 +1,59 @@
+import json
+
+from click.testing import CliRunner
+
+from graphsenselib.cli.main import cli
+
+
+def test_web_openapi_works_without_config_file(tmp_path, monkeypatch):
+    missing_cfg = tmp_path / "does-not-exist.yaml"
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        ["graphsense-cli", "web", "openapi"],
+    )
+
+    result = CliRunner().invoke(
+        cli,
+        ["web", "openapi"],
+        env={"GRAPHSENSE_CONFIG_YAML": str(missing_cfg)},
+    )
+
+    assert result.exit_code == 0
+
+    spec = json.loads(result.output)
+    assert spec["openapi"].startswith("3.")
+    assert "paths" in spec
+
+
+def test_tagpack_tool_version_works_without_config_file(tmp_path, monkeypatch):
+    missing_cfg = tmp_path / "does-not-exist.yaml"
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        ["graphsense-cli", "tagpack-tool", "--version"],
+    )
+
+    result = CliRunner().invoke(
+        cli,
+        ["tagpack-tool", "--version"],
+        env={"GRAPHSENSE_CONFIG_YAML": str(missing_cfg)},
+    )
+
+    assert result.exit_code == 0
+    assert "tagpack-tool" in result.output.lower()
+
+
+def test_tagstore_version_works_without_config_file(tmp_path, monkeypatch):
+    missing_cfg = tmp_path / "does-not-exist.yaml"
+    monkeypatch.setattr(
+        "graphsenselib.cli.common.sys.argv",
+        ["graphsense-cli", "tagstore", "version"],
+    )
+
+    result = CliRunner().invoke(
+        cli,
+        ["tagstore", "version"],
+        env={"GRAPHSENSE_CONFIG_YAML": str(missing_cfg)},
+    )
+
+    assert result.exit_code == 0
+    assert result.output.strip()