Fix for standalone msg variables inside agent python

swig/python/codegen/codegen.py

@@ -118,6 +118,7 @@ def __init__(self, tree, file = sys.stdout):
         self._message_iterator_var = None           # default
         self._input_message_var = 'message_in'      # default
         self._output_message_var = 'message_out'    # default
+        self._standalone_message_var = []           # default
         self.dispatch(tree)
         print("", file=self.f)
         self.f.flush()
@@ -506,7 +507,20 @@ def dispatchMemberFunction(self, t, t_parent):
                     # proceed
                     self.write(py_func)
 
-
+            # standalone message input variable arg
+            elif t.value.id in self._standalone_message_var:
+                # check for legit FGPU function calls and translate
+                self.write(f"{t.value.id}.")
+                if t.attr in self.fgpu_input_msg_funcs: 
+                    # proceed
+                    self.write(t.attr)
+                else:
+                    # possible getter setter type function
+                    py_func = self._deviceVariableFunctionName(t, ["getVariable"])
+                    if not py_func:
+                        self.RaiseError(t, f"Function '{t.attr}' does not exist in '{t.value.id}' message input object")
+                    # proceed
+                    self.write(py_func)
 
             # math functions (try them in raw function call format) or constants
             elif t.value.id == "math":
@@ -607,6 +621,10 @@ def _Assign(self, t):
         self.fill()
         # check if target exists in locals
         if t.targets[0].id not in self._locals :
+            # Special case, catch message.at() where a message is returned outside a message loop
+            if hasattr(t.value, "func") and t.value.func.attr == 'at' :
+                if t.value.func.value.id == self._input_message_var :
+                    self._standalone_message_var.append(t.targets[0].id)
             self.write("auto ")
             self._locals.append(t.targets[0].id)
         self.dispatch(t.targets[0])
@@ -752,7 +770,7 @@ def _FunctionDef(self, t):
             # check for return annotation type
             if not isinstance(t.returns, ast.Name):
                 self.RaiseError(t, "Agent function conditions return type must be 'bool'")
-            if t.returns.id is not 'bool':
+            if t.returns.id != 'bool':
                 self.RaiseError(t, "Agent function conditions return type must be 'bool'")
             # check to ensure no arguments (discard any with a warning)
             if t.args.args:

tests/python/codegen/test_codegen.py

@@ -310,6 +310,17 @@ async def f():
 }
 """
 
+py_fgpu_standalone_msg_input = """\
+m = message_in.at(1)
+pass
+n = m.getVariableInt("foo")
+"""
+cpp_fgpu_standalone_msg_input = """\
+auto m = FLAMEGPU->message_in.at(1);
+;
+auto n = m.getVariable<int>("foo");
+"""
+
 py_fgpu_for_msg_input_args = """\
 for m in message_in(x, y, z) : 
     pass
@@ -754,6 +765,8 @@ def test_fgpu_for_msg_input(self):
         self._checkException(py_fgpu_for_msg_input_func_unknown, "Function 'unsupported' does not exist") 
         # Test math function inside message loop (Previously bug #1077)
         self._checkExpected(py_fgpu_for_msg_input_math_func, cpp_fgpu_for_msg_input_math_func) 
+        # Test standalone input message (Previously bug #1110)
+        self._checkExpected(py_fgpu_standalone_msg_input, cpp_fgpu_standalone_msg_input) 
         # Test message input where message input requires arguments (e.g. spatial messaging)
         self._checkExpected(py_fgpu_for_msg_input_args, cpp_fgpu_for_msg_input_args)
         # Test to ensure that arguments are processed as local variables 

tests/python/conftest.py

@@ -40,7 +40,7 @@ def pytest_sessionfinish(session, exitstatus):
         # Exit if the terminalreport plugin could not be found
         if not terminalreporter:
             return
-        outcome = "Passed" if exitstatus == 0 else "Failed(code={exitstatus})"
+        outcome = "Passed" if exitstatus == 0 else f"Failed(code={exitstatus})"
         passed = len(terminalreporter.stats.get('passed', []))
         failed = len(terminalreporter.stats.get('failed', []))
         skipped = len(terminalreporter.stats.get('skipped', []))