formkit-ninja 2.2__tar.gz → 2.4__tar.gz

formkit_ninja-2.4/.github/workflows/release.yml

@@ -0,0 +1,111 @@
+name: Release
+
+# Automatic PyPI release on a version tag.
+#
+# To cut a release:
+#   1. Bump `version` in pyproject.toml on main, commit, merge.
+#   2. Tag the merged commit with the SAME version (no "v" prefix), e.g.:
+#        git tag 2.5 && git push origin 2.5
+#   3. This workflow verifies the tag, builds, publishes to PyPI, and creates
+#      a GitHub Release with auto-generated notes.
+#
+# Publishing uses PyPI Trusted Publishing (OIDC) — no API token secret.
+# ONE-TIME SETUP (maintainer, on PyPI):
+#   pypi.org -> project formkit-ninja -> Settings -> Publishing ->
+#   "Add a new trusted publisher" (GitHub Actions):
+#     Owner:        catalpainternational
+#     Repository:   formkit-ninja
+#     Workflow:     release.yml
+#     Environment:  pypi
+#   (For the very first publish on a brand-new project name, add it as a
+#    "pending publisher" instead.)
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+"
+
+permissions:
+  contents: read
+
+jobs:
+  verify:
+    name: Verify tag
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Tag must equal pyproject version
+        run: |
+          tag="${GITHUB_REF_NAME}"
+          ver="$(grep -m1 '^version' pyproject.toml | sed -E 's/^version *= *"([^"]+)".*/\1/')"
+          echo "tag=$tag  pyproject=$ver"
+          if [ "$tag" != "$ver" ]; then
+            echo "::error::Tag '$tag' does not match pyproject version '$ver'. Bump pyproject.toml to match the tag."
+            exit 1
+          fi
+      - name: Tagged commit must be on main
+        run: |
+          git fetch --no-tags --depth=100 origin main
+          if ! git merge-base --is-ancestor "$GITHUB_SHA" origin/main; then
+            echo "::error::Tagged commit $GITHUB_SHA is not on main. Release only from merged, CI-green main."
+            exit 1
+          fi
+
+  build:
+    name: Build distributions
+    needs: verify
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+      - name: Build sdist + wheel
+        run: uv build
+      - name: Check metadata
+        run: uv run --with twine twine check dist/*
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  publish:
+    name: Publish to PyPI
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/formkit-ninja/
+    permissions:
+      id-token: write # OIDC for Trusted Publishing
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - name: Publish
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+  github-release:
+    name: GitHub Release
+    needs: publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - name: Create GitHub Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release create "$GITHUB_REF_NAME" dist/* \
+            --repo "$GITHUB_REPOSITORY" \
+            --title "$GITHUB_REF_NAME" \
+            --generate-notes

{formkit_ninja-2.2 → formkit_ninja-2.4}/CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4] - 2026-06-10
+
+### Added
+
+- **`code_scheme` tag for geographic inputs** — a metadata field on `FormKitSchemaNode`
+  recording which administrative-code scheme a Suco / Postu Admin / Munisipiu input's
+  values use, so legacy and new identifier schemes can coexist on the same forms without
+  ambiguity.
+  - Choices: `pnds` (current PNDS zTable IDs), `estrada` (timor-locations pre-INTL pcodes),
+    `intl2024` (new INTL string pcodes); nullable for non-geographic nodes.
+  - Carried through the full JSON ↔ Pydantic ↔ database round-trip, covering both
+    `option_group`-backed options and JS-backed `$getLocations()` inputs.
+  - Surfaced in the node payload for downstream consumers (e.g. partisipa-import); added
+    to the schema-node admin filter and change form.
+  - formkit-ninja only records the tag — it does not validate or translate option values.
+
+### Migrations
+
+- `0043` — adds the `code_scheme` column to `FormKitSchemaNode` (and its history model).
+- `0044` — backfills existing geographic nodes (matched by field name, `$getLocations()`,
+  or a geographic `$ida()` group) to `pnds`.
+
 ## [0.8.1] - 2026-02-02
 
 ### Added

{formkit_ninja-2.2 → formkit_ninja-2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: formkit-ninja
-Version: 2.2
+Version: 2.4
 Summary: A Django-Ninja backend to specify FormKit schemas
 Author-email: Josh Brooks <josh@catalpa.io>
 Requires-Python: <3.15,>=3.10

formkit_ninja-2.4/docs/releasing.md

@@ -0,0 +1,47 @@
+# Releasing
+
+Releases are automated by [`.github/workflows/release.yml`](../.github/workflows/release.yml).
+Pushing a version tag builds the package, publishes it to PyPI, and creates a
+GitHub Release.
+
+## Cut a release
+
+1. Bump `version` in `pyproject.toml` on a branch and merge it to `main`
+   (update `CHANGELOG.md` in the same PR).
+2. Tag the merged commit with the **same** version — no `v` prefix, matching the
+   existing tag style (`2.3`, `2.4`, …):
+
+   ```bash
+   git checkout main && git pull
+   git tag 2.5
+   git push origin 2.5
+   ```
+
+3. The workflow then:
+   - **verifies** the tag equals `pyproject.toml`'s `version` and that the commit
+     is on `main` (so you can't accidentally release un-merged or mismatched code);
+   - **builds** the sdist + wheel (`uv build`) and `twine check`s them;
+   - **publishes** to PyPI via Trusted Publishing;
+   - **creates** a GitHub Release with auto-generated notes.
+
+If the tag and `pyproject` version disagree, the run fails fast — bump and re-tag.
+
+## One-time setup (maintainer)
+
+Publishing uses **PyPI Trusted Publishing (OIDC)** — there is no API token secret
+to manage. On [pypi.org](https://pypi.org), open the `formkit-ninja` project →
+**Settings → Publishing → Add a new trusted publisher** (GitHub Actions):
+
+| Field        | Value                          |
+|--------------|--------------------------------|
+| Owner        | `catalpainternational`         |
+| Repository   | `formkit-ninja`                |
+| Workflow     | `release.yml`                  |
+| Environment  | `pypi`                         |
+
+The `pypi` GitHub environment already exists; add reviewers/protection to it if
+you want a manual approval gate before each publish.
+
+> Prefer an API token instead? Replace the `publish` job's OIDC step with
+> `pypa/gh-action-pypi-publish@release/v1` configured with
+> `password: ${{ secrets.PYPI_API_TOKEN }}` and add that repo secret.

{formkit_ninja-2.2 → formkit_ninja-2.4}/formkit_ninja/admin.py

@@ -32,6 +32,41 @@ logger = logging.getLogger(__name__)
 # The key of the dict provided is a JSON field on the model
 JsonFieldDefn = dict[str, tuple[str | tuple[str, str], ...]]
 
+# Composable field sets for FormKitSchemaNode admin forms.
+# Rule: promoted props (icon, title, readonly, etc.) are model fields only in forms;
+# _json_fields is for node-only keys (e.g. name, $formkit, placeholder). The model
+# syncs promoted columns to/from node on save and in get_node_values().
+COMMON_NODE_FIELDS = (
+    "label",
+    "description",
+    "icon",
+    "title",
+    "code_scheme",
+    "readonly",
+    "sections_schema",
+    "is_active",
+    "protected",
+)
+CODE_GEN_FIELDS = (
+    "django_field_type",
+    "django_field_args",
+    "django_field_positional_args",
+    "pydantic_field_type",
+    "extra_imports",
+    "validators",
+    "list_filter",
+)
+AUDIT_FIELDS = ("created_by", "updated_by")
+
+# Code generation fieldset shown at bottom of change form; also used to exclude from default fieldset
+CODE_GEN_FIELDSET_TITLE = "Code Generation (Source of Truth)"
+CODE_GEN_FIELDSET_FIELDS = CODE_GEN_FIELDS + (
+    "django_code_preview",
+    "pydantic_code_preview",
+    "formkit_node_preview",
+)
+CODE_GEN_GROUPED_FIELDS = frozenset(CODE_GEN_FIELDSET_FIELDS)
+
 
 class ItemAdmin(admin.ModelAdmin):
     list_display = ("name",)
@@ -163,19 +198,7 @@ class FormKitBaseForm(JSONMappingMixin, forms.ModelForm):
 
     class Meta:
         model = models.FormKitSchemaNode
-        fields = (
-            "label",
-            "description",
-            "is_active",
-            "protected",
-            "django_field_type",
-            "django_field_args",
-            "django_field_positional_args",
-            "pydantic_field_type",
-            "extra_imports",
-            "validators",
-            "list_filter",
-        )
+        fields = COMMON_NODE_FIELDS + CODE_GEN_FIELDS + AUDIT_FIELDS
 
     # Code Generation Overrides
     django_field_type = forms.CharField(required=False)
@@ -231,20 +254,7 @@ class FormKitSchemaComponentInline(admin.TabularInline):
 class FormKitNodeGroupForm(FormKitBaseForm):
     class Meta:
         model = models.FormKitSchemaNode
-        fields = (
-            "label",
-            "description",
-            "additional_props",
-            "is_active",
-            "protected",
-            "django_field_type",
-            "django_field_args",
-            "django_field_positional_args",
-            "pydantic_field_type",
-            "extra_imports",
-            "validators",
-            "list_filter",
-        )
+        fields = COMMON_NODE_FIELDS + ("additional_props", "option_group") + CODE_GEN_FIELDS + AUDIT_FIELDS
 
     _json_fields = {
         "node": ("name", ("formkit", "$formkit"), "if_condition", ("html_id", "id")),
@@ -258,21 +268,7 @@ class FormKitNodeGroupForm(FormKitBaseForm):
 class FormKitNodeForm(FormKitBaseForm):
     class Meta:
         model = models.FormKitSchemaNode
-        fields = (
-            "label",
-            "description",
-            "additional_props",
-            "option_group",
-            "is_active",
-            "protected",
-            "django_field_type",
-            "django_field_args",
-            "django_field_positional_args",
-            "pydantic_field_type",
-            "extra_imports",
-            "validators",
-            "list_filter",
-        )
+        fields = COMMON_NODE_FIELDS + ("additional_props", "option_group", "add_label", "up_control", "down_control") + CODE_GEN_FIELDS + AUDIT_FIELDS
 
     _json_fields = {
         "node": (
@@ -325,21 +321,18 @@ class FormKitNodeForm(FormKitBaseForm):
 
 
 class FormKitNodeRepeaterForm(FormKitNodeForm):
+    """Repeater node form. add_label, up_control, down_control are model fields (parent);
+    itemsClass/itemClass are node-only and mapped here."""
+
     def get_json_fields(self) -> JsonFieldDefn:
         return {
             "node": (
-                *(super()._json_fields["node"]),
-                "addLabel",
-                "upControl",
-                "downControl",
+                *(super().get_json_fields()["node"]),
                 "itemsClass",
                 "itemClass",
             )
         }
 
-    addLabel = forms.CharField(required=False)
-    upControl = forms.BooleanField(required=False)
-    downControl = forms.BooleanField(required=False)
     itemsClass = forms.CharField(required=False)
     itemClass = forms.CharField(required=False)
     max = forms.IntegerField(required=False)
@@ -441,14 +434,22 @@ NODE_CONFIG: dict[type | str, dict[str, Any]] = {
         "fieldsets": [
             (
                 "Repeater field properties",
-                {"fields": ("addLabel", "upControl", "downControl", "itemsClass", "itemClass")},
+                {"fields": ("add_label", "up_control", "down_control", "itemsClass", "itemClass")},
             )
         ],
     },
     formkit_schema.FormKitSchemaDOMNode: {"form": FormKitElementForm},
     formkit_schema.FormKitSchemaComponent: {"form": FormKitComponentForm},
     formkit_schema.FormKitSchemaCondition: {"form": FormKitConditionForm},
-    formkit_schema.FormKitSchemaProps: {"form": FormKitNodeForm},
+    formkit_schema.FormKitSchemaProps: {
+        "form": FormKitNodeForm,
+        "fieldsets": [
+            (
+                "Display & behaviour",
+                {"fields": ("icon", "title", "readonly", "sections_schema")},
+            ),
+        ],
+    },
 }
 
 # Admin site registration continues below...
@@ -458,6 +459,7 @@ NODE_CONFIG: dict[type | str, dict[str, Any]] = {
 class FormKitSchemaNodeAdmin(admin.ModelAdmin):
     list_display = (
         "label",
+        "title",
         "is_active",
         "short_id",
         "node_type",
@@ -468,9 +470,17 @@ class FormKitSchemaNodeAdmin(admin.ModelAdmin):
         "protected",
         "created",
     )
-    readonly_fields = ("django_code_preview", "pydantic_code_preview", "formkit_node_preview", "created", "updated")
+    readonly_fields = (
+        "django_code_preview",
+        "pydantic_code_preview",
+        "formkit_node_preview",
+        "created",
+        "updated",
+        "created_by",
+        "updated_by",
+    )
     search_fields = ["label", "description", "id"]
-    list_filter = ("is_active", "node_type", "protected", "option_group", "created", "updated")
+    list_filter = ("is_active", "node_type", "protected", "code_scheme", "option_group", "created", "updated")
     list_select_related = ("option_group",)
     list_per_page = 50
     date_hierarchy = "created"
@@ -518,40 +528,15 @@ class FormKitSchemaNodeAdmin(admin.ModelAdmin):
                 break
 
         grouped_fields: set[str] = reduce(operator.or_, (set(opts["fields"]) for _, opts in fieldsets), set())
-        # Also include code generation fields to avoid them being duplicated in the default fieldset
-        code_gen_fields = {
-            "django_field_type",
-            "django_field_args",
-            "django_field_positional_args",
-            "pydantic_field_type",
-            "extra_imports",
-            "validators",
-            "list_filter",
-            "django_code_preview",
-            "pydantic_code_preview",
-            "formkit_node_preview",
-        }
-        grouped_fields.update(code_gen_fields)
+        grouped_fields.update(CODE_GEN_GROUPED_FIELDS)
         fieldsets.insert(0, (None, {"fields": [f for f in self.get_fields(request, obj) if f not in grouped_fields]}))
 
-        # Add Code Generation Source of Truth fieldset
         fieldsets.append(
             (
-                "Code Generation (Source of Truth)",
+                CODE_GEN_FIELDSET_TITLE,
                 {
-                    "fields": (
-                        "django_field_type",
-                        "django_field_args",
-                        "django_field_positional_args",
-                        "pydantic_field_type",
-                        "extra_imports",
-                        "validators",
-                        "list_filter",
-                        "django_code_preview",
-                        "pydantic_code_preview",
-                        "formkit_node_preview",
-                    ),
-                    "description": ("These values are the source of truth for code generation. If empty, they are auto-resolved on save from global configs."),
+                    "fields": CODE_GEN_FIELDSET_FIELDS,
+                    "description": "These values are the source of truth for code generation. If empty, they are auto-resolved on save from global configs.",
                 },
             )
         )

{formkit_ninja-2.2 → formkit_ninja-2.4}/formkit_ninja/formkit_schema.py

@@ -116,6 +116,10 @@ class FormKitSchemaProps(BaseModel):
     prefixIcon: str | None = Field(None)
     icon: str | None = Field(None)
     title: str | None = Field(None)
+    # Metadata tag for the geographic pcode scheme an input emits
+    # (e.g. "estrada" legacy ints vs "intl2024" string pcodes). Carried through
+    # to the node JSON so downstream consumers (partisipa-import) can route by it.
+    code_scheme: str | None = Field(None)
     classes: str | dict[str, str] | None = Field(None)
     readonly: bool | None = Field(None)
     sectionsSchema: dict[str, Any] | None = Field(None)

formkit_ninja-2.4/formkit_ninja/migrations/0042_formkitschemanode_list_filter.py

@@ -0,0 +1,61 @@
+# Generated by Django 4.2.27 on 2026-03-03 09:19
+
+import pgtrigger.compiler
+import pgtrigger.migrations
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("formkit_ninja", "0041_flag"),
+    ]
+
+    operations = [
+        pgtrigger.migrations.RemoveTrigger(
+            model_name="formkitschemanode",
+            name="insert_insert",
+        ),
+        pgtrigger.migrations.RemoveTrigger(
+            model_name="formkitschemanode",
+            name="update_update",
+        ),
+        migrations.AddField(
+            model_name="formkitschemanode",
+            name="list_filter",
+            field=models.BooleanField(default=False, help_text="Include this field in generated ModelAdmin.list_filter."),
+        ),
+        migrations.AddField(
+            model_name="formkitschemanodeevent",
+            name="list_filter",
+            field=models.BooleanField(default=False, help_text="Include this field in generated ModelAdmin.list_filter."),
+        ),
+        pgtrigger.migrations.AddTrigger(
+            model_name="formkitschemanode",
+            trigger=pgtrigger.compiler.Trigger(
+                name="insert_insert",
+                sql=pgtrigger.compiler.UpsertTriggerSql(
+                    func='INSERT INTO "formkit_ninja_formkitschemanodeevent" ("add_label", "additional_props", "created", "created_by_id", "description", "django_field_args", "django_field_positional_args", "django_field_type", "down_control", "extra_imports", "icon", "id", "is_active", "label", "list_filter", "max", "min", "node", "node_type", "option_group_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "protected", "pydantic_field_type", "readonly", "sections_schema", "step", "text_content", "title", "track_change", "up_control", "updated", "updated_by_id", "validators") VALUES (NEW."add_label", NEW."additional_props", NEW."created", NEW."created_by_id", NEW."description", NEW."django_field_args", NEW."django_field_positional_args", NEW."django_field_type", NEW."down_control", NEW."extra_imports", NEW."icon", NEW."id", NEW."is_active", NEW."label", NEW."list_filter", NEW."max", NEW."min", NEW."node", NEW."node_type", NEW."option_group_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."protected", NEW."pydantic_field_type", NEW."readonly", NEW."sections_schema", NEW."step", NEW."text_content", NEW."title", NEW."track_change", NEW."up_control", NEW."updated", NEW."updated_by_id", NEW."validators"); RETURN NULL;',
+                    hash="ca97f0a9bb68ffec610387b7dbb092bb006f4522",
+                    operation="INSERT",
+                    pgid="pgtrigger_insert_insert_72c4c",
+                    table="formkit_ninja_formkitschemanode",
+                    when="AFTER",
+                ),
+            ),
+        ),
+        pgtrigger.migrations.AddTrigger(
+            model_name="formkitschemanode",
+            trigger=pgtrigger.compiler.Trigger(
+                name="update_update",
+                sql=pgtrigger.compiler.UpsertTriggerSql(
+                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
+                    func='INSERT INTO "formkit_ninja_formkitschemanodeevent" ("add_label", "additional_props", "created", "created_by_id", "description", "django_field_args", "django_field_positional_args", "django_field_type", "down_control", "extra_imports", "icon", "id", "is_active", "label", "list_filter", "max", "min", "node", "node_type", "option_group_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "protected", "pydantic_field_type", "readonly", "sections_schema", "step", "text_content", "title", "track_change", "up_control", "updated", "updated_by_id", "validators") VALUES (NEW."add_label", NEW."additional_props", NEW."created", NEW."created_by_id", NEW."description", NEW."django_field_args", NEW."django_field_positional_args", NEW."django_field_type", NEW."down_control", NEW."extra_imports", NEW."icon", NEW."id", NEW."is_active", NEW."label", NEW."list_filter", NEW."max", NEW."min", NEW."node", NEW."node_type", NEW."option_group_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."protected", NEW."pydantic_field_type", NEW."readonly", NEW."sections_schema", NEW."step", NEW."text_content", NEW."title", NEW."track_change", NEW."up_control", NEW."updated", NEW."updated_by_id", NEW."validators"); RETURN NULL;',
+                    hash="2e35d6535c17e41582d263abff78490ad83436e1",
+                    operation="UPDATE",
+                    pgid="pgtrigger_update_update_d7c99",
+                    table="formkit_ninja_formkitschemanode",
+                    when="AFTER",
+                ),
+            ),
+        ),
+    ]

formkit_ninja-2.4/formkit_ninja/migrations/0043_remove_formkitschemanode_insert_insert_and_more.py

@@ -0,0 +1,73 @@
+# Generated by Django 4.2.27 on 2026-06-10 06:48
+
+import pgtrigger.compiler
+import pgtrigger.migrations
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("formkit_ninja", "0042_formkitschemanode_list_filter"),
+    ]
+
+    operations = [
+        pgtrigger.migrations.RemoveTrigger(
+            model_name="formkitschemanode",
+            name="insert_insert",
+        ),
+        pgtrigger.migrations.RemoveTrigger(
+            model_name="formkitschemanode",
+            name="update_update",
+        ),
+        migrations.AddField(
+            model_name="formkitschemanode",
+            name="code_scheme",
+            field=models.CharField(
+                blank=True,
+                choices=[("pnds", "PNDS (zTable IDs — current)"), ("estrada", "Estrada (timor-locations pre-INTL pcodes)"), ("intl2024", "intl2024 (INTL string pcodes)")],
+                help_text="Metadata tag for the geographic pcode scheme this input emits (e.g. Suco/Postu/Munisipiu values). Read by downstream consumers such as partisipa-import; formkit-ninja does not validate or translate the values themselves.",
+                max_length=32,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="formkitschemanodeevent",
+            name="code_scheme",
+            field=models.CharField(
+                blank=True,
+                choices=[("pnds", "PNDS (zTable IDs — current)"), ("estrada", "Estrada (timor-locations pre-INTL pcodes)"), ("intl2024", "intl2024 (INTL string pcodes)")],
+                help_text="Metadata tag for the geographic pcode scheme this input emits (e.g. Suco/Postu/Munisipiu values). Read by downstream consumers such as partisipa-import; formkit-ninja does not validate or translate the values themselves.",
+                max_length=32,
+                null=True,
+            ),
+        ),
+        pgtrigger.migrations.AddTrigger(
+            model_name="formkitschemanode",
+            trigger=pgtrigger.compiler.Trigger(
+                name="insert_insert",
+                sql=pgtrigger.compiler.UpsertTriggerSql(
+                    func='INSERT INTO "formkit_ninja_formkitschemanodeevent" ("add_label", "additional_props", "code_scheme", "created", "created_by_id", "description", "django_field_args", "django_field_positional_args", "django_field_type", "down_control", "extra_imports", "icon", "id", "is_active", "label", "list_filter", "max", "min", "node", "node_type", "option_group_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "protected", "pydantic_field_type", "readonly", "sections_schema", "step", "text_content", "title", "track_change", "up_control", "updated", "updated_by_id", "validators") VALUES (NEW."add_label", NEW."additional_props", NEW."code_scheme", NEW."created", NEW."created_by_id", NEW."description", NEW."django_field_args", NEW."django_field_positional_args", NEW."django_field_type", NEW."down_control", NEW."extra_imports", NEW."icon", NEW."id", NEW."is_active", NEW."label", NEW."list_filter", NEW."max", NEW."min", NEW."node", NEW."node_type", NEW."option_group_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."protected", NEW."pydantic_field_type", NEW."readonly", NEW."sections_schema", NEW."step", NEW."text_content", NEW."title", NEW."track_change", NEW."up_control", NEW."updated", NEW."updated_by_id", NEW."validators"); RETURN NULL;',
+                    hash="f1c63d16eac3a47e69e99b9139042e29dfe77d36",
+                    operation="INSERT",
+                    pgid="pgtrigger_insert_insert_72c4c",
+                    table="formkit_ninja_formkitschemanode",
+                    when="AFTER",
+                ),
+            ),
+        ),
+        pgtrigger.migrations.AddTrigger(
+            model_name="formkitschemanode",
+            trigger=pgtrigger.compiler.Trigger(
+                name="update_update",
+                sql=pgtrigger.compiler.UpsertTriggerSql(
+                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
+                    func='INSERT INTO "formkit_ninja_formkitschemanodeevent" ("add_label", "additional_props", "code_scheme", "created", "created_by_id", "description", "django_field_args", "django_field_positional_args", "django_field_type", "down_control", "extra_imports", "icon", "id", "is_active", "label", "list_filter", "max", "min", "node", "node_type", "option_group_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "protected", "pydantic_field_type", "readonly", "sections_schema", "step", "text_content", "title", "track_change", "up_control", "updated", "updated_by_id", "validators") VALUES (NEW."add_label", NEW."additional_props", NEW."code_scheme", NEW."created", NEW."created_by_id", NEW."description", NEW."django_field_args", NEW."django_field_positional_args", NEW."django_field_type", NEW."down_control", NEW."extra_imports", NEW."icon", NEW."id", NEW."is_active", NEW."label", NEW."list_filter", NEW."max", NEW."min", NEW."node", NEW."node_type", NEW."option_group_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."protected", NEW."pydantic_field_type", NEW."readonly", NEW."sections_schema", NEW."step", NEW."text_content", NEW."title", NEW."track_change", NEW."up_control", NEW."updated", NEW."updated_by_id", NEW."validators"); RETURN NULL;',
+                    hash="b235a3efcf5b151e2b55767023c943dee28517b0",
+                    operation="UPDATE",
+                    pgid="pgtrigger_update_update_d7c99",
+                    table="formkit_ninja_formkitschemanode",
+                    when="AFTER",
+                ),
+            ),
+        ),
+    ]

formkit_ninja-2.4/formkit_ninja/migrations/0044_backfill_code_scheme_pnds.py

@@ -0,0 +1,71 @@
+# Explicit backfill: existing geographic inputs predate the scheme split and
+# therefore speak the "pnds" scheme (their submitted values are PNDS zTable IDs,
+# e.g. a zSuco PK — NOT estrada or intl2024 pcodes). Tag them so "old = pnds" is
+# recorded in data rather than inferred from a NULL. New (intl2024) forms are
+# tagged at authoring time and are unaffected.
+import pgtrigger
+from django.db import migrations
+
+# Updating a "protected" node is blocked by the protect_node_deletes_and_updates
+# trigger; bypass it (and history noise) for this one-off backfill.
+_IGNORE = ("formkit_ninja.FormKitSchemaNode:protect_node_deletes_and_updates",)
+
+# Field names that, by convention, denote a Timor-Leste administrative-geography
+# input in these schemas.
+GEO_NAMES = {
+    "municipality",
+    "district",
+    "administrative_post",
+    "suco",
+    "aldeia",
+    "munisipiu",
+    "postu_administrativu",
+    "postuadministrativu",
+    "suku",
+}
+# `$ida("<group>", ...)` group names that resolve to a geographic option table.
+GEO_IDA_GROUPS = {"munisipiu", "postuadministrativu", "suku", "aldeia"}
+
+
+def _is_geographic(node):
+    if not isinstance(node, dict):
+        return False
+    name = node.get("name")
+    if isinstance(name, str) and name.lower() in GEO_NAMES:
+        return True
+    options = node.get("options")
+    if isinstance(options, str):
+        opts = options.strip()
+        if opts == "$getLocations()":
+            return True
+        if opts.startswith("$ida(") and any(g in opts.lower() for g in GEO_IDA_GROUPS):
+            return True
+    return False
+
+
+def set_pnds(apps, schema_editor):
+    Node = apps.get_model("formkit_ninja", "FormKitSchemaNode")
+    to_update = []
+    for node in Node.objects.filter(code_scheme__isnull=True).iterator():
+        if _is_geographic(node.node):
+            node.code_scheme = "pnds"
+            to_update.append(node)
+    if to_update:
+        with pgtrigger.ignore(*_IGNORE):
+            Node.objects.bulk_update(to_update, ["code_scheme"])
+
+
+def unset_pnds(apps, schema_editor):
+    Node = apps.get_model("formkit_ninja", "FormKitSchemaNode")
+    with pgtrigger.ignore(*_IGNORE):
+        Node.objects.filter(code_scheme="pnds").update(code_scheme=None)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("formkit_ninja", "0043_remove_formkitschemanode_insert_insert_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(set_pnds, unset_pnds),
+    ]