robotcode-repl-server 2.6.2__py3-none-any.whl → 2.8.0__py3-none-any.whl

robotcode/repl_server/__version__.py

@@ -1 +1 @@
-__version__ = "2.6.2"
+__version__ = "2.8.0"

robotcode/repl_server/cli.py

@@ -1,6 +1,7 @@
 import asyncio
 import threading
 import time
+from concurrent.futures import wait
 from pathlib import Path
 from typing import Any, Optional, Sequence, Tuple
 
@@ -14,7 +15,9 @@ from robotcode.plugin.click_helper.options import (
     server_options,
 )
 from robotcode.plugin.click_helper.types import AddressesPort, add_options
+from robotcode.plugin.click_helper.wrappable import wrappable
 from robotcode.repl.run import run_repl
+from robotcode.runner.cli.robot import load_robot_profile
 
 from .__version__ import __version__
 from .interpreter import Interpreter
@@ -80,9 +83,14 @@ def run_jsonrpc_server(
 ) -> None:
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
-    run_jsonrpc_server_async(mode, port, bind, pipe_name, interpreter)
+    try:
+        run_jsonrpc_server_async(mode, port, bind, pipe_name, interpreter)
+    finally:
+        # closed here, not by the garbage collector at exit, which can fail with a traceback on Python 3.11
+        loop.close()
 
 
+@wrappable
 @click.command(
     context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
     add_help_option=True,
@@ -154,11 +162,11 @@ def run_jsonrpc_server(
     "--source",
     type=click.Path(path_type=Path),
     metavar="FILE",
-    help="Use the parent directory of FILE as the REPL's working directory. "
-    "Relative paths inside `Import Resource`, `Import Library`, "
-    "file-based variables, etc. resolve against that directory. "
-    "The file itself is never read or written, so the path doesn't "
-    "need to exist.",
+    help="Run the session as if its keywords were written in FILE: `${CURDIR}` is the "
+    "directory of FILE, `${SUITE SOURCE}` is FILE and, on Robot Framework 7.4 and newer, "
+    "relative paths in `Import Resource`, `Import Library`, and `Import Variables` resolve "
+    "against that directory. A relative FILE is resolved against the directory the command "
+    "is started from. The file itself is never read or written, so the path doesn't need to exist.",
 )
 @click.argument(
     "files",
@@ -195,6 +203,10 @@ def repl_server(
     Start a REPL server, client can connect to the server and run the REPL scripts.
     """
 
+    # Before the server starts, so that it runs under the `wrapper` too; an error of the
+    # configuration shows when `run_repl` uses it, after the server has started.
+    load_robot_profile(app, tuple(str(f.absolute()) for f in files))
+
     mode, port, bind, pipe_name = resolve_server_options(
         ctx,
         app,
@@ -211,12 +223,17 @@ def repl_server(
 
     interpreter = Interpreter(list(files))
 
-    server_task = run_as_debugpy_hidden_task(run_jsonrpc_server, mode, port, bind, pipe_name, interpreter)
+    # A dry run starts no server; `run_repl` only prints what it would execute.
+    server_task = (
+        None
+        if app.config.dry
+        else run_as_debugpy_hidden_task(run_jsonrpc_server, mode, port, bind, pipe_name, interpreter)
+    )
 
-    server = wait_for_server(server_task)
+    server = wait_for_server(server_task) if server_task is not None else None
 
     try:
-        run_repl(
+        result = run_repl(
             interpreter=interpreter,
             app=app,
             variable=variable,
@@ -231,7 +248,15 @@ def repl_server(
             files=files,
         )
     finally:
+        # Closing stops the server's stdio reader too. It runs on the server's loop, because
+        # called from here it waits until all clients of a TCP server have disconnected (from
+        # Python 3.12 on). The wait must not raise: an error of the session, such as an
+        # invalid robot.toml, has to reach Click unchanged.
         if server is not None:
-            server.loop.stop()
+            server.loop.call_soon_threadsafe(server.close)
+
+        if server_task is not None:
+            wait([server_task], timeout=1)
 
-        server_task.result(5)
+    if result.exit_code is not None:
+        app.exit(result.exit_code)

robotcode/repl_server/interpreter.py

@@ -118,6 +118,8 @@ class Interpreter(BaseInterpreter):
         self._interrupted = False
         self._has_shutdown = False
         self._cell_errors: List[str] = []
+        # Set while the session waits for a cell: SIGTERM then ends the wait (`_end_waiting`).
+        self._waiting = False
 
     def shutdown(self) -> None:
         self._code = []
@@ -270,7 +272,14 @@ class Interpreter(BaseInterpreter):
             self._success = True
 
     def run_input(self) -> None:
-        self.has_input.wait()
+        self._waiting = True
+        try:
+            # Checked after marking the wait: a SIGTERM in between can't be missed.
+            if self._termination_requested:
+                raise EOFError
+            self.has_input.wait()
+        finally:
+            self._waiting = False
         if self._has_shutdown:
             self.executed.set()
             raise EOFError
@@ -280,3 +289,9 @@ class Interpreter(BaseInterpreter):
         finally:
             self.has_input.clear()
             self.executed.set()
+
+    def _end_waiting(self) -> None:
+        # Raised rather than `shutdown()`: setting the event takes a lock that the main
+        # thread, interrupted by the signal, may hold.
+        if self._waiting:
+            raise EOFError

{robotcode_repl_server-2.6.2.dist-info → robotcode_repl_server-2.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: robotcode-repl-server
-Version: 2.6.2
+Version: 2.8.0
 Summary: RobotCode REPL Server for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -20,13 +20,14 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: robotcode-jsonrpc2==2.6.2
-Requires-Dist: robotcode-runner==2.6.2
+Requires-Dist: robotcode-jsonrpc2==2.8.0
+Requires-Dist: robotcode-runner==2.8.0
 Description-Content-Type: text/markdown
 
 # robotcode-repl-server

robotcode_repl_server-2.8.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+robotcode/repl_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+robotcode/repl_server/__version__.py,sha256=z6im3C9Qb6qiQIpaJdE4f9WQiCnFGSUQnQXDPw_dvDg,22
+robotcode/repl_server/cli.py,sha256=DF9VvWl8b1lV17kz6OY9IcqFVAGOQfFp88ce-Rb8iHM,7424
+robotcode/repl_server/hooks.py,sha256=4O9H8cefHc6T7erjPxzU941w3KWytTBB5gmvYb4bs_I,196
+robotcode/repl_server/interpreter.py,sha256=KZFAbkXuTfJlMlLlKCo0orRJeDGtd1SlPSM4l75nbpU,9896
+robotcode/repl_server/protocol.py,sha256=SGCRyYdkcQPcD9zUBOQNvHVg6f5_AhNtmi85FR92rTc,1118
+robotcode/repl_server/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
+robotcode/repl_server/server.py,sha256=zzFsD6ds56d4GQJKXoysVZP-oiS08AtMKeyLKXH9Fss,746
+robotcode_repl_server-2.8.0.dist-info/METADATA,sha256=O2hfujYpxrQk9relIFWBZKw2T_ZZ3vCDXVArFccbePI,2871
+robotcode_repl_server-2.8.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+robotcode_repl_server-2.8.0.dist-info/entry_points.txt,sha256=U_1iYu71VNyPq_epO0fXHki3B4BE4gR2mbZFAOWN1cg,54
+robotcode_repl_server-2.8.0.dist-info/RECORD,,

{robotcode_repl_server-2.6.2.dist-info → robotcode_repl_server-2.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.30.1
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any

robotcode_repl_server-2.6.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-robotcode/repl_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/repl_server/__version__.py,sha256=53Sii4w6BIWn-1RhaTyqUO46gDe4nDCRQDAcpsWFH24,22
-robotcode/repl_server/cli.py,sha256=S6_bWYQZZV3rsZQBFSkKri33y-R9eAXa8-coede6x_4,6026
-robotcode/repl_server/hooks.py,sha256=4O9H8cefHc6T7erjPxzU941w3KWytTBB5gmvYb4bs_I,196
-robotcode/repl_server/interpreter.py,sha256=_cQ5RgGxFl4zWRHWgXgxqL-urr1SNL0Yy3OGE4U8oNQ,9282
-robotcode/repl_server/protocol.py,sha256=SGCRyYdkcQPcD9zUBOQNvHVg6f5_AhNtmi85FR92rTc,1118
-robotcode/repl_server/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
-robotcode/repl_server/server.py,sha256=zzFsD6ds56d4GQJKXoysVZP-oiS08AtMKeyLKXH9Fss,746
-robotcode_repl_server-2.6.2.dist-info/METADATA,sha256=eKVZZmICo9sZgzHMGAk0wXeLYNKf9XiyxpIlejZbwdY,2820
-robotcode_repl_server-2.6.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-robotcode_repl_server-2.6.2.dist-info/entry_points.txt,sha256=U_1iYu71VNyPq_epO0fXHki3B4BE4gR2mbZFAOWN1cg,54
-robotcode_repl_server-2.6.2.dist-info/RECORD,,