django-cachex 0.4.1__tar.gz → 0.4.2__tar.gz

{django_cachex-0.4.1 → django_cachex-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: django-cachex
-Version: 0.4.1
+Version: 0.4.2
 Summary: Full featured Valkey and Redis cache backend for Django
 Project-URL: Homepage, https://github.com/oliverhaas/django-cachex
 Project-URL: Documentation, https://oliverhaas.github.io/django-cachex/
@@ -44,7 +44,7 @@ Requires-Dist: ormsgpack>=1.10.0; extra == 'ormsgpack'
 Provides-Extra: redis-py
 Requires-Dist: redis<9,>=6; extra == 'redis-py'
 Provides-Extra: redis-rs
-Requires-Dist: django-cachex-redis-rs==0.4.1; extra == 'redis-rs'
+Requires-Dist: django-cachex-redis-rs==0.4.2; extra == 'redis-rs'
 Provides-Extra: valkey-glide
 Requires-Dist: valkey-glide-sync<3,>=2.3; extra == 'valkey-glide'
 Requires-Dist: valkey-glide<3,>=2.3; extra == 'valkey-glide'

{django_cachex-0.4.1 → django_cachex-0.4.2}/crates/django-cachex-redis-rs/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-cachex-redis-rs"
-version = "0.4.1"
+version = "0.4.2"
 description = "Rust adapter (PyO3 + tokio + redis-rs) for django-cachex"
 readme = "README.md"
 license = { text = "MIT" }

{django_cachex-0.4.1 → django_cachex-0.4.2}/django_cachex/admin/cas.py

@@ -8,6 +8,7 @@ Each CAS function returns:
     1: success (value matched, update applied)
     0: conflict (value changed since page load)
    -1: gone (key/field/index no longer exists)
+   -2: target name already taken (hash field rename only)
 """
 
 from typing import TYPE_CHECKING, Any
@@ -91,6 +92,16 @@ end
 return 0
 """
 
+_CAS_HASH_RENAME = """\
+local v = redis.call('HGET', KEYS[1], ARGV[1])
+if v == false then return -1 end
+if redis.sha1hex(v) ~= ARGV[3] then return 0 end
+if redis.call('HEXISTS', KEYS[1], ARGV[2]) == 1 then return -2 end
+redis.call('HSET', KEYS[1], ARGV[2], ARGV[4])
+redis.call('HDEL', KEYS[1], ARGV[1])
+return 1
+"""
+
 _CAS_ZSET_SCORE_UPDATE = """\
 local v = redis.call('ZSCORE', KEYS[1], ARGV[1])
 if v == false then return -1 end
@@ -243,6 +254,31 @@ def cas_update_hash_field(
     )
 
 
+def cas_rename_hash_field(
+    cache: RespCache,
+    key: str,
+    field: str,
+    new_field: str,
+    expected_sha1: str,
+    new_value: Any,
+) -> int:
+    """Atomically move a hash field to a new name if its value hasn't changed.
+
+    Redis has no HRENAME, so a rename is HSET plus HDEL. Running the pair in a
+    script keeps it atomic and costs a single round trip.
+
+    Returns:
+        1 = success, 0 = conflict, -1 = field gone, -2 = new name already taken.
+    """
+    encoded = cache.encode(new_value)
+    return cache.eval_script(
+        _CAS_HASH_RENAME,
+        keys=[key],
+        args=[field, new_field, expected_sha1, encoded],
+        pre_hook=keys_only_pre,
+    )
+
+
 def cas_update_zset_score(
     cache: RespCache,
     key: str,

{django_cachex-0.4.1 → django_cachex-0.4.2}/django_cachex/admin/helpers.py

@@ -1,6 +1,5 @@
 """Helper functions for cache admin views."""
 
-import json
 import logging
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING, Any
@@ -204,22 +203,18 @@ def get_type_data(
     return result
 
 
-def _format_value(value: Any) -> str:
-    """Format a cache value for display: JSON for round-trippable values, repr() otherwise.
+def _format_entry(value: Any) -> tuple[str, bool]:
+    """Format one container entry as (display_string, editable).
 
-    Uses the same approach as format_value_for_display() for string keys:
-    JSON-serializes anything that round-trips cleanly, so types are distinguishable
-    (e.g. 42 vs "42", null vs "null").
+    Shares ``format_value_for_display`` with the string editor so containers and
+    strings agree on what is round-trippable. Entries that fall back to repr()
+    are marked non-editable: submitting the repr back would store the repr text.
     """
-    if value is None:
-        return "null"
-    try:
-        serialized = json.dumps(value, indent=2, ensure_ascii=False)
-        if json.loads(serialized) == value:
-            return serialized
-    except TypeError, ValueError, OverflowError:
-        pass
-    return repr(value)
+    # Imported lazily: views.base is reachable from views/__init__, which
+    # imports the modules that import this one.
+    from django_cachex.admin.views.base import format_value_for_display
+
+    return format_value_for_display(value)
 
 
 def _fetch_type_data(cache: Any, key: str, key_type: str, *, page: int = 1) -> dict[str, Any]:  # noqa: PLR0911
@@ -231,19 +226,25 @@ def _fetch_type_data(cache: Any, key: str, key_type: str, *, page: int = 1) -> d
                 pagination = _paginate(length, page)
                 start = pagination["start_index"]
                 stop = pagination["end_index"] - 1  # LRANGE stop is inclusive
-                items = [_format_value(i) for i in cache.lrange(key, start, stop)]
-                # Pre-build item_entries with offset-aware indices (CAS overwrites with SHA1s)
-                item_entries = [(start + i, item, "") for i, item in enumerate(items)]
-                return {"items": items, "length": length, "pagination": pagination, "item_entries": item_entries}
+                # Every entry carries an empty SHA1 slot that CAS fills in later, so
+                # the template sees the same tuple shape on backends without scripting.
+                item_entries = []
+                for i, raw in enumerate(cache.lrange(key, start, stop)):
+                    item, editable = _format_entry(raw)
+                    item_entries.append((start + i, item, "", editable))
+                return {"length": length, "pagination": pagination, "item_entries": item_entries}
             case KeyType.HASH:
-                fields = {str(k): _format_value(v) for k, v in cache.hgetall(key).items()}
+                fields = {str(k): v for k, v in cache.hgetall(key).items()}
                 length = len(fields)
                 pagination = _paginate(length, page)
                 s, e = pagination["start_index"], pagination["end_index"]
-                sliced = dict(list(fields.items())[s:e])
-                return {"fields": sliced, "length": length, "pagination": pagination}
+                field_entries = []
+                for field, raw in list(fields.items())[s:e]:
+                    value, editable = _format_entry(raw)
+                    field_entries.append((field, value, "", editable))
+                return {"length": length, "pagination": pagination, "field_entries": field_entries}
             case KeyType.SET:
-                members = sorted(_format_value(m) for m in cache.smembers(key))
+                members = sorted(_format_entry(m) for m in cache.smembers(key))
                 length = len(members)
                 pagination = _paginate(length, page)
                 s, e = pagination["start_index"], pagination["end_index"]
@@ -253,7 +254,10 @@ def _fetch_type_data(cache: Any, key: str, key_type: str, *, page: int = 1) -> d
                 pagination = _paginate(length, page)
                 start = pagination["start_index"]
                 stop = pagination["end_index"] - 1  # ZRANGE stop is inclusive
-                zset_members = [(_format_value(m), s) for m, s in cache.zrange(key, start, stop, withscores=True)]
+                zset_members = []
+                for raw, score in cache.zrange(key, start, stop, withscores=True):
+                    member, editable = _format_entry(raw)
+                    zset_members.append((member, score, editable))
                 return {"members": zset_members, "length": length, "pagination": pagination}
             case KeyType.STREAM if hasattr(cache, "xrange"):
                 length = cache.xlen(key)
@@ -288,22 +292,23 @@ def _add_cas_fingerprints(cache: Any, key: str, key_type: str | None, result: di
                     from django_cachex.admin.cas import get_list_sha1s
 
                     list_sha1s = get_list_sha1s(cache, key)
-                items = result.get("items", [])
-                offset = pagination["start_index"] if pagination else 0
                 result["item_entries"] = [
-                    (offset + i, item, list_sha1s[i] if i < len(list_sha1s) else "") for i, item in enumerate(items)
+                    (index, item, list_sha1s[i] if i < len(list_sha1s) else "", editable)
+                    for i, (index, item, _, editable) in enumerate(result.get("item_entries", []))
                 ]
             case KeyType.HASH:
-                fields = result.get("fields", {})
-                if pagination and fields:
+                entries = result.get("field_entries", [])
+                if pagination and entries:
                     from django_cachex.admin.cas import get_hash_field_sha1s_for
 
-                    hash_sha1s = get_hash_field_sha1s_for(cache, key, list(fields.keys()))
+                    hash_sha1s = get_hash_field_sha1s_for(cache, key, [field for field, *_ in entries])
                 else:
                     from django_cachex.admin.cas import get_hash_field_sha1s
 
                     hash_sha1s = get_hash_field_sha1s(cache, key)
-                result["field_entries"] = [(field, value, hash_sha1s.get(field, "")) for field, value in fields.items()]
+                result["field_entries"] = [
+                    (field, value, hash_sha1s.get(field, ""), editable) for field, value, _, editable in entries
+                ]
     except NotSupportedError:
         # ``BaseCachex`` declares ``eval_script`` and raises, so LocMem and
         # Database land here: render without CAS fingerprints.

{django_cachex-0.4.1 → django_cachex-0.4.2}/django_cachex/admin/templates/admin/django_cachex/cache/styles.css

@@ -172,18 +172,58 @@
     color: var(--error-fg);
 }
 
-/* Monospace text for code-like textareas */
+/* ===== VALUE INPUTS ===== */
+/* Shared textarea for every value, item and member editor. Height comes from
+   the rows attribute, which differs per context; width fills the container. */
 /* border-box: admin textareas carry a 1px border and 8px of side padding, which
    would otherwise sit outside the 100% width and clip the right edge */
-#id_value,
-#id_list_values,
-#id_set_members,
-#id_hash_value,
-#id_zset_value {
-    font-family: var(--font-family-monospace);
+.cachex-value-input {
     width: 100%;
     box-sizing: border-box;
-    min-height: 200px;
+    resize: vertical;
+}
+
+/* The admin's fieldset.monospace rule covers textareas only, but the hash field
+   name and the zset score sit next to one and should read the same. */
+fieldset.monospace input.cachex-value-input {
+    font-family: var(--font-family-monospace);
+}
+
+/* Submit row under a value textarea */
+.cachex-value-actions {
+    margin-top: 10px;
+}
+
+/* Field-name input above a value textarea. A <p> wrapper would pick up the
+   admin's .aligned padding-left and sit indented against the textarea. */
+.cachex-name-row {
+    margin-bottom: 6px;
+}
+
+.cachex-name-row input {
+    width: 20em;
+    max-width: 100%;
+}
+
+/* In an entry table the stacked buttons are taller than a two-row field, so let
+   the field grow to the row height rather than leaving a gap under it. The 1px
+   cell height is the usual table trick: a percentage height on the child only
+   resolves once the cell itself has a specified one, and content still wins. */
+.cachex-entry-table tbody td {
+    height: 1px;
+}
+
+.cachex-entry-table td textarea.cachex-value-input {
+    height: 100%;
+}
+
+/* Row actions sit beside the value in a table row, stacked so that two buttons
+   line up with the value field instead of widening the row. */
+.cachex-row-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    align-items: stretch;
 }
 
 /* ===== NOTES ===== */

