The annotations are now literal

Author: XimoTaverner

agentspeak/__init__.py

@@ -564,7 +564,6 @@ def unify(self, right, scope, stack):
 
         if isinstance(right, Var):
             return right.unify(self, scope, stack)
-
         try:
             if self.functor != right.functor:
                 return False
@@ -573,12 +572,11 @@ def unify(self, right, scope, stack):
                 return False
         except AttributeError:
             return False
-
+        
         return all(unify(l, r, scope, stack) for l, r in zip(self.args, right.args))
 
     def unify_annotated(self, right, scope, stack):
         right = evaluate(right, scope)
-
         if isinstance(right, Var):
             choicepoint = object()
             if right.unify(self, scope, stack):
@@ -596,7 +594,6 @@ def unify_annotated(self, right, scope, stack):
                 for right_annot in right.annots:
                     if right_annot in closed_right_annots:
                         continue
-
                     for _ in unify_annotated(left_annot, right_annot, scope, stack):
                         found_right = True
                         closed_right_annots.add(right_annot)
@@ -837,9 +834,7 @@ def unify_annotated(left, right, scope, stack):
         reroll(scope, stack, choicepoint)
 
 
-def unifies_annotated(left, right):
-    scope = {}
-    stack = collections.deque()
+def unifies_annotated(left, right, scope = {}, stack = collections.deque()):
     for _ in unify_annotated(left, right, scope, stack):
         return True
     return False

agentspeak/parser.py

@@ -233,8 +233,8 @@ def __str__(self):
 class AstPlan(AstNode):
     def __init__(self):
         super(AstPlan, self).__init__()
-        self.annotations = []
-        self.dicts_annotations = None 
+        self.annotation = None
+        self.annotation_terms = None 
         self.event = None
         self.context = None
         self.body = None
@@ -249,9 +249,9 @@ def signature(self):
     def __str__(self):
         builder = []
 
-        for annotation in self.annotations:
+        if self.annotation is not None:
             builder.append("@")
-            builder.append(str(annotation))
+            builder.append(str(self.annotation))
             builder.append("\n")
 
         builder.append(str(self.event))
@@ -902,11 +902,12 @@ def parse_event(tok, tokens, log):
 
 def parse_plan(tok, tokens, log):
     plan = AstPlan()
-    while tok.lexeme == "@":
+    if tok.lexeme == "@":
         tok = next(tokens)
-        
+        print('HOLAAAA')
         tok, annotation = parse_literal(tok, tokens, log)
-        plan.annotations.append(annotation)
+        plan.annotation = annotation
+        plan.annotation_terms = annotation.annotations
 
     tok, event = parse_event(tok, tokens, log)
     plan.event = event
@@ -1355,7 +1356,8 @@ def visit_event(self, ast_event):
         return ast_event
 
     def visit_plan(self, ast_plan):
-        ast_plan.annotations = [annotation.accept(TermFoldVisitor(self.log)) for annotation in ast_plan.annotations]
+        if ast_plan.annotation is not None:
+            ast_plan.annotation = ast_plan.annotation.accept(TermFoldVisitor(self.log))
         ast_plan.event = ast_plan.event.accept(self)
         ast_plan.context = ast_plan.context.accept(LogicalFoldVisitor(self.log)) if ast_plan.context else None
         ast_plan.body = ast_plan.body.accept(self) if ast_plan.body else None
@@ -1422,9 +1424,9 @@ def validate(ast_agent, log):
         for op in plan.event.head.accept(FindOpVisitor()):
             log.error("plan head is supposed to be unifiable, but contains non-const expression", loc=op.loc, extra_locs=[plan.loc])
 
-        for annotation in plan.annotations:
-            # Warning annotations ignored
-            log.warning("plan annotations are ignored as of yet", loc=annotation.loc, extra_locs=[plan.loc])
+        if plan.annotation is not None:
+            for op in plan.annotation.accept(FindOpVisitor()):
+                log.warning("plan annotations can not contain this expression", loc=op.loc, extra_locs=[plan.loc])
 
         if plan.event.goal_type != GoalType.belief and plan.event.trigger == Trigger.removal:
             log.warning("recovery plans are ignored as of yet", loc=plan.loc)

agentspeak/runtime.py

