testsuit 0.2.2__tar.gz → 0.2.4__tar.gz

{testsuit-0.2.2/src/testsuit.egg-info → testsuit-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testsuit
-Version: 0.2.2
+Version: 0.2.4
 Summary: This toolbox helps preparing and analysing tests data, based on Pandas mainly.
 Author: Laurent ML
 License-Expression: Apache-2.0

{testsuit-0.2.2 → testsuit-0.2.4}/src/testsuit/sequencer/README.md

@@ -976,6 +976,7 @@ An optional mode of the same UI, enabled with `server.editor` (off by default, s
 - every name field proposes the values that make sense where it is, each with what it is: the component types with their commands and users, the roles of the stages of a type, the stage types with the stages that have them, the commands a step can run on the components it targets (with the type each command comes from), the keys a template can use with their values and the file each comes from;
 - what the tests ask of the lab and the lab does not have yet (a role, a stage type) is listed in the inventory form and offered when creating a component;
 - wizards start from what exists: a new stage copies another with its components renamed; **Add from the lab** creates a setup's logical components and datapack types for every role of a stage type; a new test definition comes with a pipeline that deploys, starts and waits for each component of its setup configuration in the order of their `needs`, and stops and collects them in `finally`;
+- in a form field whose value is rendered with keys (a command, a delay, a timeout, a file to wait for, a step's target...), typing `{{` opens the keys available there, with a quick search: the run-time keys (`component.*`, `run.*`, `params.*`...) and, in a test definition's pipeline, its datapack keys with their values and files. A key the list does not know can still be written as typed;
 - the YAML view has completion and hover help from the schemas (monaco-yaml) and the server's problems as markers; templates complete the datapack keys after `{{` and show a preview rendered for a component.
 
 **Applying a modification.** The same for the three kinds of edits:

{testsuit-0.2.2 → testsuit-0.2.4}/src/testsuit/sequencer/api.py

@@ -288,6 +288,8 @@ def create_app(seq: Sequencer, lifespan=None) -> FastAPI:
                             return
                         yield ": keepalive\n\n"
                         continue
+                    if event is None:                   # the server is stopping
+                        return
                     if event["kind"] == "log" and not logs:
                         continue
                     if run and event.get("run") and not str(event["run"]).startswith(run):

{testsuit-0.2.2 → testsuit-0.2.4}/src/testsuit/sequencer/daemon.py

@@ -62,16 +62,33 @@ def main(argv=None) -> int:
     parser.add_argument("--log-level", default="info")
     args = parser.parse_args(argv)
     logging.basicConfig(level=args.log_level.upper(), format="%(asctime)s %(levelname)s %(name)s: %(message)s")
-    import uvicorn
     try:
         seq, app = build(args.config)
     except SequencerError as e:
         print(f"tsqd: {e}", file=sys.stderr)
         return 2
     host, _, port = (args.listen or seq.config.server.listen).rpartition(":")
-    uvicorn.run(app, host=host or "127.0.0.1", port=int(port), log_level=args.log_level.lower())
+    serve(seq, app, host or "127.0.0.1", int(port), args.log_level.lower())
     return 0
 
 
+def server(seq, app, host: str, port: int, log_level: str = "info"):
+    """The uvicorn server of tsqd. On Ctrl+C or SIGTERM it ends the open event streams first: uvicorn
+    waits for every response to finish before it stops, and an event stream never finishes by itself.
+    Requests still running after 10 s are cancelled."""
+    import uvicorn
+
+    class Server(uvicorn.Server):
+        async def shutdown(self, sockets=None):
+            seq.end_streams()
+            await super().shutdown(sockets)
+
+    return Server(uvicorn.Config(app, host=host, port=port, log_level=log_level, timeout_graceful_shutdown=10))
+
+
+def serve(seq, app, host: str, port: int, log_level: str = "info") -> None:
+    server(seq, app, host, port, log_level).run()
+
+
 if __name__ == "__main__":
     sys.exit(main())

{testsuit-0.2.2 → testsuit-0.2.4}/src/testsuit/sequencer/sequencer.py

@@ -98,6 +98,17 @@ class Sequencer:
         if kind in ("component", "run") and self._wake is not None:
             self._wake.set()
 
+    def end_streams(self) -> None:
+        """End the open event streams (GET /events): the server is stopping, and would otherwise wait
+        for these never-ending responses before it exits."""
+        for queue in list(self.subscribers):
+            while True:
+                try:
+                    queue.put_nowait(None)
+                    break
+                except asyncio.QueueFull:
+                    queue.get_nowait()                  # the end matters more than an event nobody will read
+
     def wake(self) -> None:
         if self._wake is not None:
             self._wake.set()