django_cachex-0.4.2/django_cachex/admin/templates/admin/django_cachex/key/key_detail_hash.html

@@ -0,0 +1,73 @@
+{% load i18n %}
+{% with input_tpl="admin/django_cachex/key/key_detail_value_input.html#value-input" %}
+<!-- Hash Operations -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'Operations' %}</h2>
+    <div class="form-row">
+        <div>
+            <label for="id_hset_value">{% trans 'Set Field:' %}</label>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="hset">
+                <div class="cachex-name-row"><input type="text" name="field" placeholder="{% trans 'field' %}" class="vTextField"></div>
+                {% include input_tpl with name="field_value" rows=4 field_id="id_hset_value" placeholder=_("value") editable=True only %}
+                <div class="cachex-value-actions">
+                    <button type="submit" class="button btn-small">{% trans 'Set' %}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</fieldset>
+<!-- Hash Fields -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'Hash Fields' %}{% if type_data.length %} ({{ type_data.length }}){% endif %}</h2>
+    {% if type_data.field_entries %}
+    <div class="results">
+        <table id="result_list" class="cachex-entry-table" style="width: 100%;">
+            <thead>
+                <tr>
+                    <th scope="col" style="width: 25%;">{% trans 'Field' %}</th>
+                    <th scope="col">{% trans 'Value' %}</th>
+                    <th scope="col" style="width: 110px;">{% trans 'Actions' %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for field, value, sha1, editable in type_data.field_entries %}
+                <tr class="{% cycle 'row1' 'row2' %}">
+                    <td><input type="text" name="new_field" value="{{ field }}" class="cachex-value-input" form="hash-update-{{ forloop.counter0 }}"{% if not editable %} readonly title="{% trans 'Not JSON-serializable, so this row cannot be edited safely.' %}"{% endif %}></td>
+                    <td>{% include input_tpl with name="field_value" value=value rows=2 form_id="hash-update-" row_index=forloop.counter0 editable=editable only %}</td>
+                    <td>
+                        <div class="cachex-row-actions">
+                            {% if editable %}
+                            <button type="submit" form="hash-update-{{ forloop.counter0 }}" class="button btn-small">{% trans 'Update' %}</button>
+                            {% else %}
+                            <button type="button" class="button btn-small" disabled title="{% trans 'Not JSON-serializable, so this value cannot be edited safely.' %}">{% trans 'Update' %}</button>
+                            {% endif %}
+                            <button type="submit" form="hash-delete-{{ forloop.counter0 }}" class="button delete-btn btn-small" onclick="return confirm('{% trans 'Delete this field?' %}');">{% trans 'Delete' %}</button>
+                        </div>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <!-- Forms for hash operations (outside table for valid HTML) -->
+    {% for field, value, sha1, editable in type_data.field_entries %}
+    <form id="hash-update-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="hupdate">
+        <input type="hidden" name="field" value="{{ field }}">
+        {% if sha1 %}<input type="hidden" name="original_sha1" value="{{ sha1 }}">{% endif %}
+    </form>
+    <form id="hash-delete-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="hdel">
+        <input type="hidden" name="field" value="{{ field }}">
+    </form>
+    {% endfor %}
+    {% else %}
+    <p class="quiet" style="padding: 10px;">{% trans 'Hash is empty.' %}</p>
+    {% endif %}
+    {% include "admin/django_cachex/key/key_detail_pagination.html" %}
+</fieldset>
+{% endwith %}

