clinicedc 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

edc_metadata/metadata_mixins/source_model_metadata_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -32,7 +32,7 @@ class SourceModelMetadataMixin:
         return self._source_model
 
     @property
-    def source_model_cls(self) -> Type[CrfModelMixin]:
+    def source_model_cls(self) -> type[CrfModelMixin]:
         return django_apps.get_model(self.source_model)
 
     @property

edc_metadata/metadata_refresher.py

@@ -74,7 +74,7 @@ class MetadataRefresher:
             except AttributeError:
                 try:
                     instance.metadata_update()
-                except (AttributeError,) as e:
+                except AttributeError as e:
                     self._message(f"      skipping (got {e})     \n")
                     break
 

edc_metadata/metadata_rules/crf/crf_rule_group.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Self, Tuple
+from typing import TYPE_CHECKING, Any, Self
 
 from edc_visit_schedule.visit import CrfCollection
 
@@ -52,7 +52,7 @@ class CrfRuleGroup(RuleGroup, metaclass=RuleGroupMetaclass):
         cls: Any,
         related_visit: RelatedVisitModel = None,
         allow_create: bool | None = None,
-    ) -> Tuple[dict[str, dict[str, dict]], dict[str, CrfMetadata]]:
+    ) -> tuple[dict[str, dict[str, dict]], dict[str, CrfMetadata]]:
         rule_results = {}
         metadata_objects = {}
         for rule in cls._meta.options.get("rules"):
@@ -70,9 +70,7 @@ class CrfRuleGroup(RuleGroup, metaclass=RuleGroupMetaclass):
                         f"Target model and visit model are the same! "
                         f"Got {target_model}=={related_visit._meta.label_lower}"
                     )
-                elif (
-                    target_model.split(".")[1] == related_visit._meta.label_lower.split(".")[1]
-                ):
+                if target_model.split(".")[1] == related_visit._meta.label_lower.split(".")[1]:
                     raise TargetModelConflict(
                         f"Target model and visit model might be the same. "
                         f"Got {target_model}~={related_visit._meta.label_lower}"

edc_metadata/metadata_rules/logic.py

@@ -33,7 +33,7 @@ class Logic:
         alternative: str = None,
         comment: str | None = None,
     ) -> None:
-        if not hasattr(predicate, "__call__"):
+        if not callable(predicate):
             raise RuleLogicError(
                 "Predicate must be a callable. For example a "
                 'predicate class such as "P" or "PF"'

edc_metadata/metadata_rules/requisition/requisition_rule.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from ...constants import REQUISITION
 from ..rule import Rule
@@ -10,7 +10,7 @@ class RequisitionRuleEvaluatorError(Exception):
 
 
 class RequisitionRuleEvaluator(RuleEvaluator):
-    def __init__(self, source_panel: Optional[Any] = None, **kwargs) -> None:
+    def __init__(self, source_panel: Any | None = None, **kwargs) -> None:
         self.source_panel = source_panel
         super().__init__(**kwargs)
 
@@ -20,8 +20,8 @@ class RequisitionRule(Rule):
 
     def __init__(
         self,
-        source_panel: Optional[Any] = None,
-        target_panels: Optional[list] = None,
+        source_panel: Any | None = None,
+        target_panels: list | None = None,
         **kwargs,
     ) -> None:
         self.metadata_category = REQUISITION

edc_metadata/metadata_rules/requisition/requisition_rule_group.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections import namedtuple
-from typing import TYPE_CHECKING, Any, Tuple
+from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ValidationError
 
@@ -97,7 +97,7 @@ class RequisitionRuleGroup(RuleGroup, metaclass=RequisitionMetaclass):
         cls: Any,
         related_visit: RelatedVisitModel = None,
         allow_create: bool | None = None,
-    ) -> Tuple[dict[str, dict[str, list[RuleResult]]], dict[str, RequisitionMetadata]]:
+    ) -> tuple[dict[str, dict[str, list[RuleResult]]], dict[str, RequisitionMetadata]]:
         """Returns a tuple of (rule_results, metadata_objects) where
         rule_results ...
 

edc_metadata/metadata_rules/rule_evaluator.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -57,12 +57,11 @@ class RuleEvaluator:
         if predicate:
             if self.logic.consequence != DO_NOTHING:
                 self.result = self.logic.consequence
-        else:
-            if self.logic.alternative != DO_NOTHING:
-                self.result = self.logic.alternative
+        elif self.logic.alternative != DO_NOTHING:
+            self.result = self.logic.alternative
 
     @property
-    def registered_subject_model(self) -> Type[RegisteredSubject]:
+    def registered_subject_model(self) -> type[RegisteredSubject]:
         return get_registered_subject_model_cls()
 
     @property
@@ -75,7 +74,7 @@ class RuleEvaluator:
                 )
             except ObjectDoesNotExist as e:
                 raise RuleEvaluatorRegisterSubjectError(
-                    f"Registered subject required for rule {repr(self)}. "
+                    f"Registered subject required for rule {self!r}. "
                     f"subject_identifier='{self.related_visit.subject_identifier}'. "
                     f"Got {e}."
                 )

edc_metadata/metadata_rules/rule_group_metaclass.py

@@ -70,10 +70,9 @@ class RuleGroupMetaclass(type):
                             raise RuleGroupError(
                                 "RuleGroup Meta attr `predicates` may not be `None` if a "
                                 "rule.predicate in the RuleGroup is a string. "
-                                f'See {attrs.get("__qualname__")}.'
+                                f"See {attrs.get('__qualname__')}."
                             )
-                        else:
-                            rule.predicate = getattr(meta.predicates, rule.predicate)
+                        rule.predicate = getattr(meta.predicates, rule.predicate)
                     for k, v in meta.options.items():
                         setattr(rule, k, v)
                     rule.target_models = mcs.__get_target_models(rule, meta)

edc_metadata/metadata_rules/site.py

@@ -1,6 +1,6 @@
 import copy
 import sys
-from typing import Any, Optional
+from typing import Any
 
 from django.apps import apps as django_apps
 from django.core.management.color import color_style
@@ -23,14 +23,14 @@ class SiteMetadataRules:
     def __init__(self) -> None:
         self.registry = {}
 
-    def register(self, rule_group_cls: Optional[Any] = None) -> None:
+    def register(self, rule_group_cls: Any | None = None) -> None:
         """Register MetadataRules to a list per app_label
         for the module the rule groups were declared in.
         """
         if rule_group_cls:
             if not rule_group_cls._meta.options.get("rules"):
                 raise SiteMetadataNoRulesError(
-                    f"The metadata rule group {rule_group_cls.name} " f"has no rule!"
+                    f"The metadata rule group {rule_group_cls.name} has no rule!"
                 )
 
             if rule_group_cls._meta.app_label not in self.registry:
@@ -39,8 +39,7 @@ class SiteMetadataRules:
             for rgroup in self.registry.get(rule_group_cls._meta.app_label):
                 if rgroup.name == rule_group_cls.name:
                     raise SiteMetadataRulesAlreadyRegistered(
-                        f"The metadata rule group {rule_group_cls.name} "
-                        f"is already registered"
+                        f"The metadata rule group {rule_group_cls.name} is already registered"
                     )
             self.registry.get(rule_group_cls._meta.app_label).append(rule_group_cls)
 
@@ -51,11 +50,11 @@ class SiteMetadataRules:
     def validate(self) -> None:
         for rule_groups in self.registry.values():
             for rule_group in rule_groups:
-                sys.stdout.write(f"{repr(rule_group)}\n")
+                sys.stdout.write(f"{rule_group!r}\n")
                 rule_group.validate()
 
     @staticmethod
-    def autodiscover(module_name: Optional[str] = None) -> None:
+    def autodiscover(module_name: str | None = None) -> None:
         """Autodiscovers rules in the metadata_rules.py file
         of any INSTALLED_APP.
         """

edc_metadata/metadata_updater.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from .constants import CRF, KEYED
 from .metadata_handler import MetadataHandler
@@ -25,7 +25,7 @@ class MetadataUpdater(SourceModelMetadataMixin):
     the related_visit, source model name and desired entry status.
     """
 
-    metadata_handler_cls: Type[MetadataHandler] = MetadataHandler
+    metadata_handler_cls: type[MetadataHandler] = MetadataHandler
     metadata_category: str = CRF
     metadata_model: str = "edc_metadata.crfmetadata"
 

edc_metadata/metadata_wrappers/metadata_wrapper.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
@@ -41,7 +41,7 @@ class MetadataWrapper:
                 f"Visit code mismatch. Visit is {self.visit.visit_code}."
                 f"{self.visit.visit_code_sequence} but metadata object has "
                 f"{self.metadata_obj.visit_code}."
-                f"{self.metadata_obj.visit_code_sequence}. Got {repr(metadata_obj)}."
+                f"{self.metadata_obj.visit_code_sequence}. Got {metadata_obj!r}."
             )
 
     def __repr__(self) -> str:
@@ -59,7 +59,7 @@ class MetadataWrapper:
                 self._source_model_obj = self.source_model_cls.objects.get(**self.options)
             except AttributeError as e:
                 if "related_visit_model_attr" not in str(e):
