mkdocs2confluence 0.9.6__tar.gz → 0.9.7__tar.gz

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.6
+Version: 0.9.7
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.9.6"
+version = "0.9.7"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.7}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.9.6
+Version: 0.9.7
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.7}/src/mkdocs_to_confluence/transforms/mermaid.py

@@ -135,11 +135,13 @@ def _render_one(source: str, kroki_url: str, *, quiet: bool = False) -> Path | N
                 continue  # retry
             _warn(f"mermaid diagram: Kroki returned HTTP {exc.code} {exc.reason} — falling back to code block")
             return None
-        except urllib.error.URLError as exc:
+        except (urllib.error.URLError, OSError) as exc:
+            # URLError covers connection errors; OSError covers read-phase timeouts
+            # (socket.timeout is OSError but not URLError when raised by resp.read()).
             last_exc = exc
-            kroki_unavailable = True  # timeout or connection refused — kroki unreachable
+            kroki_unavailable = True
             continue  # retry — network blip
-        except (OSError, ValueError) as exc:
+        except ValueError as exc:
             _warn(f"mermaid diagram: {exc} — falling back to code block")
             return None
 

{mkdocs2confluence-0.9.6 → mkdocs2confluence-0.9.7}/tests/test_mermaid.py

@@ -398,7 +398,7 @@ def test_render_one_504_on_public_kroki_falls_back_to_mermaid_ink(tmp_path, caps
 
 
 def test_render_one_timeout_on_public_kroki_falls_back_to_mermaid_ink(tmp_path):
-    """Public kroki.io timeout → automatic fallback to mermaid.ink."""
+    """Public kroki.io URLError timeout → automatic fallback to mermaid.ink."""
     import urllib.error
 
     from mkdocs_to_confluence.transforms.mermaid import _render_one
@@ -416,6 +416,25 @@ def test_render_one_timeout_on_public_kroki_falls_back_to_mermaid_ink(tmp_path):
     mock_ink.assert_called_once_with(_SAMPLE_SOURCE)
 
 
+def test_render_one_read_phase_timeout_falls_back_to_mermaid_ink(tmp_path):
+    """socket.timeout during resp.read() (OSError, not URLError) → fallback to mermaid.ink."""
+    import socket
+
+    from mkdocs_to_confluence.transforms.mermaid import _render_one
+
+    with patch("mkdocs_to_confluence.transforms.mermaid._CACHE_DIR", tmp_path), \
+         patch("mkdocs_to_confluence.transforms.mermaid.time.sleep"), \
+         patch("mkdocs_to_confluence.transforms.mermaid._kroki_png",
+               side_effect=socket.timeout("The read operation timed out")), \
+         patch("mkdocs_to_confluence.transforms.mermaid._mermaid_ink_png",
+               return_value=_FAKE_PNG) as mock_ink:
+        result = _render_one(_SAMPLE_SOURCE, "https://kroki.io")
+
+    assert result is not None
+    assert result.exists()
+    mock_ink.assert_called_once_with(_SAMPLE_SOURCE)
+
+
 def test_render_one_504_on_self_hosted_kroki_does_not_fall_back(tmp_path):
     """Self-hosted Kroki 504 → no mermaid.ink fallback (privacy isolation)."""
     import urllib.error
@@ -435,7 +454,7 @@ def test_render_one_504_on_self_hosted_kroki_does_not_fall_back(tmp_path):
 
 
 def test_render_one_timeout_on_self_hosted_kroki_does_not_fall_back(tmp_path):
-    """Self-hosted Kroki timeout → no mermaid.ink fallback (privacy isolation)."""
+    """Self-hosted Kroki URLError timeout → no mermaid.ink fallback (privacy isolation)."""
     import urllib.error
 
     from mkdocs_to_confluence.transforms.mermaid import _render_one
@@ -452,6 +471,24 @@ def test_render_one_timeout_on_self_hosted_kroki_does_not_fall_back(tmp_path):
     mock_ink.assert_not_called()
 
 
+def test_render_one_read_phase_timeout_self_hosted_does_not_fall_back(tmp_path):
+    """socket.timeout on self-hosted Kroki → no mermaid.ink fallback (privacy isolation)."""
+    import socket
+
+    from mkdocs_to_confluence.transforms.mermaid import _render_one
+
+    with patch("mkdocs_to_confluence.transforms.mermaid._CACHE_DIR", tmp_path), \
+         patch("mkdocs_to_confluence.transforms.mermaid.time.sleep"), \
+         patch("mkdocs_to_confluence.transforms.mermaid._kroki_png",
+               side_effect=socket.timeout("The read operation timed out")), \
+         patch("mkdocs_to_confluence.transforms.mermaid._mermaid_ink_png",
+               return_value=_FAKE_PNG) as mock_ink:
+        result = _render_one(_SAMPLE_SOURCE, "https://my-internal-kroki.corp")
+
+    assert result is None
+    mock_ink.assert_not_called()
+
+
 def test_render_one_mermaid_ink_fallback_also_fails_returns_none(tmp_path, capsys):
     """When mermaid.ink fallback also fails, returns None (code-block fallback)."""
     import urllib.error