django_cachex-0.4.2/django_cachex/admin/templates/admin/django_cachex/key/key_detail_list.html

@@ -0,0 +1,114 @@
+{% load i18n %}
+{% with input_tpl="admin/django_cachex/key/key_detail_value_input.html#value-input" %}
+<!-- List Operations -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'Operations' %}</h2>
+    <div class="form-row">
+        <div>
+            <label for="id_lpush_value">{% trans 'Push Left:' %}</label>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="lpush">
+                {% include input_tpl with name="value" rows=4 field_id="id_lpush_value" placeholder=_("value") editable=True only %}
+                <div class="cachex-value-actions">
+                    <button type="submit" class="button btn-small">{% trans 'Push' %}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+    <div class="form-row">
+        <div>
+            <label for="id_rpush_value">{% trans 'Push Right:' %}</label>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="rpush">
+                {% include input_tpl with name="value" rows=4 field_id="id_rpush_value" placeholder=_("value") editable=True only %}
+                <div class="cachex-value-actions">
+                    <button type="submit" class="button btn-small">{% trans 'Push' %}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+    <div class="form-row">
+        <label>{% trans 'Pop Left:' %}</label>
+        <form method="post" style="display: inline;">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="lpop">
+            <input type="number" name="pop_count" value="1" min="1" class="vIntegerField" style="width: 50px;" title="{% trans 'Count' %}">
+            <button type="submit" class="button btn-small">{% trans 'Pop' %}</button>
+        </form>
+    </div>
+    <div class="form-row">
+        <label>{% trans 'Pop Right:' %}</label>
+        <form method="post" style="display: inline;">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="rpop">
+            <input type="number" name="pop_count" value="1" min="1" class="vIntegerField" style="width: 50px;" title="{% trans 'Count' %}">
+            <button type="submit" class="button btn-small">{% trans 'Pop' %}</button>
+        </form>
+    </div>
+    <div class="form-row">
+        <label>{% trans 'Trim:' %}</label>
+        <form method="post" style="display: inline;">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="ltrim">
+            <input type="number" name="trim_start" value="0" class="vIntegerField" style="width: 60px;" title="{% trans 'Start index' %}" placeholder="{% trans 'start' %}">
+            <input type="number" name="trim_stop" value="-1" class="vIntegerField" style="width: 60px;" title="{% trans 'Stop index (-1 for last)' %}" placeholder="{% trans 'stop' %}">
+            <button type="submit" class="button btn-small" onclick="return confirm('{% trans 'Trim list to this range? Elements outside the range will be removed.' %}');">{% trans 'Trim' %}</button>
+        </form>
+    </div>
+</fieldset>
+<!-- List Items -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'List Items' %}{% if type_data.length %} ({{ type_data.length }}){% endif %}</h2>
+    {% if type_data.item_entries %}
+    <div class="results">
+        <table id="result_list" class="cachex-entry-table" style="width: 100%;">
+            <thead>
+                <tr>
+                    <th scope="col" style="width: 60px;">{% trans 'Index' %}</th>
+                    <th scope="col">{% trans 'Value' %}</th>
+                    <th scope="col" style="width: 110px;">{% trans 'Actions' %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for index, item, sha1, editable in type_data.item_entries %}
+                <tr class="{% cycle 'row1' 'row2' %}">
+                    <td class="quiet">{{ index }}</td>
+                    <td>{% include input_tpl with name="value" value=item rows=2 form_id="list-update-" row_index=forloop.counter0 editable=editable only %}</td>
+                    <td>
+                        <div class="cachex-row-actions">
+                            {% if editable %}
+                            <button type="submit" form="list-update-{{ forloop.counter0 }}" class="button btn-small">{% trans 'Update' %}</button>
+                            <button type="submit" form="list-remove-{{ forloop.counter0 }}" class="button delete-btn btn-small" onclick="return confirm('{% trans 'Remove this item?' %}');">{% trans 'Remove' %}</button>
+                            {% else %}
+                            <button type="button" class="button btn-small" disabled title="{% trans 'Not JSON-serializable, so this item cannot be edited or matched for removal.' %}">{% trans 'Update' %}</button>
+                            <button type="button" class="button delete-btn btn-small" disabled title="{% trans 'Not JSON-serializable, so this item cannot be edited or matched for removal.' %}">{% trans 'Remove' %}</button>
+                            {% endif %}
+                        </div>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <!-- Forms for list operations (outside table for valid HTML) -->
+    {% for index, item, sha1, editable in type_data.item_entries %}
+    <form id="list-update-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="lset">
+        <input type="hidden" name="index" value="{{ index }}">
+        {% if sha1 %}<input type="hidden" name="original_sha1" value="{{ sha1 }}">{% endif %}
+    </form>
+    <form id="list-remove-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="lrem">
+        <input type="hidden" name="value" value="{{ item }}">
+    </form>
+    {% endfor %}
+    {% else %}
+    <p class="quiet" style="padding: 10px;">{% trans 'List is empty.' %}</p>
+    {% endif %}
+    {% include "admin/django_cachex/key/key_detail_pagination.html" %}
+</fieldset>
+{% endwith %}