-                    raise ImproperlyConfigured(f"{e} See {repr(self.source_model_cls)}")
+                    raise ImproperlyConfigured(f"{e} See {self.source_model_cls!r}")
             except ObjectDoesNotExist:
                 self._source_model_obj = None
         return self._source_model_obj
@@ -69,6 +69,6 @@ class MetadataWrapper:
         self._source_model_obj = value
 
     @property
-    def source_model_cls(self) -> Type[CrfModelMixin]:
+    def source_model_cls(self) -> type[CrfModelMixin]:
         """Returns a CRF model class"""
         return django_apps.get_model(self.metadata_obj.model)

edc_metadata/model_mixins/creates/creates_metadata_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.db import models, transaction
 
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
     from edc_visit_tracking.typing_stubs import RelatedVisitProtocol
 else:
 
-    class RelatedVisitProtocol: ...  # noqa
+    class RelatedVisitProtocol: ...
 
 
 class CreatesMetadataModelMixin(RelatedVisitProtocol, models.Model):
@@ -27,9 +27,9 @@ class CreatesMetadataModelMixin(RelatedVisitProtocol, models.Model):
     create metadata on save.
     """
 
-    metadata_cls: Type[Metadata] = Metadata
-    metadata_destroyer_cls: Type[Destroyer] = Destroyer
-    metadata_rule_evaluator_cls: Type[MetadataRuleEvaluator] = MetadataRuleEvaluator
+    metadata_cls: type[Metadata] = Metadata
+    metadata_destroyer_cls: type[Destroyer] = Destroyer
+    metadata_rule_evaluator_cls: type[MetadataRuleEvaluator] = MetadataRuleEvaluator
 
     def metadata_create(self) -> None:
         """Creates metadata, called by post_save signal."""
@@ -96,8 +96,7 @@ class CreatesMetadataModelMixin(RelatedVisitProtocol, models.Model):
             for key in [CRF, REQUISITION]:
                 if [obj for obj in self.metadata[key] if obj.get_entry_status() == KEYED]:
                     raise DeleteMetadataError(
-                        f"Metadata cannot be deleted. {key}s have been "
-                        f"keyed. Got {repr(self)}."
+                        f"Metadata cannot be deleted. {key}s have been keyed. Got {self!r}."
                     )
             destroyer = self.metadata_destroyer_cls(related_visit=self)
             destroyer.delete(entry_status_not_in=[KEYED])

edc_metadata/model_mixins/updates/updates_crf_metadata_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.db import models
@@ -44,7 +44,7 @@ class UpdatesCrfMetadataModelMixin(UpdatesMetadataModelMixin):
         return super().metadata_query_options
 
     @property
-    def metadata_model(self: CrfModel) -> Type[CrfMetadata]:
+    def metadata_model(self: CrfModel) -> type[CrfMetadata]:
         """Returns the metadata model associated with self."""
         metadata_model = "edc_metadata.crfmetadata"
         return django_apps.get_model(metadata_model)

edc_metadata/model_mixins/updates/updates_metadata_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.db import models
 
@@ -74,7 +74,7 @@ class UpdatesMetadataModelMixin(models.Model):
     @property
     def metadata_model(
         self: CrfModel | RequisitionModel,
-    ) -> Type[CrfMetadata] | Type[RequisitionMetadata]:
+    ) -> type[CrfMetadata] | type[RequisitionMetadata]:
         """Returns the metadata model associated with self.
 
         Override

edc_metadata/model_mixins/updates/updates_requisition_metadata_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.db import models
@@ -68,7 +68,7 @@ class UpdatesRequisitionMetadataModelMixin(UpdatesMetadataModelMixin):
         return REQUIRED if requisition.required else NOT_REQUIRED
 
     @property
-    def metadata_model(self: RequisitionModel) -> Type[RequisitionMetadata]:
+    def metadata_model(self: RequisitionModel) -> type[RequisitionMetadata]:
         """Returns the metadata model associated with self."""
         metadata_model = "edc_metadata.requisitionmetadata"
         return django_apps.get_model(metadata_model)

edc_metadata/models/crf_metadata.py

