[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

jupyter_server/serverapp.py

@@ -2836,7 +2836,7 @@ def initialize(
         self.init_mime_overrides()
         self.init_shutdown_no_activity()
         self.init_metrics()
-        
+
         # Start metrics server after webapp is initialized, so handlers can be properly excluded
         if self.metrics_port:
             self._start_metrics_server(self.metrics_port)
@@ -3066,9 +3066,9 @@ def _start_metrics_server(self, port):
             # Check if the metrics server actually started (has a port)
             if not hasattr(self.metrics_server, "port") or self.metrics_server.port is None:
                 raise RuntimeError("Metrics server failed to start - no port assigned")
-            
+
             self.log.info(f"Metrics server is running on port {self.metrics_server.port}")
-            
+
         except Exception as e:
             self.log.error(f"Failed to start metrics server: {e}")
             raise RuntimeError(f"Metrics server is required but failed to start: {e}")

tests/test_metrics.py

@@ -1,10 +1,11 @@
 """Tests for Jupyter Server metrics functionality."""
 
-import pytest
-import requests
 import time
 from unittest.mock import patch
 
+import pytest
+import requests
+
 from jupyter_server.prometheus.server import PrometheusMetricsServer, start_metrics_server
 from jupyter_server.serverapp import ServerApp
 
@@ -13,7 +14,7 @@
 def metrics_server_app():
     """Create a server app with metrics enabled on a specific port."""
     # Override the environment variable for this test
-    with patch.dict('os.environ', {'JUPYTER_SERVER_METRICS_PORT': '9090'}):
+    with patch.dict("os.environ", {"JUPYTER_SERVER_METRICS_PORT": "9090"}):
         app = ServerApp()
         # Set the metrics_port directly as a trait
         app.metrics_port = 9090
@@ -29,38 +30,38 @@ def metrics_server(metrics_server_app):
     time.sleep(0.1)
     yield server
     # Cleanup
-    if hasattr(server, 'stop'):
+    if hasattr(server, "stop"):
         server.stop()
 
 
 def test_metrics_server_starts(metrics_server):
     """Test that the metrics server starts successfully."""
     assert metrics_server is not None
-    assert hasattr(metrics_server, 'port')
+    assert hasattr(metrics_server, "port")
     assert metrics_server.port == 9090
 
 
 def test_metrics_endpoint_accessible(metrics_server):
     """Test that the metrics endpoint is accessible."""
-    response = requests.get(f'http://localhost:{metrics_server.port}/metrics')
+    response = requests.get(f"http://localhost:{metrics_server.port}/metrics")
     assert response.status_code == 200
-    assert 'jupyter_server' in response.text
+    assert "jupyter_server" in response.text
 
 
 def test_metrics_contains_kernel_metrics(metrics_server):
     """Test that kernel metrics are present."""
-    response = requests.get(f'http://localhost:{metrics_server.port}/metrics')
+    response = requests.get(f"http://localhost:{metrics_server.port}/metrics")
     assert response.status_code == 200
     content = response.text
-    assert 'jupyter_kernel_currently_running_total' in content
+    assert "jupyter_kernel_currently_running_total" in content
 
 
 def test_metrics_contains_server_info(metrics_server):
     """Test that server info metrics are present."""
-    response = requests.get(f'http://localhost:{metrics_server.port}/metrics')
+    response = requests.get(f"http://localhost:{metrics_server.port}/metrics")
     assert response.status_code == 200
     content = response.text
-    assert 'jupyter_server_info' in content
+    assert "jupyter_server_info" in content
 
 
 def test_metrics_server_with_authentication():
@@ -70,20 +71,20 @@ def test_metrics_server_with_authentication():
     app.authenticate_prometheus = True
     app.initialize([])
     app.identity_provider.token = "test_token"
-    
+
     server = start_metrics_server(app, 9091)
     time.sleep(0.1)
-    
+
     try:
         # Without token should fail
-        response = requests.get(f'http://localhost:{server.port}/metrics')
+        response = requests.get(f"http://localhost:{server.port}/metrics")
         assert response.status_code == 401
-        
+
         # With token should succeed
-        response = requests.get(f'http://localhost:{server.port}/metrics?token=test_token')
+        response = requests.get(f"http://localhost:{server.port}/metrics?token=test_token")
         assert response.status_code == 200
     finally:
-        if hasattr(server, 'stop'):
+        if hasattr(server, "stop"):
             server.stop()
 
 
@@ -96,31 +97,31 @@ def test_metrics_server_port_conflict_handling():
     # Start first server
     server1 = start_metrics_server(app, 9092)
     time.sleep(0.1)
-    
+
     try:
         # Try to start second server on same port
         server2 = start_metrics_server(app, 9092)
         time.sleep(0.1)
-        
+
         # One of them should have failed to start or used a different port
-        if server2 is not None and hasattr(server2, 'port'):
+        if server2 is not None and hasattr(server2, "port"):
             assert server2.port != 9092 or server1.port != 9092
     finally:
-        if hasattr(server1, 'stop'):
+        if hasattr(server1, "stop"):
             server1.stop()
-        if server2 is not None and hasattr(server2, 'stop'):
+        if server2 is not None and hasattr(server2, "stop"):
             server2.stop()
 
 
 def test_metrics_server_disabled_when_port_zero():
     """Test that metrics server is not started when port is 0."""
-    with patch.dict('os.environ', {'JUPYTER_SERVER_METRICS_PORT': '0'}):
+    with patch.dict("os.environ", {"JUPYTER_SERVER_METRICS_PORT": "0"}):
         app = ServerApp()
         app.metrics_port = 0
         app.initialize([])
-        
+
         # Should not start metrics server
-        assert not hasattr(app, 'metrics_server') or app.metrics_server is None
+        assert not hasattr(app, "metrics_server") or app.metrics_server is None
 
 
 def test_metrics_url_logging_with_separate_server():
@@ -130,18 +131,18 @@ def test_metrics_url_logging_with_separate_server():
     app.authenticate_prometheus = True
     app.initialize([])
     app.identity_provider.token = "test_token"
-    
+
     # Start metrics server
     server = start_metrics_server(app, 9093)
     time.sleep(0.1)
-    
+
     try:
         # The URL should include the separate port
         expected_url = "http://localhost:9093/metrics?token=test_token"
         # This is a basic test - in practice you'd capture the log output
         assert server.port == 9093
     finally:
-        if hasattr(server, 'stop'):
+        if hasattr(server, "stop"):
             server.stop()
 
 
@@ -152,7 +153,7 @@ def test_metrics_url_logging_with_main_server():
     app.authenticate_prometheus = True
     app.initialize([])
     app.identity_provider.token = "test_token"
-    
+
     # Should use main server's /metrics endpoint
     # This would be tested by checking the log output in practice
-    assert app.metrics_port == 0 
+    assert app.metrics_port == 0