Fix sqlalchemy required fields. Fix CI.

Author: vsdudakov

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: v22.4.1
+          node-version: v24.3.0
           cache: 'yarn'
           cache-dependency-path: 'frontend/yarn.lock'
       - name: Install Dependencies

docs/build.py

@@ -42,6 +42,12 @@ def read_cls_docstring(cls):
 
 def get_versions():
     return [
+        {
+            "version": "0.3.1",
+            "changes": [
+                "Fix sqlalchemy required fields. Fix CI.",
+            ],
+        },
         {
             "version": "0.3.0",
             "changes": [

fastadmin/models/orms/sqlalchemy.py

@@ -70,11 +70,14 @@ def get_model_fields_with_widget_types(
             is_immutable = (
                 is_pk or bool(getattr(orm_model_field, "onupdate", None))
             ) and field_name not in self.readonly_fields
-            required = (
-                not getattr(orm_model_field, "nullable", False)
-                and not getattr(orm_model_field, "default", False)
-                and not is_m2m
-            )
+            # For columns, use the column's nullable; for relationships (MANYTOONE/ONETOONE),
+            # the relationship object has no nullable — use the underlying FK column's nullable.
+            nullable = getattr(orm_model_field, "nullable", False)
+            if field_type in ("ONETOONE", "MANYTOONE"):
+                fk_column = next((c for c in mapper.c if c.key == column_name), None)
+                if fk_column is not None:
+                    nullable = getattr(fk_column, "nullable", False)
+            required = not nullable and not getattr(orm_model_field, "default", False) and not is_m2m
             choices = (
                 orm_model_field.type._object_lookup
                 if hasattr(orm_model_field, "type") and hasattr(orm_model_field.type, "_object_lookup")

tests/models/test_orm.py

@@ -322,3 +322,22 @@ def test_get_form_widget_event(event):
                 assert field.form_widget_props
             case _:
                 raise ValueError(f"Unexpected field: {field.name}")
+
+
+def test_nullable_foreign_key_form_required(event):
+    """Nullable FK (base) must have required=False; non-nullable FK (tournament) required=True.
+
+    Suitable for all ORMs: Django/Tortoise use field.null, Pony uses is_required,
+    SQLAlchemy uses the underlying FK column's nullable.
+    """
+    admin_model = get_admin_model(event.__class__)
+    fields = admin_model.get_model_fields_with_widget_types()
+    by_name = {f.name: f for f in fields}
+    assert "base" in by_name, "Event should have base (nullable FK) field"
+    assert "tournament" in by_name, "Event should have tournament (required FK) field"
+    assert (
+        by_name["base"].form_widget_props["required"] is False
+    ), "nullable FK base_id should be optional in admin form"
+    assert (
+        by_name["tournament"].form_widget_props["required"] is True
+    ), "non-nullable FK tournament_id should be required in admin form"