django_cachex-0.4.2/django_cachex/admin/templates/admin/django_cachex/key/key_detail_set.html

@@ -0,0 +1,79 @@
+{% load i18n %}
+{% with input_tpl="admin/django_cachex/key/key_detail_value_input.html#value-input" %}
+<!-- Set Operations -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'Operations' %}</h2>
+    <div class="form-row">
+        <div>
+            <label for="id_sadd_member">{% trans 'Add:' %}</label>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="sadd">
+                {% include input_tpl with name="member" rows=4 field_id="id_sadd_member" placeholder=_("member") editable=True only %}
+                <div class="cachex-value-actions">
+                    <button type="submit" class="button btn-small">{% trans 'Add' %}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+    <div class="form-row">
+        <label>{% trans 'Pop:' %}</label>
+        <form method="post" style="display: inline;">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="spop">
+            <input type="number" name="pop_count" value="1" min="1" class="vIntegerField" style="width: 50px;" title="{% trans 'Count' %}">
+            <button type="submit" class="button btn-small" onclick="return confirm('{% trans 'Pop random members? They will be removed from the set.' %}');">{% trans 'Random' %}</button>
+        </form>
+    </div>
+</fieldset>
+<!-- Set Members -->
+<fieldset class="module aligned monospace">
+    <h2>{% trans 'Set Members' %}{% if type_data.length %} ({{ type_data.length }}){% endif %}</h2>
+    {% if type_data.members %}
+    <div class="results">
+        <table id="result_list" class="cachex-entry-table" style="width: 100%;">
+            <thead>
+                <tr>
+                    <th scope="col">{% trans 'Member' %}</th>
+                    <th scope="col" style="width: 110px;">{% trans 'Actions' %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for member, editable in type_data.members %}
+                <tr class="{% cycle 'row1' 'row2' %}">
+                    <td>{% include input_tpl with name="new_member" value=member rows=2 form_id="set-update-" row_index=forloop.counter0 editable=editable only %}</td>
+                    <td>
+                        <div class="cachex-row-actions">
+                            {% if editable %}
+                            <button type="submit" form="set-update-{{ forloop.counter0 }}" class="button btn-small">{% trans 'Update' %}</button>
+                            <button type="submit" form="set-remove-{{ forloop.counter0 }}" class="button delete-btn btn-small" onclick="return confirm('{% trans 'Remove this member?' %}');">{% trans 'Remove' %}</button>
+                            {% else %}
+                            <button type="button" class="button btn-small" disabled title="{% trans 'Not JSON-serializable, so this member cannot be edited or matched for removal.' %}">{% trans 'Update' %}</button>
+                            <button type="button" class="button delete-btn btn-small" disabled title="{% trans 'Not JSON-serializable, so this member cannot be edited or matched for removal.' %}">{% trans 'Remove' %}</button>
+                            {% endif %}
+                        </div>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <!-- Forms for set operations (outside table for valid HTML) -->
+    {% for member, editable in type_data.members %}
+    <form id="set-update-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="supdate">
+        <input type="hidden" name="member" value="{{ member }}">
+    </form>
+    <form id="set-remove-{{ forloop.counter0 }}" method="post" style="display: none;">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="srem">
+        <input type="hidden" name="member" value="{{ member }}">
+    </form>
+    {% endfor %}
+    {% else %}
+    <p class="quiet" style="padding: 10px;">{% trans 'Set is empty.' %}</p>
+    {% endif %}
+    {% include "admin/django_cachex/key/key_detail_pagination.html" %}
+</fieldset>
+{% endwith %}

