feat: improve semantics error reporting

Also makes model seeds cancellable to reduce server load during semantic
analysis.

4 files changed, 18 insertions, 16 deletions

diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
index d75d7f17..12cfaa4e 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
@@ -50,7 +50,7 @@ class DnfToDefinitionStringTest {
                 var dnf = Dnf.builder("Example").parameter(p, ParameterDirection.IN).clause().build();
 
                 assertThat(dnf.toDefinitionString(), is("""
-                                pred Example(@In p) <->
+                                pred Example(in p) <->
                                     <empty>.
                                 """));
         }
@@ -73,7 +73,7 @@ class DnfToDefinitionStringTest {
                                 .build();
 
                 assertThat(dnf.toDefinitionString(), is("""
-                                pred Example(@In p) <->
+                                pred Example(in p) <->
                                     !(@RelationView("key") friend(p, q)).
                                 """));
         }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
index e22dbb21..854bd469 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.dnf;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
@@ -80,7 +81,7 @@ class TopologicalSortTest {
                                                 example.call(r, t, q, s),
                                                 friendView.call(r, t)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 
         @Test
@@ -93,7 +94,7 @@ class TopologicalSortTest {
                                                 example.call(p, q, r, s),
                                                 example.call(r, t, q, s)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 
         @Test
@@ -107,6 +108,6 @@ class TopologicalSortTest {
                                                 example.call(r, t, q, s),
                                                 example.call(p, q, r, t)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
index bfeaa447..fc3f5d48 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
@@ -48,7 +48,7 @@ class VariableDirectionTest {
         @MethodSource("clausesWithVariableInput")
         void unboundOutVariableTest(List<? extends Literal> clause) {
                 var builder = Dnf.builder().parameter(p, ParameterDirection.OUT).clause(clause);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
@@ -100,7 +100,7 @@ class VariableDirectionTest {
                 var clauseWithEquivalence = new ArrayList<Literal>(clause);
                 clauseWithEquivalence.add(r.isEquivalent(p));
                 var builder = Dnf.builder().clause(clauseWithEquivalence);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         static Stream<Arguments> clausesNotBindingVariable() {
@@ -118,7 +118,7 @@ class VariableDirectionTest {
         @MethodSource("literalsWithPrivateVariable")
         void unboundTwicePrivateVariableTest(Literal literal) {
                 var builder = Dnf.builder().clause(not(personView.call(p)), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
@@ -126,7 +126,7 @@ class VariableDirectionTest {
         void unboundTwiceByEquivalencePrivateVariableTest(Literal literal) {
                 var r = Variable.of("r");
                 var builder = Dnf.builder().clause(not(personView.call(r)), r.isEquivalent(p), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         static Stream<Arguments> literalsWithPrivateVariable() {
@@ -159,7 +159,7 @@ class VariableDirectionTest {
         @MethodSource("literalsWithRequiredVariableInput")
         void unboundPrivateVariableTest(Literal literal) {
                 var builder = Dnf.builder().clause(literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
index 35910e08..ddd57e96 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
@@ -7,15 +7,16 @@ package tools.refinery.store.query.literal;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.InvalidClauseException;
 import tools.refinery.store.query.term.*;
 
 import java.util.List;
 import java.util.Set;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static tools.refinery.store.query.literal.Literals.not;
@@ -57,13 +58,13 @@ class AggregationLiteralTest {
         @Test
         void missingAggregationVariableTest() {
                 var aggregation = fakeConstraint.aggregateBy(y, INT_SUM, p, z);
-                assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
+                assertThrows(InvalidQueryException.class, () -> x.assign(aggregation));
         }
 
         @Test
         void circularAggregationVariableTest() {
                 var aggregation = fakeConstraint.aggregateBy(x, INT_SUM, p, x);
-                assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
+                assertThrows(InvalidQueryException.class, () -> x.assign(aggregation));
         }
 
         @Test
@@ -73,7 +74,7 @@ class AggregationLiteralTest {
                                                 not(fakeConstraint.call(p, y)),
                                                 x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @Test
@@ -83,6 +84,6 @@ class AggregationLiteralTest {
                                                 y.assign(constant(27)),
                                                 x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 }