@@ -541,7 +541,8 @@ def _tell_how(self, term):
             ast_plan.body.accept(BuildInstructionsVisitor(variables, actions, body, log))
 
         # Converts the Astplan to Plan
-        plan = Plan(ast_plan.event.trigger, ast_plan.event.goal_type, head, context, body, ast_plan.body, ast_plan.dicts_annotations)
+            
+        plan = Plan(ast_plan.event.trigger, ast_plan.event.goal_type, head, context, body, ast_plan.body, ast_plan.annotation)
 
         plan.args = [str(i) for i in ast_plan.event.head.terms] + [str(j) for i in ast_plan.event.head.annotations for j in i.terms]
 
@@ -648,14 +649,11 @@ def remove_belief(self, term, intention):
         choicepoint = object()
 
         relevant_beliefs = self.beliefs[group]
-
         for belief in relevant_beliefs:
             intention.stack.append(choicepoint)
-
-            if agentspeak.unify(term, belief, intention.scope, intention.stack):
+            if agentspeak.unifies_annotated(term, belief, intention.scope, intention.stack):
                 relevant_beliefs.remove(belief)
                 return True
-
             agentspeak.reroll(intention.scope, intention.stack, choicepoint)
 
         return False
@@ -740,15 +738,15 @@ def plan_to_str(plan):
         context = plan.context
 
     body = plan.str_body
-    
+
     if len(plan.head.args):
         pattern = r"_X_[0-9a-fA-F]{3}_[0-9a-fA-F]+"
         head = re.sub(pattern, lambda m: plan.args.pop(0), str(plan.head))
     else:
         head = str(plan.head)
 
     if plan.annotation:
-        label = str(plan.annotation[0])
+        label = str(plan.annotation)
     else:
         label = ""
         return  f"{plan.trigger.value}{plan.goal_type.value}{head} : {context} <- {body}."
@@ -802,7 +800,7 @@ def build_agent_from_ast(self, source, ast_agent, actions, agent_cls=Agent, name
 
             str_body = str(ast_plan.body)
 
-            plan = Plan(ast_plan.event.trigger, ast_plan.event.goal_type, head, context, body, ast_plan.body, ast_plan.annotations)
+            plan = Plan(ast_plan.event.trigger, ast_plan.event.goal_type, head, context, body, ast_plan.body, ast_plan.annotation)
 
             plan.args = [str(i) for i in ast_plan.event.head.terms] + [str(j) for i in ast_plan.event.head.annotations for j in i.terms]
 

agentspeak/stdlib.py

@@ -139,7 +139,6 @@ def _send(agent, term, intention):
         message = agentspeak.Literal("plain_text", (term.args[2], ), frozenset())
     else:
         message = agentspeak.freeze(term.args[2], intention.scope, {})
-
 
     tagged_message = message.with_annotation(
         agentspeak.Literal("source", (agentspeak.Literal(agent.name), )))

examples/annotations/receiver.asl

@@ -0,0 +1,31 @@
+
+!start.
+
+@p1[hello(world),time(sunny)]
++!start
+<- 
+    .print("hello world").
+
++!start
+<-
+    .print("by world").
+
++hello(world)[source(sender1)]
+<-
+    .print("I receive a message from sender1");
+    -hello(world)[source(sender1)];
+    -hello(world);
+    !stop.
+
++hello(world)[source(S)]
+<-
+    .print("I receive a message from", S).
+
+
++!stop: hello(world)[source(S)]
+<-
+    .print("almost one belief remains").
+
++!stop
+<-
+    .print("all delete").

examples/annotations/sender.asl

@@ -0,0 +1,5 @@
+!start.
+
++!start
+<-
+    .send(receiver,tell, hello(world)).

examples/annotations/test.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+import os
+
+import agentspeak.runtime
+import agentspeak.stdlib
+
+env = agentspeak.runtime.Environment()
+
+with open(os.path.join(os.path.dirname(__file__), "sender.asl")) as source:
+    agents = env.build_agents(source, 2, agentspeak.stdlib.actions)
+
+with open(os.path.join(os.path.dirname(__file__), "receiver.asl")) as source:
+    agents.append(env.build_agent(source, agentspeak.stdlib.actions))
+
+if __name__ == "__main__":
+    env.run()