python-substack 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

substack/cli.py

@@ -18,7 +18,7 @@ class CLIUsageError(Exception):
     pass
 
 
-def _api_from_env(cookies_path=None, publication_url=None):
+def _api_from_env(cookies_path=None, publication_url=None, timeout=None):
     load_dotenv()
 
     cookies_path = cookies_path or os.getenv("COOKIES_PATH")
@@ -30,12 +30,14 @@ def _api_from_env(cookies_path=None, publication_url=None):
             cookies_path=cookies_path,
             cookies_string=cookies_string,
             publication_url=publication_url,
+            timeout=timeout,
         )
 
     return Api(
         email=os.getenv("EMAIL"),
         password=os.getenv("PASSWORD"),
         publication_url=publication_url,
+        timeout=timeout,
     )
 
 
@@ -370,6 +372,9 @@ def _build_parser():
     parser.add_argument(
         "--publication-url", help="Override PUBLICATION_URL for this command."
     )
+    parser.add_argument(
+        "--timeout", type=float, help="Timeout in seconds for API requests."
+    )
     parser.add_argument("--json", action="store_true", dest="json_output")
     parser.add_argument("--version", action="version", version=__version__)
 
@@ -450,6 +455,7 @@ def main(argv=None):
         api = _api_from_env(
             cookies_path=args.cookies,
             publication_url=args.publication_url,
+            timeout=args.timeout,
         )
         args.handler(api, args)
     except CLIUsageError as exc:

substack/exceptions.py

@@ -1,32 +1,44 @@
-import json
-
-
-class SubstackAPIException(Exception):
-    def __init__(self, status_code, text):
-        try:
-            json_res = json.loads(text)
-        except ValueError:
-            self.message = f"Invalid JSON error message from Substack: {text}"
-        else:
-            self.message = ", ".join(
-                list(
-                    map(lambda error: error.get("msg", ""), json_res.get("errors", []))
-                )
-            )
-            self.message = self.message or json_res.get("error", "")
-        self.status_code = status_code
-
-    def __str__(self):
-        return f"APIError(code={self.status_code}): {self.message}"
-
-
-class SubstackRequestException(Exception):
-    def __init__(self, message):
-        self.message = message
-
-    def __str__(self):
-        return f"SubstackRequestException: {self.message}"
-
-
-class SectionNotExistsException(SubstackRequestException):
-    pass
+import json
+import re
+
+
+def _redact_message(text: str) -> str:
+    if not text:
+        return text
+    # Redact common cookie-like values and session tokens
+    # e.g., s%3A... or s:... which are typical for express session cookies
+    text = re.sub(r"s%3A[a-zA-Z0-9_\-\.\%]+", "[REDACTED_COOKIE]", text)
+    text = re.sub(r"s:[a-zA-Z0-9_\-\.\%]+", "[REDACTED_COOKIE]", text)
+    return text
+
+
+class SubstackAPIException(Exception):
+    def __init__(self, status_code, text):
+        text = _redact_message(text)
+        try:
+            json_res = json.loads(text)
+        except ValueError:
+            self.message = f"Invalid JSON error message from Substack: {text}"
+        else:
+            self.message = ", ".join(
+                list(
+                    map(lambda error: error.get("msg", ""), json_res.get("errors", []))
+                )
+            )
+            self.message = self.message or json_res.get("error", "")
+        self.status_code = status_code
+
+    def __str__(self):
+        return f"APIError(code={self.status_code}): {self.message}"
+
+
+class SubstackRequestException(Exception):
+    def __init__(self, message):
+        self.message = _redact_message(message)
+
+    def __str__(self):
+        return f"SubstackRequestException: {self.message}"
+
+
+class SectionNotExistsException(SubstackRequestException):
+    pass

substack_mcp/mcp_server.py

