Merge pull request trueagi-io#759 from vsbogd/workshop

Various fixes

Dockerfile

@@ -2,10 +2,10 @@ FROM python:3.10-slim-bookworm AS os
 
 FROM os AS build
 
-RUN apt update && \
+RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
     TZ=UTC \
-    apt install -y sudo git curl cmake build-essential \
+    apt-get install -y sudo git curl cmake build-essential \
         pkg-config libssl-dev zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 

README.md

@@ -213,14 +213,14 @@ For example, to log all hyperon messages at the `debug` level and
 below, while running `script.metta`, you may type:
 
 ```
-RUST_LOG=hyperon=debug metta script.metta
+RUST_LOG=hyperon=debug metta-py script.metta
 ```
 
 Or, to log all hyperon messages at the `trace` level and below,
 restricted to module `metta` and submodule `types`, you may type:
 
 ```
-RUST_LOG=hyperon::metta::types=trace metta script.metta
+RUST_LOG=hyperon::metta::types=trace metta-py script.metta
 ```
 
 By default all log messages are directed to stderr.

lib/src/metta/interpreter_minimal.rs

@@ -554,12 +554,13 @@ fn query<'a, T: Space>(space: T, prev: Option<Rc<RefCell<Stack>>>, to_eval: Atom
             log::debug!("interpreter_minimal::query: b: {}", b);
             b.merge_v2(&bindings).into_iter()
         }).filter_map(move |b| {
-            let res = b.resolve(&var_x).unwrap();
-            if b.has_loops() {
-                None
-            } else {
-                Some(result(res, b))
-            }
+            b.resolve(&var_x).map_or(None, |res| {
+                if b.has_loops() {
+                    None
+                } else {
+                    Some(result(res, b))
+                }
+            })
         })
         .collect()
     }
@@ -1410,6 +1411,13 @@ mod tests {
         assert_eq!(result, vec![metta_atom("NotReducible")]);
     }
 
+    #[test]
+    fn interpret_atom_evaluate_pure_expression_variable_in_space() {
+        let space = space("$t (= (foo $a B) $a)");
+        let result = call_interpret(&space, &metta_atom("(eval (foo A $b))"));
+        assert_eq!(result, vec![metta_atom("A")]);
+    }
+
     #[test]
     fn interpret_atom_evaluate_pure_expression_variable_name_conflict() {
         let space = space("(= (foo ($W)) True)");