wagapi 0.2.2__tar.gz → 0.2.3__tar.gz

{wagapi-0.2.2 → wagapi-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagapi
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI client for the Wagtail Write API, optimised for LLM orchestration
 Project-URL: Repository, https://github.com/tomdyson/wagapi
 Project-URL: Issues, https://github.com/tomdyson/wagapi/issues
@@ -255,8 +255,8 @@ wagapi pages list [OPTIONS]
 | Option | Description |
 |---|---|
 | `--type TYPE` | Filter by page type, e.g. `testapp.BlogPage` |
-| `--parent ID` | Direct children of page ID |
-| `--descendant-of ID` | All descendants of page ID |
+| `--parent ID_OR_PATH` | Direct children of page ID or URL path (e.g. `5` or `/blog/`) |
+| `--descendant-of ID_OR_PATH` | All descendants of page ID or URL path |
 | `--status STATUS` | `draft`, `live`, or `live+draft` |
 | `--slug SLUG` | Exact slug match |
 | `--path PATH` | Exact URL path match, e.g. `/blog/my-post/` |
@@ -288,7 +288,9 @@ wagapi pages create <type> --parent ID_OR_PATH --title TITLE [OPTIONS]
 | `--publish` | Publish immediately (default: create as draft) |
 | `--raw` | Treat field values as raw JSON (no auto-wrapping) |
 
-**Markdown body (auto-converted to StreamField):**
+**Markdown body (auto-detected: StreamField blocks or RichTextField HTML):**
+
+`--body` checks the page type schema to determine the field type. For StreamField fields, markdown is converted to blocks. For RichTextField fields, markdown is sent as-is for server-side conversion to HTML.
 
 ```bash
 wagapi pages create testapp.BlogPage --parent /blog/ \

{wagapi-0.2.2 → wagapi-0.2.3}/README.md

@@ -225,8 +225,8 @@ wagapi pages list [OPTIONS]
 | Option | Description |
 |---|---|
 | `--type TYPE` | Filter by page type, e.g. `testapp.BlogPage` |
-| `--parent ID` | Direct children of page ID |
-| `--descendant-of ID` | All descendants of page ID |
+| `--parent ID_OR_PATH` | Direct children of page ID or URL path (e.g. `5` or `/blog/`) |
+| `--descendant-of ID_OR_PATH` | All descendants of page ID or URL path |
 | `--status STATUS` | `draft`, `live`, or `live+draft` |
 | `--slug SLUG` | Exact slug match |
 | `--path PATH` | Exact URL path match, e.g. `/blog/my-post/` |
@@ -258,7 +258,9 @@ wagapi pages create <type> --parent ID_OR_PATH --title TITLE [OPTIONS]
 | `--publish` | Publish immediately (default: create as draft) |
 | `--raw` | Treat field values as raw JSON (no auto-wrapping) |
 
-**Markdown body (auto-converted to StreamField):**
+**Markdown body (auto-detected: StreamField blocks or RichTextField HTML):**
+
+`--body` checks the page type schema to determine the field type. For StreamField fields, markdown is converted to blocks. For RichTextField fields, markdown is sent as-is for server-side conversion to HTML.
 
 ```bash
 wagapi pages create testapp.BlogPage --parent /blog/ \

{wagapi-0.2.2 → wagapi-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wagapi"
-version = "0.2.2"
+version = "0.2.3"
 description = "CLI client for the Wagtail Write API, optimised for LLM orchestration"
 readme = "README.md"
 license = "MIT"

{wagapi-0.2.2 → wagapi-0.2.3}/tests/conftest.py

@@ -51,6 +51,23 @@ SAMPLE_PAGE_TYPE_SCHEMA = {
     },
 }
 
+SAMPLE_RICHTEXT_PAGE_TYPE_SCHEMA = {
+    "name": "home.SimplePage",
+    "verbose_name": "simple page",
+    "create_schema": {
+        "required": ["type", "parent", "title"],
+        "properties": {
+            "type": {"type": "string"},
+            "parent": {"type": "integer"},
+            "title": {"type": "string"},
+            "body": {"type": "string", "description": "RichTextField body content"},
+        },
+    },
+    "allowed_parents": ["wagtailcore.Page"],
+    "allowed_children": [],
+    "streamfield_blocks": {},
+}
+
 SAMPLE_PAGE = {
     "id": 42,
     "title": "Hello",

{wagapi-0.2.2 → wagapi-0.2.3}/tests/test_commands.py

@@ -158,7 +158,12 @@ def test_pages_create(runner):
 
 
 @respx.mock
-def test_pages_create_with_body(runner):
+def test_pages_create_with_body_streamfield(runner):
+    """Body is converted to StreamField blocks when the field is a StreamField."""
+    schema = {"streamfield_blocks": {"body": [{"type": "heading"}, {"type": "paragraph"}]}}
+    respx.get(f"{BASE_URL}/schema/blog.BlogPage/").mock(
+        return_value=Response(200, json=schema)
+    )
     data = {
         "id": 43,
         "title": "Iris",
@@ -179,13 +184,45 @@ def test_pages_create_with_body(runner):
             ],
         )
     assert result.exit_code == 0
-    # Verify the request body contained streamfield blocks
     request_body = json.loads(route.calls[0].request.content)
     assert isinstance(request_body["body"], list)
     assert request_body["body"][0]["type"] == "heading"
     assert request_body["body"][1]["type"] == "paragraph"
 
 
+@respx.mock
+def test_pages_create_with_body_richtext(runner):
+    """Body is sent as richtext format dict when the field is a RichTextField."""
+    schema = {"streamfield_blocks": {}}
+    respx.get(f"{BASE_URL}/schema/home.SimplePage/").mock(
+        return_value=Response(200, json=schema)
+    )
+    data = {
+        "id": 50,
+        "title": "About",
+        "slug": "about",
+        "meta": {"type": "home.SimplePage", "live": False, "parent_id": 3},
+    }
+    route = respx.post(f"{BASE_URL}/pages/").mock(
+        return_value=Response(201, json=data)
+    )
+    with mock.patch.dict("os.environ", ENV):
+        result = runner.invoke(
+            cli,
+            [
+                "pages", "create", "home.SimplePage",
+                "--parent", "3",
+                "--title", "About",
+                "--body", "Hello **world**",
+            ],
+        )
+    assert result.exit_code == 0
+    request_body = json.loads(route.calls[0].request.content)
+    assert isinstance(request_body["body"], dict)
+    assert request_body["body"]["format"] == "markdown"
+    assert request_body["body"]["content"] == "Hello **world**"
+
+
 @respx.mock
 def test_pages_create_with_path_parent(runner):
     data = {
@@ -245,6 +282,33 @@ def test_pages_update(runner):
     assert "Updated" in result.output
 
 
+@respx.mock
+def test_pages_update_with_body_richtext(runner):
+    """Update fetches the page type and sends richtext for RichTextField."""
+    # Mock GET to fetch the page (to learn its type)
+    page_data = {
+        "id": 42, "title": "Old", "body": "<p>old</p>",
+        "meta": {"type": "home.SimplePage", "live": True},
+    }
+    respx.get(f"{BASE_URL}/pages/42/").mock(return_value=Response(200, json=page_data))
+    # Mock schema lookup
+    schema = {"streamfield_blocks": {}}
+    respx.get(f"{BASE_URL}/schema/home.SimplePage/").mock(
+        return_value=Response(200, json=schema)
+    )
+    # Mock PATCH
+    updated = {**page_data, "body": "<p>new</p>"}
+    route = respx.patch(f"{BASE_URL}/pages/42/").mock(
+        return_value=Response(200, json=updated)
+    )
+    with mock.patch.dict("os.environ", ENV):
+        result = runner.invoke(cli, ["pages", "update", "42", "--body", "new content"])
+    assert result.exit_code == 0
+    request_body = json.loads(route.calls[0].request.content)
+    assert isinstance(request_body["body"], dict)
+    assert request_body["body"]["format"] == "markdown"
+
+
 @respx.mock
 def test_pages_delete(runner):
     respx.delete(f"{BASE_URL}/pages/42/").mock(return_value=Response(204))

wagapi-0.2.3/wagapi/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{wagapi-0.2.2 → wagapi-0.2.3}/wagapi/commands/pages.py

@@ -7,7 +7,7 @@ import click
 
 from wagapi.cli import Context, handle_api_errors, pass_ctx
 from wagapi.exceptions import UsageError
-from wagapi.formatting.markdown import markdown_to_streamfield
+from wagapi.formatting.markdown import markdown_to_richtext, markdown_to_streamfield
 from wagapi.formatting.output import (
     format_page_created,
     format_page_deleted,
@@ -27,6 +27,15 @@ def _require_client(ctx: Context):
         )
 
 
+def _is_streamfield(ctx: Context, page_type: str, field_name: str) -> bool:
+    """Check if a field is a StreamField by looking for it in streamfield_blocks."""
+    try:
+        schema = ctx.client.get_page_type_schema(page_type)
+        return field_name in schema.get("streamfield_blocks", {})
+    except Exception:
+        return True  # default to StreamField if schema lookup fails
+
+
 def _parse_parent(value: str) -> int | str:
     """Parse parent as int ID or string path."""
     try:
@@ -175,7 +184,11 @@ def create(ctx: Context, page_type, parent, title, slug, fields, body, publish,
             except json.JSONDecodeError:
                 data["body"] = body
         else:
-            data["body"] = markdown_to_streamfield(body)
+            # Check if body is a StreamField or RichTextField
+            if _is_streamfield(ctx, page_type, "body"):
+                data["body"] = markdown_to_streamfield(body)
+            else:
+                data["body"] = markdown_to_richtext(body)
 
     if publish:
         data["action"] = "publish"
@@ -225,7 +238,13 @@ def update(ctx: Context, page_id, title, slug, fields, body, publish, raw):
             except json.JSONDecodeError:
                 data["body"] = body
         else:
-            data["body"] = markdown_to_streamfield(body)
+            # Fetch page to determine its type, then check schema
+            page_data = ctx.client.get_page(page_id)
+            page_type = page_data.get("meta", {}).get("type", "")
+            if _is_streamfield(ctx, page_type, "body"):
+                data["body"] = markdown_to_streamfield(body)
+            else:
+                data["body"] = markdown_to_richtext(body)
 
     if publish:
         data["action"] = "publish"

wagapi-0.2.2/wagapi/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.2"