@@ -163,55 +163,24 @@ async def post_draft_from_markdown(
         This docstring example is meant to mirror the YAML-driven workflow and show how to decompose the same operations into explicit tool calls.
     """
     client = get_api()
-    user_id = client.get_user_id()
 
-    post = Post(
+    return client.create_draft_from_markdown(
         title=title,
-        subtitle=subtitle or "",
-        user_id=user_id,
+        markdown=markdown,
+        subtitle=subtitle,
         audience=audience,
         write_comment_permissions=write_comment_permissions,
+        search_engine_title=search_engine_title,
+        search_engine_description=search_engine_description,
+        slug=slug,
+        draft_section_id=draft_section_id,
+        tags=tags,
+        prepublish=prepublish,
+        publish=publish,
+        send=send,
+        share_automatically=share_automatically,
     )
 
-    post.from_markdown(markdown, api=client)
-
-    draft = client.post_draft(post.get_draft())
-
-    update_payload: Dict[str, Any] = {}
-    if search_engine_title:
-        update_payload["search_engine_title"] = search_engine_title
-    if search_engine_description:
-        update_payload["search_engine_description"] = search_engine_description
-    if slug:
-        update_payload["slug"] = slug
-    if draft_section_id is not None:
-        update_payload["draft_section_id"] = draft_section_id
-
-    if update_payload:
-        draft = client.put_draft(draft.get("id"), **update_payload)
-
-    tags_list = _normalize_tags(tags)
-    tags_result = None
-    if tags_list:
-        tags_result = client.add_tags_to_post(draft.get("id"), tags_list)
-
-    prepublish_result = None
-    if prepublish:
-        prepublish_result = client.prepublish_draft(draft.get("id"))
-
-    publish_result = None
-    if publish:
-        publish_result = client.publish_draft(
-            draft.get("id"), send=send, share_automatically=share_automatically
-        )
-
-    return {
-        "draft": draft,
-        "tags": tags_result,
-        "prepublish": prepublish_result,
-        "publish": publish_result,
-    }
-
 
 @mcp.tool()
 async def put_draft(
@@ -269,7 +238,11 @@ async def publish_draft(
     send: bool = True,
     share_automatically: bool = False,
 ) -> Dict[str, Any]:
-    """Publish a draft to live post state.
+    """Publish a draft to live post state. (Legacy compatibility interface).
+
+    This tool remains for backward compatibility. It is recommended to use
+    `publish_draft_checked` instead, which provides a safer publishing path
+    with explicit confirmation and prepublish validation.
 
     Args:
         draft_id: target draft identifier.
@@ -285,6 +258,126 @@ async def publish_draft(
     )
 
 
+@mcp.tool()
+async def publish_draft_checked(
+    draft_id: int,
+    confirm: bool = False,
+    send: bool = False,
+    share_automatically: bool = False,
+) -> Dict[str, Any]:
+    """A safer publishing path that requires confirmation and runs prepublish checks.
+
+    Args:
+        draft_id: target draft identifier.
+        confirm: Must be True to proceed with publication.
+        send: if False then do not send email to subscribers. Defaults to False.
+        share_automatically: whether to auto-share.
+
+    Returns:
+        Response from Substack `publish_draft`.
+    """
+    if not confirm:
+        raise ValueError("Publishing rejected: confirm parameter must be True.")
+
+    client = get_api()
+    client.prepublish_draft(draft_id)
+    return client.publish_draft(
+        draft_id, send=send, share_automatically=share_automatically
+    )
+
+
+@mcp.tool()
+async def get_status() -> Dict[str, Any]:
+    """Get the authentication status and basic user information.
+
+    Returns:
+        A dictionary containing user profile and primary publication details.
+    """
+    client = get_api()
+    profile = client.get_user_profile()
+    primary_pub = client.get_user_primary_publication()
+    return {"profile": profile, "primary_publication": primary_pub}
+
+
+@mcp.tool()
+async def list_publications() -> List[Dict[str, Any]]:
+    """List all publications available to the authenticated user.
+
+    Returns:
+        A list of publications.
+    """
+    client = get_api()
+    return client.get_user_publications()
+
+
+@mcp.tool()
+async def list_drafts(
+    filter: str = "draft", offset: int = 0, limit: int = 25
+) -> List[Dict[str, Any]]:
+    """List drafts for the current publication.
+
+    Args:
+        filter: Filter string, defaults to "draft".
+        offset: Pagination offset.
+        limit: Max number of drafts to return.
+
+    Returns:
+        A list of drafts.
+    """
+    client = get_api()
+    return client.get_drafts(filter=filter, offset=offset, limit=limit)
+
+
+@mcp.tool()
+async def get_draft(draft_id: int) -> Dict[str, Any]:
+    """Get a specific draft by its ID.
+
+    Args:
+        draft_id: The identifier of the draft.
+
+    Returns:
+        The draft details.
+    """
+    client = get_api()
+    return client.get_draft(draft_id)
+
+
+@mcp.tool()
+async def schedule_draft(draft_id: int, at: str) -> Dict[str, Any]:
+    """Schedule a draft for release.
+
+    Args:
+        draft_id: target draft identifier.
+        at: ISO 8601 formatted datetime string (e.g., "2024-01-01T12:00:00Z").
+
+    Returns:
+        API response dict for the scheduled draft.
+    """
+    from datetime import datetime
+
+    try:
+        draft_datetime = datetime.fromisoformat(at.replace("Z", "+00:00"))
+    except ValueError as e:
+        raise ValueError(f"Invalid ISO datetime string for 'at': {e}")
+
+    client = get_api()
+    return client.schedule_draft(draft_id, draft_datetime)
+
+
+@mcp.tool()
+async def unschedule_draft(draft_id: int) -> Dict[str, Any]:
+    """Unschedule a previously scheduled draft.
+
+    Args:
+        draft_id: target draft identifier.
+
+    Returns:
+        API response dict for unscheduling.
+    """
+    client = get_api()
+    return client.unschedule_draft(draft_id)
+
+
 def main() -> None:
     mcp.run(transport="stdio")
 

python_substack-0.3.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-substack/__init__.py,sha256=wulIsJc0NOyRmhOrRSyATms453zZ1GoPCHCqk0Yef5k,437
-substack/api.py,sha256=5dIijlGDZI5bPgX9skTzytDkY1IO6etvCv6PbNFUjyQ,23212
-substack/cli.py,sha256=JBCsCdmthjzTeDpOYBLeVKOdNYjBrPuY1o_CIsAIekk,21712
-substack/exceptions.py,sha256=BbP5W5UpzFcM5SYIxx6snWD_Rmj7F_YjYIYC_r03gZY,911
-substack/mdrender.py,sha256=QGJkdp1isFmhVyTRMogIabAK8OO2xQh9CrjnXZvFTY4,9308
-substack/nodes.py,sha256=fTsGO0-lTztcXiloIjXrHVnJes9EcltGcrX-mEV2ceQ,5004
-substack/post.py,sha256=qDXu-xzO3nRXtahc-yG2EhxKAXB2hG_Z1nLa55UMBGg,19697
-substack_mcp/mcp_server.py,sha256=gmevdc59XTBXXMTvVMpYoq66Umlqku1O_uzmw5tMy7o,8405
-python_substack-0.3.0.dist-info/METADATA,sha256=oj9XGFEZB62J8QCUyhO0n2VUrZFPXzu_TQsgkt2L_4s,8349
-python_substack-0.3.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
-python_substack-0.3.0.dist-info/entry_points.txt,sha256=MKPjaBUd-0PtvxsBviStsVq1c0h8JZ_qUoYEsBK1xJc,236
-python_substack-0.3.0.dist-info/licenses/LICENSE,sha256=L6jk148I5HhhVbfUvkO3EO7eAoU5zToLio4-ApkCkxg,1062
-python_substack-0.3.0.dist-info/RECORD,,