Merge pull request #17 from tomsch420/main

Fixed pyproject.toml

Author: tomsch420

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "krrood"
-version = "1.0.2"
+version = "1.0.3"
 description = "A university data generator based on the LUBM (Lehigh University Benchmark) ontology"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -51,7 +51,7 @@ include = ["krrood*"]
 exclude = ["test*"]
 
 [tool.setuptools.package-data]
-my_library = ["templates/*.j2"]  # glob patterns allowed
+my_library = ["ormatic/templates/*.j2"]  # glob patterns allowed
 
 [tool.pytest.ini_options]
 testpaths = ["test"]

src/krrood/entity_query_language/symbol_graph.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 import os
+import weakref
 from copy import copy
 from dataclasses import dataclass, field, fields
 from functools import cached_property
+from weakref import WeakKeyDictionary
 
 from rustworkx import PyDiGraph
 from typing_extensions import (
@@ -34,6 +36,7 @@ class PredicateRelation(Relation):
     The relation carries the predicate instance that asserted the edge and a flag indicating
     whether it was inferred transitively or added directly.
     """
+
     source: WrappedInstance
     target: WrappedInstance
     predicate: BinaryPredicate
@@ -51,6 +54,7 @@ def color(self) -> str:
 @dataclass
 class WrappedInstance:
     """A node wrapper around a concrete Symbol instance used in the instance graph."""
+
     instance: Symbol
     index: Optional[int] = field(init=False, default=None)
     _symbol_graph_: Optional[SymbolGraph] = field(
@@ -94,7 +98,9 @@ class SymbolGraph:
     _instance_graph: PyDiGraph[WrappedInstance, PredicateRelation] = field(
         default_factory=PyDiGraph
     )
-    _instance_index: Dict = field(default_factory=dict, init=False, repr=False)
+    _instance_index: WeakKeyDictionary[Symbol, WrappedInstance] = field(
+        default_factory=WeakKeyDictionary, init=False, repr=False
+    )
     _relation_index: Dict[type, set[tuple[int, int]]] = field(
         default_factory=dict, init=False, repr=False
     )

test/test_eql/test_symbol_graph.py

@@ -1,10 +1,14 @@
 import os
+import time
 
 import pytest
 
 from krrood.entity_query_language.symbol_graph import SymbolGraph
+from krrood.entity_query_language.symbolic import symbolic_mode
 from ..dataset import semantic_world_like_classes
+from ..dataset.example_classes import Position
 from krrood.class_diagrams.utils import classes_of_module
+from krrood.entity_query_language.entity import an, entity, let
 
 try:
     import pydot
@@ -22,3 +26,19 @@ def test_visualize_symbol_graph():
     assert len(symbol_graph._type_graph.wrapped_classes) == 14
     if os.path.exists("symbol_graph.svg"):
         os.remove("symbol_graph.svg")
+
+
+@pytest.mark.skip
+def test_memory_leak():
+    """
+    Test if the SymbolGraph does not artificially keep objects alive that would be garbage collected.
+    """
+
+    def create_data():
+        point = Position(1, 2, 3)
+
+    create_data()
+    time.sleep(1)
+    with symbolic_mode():
+        q = an(entity(let(Position)))
+    assert list(q.evaluate()) == []