Remove prop_type denormalisation

Author: pudo

followthemoney/statement/statement.py

@@ -10,15 +10,14 @@
 from followthemoney.statement.util import get_prop_type, BASE_ID
 
 if TYPE_CHECKING:
-    from followthemoney.statement.entity import SE
+    from followthemoney.statement.entity import StatementEntity
 
 
 class StatementDict(TypedDict):
     id: Optional[str]
     entity_id: str
     canonical_id: str
     prop: str
-    prop_type: str
     schema: str
     value: str
     dataset: str
@@ -47,7 +46,6 @@ class Statement(object):
         "entity_id",
         "canonical_id",
         "prop",
-        "prop_type",
         "schema",
         "value",
         "dataset",
@@ -76,7 +74,6 @@ def __init__(
         self.entity_id = entity_id
         self.canonical_id = canonical_id or entity_id
         self.prop = prop
-        self.prop_type = get_prop_type(schema, prop)
         self.schema = schema
         self.value = value
         self.dataset = dataset
@@ -89,12 +86,16 @@ def __init__(
             id = self.generate_key()
         self.id = id
 
+    @property
+    def prop_type(self) -> str:
+        """The type of the property, e.g. 'string', 'number', 'url'."""
+        return get_prop_type(self.schema, self.prop)
+
     def to_dict(self) -> StatementDict:
         return {
             "canonical_id": self.canonical_id,
             "entity_id": self.entity_id,
             "prop": self.prop,
-            "prop_type": self.prop_type,
             "schema": self.schema,
             "value": self.value,
             "dataset": self.dataset,
@@ -109,6 +110,7 @@ def to_dict(self) -> StatementDict:
     def to_csv_row(self) -> Dict[str, Optional[str]]:
         data = cast(Dict[str, Optional[str]], self.to_dict())
         data["external"] = bool_text(self.external)
+        data["prop_type"] = self.prop_type
         return data
 
     def to_db_row(self) -> Dict[str, Any]:
@@ -206,7 +208,7 @@ def from_db_row(cls, row: Row) -> "Statement":
     @classmethod
     def from_entity(
         cls,
-        entity: "SE",
+        entity: StatementEntity,
         dataset: str,
         first_seen: Optional[str] = None,
         last_seen: Optional[str] = None,

followthemoney/statement/util.py

@@ -2,7 +2,6 @@
 from typing import Tuple
 
 from followthemoney.model import Model
-from followthemoney.util import sanitize_text
 
 BASE_ID = "id"