1. fix quote and \ characters in execute_command ; 2. add terminal output text as extra observation ; 3. move get_vm_*() to reset()

desktop_env/server/main.py

@@ -14,7 +14,7 @@ from pyatspi import Value as ATValue
 from pyatspi import Action as ATAction
 
 from typing import List, Dict
-from typing import Any
+from typing import Any, Optional
 
 import Xlib
 import pyautogui
@@ -114,6 +114,39 @@ def capture_screen_with_cursor():
 
     return send_file(file_path, mimetype='image/png')
 
+
+def _has_active_terminal(desktop: Accessible) -> bool:
+    """ A quick check whether the terminal window is open and active.
+    """
+    for app in desktop:
+        if app.getRoleName() == "application" and app.name == "gnome-terminal-server":
+            for frame in app:
+                if frame.getRoleName() == "frame" and frame.getState().contains(pyatspi.STATE_ACTIVE):
+                    return True
+    return False
+
+
+@app.route('/terminal', methods=['GET'])
+def get_terminal_output():
+    user_platform = platform.system()
+    output: Optional[str] = None
+    try:
+        if user_platform == "Linux":
+            desktop: Accessible = pyatspi.Registry.getDesktop(0)
+            if _has_active_terminal(desktop):
+                desktop_xml: _Element = _create_node(desktop)
+                # 1. the terminal window (frame of application is st:active) is open and active
+                # 2. the terminal tab (terminal status is st:focused) is focused
+                xpath = '//application[@name="gnome-terminal-server"]/frame[@st:active="true"]//terminal[@st:focused="true"]'
+                terminals: List[_Element] = desktop_xml.xpath(xpath, namespaces=_accessibility_ns_map)
+                output = terminals[0].text.rstrip() if len(terminals) == 1 else None
+        else: # windows and macos platform is not implemented currently
+            raise NotImplementedError
+        return jsonify({"output": output, "status": "success"})
+    except:
+        return jsonify({"output": None, "status": "error"})
+
+
 _accessibility_ns_map = { "st": "uri:deskat:state.at-spi.gnome.org"
                         , "attr": "uri:deskat:attributes.at-spi.gnome.org"
                         , "cp": "uri:deskat:component.at-spi.gnome.org"