python-substack 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

{python_substack-0.9.0.dist-info → python_substack-0.9.1.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: python-substack
-Version: 0.9.0
+Version: 0.9.1
 Summary: Write and safely manage Substack drafts from Markdown with Python, CLI, and MCP.
-License: MIT
+License-Expression: MIT
 License-File: LICENSE
 Keywords: substack,substack-api,cli,newsletter,publishing,automation,mcp
 Author: Paolo Mazza
@@ -10,13 +10,11 @@ Author-email: mazzapaolo2019@gmail.com
 Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications :: Email
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

python_substack-0.9.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+substack/__init__.py,sha256=FNVZvkchlc56ph-fm0NUca2FHQpLFmwV_o2Umz_nNjQ,450
+substack/api.py,sha256=hnzIHC_t6VOjEzOCSngg9uaTQacyLtBYUlS3uQfbrJk,34830
+substack/cli.py,sha256=56BTWxfr3gpAaJOLJsKRG7k6PPT7xSgLdp632H4mezA,26292
+substack/exceptions.py,sha256=Y61XSPyxDxXPbVlioFvKhb94MRY0tpD389F5YdL1rGM,1390
+substack/mdexport.py,sha256=Tzkav3mnF9eIUVHUqUzEQkOTiJsLYde1Xi2AcE_cUdk,14017
+substack/mdrender.py,sha256=xRJIO4_6gcQ9jwLFm32KByi7bRmOJyowqF41GmYCA7A,15450
+substack/nodes.py,sha256=fTsGO0-lTztcXiloIjXrHVnJes9EcltGcrX-mEV2ceQ,5004
+substack/post.py,sha256=qDXu-xzO3nRXtahc-yG2EhxKAXB2hG_Z1nLa55UMBGg,19697
+substack_mcp/mcp_server.py,sha256=M5XH3C4iWjzvCw3uOPbY2NFljTQAl8FLt14RKaTzka0,11324
+python_substack-0.9.1.dist-info/METADATA,sha256=pDBPPtbe1r5CKfn2dC-qAsH0l0SuCGwGtFd9sPl3jmM,9208
+python_substack-0.9.1.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+python_substack-0.9.1.dist-info/entry_points.txt,sha256=MKPjaBUd-0PtvxsBviStsVq1c0h8JZ_qUoYEsBK1xJc,236
+python_substack-0.9.1.dist-info/licenses/LICENSE,sha256=L6jk148I5HhhVbfUvkO3EO7eAoU5zToLio4-ApkCkxg,1062
+python_substack-0.9.1.dist-info/RECORD,,

substack/__init__.py

@@ -3,7 +3,7 @@
 __author__ = "Paolo Mazza"
 __email__ = "mazzapaolo2019@gmail.com"
 __license__ = "MIT License"
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 __url__ = "https://github.com/ma2za/python-substack"
 __download_url__ = "https://pypi.python.org/pypi/python-substack"
 __description__ = (

substack/api.py

@@ -500,6 +500,7 @@ class Api:
         """
         Update an existing draft body from Markdown, with optional metadata changes.
         """
+        from substack import mdrender
         from substack.mdexport import document_to_markdown
         from substack.post import Post
 
@@ -517,6 +518,7 @@ class Api:
 
         _, remote_unsupported = document_to_markdown(draft_body)
 
+        image_markers = []
         post = Post(
             title=draft.get("title", ""),
             subtitle=(
@@ -526,30 +528,88 @@ class Api:
             audience=audience,
             write_comment_permissions=write_comment_permissions,
         )
-        post.from_markdown(markdown, api=self)
+        rendered = mdrender.markdown_to_doc(
+            markdown, api=self, track_markers=image_markers
+        )
+        post.draft_body["content"] = rendered
 
         remote_images = _image_attrs(draft_body)
         submitted_images = _image_attrs(post.draft_body)
-        for submitted in submitted_images:
-            matches = [
-                image
-                for image in remote_images
-                if image.get("src") == submitted.get("src")
-            ]
-            if len(matches) == 1:
+
+        consumed_remote_indices = set()
+
+        for submitted, marker in zip(submitted_images, image_markers):
+            if marker is not None and marker.get("version") == 2:
+                bound_src = marker["src"]
+                matched_idx = None
+                for idx, r_img in enumerate(remote_images):
+                    if (
+                        idx not in consumed_remote_indices
+                        and r_img.get("src") == bound_src
+                    ):
+                        matched_idx = idx
+                        break
+
+                if matched_idx is None:
+                    all_with_src = [
+                        idx
+                        for idx, r_img in enumerate(remote_images)
+                        if r_img.get("src") == bound_src
+                    ]
+                    if not all_with_src:
+                        raise ValueError(
+                            f"Refusing to update: stale image marker bound to '{bound_src}'."
+                        )
+                    else:
+                        raise ValueError(
+                            f"Refusing to update: reused or duplicate image marker for '{bound_src}'."
+                        )
+
+                consumed_remote_indices.add(matched_idx)
+                remote_img = remote_images[matched_idx]
                 source, alt, href = (
                     submitted.get("src"),
                     submitted.get("alt"),
                     submitted.get("href"),
                 )
-                submitted.update(matches[0])
+                submitted.update(remote_img)
+                submitted.update(marker["attrs"])
                 submitted.update(
                     {"src": source, "alt": alt, "href": href, "isProcessing": False}
                 )
-            elif not allow_image_replacement:
-                raise ValueError(
-                    "Refusing to update: image cannot be matched uniquely; set allow_image_replacement=True to proceed."
-                )
+
+            elif marker is not None and marker.get("version") == 1:
+                sub_src = submitted.get("src")
+                matches = [
+                    idx
+                    for idx, r_img in enumerate(remote_images)
+                    if r_img.get("src") == sub_src
+                    and idx not in consumed_remote_indices
+                ]
+                if len(matches) == 1:
+                    matched_idx = matches[0]
+                    consumed_remote_indices.add(matched_idx)
+                    remote_img = remote_images[matched_idx]
+                    source, alt, href = (
+                        submitted.get("src"),
+                        submitted.get("alt"),
+                        submitted.get("href"),
+                    )
+                    submitted.update(remote_img)
+                    submitted.update(marker["attrs"])
+                    submitted.update(
+                        {"src": source, "alt": alt, "href": href, "isProcessing": False}
+                    )
+                elif not allow_image_replacement:
+                    raise ValueError(
+                        "Refusing to update: image cannot be matched uniquely; set allow_image_replacement=True to proceed."
+                    )
+
+            else:
+                if not allow_image_replacement:
+                    raise ValueError(
+                        "Refusing to update: image cannot be matched uniquely; set allow_image_replacement=True to proceed."
+                    )
 
         _, submitted_unsupported = document_to_markdown(post.draft_body)
 

substack/mdexport.py

@@ -58,18 +58,19 @@ def _marker(node, unsupported):
 
 
 def _image_marker(attrs):
-    preserved = {
-        key: value
-        for key, value in attrs.items()
-        if key not in {"src", "alt", "href", "isProcessing"}
+    payload_data = {
+        "src": attrs["src"],
+        **{
+            key: value
+            for key, value in attrs.items()
+            if key not in {"src", "alt", "href", "isProcessing"}
+        },
     }
-    if not preserved:
-        return ""
     payload = json.dumps(
-        preserved, ensure_ascii=False, separators=(",", ":"), sort_keys=True
+        payload_data, ensure_ascii=False, separators=(",", ":"), sort_keys=True
     ).encode("utf-8")
     encoded = base64.urlsafe_b64encode(payload).decode("ascii").rstrip("=")
-    return f"\n<!-- python-substack-image:v1 {encoded} -->"
+    return f"\n<!-- python-substack-image:v2 {encoded} -->"
 
 
 def _require_dict(node, context):
@@ -229,7 +230,6 @@ def _render_image(node, unsupported):
         image["type"] != "image2"
         or _has_unknown_keys(node, {"type", "content"})
         or _has_unknown_keys(image, {"type", "attrs"})
-        or _has_unknown_keys(attrs, _IMAGE_ATTRS)
         or not isinstance(attrs.get("src"), str)
     ):
         return _marker(node, unsupported)

substack/mdrender.py

@@ -45,7 +45,7 @@ _MARK_FOR = {
 }
 
 
-def parse_node_marker(comment_content: str) -> dict | None:
+def parse_node_marker(comment_content: str) -> dict | None:
     """
     Parse a python-substack-node:v1 comment marker and return the parsed JSON dictionary.
 
@@ -88,29 +88,45 @@ def parse_node_marker(comment_content: str) -> dict | None:
     if not isinstance(node_type, str) or not node_type:
         raise ValueError("Marker payload has missing or empty 'type'")
 
-    return data
-
-
-def parse_image_marker(comment_content: str) -> dict | None:
-    clean = comment_content.strip()
-    match = re.match(
-        r"^<!--\s*python-substack-image:v1\s+([A-Za-z0-9_-]+=*)\s*-->$", clean
-    )
-    if not match:
-        if "python-substack-image:v1" in clean:
-            raise ValueError("Corrupt image marker format")
-        return None
-    encoded = match.group(1)
-    encoded += "=" * (-len(encoded) % 4)
-    try:
-        attrs = json.loads(base64.urlsafe_b64decode(encoded.encode("ascii")))
-    except Exception as exc:
-        raise ValueError("Invalid image marker") from exc
-    if not isinstance(attrs, dict) or any(
-        key in {"src", "alt", "href", "isProcessing"} for key in attrs
-    ):
-        raise ValueError("Invalid image marker attributes")
-    return attrs
+    return data
+
+
+def parse_image_marker(comment_content: str) -> dict | None:
+    clean = comment_content.strip()
+    match = re.match(
+        r"^<!--\s*python-substack-image:(v1|v2)\s+([A-Za-z0-9_-]+=*)\s*-->$", clean
+    )
+    if not match:
+        if "python-substack-image:" in clean:
+            raise ValueError("Corrupt image marker format")
+        return None
+    version_str, encoded = match.group(1), match.group(2)
+    encoded += "=" * (-len(encoded) % 4)
+    try:
+        decoded_bytes = base64.urlsafe_b64decode(encoded.encode("ascii"))
+    except Exception as exc:
+        raise ValueError("Invalid image marker") from exc
+    try:
+        attrs = json.loads(decoded_bytes.decode("utf-8"))
+    except Exception as exc:
+        raise ValueError("Invalid image marker") from exc
+    if not isinstance(attrs, dict):
+        raise ValueError("Invalid image marker attributes")
+
+    if version_str == "v1":
+        if any(key in {"src", "alt", "href", "isProcessing"} for key in attrs):
+            raise ValueError("Invalid image marker attributes")
+        return {"version": 1, "src": None, "attrs": attrs}
+
+    if version_str == "v2":
+        if "src" not in attrs or not isinstance(attrs["src"], str):
+            raise ValueError("Invalid image marker attributes")
+        if any(key in {"alt", "href", "isProcessing"} for key in attrs):
+            raise ValueError("Invalid image marker attributes")
+        preserved = {k: v for k, v in attrs.items() if k != "src"}
+        return {"version": 2, "src": attrs["src"], "attrs": preserved}
+
+    return None
 
 
 def _make_parser() -> MarkdownIt:
@@ -177,6 +193,8 @@ def _render_inline(node: SyntaxTreeNode, marks: List[Dict], ctx: Dict) -> List[D
             if alt:
                 out.append(nodes.text(alt, marks))
         elif t == "html_inline":
+            if "python-substack-image:" in child.content:
+                raise ValueError("Image marker must immediately follow an image")
             marker_data = parse_node_marker(child.content)
             if marker_data is not None:
                 out.append(marker_data)
@@ -325,7 +343,9 @@ def _footnote_definitions(tree: SyntaxTreeNode, api) -> Dict[int, List[Dict]]:
     return definitions
 
 
-def markdown_to_doc(markdown_content: str, api=None) -> List[Dict]:
+def markdown_to_doc(
+    markdown_content: str, api=None, track_markers: Optional[List] = None
+) -> List[Dict]:
     """Convert Markdown into a list of Substack ProseMirror block nodes."""
     tree = SyntaxTreeNode(_make_parser().parse(markdown_content))
 
@@ -333,18 +353,39 @@ def markdown_to_doc(markdown_content: str, api=None) -> List[Dict]:
 
     ctx: Dict = {"order": []}
     out: List[Dict] = []
-    for node in tree.children:
-        if node.type == "footnote_block":
-            continue
-        if node.type == "html_block":
-            attrs = parse_image_marker(node.content)
-            if attrs is not None:
-                if not out or out[-1].get("type") != "captionedImage":
-                    raise ValueError("Image marker must immediately follow an image")
-                out[-1]["content"][0]["attrs"].update(attrs)
-                out[-1]["content"][0]["attrs"]["isProcessing"] = False
-                continue
-        out.extend(_render_block(node, api, ctx))
+    last_was_image = False
+    last_image_idx: Optional[int] = None
+
+    for node in tree.children:
+        if node.type == "footnote_block":
+            last_was_image = False
+            continue
+        if node.type == "html_block":
+            marker = parse_image_marker(node.content)
+            if marker is not None:
+                if not last_was_image or last_image_idx is None:
+                    raise ValueError("Image marker must immediately follow an image")
+                last_was_image = False
+                out[last_image_idx]["content"][0]["attrs"].update(marker["attrs"])
+                out[last_image_idx]["content"][0]["attrs"]["isProcessing"] = False
+                if track_markers is not None:
+                    track_markers[-1] = marker
+                continue
+            last_was_image = False
+
+        rendered = _render_block(node, api, ctx)
+        if rendered:
+            for blk in rendered:
+                out.append(blk)
+                if blk.get("type") == NodeType.CAPTIONED_IMAGE:
+                    last_was_image = True
+                    last_image_idx = len(out) - 1
+                    if track_markers is not None:
+                        track_markers.append(None)
+                else:
+                    last_was_image = False
+        else:
+            last_was_image = False
 
     # Emit one footnote block per reference, in anchor order, numbered to match.
     for number, footnote_id in enumerate(ctx["order"], start=1):

python_substack-0.9.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-substack/__init__.py,sha256=W0VG-klGuBHRwwQxQWEdvxB68z6YVQMvEAWO3yNn8bY,449
-substack/api.py,sha256=k6ympBEJnwE3Gy0n2qGYTM4d26As1--SZTgZQWl7PzU,32176
-substack/cli.py,sha256=56BTWxfr3gpAaJOLJsKRG7k6PPT7xSgLdp632H4mezA,26292
-substack/exceptions.py,sha256=Y61XSPyxDxXPbVlioFvKhb94MRY0tpD389F5YdL1rGM,1390
-substack/mdexport.py,sha256=lg2DCTHWRa_w7O2eO6ks1Iif2A7_tphDIayI0w_yxKk,14037
-substack/mdrender.py,sha256=Bq0VXs0B3cC2fpKzyRNxApM-ZbK_-pC9wPvn1HIanHw,13666
-substack/nodes.py,sha256=fTsGO0-lTztcXiloIjXrHVnJes9EcltGcrX-mEV2ceQ,5004
-substack/post.py,sha256=qDXu-xzO3nRXtahc-yG2EhxKAXB2hG_Z1nLa55UMBGg,19697
-substack_mcp/mcp_server.py,sha256=M5XH3C4iWjzvCw3uOPbY2NFljTQAl8FLt14RKaTzka0,11324
-python_substack-0.9.0.dist-info/METADATA,sha256=1S7eMKYmbI8AMKG5rruRyRcUWESxELT6XStsQQeRCsY,9299
-python_substack-0.9.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
-python_substack-0.9.0.dist-info/entry_points.txt,sha256=MKPjaBUd-0PtvxsBviStsVq1c0h8JZ_qUoYEsBK1xJc,236
-python_substack-0.9.0.dist-info/licenses/LICENSE,sha256=L6jk148I5HhhVbfUvkO3EO7eAoU5zToLio4-ApkCkxg,1062
-python_substack-0.9.0.dist-info/RECORD,,