hoprd/rest-api/src/lib.rs (1)

265-292: Implementation of a separate router for metrics route with text/plain content type looks good.

This change correctly implements a dedicated router for the /node/metrics endpoint that accepts text/plain content type, which aligns with the PR objective of removing content type validation constraints. The metrics endpoint now properly accepts plain text data instead of requiring JSON format.

While the implementation is correct, consider extracting the common middleware configuration patterns between this router and the main router to reduce code duplication. This would improve maintainability for future changes.

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

tests/test_rest_api.py (4)

41-53: Consider optimizing the test function to reuse HTTP session.

The test creates three separate ClientSession instances, which is inefficient. Consider reusing a single session for all requests in this test.

Here's a more efficient implementation:

 async def test_metric_endpoint_accepts_plain_text_header(peer: str, swarm7: dict[str, Node]):
     url = f"http://{swarm7[peer].host_addr}:{swarm7[peer].api_port}/metrics"
     headers = {"X-Auth-Token": swarm7[peer].api_token}
 
-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 200
-
-    async with aiohttp.ClientSession(headers=headers+{"accept": "text/plain"}) as s:
-        assert (await s.get(url)).status == 200
-
-    async with aiohttp.ClientSession(headers=headers+{"accept": "application/json"}) as s:
-        assert (await s.get(url)).status == 406
+    async with aiohttp.ClientSession() as s:
+        # Test with default headers (no accept header)
+        assert (await s.get(url, headers=headers)).status == 200
+        
+        # Test with text/plain accept header
+        plain_headers = {**headers, "accept": "text/plain"}
+        assert (await s.get(url, headers=plain_headers)).status == 200
+        
+        # Test with application/json accept header
+        json_headers = {**headers, "accept": "application/json"}
+        assert (await s.get(url, headers=json_headers)).status == 406

---

41-53: Enhance test assertions with descriptive messages.

The assertions would be more helpful during debugging if they included descriptive messages explaining what's being tested.

Consider adding descriptive messages:

 async def test_metric_endpoint_accepts_plain_text_header(peer: str, swarm7: dict[str, Node]):
     url = f"http://{swarm7[peer].host_addr}:{swarm7[peer].api_port}/metrics"
     headers = {"X-Auth-Token": swarm7[peer].api_token}

     async with aiohttp.ClientSession() as s:
-        assert (await s.get(url, headers=headers)).status == 200
+        response = await s.get(url, headers=headers)
+        assert response.status == 200, f"Expected 200 OK for default request, got {response.status}"
         
-        assert (await s.get(url, headers={**headers, "accept": "text/plain"})).status == 200
+        response = await s.get(url, headers={**headers, "accept": "text/plain"})
+        assert response.status == 200, f"Expected 200 OK for text/plain request, got {response.status}"
         
-        assert (await s.get(url, headers={**headers, "accept": "application/json"})).status == 406
+        response = await s.get(url, headers={**headers, "accept": "application/json"})
+        assert response.status == 406, f"Expected 406 Not Acceptable for application/json request, got {response.status}"

---

41-53: Consider validating response content type, not just status code.

The test only checks status codes but doesn't verify that the response content type matches the requested format. This would make the test more robust.

Add content type verification:

 async def test_metric_endpoint_accepts_plain_text_header(peer: str, swarm7: dict[str, Node]):
     url = f"http://{swarm7[peer].host_addr}:{swarm7[peer].api_port}/metrics"
     headers = {"X-Auth-Token": swarm7[peer].api_token}

     async with aiohttp.ClientSession() as s:
-        assert (await s.get(url, headers={**headers, "accept": "text/plain"})).status == 200
+        response = await s.get(url, headers={**headers, "accept": "text/plain"})
+        assert response.status == 200, "Expected 200 OK for text/plain request"
+        content_type = response.headers.get('Content-Type', '')
+        assert 'text/plain' in content_type, f"Expected text/plain content type, got {content_type}"

---

53-53: Add a newline at the end of the file.

The file is missing a newline at the end, which can cause issues with some linters and version control systems.

Add an empty line at the end of the file.

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

tests/test_rest_api.py (2)

48-54: Suggestion: Consider reusing the ClientSession

For improved efficiency, consider reusing the same ClientSession for all requests within the test function instead of creating a new one for each request.

-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 200
-
-    headers["accept"] = "text/plain"
-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 200
-
-    headers["accept"] = "application/json"
-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 406
+    async with aiohttp.ClientSession() as s:
+        # Test with default headers
+        assert (await s.get(url, headers=headers)).status == 200
+        
+        # Test with text/plain accept header
+        headers_plain = {**headers, "accept": "text/plain"}
+        assert (await s.get(url, headers=headers_plain)).status == 200
+        
+        # Test with application/json accept header
+        headers_json = {**headers, "accept": "application/json"}
+        assert (await s.get(url, headers=headers_json)).status == 406

---

66-72: Apply the same session reuse pattern to this test

For consistency, consider applying the same ClientSession reuse pattern to this test function as well.

-    headers["accept"] = "text/plain"
-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 406
-
-    headers["accept"] = "application/json"
-    async with aiohttp.ClientSession(headers=headers) as s:
-        assert (await s.get(url)).status == 200
+    async with aiohttp.ClientSession() as s:
+        # Test with default headers
+        assert (await s.get(url, headers=headers)).status == 200
+        
+        # Test with text/plain accept header
+        headers_plain = {**headers, "accept": "text/plain"}
+        assert (await s.get(url, headers=headers_plain)).status == 406
+        
+        # Test with application/json accept header
+        headers_json = {**headers, "accept": "application/json"}
+        assert (await s.get(url, headers=headers_json)).status == 200

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro