Restrict retries to status-code responses only, fix raise_on_status and config validation

Author: bigcat88

src/nextcloud_mcp/client.py

@@ -82,10 +82,15 @@ async def _get_session(self) -> niquests.AsyncSession:
             if self._config.retry_max > 0:
                 kwargs["retries"] = Retry(
                     total=self._config.retry_max,
+                    connect=0,
+                    read=0,
+                    other=0,
+                    redirect=0,
                     status_forcelist=[429, 503],
                     backoff_factor=1.0,
                     respect_retry_after_header=True,
                     allowed_methods=None,
+                    raise_on_status=False,
                 )
             self._session = niquests.AsyncSession(**kwargs)  # type: ignore[arg-type]
         return self._session

src/nextcloud_mcp/config.py

@@ -46,7 +46,11 @@ def from_env(cls) -> "Config":
 
         host = os.environ.get("NEXTCLOUD_MCP_HOST", "0.0.0.0")
         port = int(os.environ.get("NEXTCLOUD_MCP_PORT", "8100"))
-        retry_max = int(os.environ.get("NEXTCLOUD_MCP_RETRY_MAX", "3"))
+        retry_raw = os.environ.get("NEXTCLOUD_MCP_RETRY_MAX", "3")
+        try:
+            retry_max = int(retry_raw)
+        except ValueError:
+            raise ValueError(f"Invalid NEXTCLOUD_MCP_RETRY_MAX='{retry_raw}'. Expected integer >= 0.") from None
 
         return cls(
             nextcloud_url=url,

tests/test_client_retry.py

@@ -86,3 +86,33 @@ async def test_retry_backoff_factor(self) -> None:
             assert adapter.max_retries.backoff_factor == 1.0
         finally:
             await client.close()
+
+    @pytest.mark.asyncio
+    async def test_retry_no_connect_retries(self) -> None:
+        client = NextcloudClient(_make_config())
+        session = await client._get_session()
+        try:
+            adapter = session.get_adapter("http://localhost")
+            assert adapter.max_retries.connect == 0
+        finally:
+            await client.close()
+
+    @pytest.mark.asyncio
+    async def test_retry_no_read_retries(self) -> None:
+        client = NextcloudClient(_make_config())
+        session = await client._get_session()
+        try:
+            adapter = session.get_adapter("http://localhost")
+            assert adapter.max_retries.read == 0
+        finally:
+            await client.close()
+
+    @pytest.mark.asyncio
+    async def test_retry_raise_on_status_disabled(self) -> None:
+        client = NextcloudClient(_make_config())
+        session = await client._get_session()
+        try:
+            adapter = session.get_adapter("http://localhost")
+            assert adapter.max_retries.raise_on_status is False
+        finally:
+            await client.close()

tests/test_config.py

@@ -95,6 +95,15 @@ def test_retry_max_negative_clamped_to_zero(self, monkeypatch: pytest.MonkeyPatc
         config = Config.from_env()
         assert config.retry_max == 0
 
+    def test_retry_max_invalid_raises(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setenv("NEXTCLOUD_URL", "http://localhost")
+        monkeypatch.setenv("NEXTCLOUD_USER", "admin")
+        monkeypatch.setenv("NEXTCLOUD_PASSWORD", "admin")
+        monkeypatch.setenv("NEXTCLOUD_MCP_RETRY_MAX", "abc")
+
+        with pytest.raises(ValueError, match="Invalid NEXTCLOUD_MCP_RETRY_MAX"):
+            Config.from_env()
+
     def test_case_insensitive_permission(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setenv("NEXTCLOUD_URL", "http://localhost")
         monkeypatch.setenv("NEXTCLOUD_USER", "admin")