{django_cachex-0.4.1 → django_cachex-0.4.2}/django_cachex/admin/templates/admin/django_cachex/key/key_detail_stream.html

@@ -1,16 +1,21 @@
 {% load i18n %}
+{% with input_tpl="admin/django_cachex/key/key_detail_value_input.html#value-input" %}
 <!-- Stream Operations -->
-<fieldset class="module aligned">
+<fieldset class="module aligned monospace">
     <h2>{% trans 'Operations' %}</h2>
     <div class="form-row">
-        <label>{% trans 'Add Entry:' %}</label>
-        <form method="post" style="display: inline;">
-            {% csrf_token %}
-            <input type="hidden" name="action" value="xadd">
-            <input type="text" name="field" placeholder="{% trans 'field' %}" style="width: 100px;">
-            <input type="text" name="field_value" placeholder="{% trans 'value' %}" style="width: 150px;">
-            <button type="submit" class="button btn-small">{% trans 'Add' %}</button>
-        </form>
+        <div>
+            <label for="id_xadd_value">{% trans 'Add Entry:' %}</label>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="xadd">
+                <div class="cachex-name-row"><input type="text" name="field" placeholder="{% trans 'field' %}" class="vTextField"></div>
+                {% include input_tpl with name="field_value" rows=4 field_id="id_xadd_value" placeholder=_("value") editable=True only %}
+                <div class="cachex-value-actions">
+                    <button type="submit" class="button btn-small">{% trans 'Add' %}</button>
+                </div>
+            </form>
+        </div>
     </div>
     <div class="form-row">
         <label>{% trans 'Trim:' %}</label>
