nedb-engine 2.2.14__tar.gz → 2.2.16__tar.gz

{nedb_engine-2.2.14 → nedb_engine-2.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedb-engine
-Version: 2.2.14
+Version: 2.2.16
 Summary: NEDB — a versioned, self-compressing, time-traveling embedded database (replay-protected, idempotent, relational, searchable) with durable AOF persistence and a server daemon (nedbd).
 Project-URL: Homepage, https://github.com/aiassistsecure/nedb
 Project-URL: Repository, https://github.com/aiassistsecure/nedb

{nedb_engine-2.2.14 → nedb_engine-2.2.16}/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nedb-engine"
-version = "2.2.14"
+version = "2.2.16"
 description = "NEDB — a versioned, self-compressing, time-traveling embedded database (replay-protected, idempotent, relational, searchable) with durable AOF persistence and a server daemon (nedbd)."
 readme = "README.md"
 requires-python = ">=3.8"

{nedb_engine-2.2.14 → nedb_engine-2.2.16}/python/nedb/__init__.py

@@ -47,4 +47,4 @@ __all__ = [
     "wrap_redis", "WrappedRedis",
     "_native", "__has_native__",
 ]
-__version__ = "2.2.14"
+__version__ = "2.2.16"

{nedb_engine-2.2.14 → nedb_engine-2.2.16}/python/nedb/server.py

@@ -563,31 +563,38 @@ def main() -> None:
     if args.dag:
         import shutil as _shutil, subprocess as _sub, sys as _sys
         _pkg_dir = os.path.dirname(os.path.abspath(__file__))
-        # Include .exe variants for Windows; order: bundled wheel binary first
+        _cwd     = os.getcwd()
+        # Include .exe variants for Windows; search order:
+        # 1. Bundled in the Python wheel (platform wheel includes the binary)
+        # 2. PATH
+        # 3. Cargo release build relative to CWD (built from source)
+        # 4. Cargo release build relative to the package location
         _names = ["nedbd-v2", "nedbd_v2", "nedbd-v2.exe", "nedbd_v2.exe"]
+        _cargo_names = ["nedbd", "nedbd.exe"]  # cargo output is just "nedbd"
+        _cargo_dirs = [
+            os.path.join(_cwd, "rust", "nedb-v2", "target", "release"),
+            os.path.join(_cwd, "target", "release"),
+            os.path.join(os.path.dirname(_pkg_dir), "rust", "nedb-v2", "target", "release"),
+        ]
         _candidates = (
             [os.path.join(_pkg_dir, n) for n in _names]
             + [_shutil.which(n) or "" for n in _names]
+            + [os.path.join(d, n) for d in _cargo_dirs for n in _cargo_names]
         )
         _bin = next((c for c in _candidates if c and os.path.isfile(c)), None)
         if _bin is None:
-            print("nedbd --dag: v2 Rust binary not found.", file=_sys.stderr)
-            print("  Expected 'nedbd-v2' (or 'nedbd-v2.exe' on Windows) alongside the", file=_sys.stderr)
-            print("  package or on PATH.  Options:", file=_sys.stderr)
-            print("    pip install --upgrade nedb-engine  (platform wheel bundles the binary)", file=_sys.stderr)
-            print("    cd rust/nedb-v2 && cargo build --release", file=_sys.stderr)
-            print("    # then copy: nedbd-v2[.exe] to PATH or the nedb package dir", file=_sys.stderr)
-            _sys.exit(1)
-        # Build argv forwarding all recognised flags
-        _argv = [_bin, "--data", args.data, "--port", str(args.port)]
+            # Auto-download from GitHub releases — handles MinGW Python, Linux ARM,
+            # and any platform where the pip wheel doesn't match but the standalone
+            # binary still runs (e.g. MSVC .exe works fine from Git Bash / MINGW64).
+            _bin = _dag_download_binary(_pkg_dir, _sys)
+        # Rust binary: nedbd-v2 [data_dir]
+        # Port/token/TMK are passed via environment variables (not CLI flags).
+        os.environ["NEDBD_PORT"] = str(args.port)
         if args.token:
-            _argv += ["--token", args.token]
-        if os.environ.get("NEDBD_TOKEN") and "--token" not in _argv:
-            _argv += ["--token", os.environ["NEDBD_TOKEN"]]
-        if os.environ.get("NEDB_TMK"):
-            os.environ.setdefault("NEDB_TMK", os.environ["NEDB_TMK"])
+            os.environ["NEDBD_TOKEN"] = args.token
+        _argv = [_bin, args.data]   # data_dir is the only positional arg
         # os.execv replaces the process on POSIX; use subprocess on Windows
-        if sys.platform == "win32":
+        if _sys.platform == "win32":
             _sys.exit(_sub.call(_argv))
         else:
             os.execv(_bin, _argv)