@@ -57,33 +57,31 @@ class CrfMetadata(CrfMetadataModelMixin, BaseUuidModel):
             )
         ]
         indexes = (
-            CrfMetadataModelMixin.Meta.indexes
-            + BaseUuidModel.Meta.indexes
-            + [
-                models.Index(
-                    fields=[
-                        "site",
-                        "entry_status",
-                        "visit_code",
-                        "visit_code_sequence",
-                        "model",
-                        "subject_identifier",
-                        "schedule_name",
-                        "visit_schedule_name",
-                    ],
-                ),
-                models.Index(
-                    fields=[
-                        "subject_identifier",
-                        "visit_schedule_name",
-                        "schedule_name",
-                        "visit_code",
-                        "visit_code_sequence",
-                        "model",
-                        "entry_status",
-                        "timepoint",
-                        "show_order",
-                    ],
-                ),
-            ]
+            *CrfMetadataModelMixin.Meta.indexes,
+            *BaseUuidModel.Meta.indexes,
+            models.Index(
+                fields=[
+                    "site",
+                    "entry_status",
+                    "visit_code",
+                    "visit_code_sequence",
+                    "model",
+                    "subject_identifier",
+                    "schedule_name",
+                    "visit_schedule_name",
+                ],
+            ),
+            models.Index(
+                fields=[
+                    "subject_identifier",
+                    "visit_schedule_name",
+                    "schedule_name",
+                    "visit_code",
+                    "visit_code_sequence",
+                    "model",
+                    "entry_status",
+                    "timepoint",
+                    "show_order",
+                ],
+            ),
         )

edc_metadata/models/crf_metadata_model_mixin.py

@@ -48,7 +48,7 @@ class CrfMetadataModelMixin(
 
     report_datetime = models.DateTimeField(null=True, blank=True)
 
-    entry_comment = models.TextField(max_length=250, null=True, blank=True)
+    entry_comment = models.TextField(max_length=250, default="", blank=True)
 
     close_datetime = models.DateTimeField(null=True, blank=True)
 

edc_metadata/models/requisition_metadata.py

@@ -86,35 +86,33 @@ class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
             )
         ]
         indexes = (
-            CrfMetadataModelMixin.Meta.indexes
-            + BaseUuidModel.Meta.indexes
-            + [
-                models.Index(
-                    fields=[
-                        "site",
-                        "entry_status",
-                        "visit_code",
-                        "visit_code_sequence",
-                        "model",
-                        "panel_name",
-                        "subject_identifier",
-                        "schedule_name",
-                        "visit_schedule_name",
-                    ],
-                ),
-                models.Index(
-                    fields=[
-                        "subject_identifier",
-                        "visit_schedule_name",
-                        "schedule_name",
-                        "visit_code",
-                        "visit_code_sequence",
-                        "model",
-                        "panel_name",
-                        "entry_status",
-                        "timepoint",
-                        "show_order",
-                    ],
-                ),
-            ]
+            *CrfMetadataModelMixin.Meta.indexes,
+            *BaseUuidModel.Meta.indexes,
+            models.Index(
+                fields=[
+                    "site",
+                    "entry_status",
+                    "visit_code",
+                    "visit_code_sequence",
+                    "model",
+                    "panel_name",
+                    "subject_identifier",
+                    "schedule_name",
+                    "visit_schedule_name",
+                ],
+            ),
+            models.Index(
+                fields=[
+                    "subject_identifier",
+                    "visit_schedule_name",
+                    "schedule_name",
+                    "visit_code",
+                    "visit_code_sequence",
+                    "model",
+                    "panel_name",
+                    "entry_status",
+                    "timepoint",
+                    "show_order",
+                ],
+            ),
         )

edc_metadata/stubs.py

@@ -1,4 +1,4 @@
-from typing import Any, Protocol, Type
+from typing import Any, Protocol
 
 from django.db.models import Manager, Model, QuerySet
 
@@ -28,11 +28,11 @@ class VisitModel(Protocol):
     visit_schedule_name: str
     _meta: ModelMetaStub
 
-    def visit_schedule(self) -> VisitSchedule: ...  # noqa
+    def visit_schedule(self) -> VisitSchedule: ...
 
 
 class CrfMetadataModelStub(Protocol):
-    updater_cls = Type["CrfMetadataUpdaterStub"]
+    updater_cls = type["CrfMetadataUpdaterStub"]
     entry_status: str
     metadata_query_options: dict
     model: str
@@ -45,13 +45,13 @@ class CrfMetadataModelStub(Protocol):
     visit: VisitModel
     _meta: ModelMetaStub
 
-    def save(self, *args, **kwargs) -> None: ...  # noqa
+    def save(self, *args, **kwargs) -> None: ...
 
-    def delete(self) -> int: ...  # noqa
+    def delete(self) -> int: ...
 
-    def metadata_visit_object(self) -> Visit: ...  # noqa
+    def metadata_visit_object(self) -> Visit: ...
 
-    def refresh_from_db(self) -> None: ...  # noqa
+    def refresh_from_db(self) -> None: ...
 
 
 class PanelStub(Protocol):