@@ -23,11 +28,11 @@
     </div>
 </fieldset>
 <!-- Stream Entries -->
-<fieldset class="module aligned">
+<fieldset class="module aligned monospace">
     <h2>{% trans 'Stream Entries' %}{% if type_data.length %} ({{ type_data.length }}){% endif %}</h2>
     {% if type_data.entries %}
     <div class="results">
-        <table id="result_list" style="width: 100%;">
+        <table id="result_list" class="cachex-entry-table" style="width: 100%;">
             <thead>
                 <tr>
                     <th scope="col" style="width: 180px;">{% trans 'Entry ID' %}</th>
@@ -58,3 +63,4 @@
     {% endif %}
     {% include "admin/django_cachex/key/key_detail_pagination.html" %}
 </fieldset>
+{% endwith %}

{django_cachex-0.4.1 → django_cachex-0.4.2}/django_cachex/admin/templates/admin/django_cachex/key/key_detail_string.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <!-- String Value Editor (default for string type or when type data not available) -->
-<fieldset class="module aligned">
+<fieldset class="module aligned monospace">
     <h2>{% trans 'Value' %}{% if value_is_editable %} <span class="quiet" style="font-weight: normal; font-size: 0.85em;">(JSON)</span>{% else %} <span class="quiet" style="font-weight: normal; font-size: 0.85em;">({% trans 'read-only' %})</span>{% endif %}</h2>
     {% if not value_is_editable %}
     <div class="warningnote">
