seamless-database 2.0__tar.gz → 2.0.2__tar.gz

{seamless_database-2.0 → seamless_database-2.0.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: seamless-database
-Version: 2.0
+Version: 2.0.2
 Summary: SQLite-backed metadata database service for Seamless
 Author: Sjoerd de Vries
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/sjdv1982/seamless
-Project-URL: Repository, https://github.com/sjdv1982/seamless
+Project-URL: Repository, https://github.com/sjdv1982/seamless-database
 Project-URL: Issues, https://github.com/sjdv1982/seamless/issues
 Keywords: seamless,database,sqlite,service
 Classifier: Development Status :: 3 - Alpha
@@ -13,11 +13,10 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp
 Requires-Dist: peewee
@@ -70,6 +69,27 @@ seamless-database seamless.db --port-range 5520 5530 --writable
 seamless-database seamless.db --port 5522
 ```
 
+If `--port` and `--port-range` are both omitted, `seamless-database` picks a random free port in the dynamic/private range (`49152-65535`).
+
+### Status-file protocol
+
+`seamless-database` does not require a status file. If `--status-file` is omitted, it runs independently.
+
+If `--status-file` is provided, the file is used for two things:
+
+1. Report the chosen port, especially when `--port-range` is used.
+2. Report whether startup succeeded (`"running"`) or failed (`"failed"`).
+
+The status-file protocol is simple:
+
+1. Wait for the status file to exist and parse it as JSON.
+2. Reuse the existing JSON object as the base payload. An empty JSON object `{}` is sufficient.
+3. Choose or validate its listening port.
+4. Once the HTTP server is up, rewrite the same file with `"status": "running"` and the selected `"port"`.
+5. If startup fails before the server is running, rewrite the file with `"status": "failed"` instead.
+
+If `remote-http-launcher` is used, it may pre-populate the JSON with fields such as the PID, workdir, or `"status": "starting"`. `seamless-database` preserves such fields when it writes back the final status.
+
 ### CLI options
 
 | Option | Description |

{seamless_database-2.0 → seamless_database-2.0.2}/README.md

@@ -46,6 +46,27 @@ seamless-database seamless.db --port-range 5520 5530 --writable
 seamless-database seamless.db --port 5522
 ```
 
+If `--port` and `--port-range` are both omitted, `seamless-database` picks a random free port in the dynamic/private range (`49152-65535`).
+
+### Status-file protocol
+
+`seamless-database` does not require a status file. If `--status-file` is omitted, it runs independently.
+
+If `--status-file` is provided, the file is used for two things:
+
+1. Report the chosen port, especially when `--port-range` is used.
+2. Report whether startup succeeded (`"running"`) or failed (`"failed"`).
+
+The status-file protocol is simple:
+
+1. Wait for the status file to exist and parse it as JSON.
+2. Reuse the existing JSON object as the base payload. An empty JSON object `{}` is sufficient.
+3. Choose or validate its listening port.
+4. Once the HTTP server is up, rewrite the same file with `"status": "running"` and the selected `"port"`.
+5. If startup fails before the server is running, rewrite the file with `"status": "failed"` instead.
+
+If `remote-http-launcher` is used, it may pre-populate the JSON with fields such as the PID, workdir, or `"status": "starting"`. `seamless-database` preserves such fields when it writes back the final status.
+
 ### CLI options
 
 | Option | Description |

{seamless_database-2.0 → seamless_database-2.0.2}/database.py

@@ -23,6 +23,9 @@ from database_models import (
     IrreproducibleTransformation,
 )
 
+DEFAULT_RANDOM_PORT_START = 49152
+DEFAULT_RANDOM_PORT_END = 65535
+
 
 STATUS_FILE_WAIT_TIMEOUT = 20.0
 INACTIVITY_CHECK_INTERVAL = 1.0
@@ -775,21 +778,28 @@ If it doesn't exist, a new file is created.""",
             create_tables=False,
         )
 
-    selected_port = args.port if args.port is not None else 5522
-    status_file_path = args.status_file
-    status_tracker = None
-    if status_file_path:
-        status_file_contents = wait_for_status_file(status_file_path)
-        status_tracker = StatusFileTracker(
-            status_file_path, status_file_contents, args.port
-        )
-
     if args.port_range:
         start, end = args.port_range
         try:
             selected_port = pick_random_free_port(args.host, start, end)
         except BaseException as exc:
             raise_startup_error(exc)
+    elif args.port is not None:
+        selected_port = args.port
+    else:
+        try:
+            selected_port = pick_random_free_port(
+                args.host, DEFAULT_RANDOM_PORT_START, DEFAULT_RANDOM_PORT_END
+            )
+        except BaseException as exc:
+            raise_startup_error(exc)
+    status_file_path = args.status_file
+    status_tracker = None
+    if status_file_path:
+        status_file_contents = wait_for_status_file(status_file_path)
+        status_tracker = StatusFileTracker(
+            status_file_path, status_file_contents, selected_port
+        )
     if status_tracker:
         status_tracker.port = selected_port
 

