markdown-to-confluence 0.4.6__tar.gz → 0.4.7__tar.gz

{markdown_to_confluence-0.4.6/markdown_to_confluence.egg-info → markdown_to_confluence-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-to-confluence
-Version: 0.4.6
+Version: 0.4.7
 Summary: Publish Markdown files to Confluence wiki
 Author-email: Levente Hunyadi <hunyadi@gmail.com>
 Maintainer-email: Levente Hunyadi <hunyadi@gmail.com>
@@ -581,6 +581,9 @@ options:
   --headers KEY=VALUE [KEY=VALUE ...]
                         Apply custom headers to all Confluence API requests.
   --webui-links         Enable Confluence Web UI links. (Typically required for on-prem versions of Confluence.)
+  --alignment {center,left,right}
+                        Alignment for block-level images and formulas (default: 'center').
+  --use-panel           Transform admonitions and alerts into a Confluence custom panel.
 ```
 
 ### Using the Docker container

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7}/README.md

@@ -535,6 +535,9 @@ options:
   --headers KEY=VALUE [KEY=VALUE ...]
                         Apply custom headers to all Confluence API requests.
   --webui-links         Enable Confluence Web UI links. (Typically required for on-prem versions of Confluence.)
+  --alignment {center,left,right}
+                        Alignment for block-level images and formulas (default: 'center').
+  --use-panel           Transform admonitions and alerts into a Confluence custom panel.
 ```
 
 ### Using the Docker container

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7/markdown_to_confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-to-confluence
-Version: 0.4.6
+Version: 0.4.7
 Summary: Publish Markdown files to Confluence wiki
 Author-email: Levente Hunyadi <hunyadi@gmail.com>
 Maintainer-email: Levente Hunyadi <hunyadi@gmail.com>
@@ -581,6 +581,9 @@ options:
   --headers KEY=VALUE [KEY=VALUE ...]
                         Apply custom headers to all Confluence API requests.
   --webui-links         Enable Confluence Web UI links. (Typically required for on-prem versions of Confluence.)
+  --alignment {center,left,right}
+                        Alignment for block-level images and formulas (default: 'center').
+  --use-panel           Transform admonitions and alerts into a Confluence custom panel.
 ```
 
 ### Using the Docker container

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7}/markdown_to_confluence.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ tests/test_xml.py
 tests/utility.py
 tests/source/admonition.md
 tests/source/alert.md
+tests/source/alignment.md
 tests/source/anchors.md
 tests/source/basic.md
 tests/source/code.md
@@ -78,6 +79,7 @@ tests/source/figure/vector.svg
 tests/source/images/images.md
 tests/target/admonition.xml
 tests/target/alert.xml
+tests/target/alignment.xml
 tests/target/anchors.xml
 tests/target/basic.xml
 tests/target/code.xml
@@ -89,6 +91,7 @@ tests/target/macro.xml
 tests/target/math.xml
 tests/target/mermaid.xml
 tests/target/missing.xml
+tests/target/panel.xml
 tests/target/sections.xml
 tests/target/status.xml
 tests/target/table.xml

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7}/md2conf/__init__.py

@@ -5,7 +5,7 @@ Parses Markdown files, converts Markdown content into the Confluence Storage For
 Confluence API endpoints to upload images and content.
 """
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 __author__ = "Levente Hunyadi"
 __copyright__ = "Copyright 2022-2025, Levente Hunyadi"
 __license__ = "MIT"

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7}/md2conf/__main__.py

@@ -46,6 +46,8 @@ class Arguments(argparse.Namespace):
     local: bool
     headers: dict[str, str]
     webui_links: bool
+    alignment: Literal["center", "left", "right"]
+    use_panel: bool
 
 
 class KwargsAppendAction(argparse.Action):
@@ -74,7 +76,7 @@ class PositionalOnlyHelpFormatter(argparse.HelpFormatter):
         self,
         usage: Optional[str],
         actions: Iterable[argparse.Action],
-        groups: Iterable[argparse._MutuallyExclusiveGroup],
+        groups: Iterable[argparse._MutuallyExclusiveGroup],  # pyright: ignore[reportPrivateUsage]
         prefix: Optional[str],
     ) -> str:
         # filter only positional arguments
@@ -242,6 +244,19 @@ def get_parser() -> argparse.ArgumentParser:
         default=False,
         help="Enable Confluence Web UI links. (Typically required for on-prem versions of Confluence.)",
     )
+    parser.add_argument(
+        "--alignment",
+        dest="alignment",
+        choices=["center", "left", "right"],
+        default="center",
+        help="Alignment for block-level images and formulas (default: 'center').",
+    )
+    parser.add_argument(
+        "--use-panel",
+        action="store_true",
+        default=False,
+        help="Transform admonitions and alerts into a Confluence custom panel.",
+    )
     return parser
 
 
@@ -275,6 +290,8 @@ def main() -> None:
         render_latex=args.render_latex,
         diagram_output_format=args.diagram_output_format,
         webui_links=args.webui_links,
+        alignment=args.alignment,
+        use_panel=args.use_panel,
     )
     if args.local:
         from .local import LocalConverter

{markdown_to_confluence-0.4.6 → markdown_to_confluence-0.4.7}/md2conf/api.py

@@ -17,7 +17,7 @@ import typing
 from dataclasses import dataclass
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Optional, TypeVar
+from typing import Any, Optional, TypeVar, overload
 from urllib.parse import urlencode, urlparse, urlunparse
 
 import requests
@@ -71,16 +71,24 @@ def build_url(base_url: str, query: Optional[dict[str, str]] = None) -> str:
 LOGGER = logging.getLogger(__name__)
 
 
-def response_cast(response_type: type[T], response: requests.Response) -> T:
+@overload
+def response_cast(response_type: None, response: requests.Response) -> None: ...
+
+
+@overload
+def response_cast(response_type: type[T], response: requests.Response) -> T: ...
+
+
+def response_cast(response_type: Optional[type[T]], response: requests.Response) -> Optional[T]:
     "Converts a response body into the expected type."
 
     if response.text:
         LOGGER.debug("Received HTTP payload:\n%s", response.text)
     response.raise_for_status()
-    if response_type is not type(None):
-        return _json_to_object(response_type, response.json())
-    else:
+    if response_type is None:
         return None
+    else:
+        return _json_to_object(response_type, response.json())
 
 
 @enum.unique
@@ -450,7 +458,7 @@ class ConfluenceSession:
 
             if not domain or not base_path:
                 data = self._get(ConfluenceVersion.VERSION_2, "/spaces", ConfluenceResultSet, query={"limit": "1"})
-                base_url = data._links.base
+                base_url = data._links.base  # pyright: ignore[reportPrivateUsage]
 
                 _, domain, base_path, _, _, _ = urlparse(base_url)
                 if not base_path.endswith("/"):
@@ -548,23 +556,23 @@ class ConfluenceSession:
 
         return items
 
-    def _build_request(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> tuple[str, dict[str, str], bytes]:
+    def _build_request(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> tuple[str, dict[str, str], bytes]:
         "Generates URL, headers and raw payload for a typed request/response."
 
         url = self._build_url(version, path)
-        if response_type is not type(None):
-            headers = {
-                "Content-Type": "application/json; charset=utf-8",
-                "Accept": "application/json",
-            }
-        else:
-            headers = {
-                "Content-Type": "application/json; charset=utf-8",
-            }
+        headers = {"Content-Type": "application/json"}
+        if response_type is not None:
+            headers["Accept"] = "application/json"
         data = json_dump_string(object_to_json(body)).encode("utf-8")
         return url, headers, data
 
-    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T:
+    @overload
+    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: None) -> None: ...
+
+    @overload
+    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T: ...
+
+    def _post(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> Optional[T]:
         "Creates a new object via Confluence REST API."
 
         url, headers, data = self._build_request(version, path, body, response_type)
@@ -572,7 +580,13 @@ class ConfluenceSession:
         response.raise_for_status()
         return response_cast(response_type, response)
 
-    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T:
+    @overload
+    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: None) -> None: ...
+
+    @overload
+    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: type[T]) -> T: ...
+
+    def _put(self, version: ConfluenceVersion, path: str, body: Any, response_type: Optional[type[T]]) -> Optional[T]:
         "Updates an existing object via Confluence REST API."
 
         url, headers, data = self._build_request(version, path, body, response_type)
@@ -806,7 +820,7 @@ class ConfluenceSession:
         )
 
         LOGGER.info("Updating attachment: %s", attachment_id)
-        self._put(ConfluenceVersion.VERSION_1, path, request, type(None))
+        self._put(ConfluenceVersion.VERSION_1, path, request, None)
 
     def get_page_properties_by_title(
         self,
@@ -899,7 +913,7 @@ class ConfluenceSession:
             version=ConfluenceContentVersion(number=version, minorEdit=True),
         )
         LOGGER.info("Updating page: %s", page_id)
-        self._put(ConfluenceVersion.VERSION_2, path, request, type(None))
+        self._put(ConfluenceVersion.VERSION_2, path, request, None)
 
     def create_page(
         self,
@@ -934,7 +948,7 @@ class ConfluenceSession:
             url,
             data=json_dump_string(object_to_json(request)).encode("utf-8"),
             headers={
-                "Content-Type": "application/json; charset=utf-8",
+                "Content-Type": "application/json",
                 "Accept": "application/json",
             },
             verify=True,
@@ -995,7 +1009,7 @@ class ConfluenceSession:
             url,
             params=query,
             headers={
-                "Content-Type": "application/json; charset=utf-8",
+                "Content-Type": "application/json",
                 "Accept": "application/json",
             },
             verify=True,
@@ -1048,7 +1062,7 @@ class ConfluenceSession:
         """
 
         path = f"/content/{page_id}/label"
-        self._post(ConfluenceVersion.VERSION_1, path, labels, type(None))
+        self._post(ConfluenceVersion.VERSION_1, path, labels, None)
 
     def remove_labels(self, page_id: str, labels: list[ConfluenceLabel]) -> None:
         """