@@ -59,7 +59,7 @@ class PanelStub(Protocol):
 
 
 class RequisitionMetadataModelStub(Protocol):
-    updater_cls = Type["RequisitionMetadataUpdaterStub"]
+    updater_cls = type["RequisitionMetadataUpdaterStub"]
     entry_status: str
     metadata_query_options: dict
     model: str
@@ -73,13 +73,13 @@ class RequisitionMetadataModelStub(Protocol):
     visit: VisitModel
     _meta: ModelMetaStub
 
-    def save(self, *args, **kwargs) -> None: ...  # noqa
+    def save(self, *args, **kwargs) -> None: ...
 
     def delete(self) -> int: ...
 
-    def metadata_visit_object(self) -> Visit: ...  # noqa
+    def metadata_visit_object(self) -> Visit: ...
 
-    def metadata_updater_cls(self, **opts: dict): ...  # noqa
+    def metadata_updater_cls(self, **opts: dict): ...
 
 
 class MetadataGetterStub(Protocol):
@@ -87,23 +87,23 @@ class MetadataGetterStub(Protocol):
     visit: RelatedVisitModelStub | None
 
 
-class CrfMetadataUpdaterStub(Protocol): ...  # noqa
+class CrfMetadataUpdaterStub(Protocol): ...
 
 
-class RequisitionMetadataUpdaterStub(Protocol): ...  # noqa
+class RequisitionMetadataUpdaterStub(Protocol): ...
 
 
-class RequisitionMetadataGetterStub(MetadataGetterStub, Protocol): ...  # noqa
+class RequisitionMetadataGetterStub(MetadataGetterStub, Protocol): ...
 
 
 class MetadataWrapperStub(Protocol):
     options: dict
     model_obj: CrfMetadataModelStub
-    model_cls: Type[CrfMetadataModelStub]
-    ...  # noqa
+    model_cls: type[CrfMetadataModelStub]
+    ...
 
 
-class RequisitionMetadataWrapperStub(MetadataWrapperStub, Protocol): ...  # noqa
+class RequisitionMetadataWrapperStub(MetadataWrapperStub, Protocol): ...
 
 
 class Predicate(Protocol):

edc_metadata/utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -43,17 +43,17 @@ class HasKeyedMetadata(Exception):
     pass
 
 
-def get_crf_metadata_model_cls() -> Type[CrfMetadata]:
+def get_crf_metadata_model_cls() -> type[CrfMetadata]:
     return django_apps.get_model("edc_metadata.crfmetadata")
 
 
-def get_requisition_metadata_model_cls() -> Type[RequisitionMetadata]:
+def get_requisition_metadata_model_cls() -> type[RequisitionMetadata]:
     return django_apps.get_model("edc_metadata.requisitionmetadata")
 
 
 def get_metadata_model_cls(
     metadata_category: str,
-) -> Type[CrfMetadata] | Type[RequisitionMetadata]:
+) -> type[CrfMetadata] | type[RequisitionMetadata]:
     if metadata_category == CRF:
         model_cls = get_crf_metadata_model_cls()
     elif metadata_category == REQUISITION:

edc_model/__init__.py

@@ -1,5 +1,5 @@
-from .choices import REPORT_STATUS  # noqa
-from .constants import DEFAULT_BASE_FIELDS  # noqa
+from .choices import REPORT_STATUS
+from .constants import DEFAULT_BASE_FIELDS
 from .utils import (
     InvalidFieldName,
     InvalidFormat,

edc_model/models/historical_records.py

@@ -13,7 +13,7 @@ class SerializableModel(models.Model):
     objects = SerializableModelManager()
 
     def natural_key(self) -> tuple:
-        return (self.history_id,)  # noqa
+        return (self.history_id,)
 
     def related_visit_model_attr(self):
         try:
@@ -37,7 +37,7 @@ class SerializableCrfModel(models.Model):
         return NotImplemented(self)
 
     def natural_key(self) -> tuple:
-        return (self.history_id,)  # noqa
+        return (self.history_id,)
 
     class Meta:
         abstract = True

edc_model/models/signals.py

@@ -16,7 +16,7 @@ def remove_f_expressions(sender, instance, history_instance, **kwargs) -> None:
     django-simple-history-by-overriding-save/62369328#62369328
     """
     f_expression_fields = []
-    for field in history_instance._meta.fields:  # noqa
+    for field in history_instance._meta.fields:
         field_value = getattr(history_instance, field.name)
         if isinstance(field_value, expressions.BaseExpression):
             f_expression_fields.append(field.name)