Remove model attribute from Schema and Property

followthemoney/model.py

@@ -44,10 +44,9 @@ def generate(self) -> None:
         called once all schemata are loaded to finalise dereferencing the
         schemata."""
         for schema in self:
-            schema.generate()
+            schema.generate(self)
         for prop in self.properties:
             self.qnames[prop.qname] = prop
-            # FIXME: stubs are not correctly assigned
             for schema in prop.schema.descendants:
                 if prop.name not in schema.properties:
                     schema.properties[prop.name] = prop

followthemoney/property.py

@@ -8,6 +8,7 @@
 
 if TYPE_CHECKING:
     from followthemoney.schema import Schema
+    from followthemoney.model import Model
 
 
 class ReverseSpec(TypedDict, total=False):
@@ -66,8 +67,6 @@ class Property:
     RESERVED = ["id", "caption", "schema", "schemata"]
 
     def __init__(self, schema: "Schema", name: str, data: PropertySpec) -> None:
-        self.model = schema.model
-
         #: The schema which the property is defined for. This is always the
         #: most abstract schema that has this property, not the possible
         #: child schemata that inherit it.
@@ -124,19 +123,19 @@ def __init__(self, schema: "Schema", name: str, data: PropertySpec) -> None:
         #: RDF term for this property (i.e. the predicate URI).
         self.uri = URIRef(cast(str, data.get("rdf", NS[self.qname])))
 
-    def generate(self) -> None:
+    def generate(self, model: "Model") -> None:
         """Setup method used when loading the model in order to build out the reverse
         links of the property."""
-        self.model.properties.add(self)
+        model.properties.add(self)
 
         if self.type == registry.entity:
             if self.range is None and self._range is not None:
-                self.range = self.model.get(self._range)
+                self.range = model.get(self._range)
 
             if self.reverse is None and self.range and self._reverse:
                 if not is_mapping(self._reverse):
                     raise InvalidModel("Invalid reverse: %s" % self)
-                self.reverse = self.range._add_reverse(self._reverse, self)
+                self.reverse = self.range._add_reverse(model, self._reverse, self)
 
     @property
     def label(self) -> str:

followthemoney/schema.py

@@ -200,14 +200,14 @@ def __init__(self, model: "Model", name: str, data: SchemaSpec) -> None:
         for name, prop in data.get("properties", {}).items():
             self.properties[name] = Property(self, name, prop)
 
-    def generate(self) -> None:
+    def generate(self, model: "Model") -> None:
         """While loading the schema, this function will validate and
         load the hierarchy, properties, and flags of the definition."""
         for extends in self._extends:
-            parent = self.model.get(extends)
+            parent = model.get(extends)
             if parent is None:
                 raise InvalidData("Invalid extends: %r" % extends)
-            parent.generate()
+            parent.generate(model)
 
             for name, prop in parent.properties.items():
                 if name not in self.properties:
@@ -223,7 +223,7 @@ def generate(self) -> None:
             self.temporal_end |= parent.temporal_end
 
         for prop in list(self.properties.values()):
-            prop.generate()
+            prop.generate(model)
 
         for featured in self.featured:
             if self.get(featured) is None:
@@ -249,7 +249,9 @@ def generate(self) -> None:
                 msg = "Missing edge target: %s" % self.edge_target
                 raise InvalidModel(msg)
 
-    def _add_reverse(self, data: ReverseSpec, other: Property) -> Property:
+    def _add_reverse(
+        self, model: "Model", data: ReverseSpec, other: Property
+    ) -> Property:
         name = data.get("name")
         if name is None:
             raise InvalidModel("Unnamed reverse: %s" % other)
@@ -265,7 +267,7 @@ def _add_reverse(self, data: ReverseSpec, other: Property) -> Property:
             }
             prop = Property(self, name, spec)
             prop.stub = True
-            prop.generate()
+            prop.generate(model)
             self.properties[name] = prop
         return prop
 
@@ -351,7 +353,9 @@ def can_match(self, other: "Schema") -> bool:
     def is_a(self, other: Union[str, "Schema"]) -> bool:
         """Check if the schema or one of its parents is the same as the given
         candidate ``other``."""
-        return self.model.get(other) in self.schemata
+        if not isinstance(other, str):
+            other = other.name
+        return other in self.names
 
     def get(self, name: Optional[str]) -> Optional[Property]:
         """Retrieve a property defined for this schema by its name."""