@@ -15,15 +15,9 @@
         <div class="form-row">
             <div>
                 <label for="id_value" class="{% if not value_is_editable %}readonly{% endif %}">{% trans 'Value:' %}</label>
-                <textarea
-                    id="id_value"
-                    name="value"
-                    rows="12"
-                    class="vLargeTextField"
-                    {% if not value_is_editable %}readonly{% endif %}
-                >{{ value_display }}</textarea>
+                {% include "admin/django_cachex/key/key_detail_value_input.html#value-input" with name="value" value=value_display rows=12 field_id="id_value" editable=value_is_editable only %}
                 {% if value_is_editable %}
-                <div style="margin-top: 10px;">
+                <div class="cachex-value-actions">
                     <button type="submit" class="button btn-small">{% trans 'Update' %}</button>
                 </div>
                 {% endif %}

django_cachex-0.4.2/django_cachex/admin/templates/admin/django_cachex/key/key_detail_value_input.html

@@ -0,0 +1,18 @@
+{% load i18n %}
+{% comment %}
+Shared value textarea for every editor on the key detail page.
+
+Parameters:
+  name         POST field name (required)
+  value        current text
+  rows         visible rows: 12 for the string editor, 4 for the operations
+               forms, 2 for the compact rows in a member/item table
+  form_id      id of the out-of-table <form> the field belongs to; in a table
+               it is a prefix that row_index completes
+  row_index    row number appended to form_id, for per-row forms
+  field_id     id attribute, for a <label for="...">
+  placeholder  placeholder text
+  editable     always pass explicitly: False renders the field read-only,
+               which is what a value that is not JSON-serializable needs
+{% endcomment %}
+{% partialdef value-input %}<textarea{% if field_id %} id="{{ field_id }}"{% endif %} name="{{ name }}" rows="{{ rows|default:2 }}" class="cachex-value-input"{% if form_id %} form="{{ form_id }}{{ row_index }}"{% endif %}{% if placeholder %} placeholder="{{ placeholder }}"{% endif %}{% if not editable %} readonly title="{% trans 'Not JSON-serializable, so this is a Python repr() and cannot be edited safely.' %}"{% endif %}>{{ value }}</textarea>{% endpartialdef %}