Partial cleanups in VM (#667)

* Refactor some *_op_helper methods into query_op_helper

Done: arithmetic, comparisons.
Todo: in, isa.
Probably not: unify, dot.

* Refactor in_op_helper to use new query_op_helper

* Add add_constraint method.

* Use add constraint in unify vars.

* Format, fix some comments, and the tests.

* Refactor dot_op_helper to use query_op_helper.

* Bump flask-oso dependencies.

* Fix some (but not all) JS tests.

* Actually fix JS tests.

This reverts commit 304dfe4,
and instead fixes the underlying problem, which was that we
were losing source information in sub-queries.

* Fix more tests, appease 📎.

* Mypy 0.800 compatibility

See python/mypy#9940

* Clean up comments & error messages in add_constraint.

* Move `dot_op_helper` below `query_op_helper`.

* Remove misleading comments.

* Fix TODO based on review suggestion.

* Re-mute logs during rule selection.

* Better TODO comment.

* Update flask-oso oso requirement.

Co-authored-by: David Hatch <[email protected]>

Author: plotnick

languages/python/flask-oso/requirements.txt

@@ -1,2 +1,2 @@
-oso~=0.10.0
+oso~=0.11.0a0
 flask>=0.12.0

polar-core/src/partial/partial.rs

@@ -163,7 +163,7 @@ impl Operation {
                             | (Value::Boolean(_), Value::Number(_))
                             | (Value::Boolean(_), Value::Boolean(_))
                             | (Value::String(_), Value::String(_)) => {
-                                if compare(&o.operator, left, right) {
+                                if compare(o.operator, &left, &right) {
                                     TRUE
                                 } else {
                                     self.consistent = false;
@@ -937,14 +937,8 @@ mod test {
         let p = Polar::new();
         p.load_str("f(x) if x = x + 0;")?;
         let mut q = p.new_query_from_term(term!(call!("f", [sym!("x")])), false);
-        let error = q.next_event().unwrap_err();
-        assert!(matches!(
-            error,
-            PolarError {
-                kind: ErrorKind::Runtime(RuntimeError::Unsupported { .. }),
-                ..
-            }
-        ));
+        assert_partial_expression!(next_binding(&mut q)?, "x", "_this + 0 = _this");
+        assert_query_done!(q);
         Ok(())
     }