{seamless_database-2.0 → seamless_database-2.0.2}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "seamless-database"
-version = "2.0"
+version = "2.0.2"
 description = "SQLite-backed metadata database service for Seamless"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 license = "MIT"
 authors = [{name = "Sjoerd de Vries"}]
 dependencies = [
@@ -21,7 +21,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
     "Topic :: Scientific/Engineering",
     "Topic :: Software Development :: Libraries",
@@ -29,7 +28,7 @@ classifiers = [
 
 [project.urls]
 Homepage = "https://github.com/sjdv1982/seamless"
-Repository = "https://github.com/sjdv1982/seamless"
+Repository = "https://github.com/sjdv1982/seamless-database"
 Issues = "https://github.com/sjdv1982/seamless/issues"
 
 [project.scripts]

{seamless_database-2.0 → seamless_database-2.0.2}/seamless_database.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: seamless-database
-Version: 2.0
+Version: 2.0.2
 Summary: SQLite-backed metadata database service for Seamless
 Author: Sjoerd de Vries
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/sjdv1982/seamless
-Project-URL: Repository, https://github.com/sjdv1982/seamless
+Project-URL: Repository, https://github.com/sjdv1982/seamless-database
 Project-URL: Issues, https://github.com/sjdv1982/seamless/issues
 Keywords: seamless,database,sqlite,service
 Classifier: Development Status :: 3 - Alpha
@@ -13,11 +13,10 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: aiohttp
 Requires-Dist: peewee
@@ -70,6 +69,27 @@ seamless-database seamless.db --port-range 5520 5530 --writable
 seamless-database seamless.db --port 5522
 ```
 
+If `--port` and `--port-range` are both omitted, `seamless-database` picks a random free port in the dynamic/private range (`49152-65535`).
+
+### Status-file protocol
+
+`seamless-database` does not require a status file. If `--status-file` is omitted, it runs independently.
+
+If `--status-file` is provided, the file is used for two things:
+
+1. Report the chosen port, especially when `--port-range` is used.
+2. Report whether startup succeeded (`"running"`) or failed (`"failed"`).
+
+The status-file protocol is simple:
+
+1. Wait for the status file to exist and parse it as JSON.
+2. Reuse the existing JSON object as the base payload. An empty JSON object `{}` is sufficient.
+3. Choose or validate its listening port.
+4. Once the HTTP server is up, rewrite the same file with `"status": "running"` and the selected `"port"`.
+5. If startup fails before the server is running, rewrite the file with `"status": "failed"` instead.
+
+If `remote-http-launcher` is used, it may pre-populate the JSON with fields such as the PID, workdir, or `"status": "starting"`. `seamless-database` preserves such fields when it writes back the final status.
+
 ### CLI options
 
 | Option | Description |

{seamless_database-2.0 → seamless_database-2.0.2}/seamless_database.egg-info/SOURCES.txt

@@ -8,4 +8,5 @@ seamless_database.egg-info/SOURCES.txt
 seamless_database.egg-info/dependency_links.txt
 seamless_database.egg-info/entry_points.txt
 seamless_database.egg-info/requires.txt
-seamless_database.egg-info/top_level.txt
+seamless_database.egg-info/top_level.txt
+tests/test_random_port.py

seamless_database-2.0.2/tests/test_random_port.py

@@ -0,0 +1,82 @@
+import json
+import os
+import signal
+import subprocess
+import time
+from pathlib import Path
+from urllib.error import URLError
+from urllib.request import urlopen
+
+
+DEFAULT_RANDOM_PORT_START = 49152
+DEFAULT_RANDOM_PORT_END = 65535
+
+
+def wait_for_status_file(status_file: Path, timeout: float = 10.0):
+    deadline = time.monotonic() + timeout
+    last_error = None
+    while time.monotonic() < deadline:
+        try:
+            payload = json.loads(status_file.read_text())
+        except (FileNotFoundError, json.JSONDecodeError) as exc:
+            last_error = exc
+            time.sleep(0.1)
+            continue
+        if payload.get("status") == "running" and isinstance(payload.get("port"), int):
+            return payload
+        last_error = payload
+        time.sleep(0.1)
+    raise RuntimeError(f"Database status file did not report running state: {last_error}")
+
+
+def wait_for_server(port: int, timeout: float = 10.0):
+    deadline = time.monotonic() + timeout
+    url = f"http://127.0.0.1:{port}/healthcheck"
+    last_error = None
+    while time.monotonic() < deadline:
+        try:
+            with urlopen(url, timeout=1.0) as response:  # noqa: S310 - local test server
+                if response.status == 200 and response.read().decode() == "OK":
+                    return
+                last_error = response.status
+        except URLError as exc:
+            last_error = exc
+        time.sleep(0.1)
+    raise RuntimeError(f"Database server at {url} did not become ready: {last_error}")
+
+
+def test_random_port_default(tmp_path):
+    database_file = tmp_path / "seamless.db"
+    status_file = tmp_path / "status.json"
+    status_file.write_text("{}\n")
+    command = [
+        "seamless-database",
+        str(database_file),
+        "--writable",
+        "--status-file",
+        str(status_file),
+    ]
+    process = subprocess.Popen(  # noqa: S603,S607 - controlled test command
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        env=os.environ.copy(),
+    )
+    try:
+        payload = wait_for_status_file(status_file)
+        port = payload["port"]
+        assert DEFAULT_RANDOM_PORT_START <= port <= DEFAULT_RANDOM_PORT_END, port
+        assert port != 5522
+        wait_for_server(port)
+    finally:
+        if process.poll() is None:
+            process.send_signal(signal.SIGINT)
+        try:
+            stdout, _ = process.communicate(timeout=5)
+        except subprocess.TimeoutExpired:
+            process.kill()
+            stdout, _ = process.communicate()
+        if stdout:
+            print("Server logs:")
+            print(stdout, end="" if stdout.endswith("\n") else "\n")