From 0eae33a918fc9a11dba328074e4e698094f54624 Mon Sep 17 00:00:00 2001 From: Chris Coutinho Date: Tue, 11 Nov 2025 23:42:00 +0100 Subject: [PATCH] ci: Fix logging warning and cli mock --- nextcloud_mcp_server/observability/logging_config.py | 8 ++++---- tests/test_cli.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nextcloud_mcp_server/observability/logging_config.py b/nextcloud_mcp_server/observability/logging_config.py index 4463b7a..d64ddd4 100644 --- a/nextcloud_mcp_server/observability/logging_config.py +++ b/nextcloud_mcp_server/observability/logging_config.py @@ -12,7 +12,7 @@ import logging import sys from typing import Any -from pythonjsonlogger import jsonlogger +from pythonjsonlogger.json import JsonFormatter from nextcloud_mcp_server.observability.tracing import get_trace_context @@ -43,7 +43,7 @@ class HealthCheckFilter(logging.Filter): ) -class TraceContextFormatter(jsonlogger.JsonFormatter): +class TraceContextFormatter(JsonFormatter): """ JSON formatter that injects OpenTelemetry trace context into log records. @@ -147,7 +147,7 @@ def setup_logging( datefmt="%Y-%m-%dT%H:%M:%S", ) else: - formatter = jsonlogger.JsonFormatter( + formatter = JsonFormatter( "%(timestamp)s %(level)s %(name)s %(message)s", datefmt="%Y-%m-%dT%H:%M:%S", ) @@ -251,7 +251,7 @@ def get_uvicorn_logging_config( if include_trace_context: formatter_class = "nextcloud_mcp_server.observability.logging_config.TraceContextFormatter" else: - formatter_class = "pythonjsonlogger.jsonlogger.JsonFormatter" + formatter_class = "pythonjsonlogger.json.JsonFormatter" format_string = "%(timestamp)s %(level)s %(name)s %(message)s" else: if include_trace_context: diff --git a/tests/test_cli.py b/tests/test_cli.py index 5c7f77f..9a131b6 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -103,7 +103,7 @@ def test_cli_options_set_environment_variables(runner, clean_env, monkeypatch): raise SystemExit(0) # Patch get_app to capture env vars - monkeypatch.setattr("nextcloud_mcp_server.app.get_app", mock_get_app) + monkeypatch.setattr("nextcloud_mcp_server.cli.get_app", mock_get_app) _ = runner.invoke( run, @@ -158,7 +158,7 @@ def test_cli_options_override_environment_variables(runner, monkeypatch): ) raise SystemExit(0) - monkeypatch.setattr("nextcloud_mcp_server.app.get_app", mock_get_app) + monkeypatch.setattr("nextcloud_mcp_server.cli.get_app", mock_get_app) # Provide CLI options that should override env vars _ = runner.invoke( @@ -211,7 +211,7 @@ def test_environment_variables_used_when_cli_not_provided(runner, monkeypatch): ) raise SystemExit(0) - monkeypatch.setattr("nextcloud_mcp_server.app.get_app", mock_get_app) + monkeypatch.setattr("nextcloud_mcp_server.cli.get_app", mock_get_app) # Don't provide any CLI options - should use env vars _ = runner.invoke(run, []) @@ -243,7 +243,7 @@ def test_default_values(runner, clean_env, monkeypatch): ) raise SystemExit(0) - monkeypatch.setattr("nextcloud_mcp_server.app.get_app", mock_get_app) + monkeypatch.setattr("nextcloud_mcp_server.cli.get_app", mock_get_app) # Don't provide CLI options or env vars - should use defaults _ = runner.invoke(run, []) @@ -275,7 +275,7 @@ def test_oauth_token_type_case_normalization(runner, clean_env, monkeypatch): ) raise SystemExit(0) - monkeypatch.setattr("nextcloud_mcp_server.app.get_app", mock_get_app) + monkeypatch.setattr("nextcloud_mcp_server.cli.get_app", mock_get_app) # Test uppercase JWT runner.invoke(run, ["--oauth-token-type", "JWT"])