Merge branch 'release/v4.6.3'

CHANGELOG.md

@@ -13,6 +13,12 @@ Then paste output from that script here.
 
 -----------------------------------------------------------------
 
+## v4.6.3 - 2025-02-08
+
+### Bugfixes
+* [Email] Fix: Pretty-Print Python data instead of JSON - [#2754](https://github.com/carpentries/amy/pull/2754) by @pbanaszkiewicz
+
+
 ## v4.6.2 - 2025-02-04
 
 ### Bugfixes

amy/__init__.py

@@ -1 +1 @@
-__version__ = "v4.6.2"
+__version__ = "v4.6.3"

amy/emails/utils.py

@@ -281,7 +281,7 @@ def map_single_api_uri_to_serialized_model(uri: str) -> dict[str, Any]:
                 model_class = find_model_class(model_name)
                 model_instance = find_model_instance(model_class, int(id_))
                 serializer = ModelToSerializerMapper[model_class]
-                return serializer(model_instance).data
+                return dict(serializer(model_instance).data)
             except ValueError as exc:
                 raise ValueError(f"Failed to parse URI {uri!r}.") from exc
 

amy/templates/emails/scheduled_email_detail.html

@@ -170,15 +170,15 @@ <h1>
   </tr>
   <tr>
     <th>Rendered context JSON:</th>
-    <td colspan="2"><pre><code class="language-json">{{ rendered_context|indent_json }}</code></pre></td>
+    <td colspan="2"><pre><code class="language-python">{{ rendered_context|pprint_py }}</code></pre></td>
   </tr>
   <tr>
     <th>"To" header context JSON:</th>
     <td colspan="2"><pre><code class="language-json">{{ scheduled_email.to_header_context_json|indent_json }}</code></pre></td>
   </tr>
   <tr>
     <th>Rendered "To" header context JSON:</th>
-    <td colspan="2"><pre><code class="language-json">{{ rendered_to_header_context|indent_json }}</code></pre></td>
+    <td colspan="2"><pre><code class="language-python">{{ rendered_to_header_context|pprint_py }}</code></pre></td>
   </tr>
 </table>
 

amy/workshops/templatetags/pprint.py

@@ -1,4 +1,5 @@
 import json
+import pprint as stdlib_pprint
 from typing import Any
 
 from django import template
@@ -10,3 +11,9 @@
 def indent_json(value: Any, indent: int = 2) -> str:
     """Indent string containing JSON."""
     return json.dumps(value, sort_keys=True, indent=indent)
+
+
+@register.filter
+def pprint_py(value: Any) -> str:
+    """Indent Python dict."""
+    return stdlib_pprint.pformat(value, width=40)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amy",
-  "version": "v4.6.2",
+  "version": "v4.6.3",
   "description": "A web-based workshop administration application for The Carpentries",
   "main": "index.js",
   "repository": "git@github.com:carpentries/amy.git",