lambda-erp 0.6.3__tar.gz → 0.6.5__tar.gz

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lambda-erp
-Version: 0.6.3
+Version: 0.6.5
 Summary: Core ERP logic - accounting, sales, purchasing, inventory
 Author: TORUS INVESTMENTS AG
 License-Expression: Apache-2.0

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/api/routers/documents.py

@@ -13,6 +13,7 @@ from api.services import (
     list_documents,
     count_documents,
     document_columns,
+    adjacent_documents,
 )
 from api.pdf import generate_pdf
 from api.auth import require_role
@@ -80,6 +81,50 @@ def list_docs(
     return {"rows": rows, "total": total, "limit": limit, "offset": offset}
 
 
+@router.get("/{doctype_slug}/{name}/adjacent")
+def adjacent_doc(
+    doctype_slug: str,
+    name: str,
+    request: Request,
+    status: str | None = None,
+    party: str | None = None,
+    from_date: str | None = None,
+    to_date: str | None = None,
+    docstatus: int | None = None,
+    include_discarded: bool = False,
+    order_by: str | None = None,
+    order: str = "desc",
+    _user: dict = _viewer,
+):
+    """Prev/next record around `name` in the same order+filters the list uses.
+    Returns {"prev": name|None, "next": name|None}. Filters mirror the list
+    endpoint so navigation stays within the list the user came from."""
+    filters = {}
+    if status:
+        filters["status"] = status
+    if docstatus is not None:
+        filters["docstatus"] = docstatus
+    if party:
+        filters["customer"] = party
+    if from_date:
+        filters["from_date"] = from_date
+    if to_date:
+        filters["to_date"] = to_date
+    columns = document_columns(doctype_slug)
+    for key, value in request.query_params.items():
+        if key in _LIST_RESERVED:
+            continue
+        if key not in columns:
+            raise HTTPException(status_code=400, detail=f"Unknown filter field: {key}")
+        filters[key] = value
+    if order_by is not None and order_by not in columns:
+        raise HTTPException(status_code=400, detail=f"Unknown order_by field: {order_by}")
+    if order.lower() not in ("asc", "desc"):
+        raise HTTPException(status_code=400, detail="order must be 'asc' or 'desc'")
+    return adjacent_documents(doctype_slug, name, filters=filters,
+                              include_discarded=include_discarded, order_by=order_by, order=order)
+
+
 @router.get("/{doctype_slug}/search")
 def search_docs(doctype_slug: str, q: str = "", limit: int = Query(default=10, le=50), _user: dict = _viewer):
     docs = list_documents(doctype_slug, limit=limit)

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/api/routers/masters.py

@@ -299,7 +299,9 @@ def list_masters(
     query = f'SELECT * FROM "{doctype}"'
     if where_parts:
         query += " WHERE " + " AND ".join(where_parts)
-    query += f" LIMIT {int(limit)}"
+    # Deterministic order: without it Postgres returns pages in arbitrary order,
+    # which breaks OFFSET pagination and the /adjacent prev/next contract.
+    query += f" ORDER BY name LIMIT {int(limit)}"
     if offset:
         query += f" OFFSET {int(offset)}"
     rows = db.sql(query, params)
@@ -325,6 +327,29 @@ def search_masters(master_type: str, q: str = "", _user: dict = _viewer):
     return rows
 
 
+@router.get("/{master_type}/{name}/adjacent")
+def adjacent_master(master_type: str, name: str, include_disabled: bool = True,
+                    _user: dict = _viewer):
+    """The records immediately before/after `name` in the list's order (name
+    ASC) — {"prev": name|None, "next": name|None}. Keyset queries on the
+    primary key. include_disabled defaults True to step 1:1 with the master
+    list, which shows disabled records too."""
+    doctype, _ = _get_table(master_type)
+    if not doctype:
+        raise HTTPException(status_code=404, detail=f"Unknown master type: {master_type}")
+    db = get_db()
+    active = ("" if include_disabled or "disabled" not in db._get_table_columns(doctype)
+              else "disabled = 0 AND ")
+
+    def neighbor(cmp: str, direction: str):
+        rows = db.sql(
+            f'SELECT name FROM "{doctype}" WHERE {active}name {cmp} ? '
+            f"ORDER BY name {direction} LIMIT 1", [name])
+        return rows[0]["name"] if rows else None
+
+    return {"prev": neighbor("<", "DESC"), "next": neighbor(">", "ASC")}
+
+
 @router.get("/{master_type}/{name}")
 def get_master(master_type: str, name: str, _user: dict = _viewer):
     doctype, _ = _get_table(master_type)

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/api/services.py

@@ -519,6 +519,76 @@ def count_documents(doctype_slug: str, filters: dict = None, include_discarded:
     return int(rows[0]["c"]) if rows else 0
 
 
+def _filter_where(db, doctype: str, filters: dict, include_discarded: bool):
+    """Build (where_parts, params) for a doctype from a list-style `filters` dict
+    (equality filters + from_date/to_date on the doctype's date field + discard
+    exclusion). Same semantics as list_documents/count_documents so prev/next
+    matches exactly what the list shows."""
+    db_filters, from_date, to_date = {}, None, None
+    for key, value in (filters or {}).items():
+        if value is None or value == "":
+            continue
+        if key == "from_date":
+            from_date = value
+        elif key == "to_date":
+            to_date = value
+        else:
+            db_filters[key] = value
+    _exclude_discarded(db, doctype, db_filters, include_discarded)
+
+    date_field = DATE_FIELDS.get(doctype)
+    where_parts, params = [], []
+    if date_field and from_date:
+        where_parts.append(f'"{date_field}" >= ?'); params.append(from_date)
+    if date_field and to_date:
+        where_parts.append(f'"{date_field}" <= ?'); params.append(to_date)
+    for k, v in db_filters.items():
+        if isinstance(v, (list, tuple)) and len(v) == 2:
+            op, val = v
+            where_parts.append(f'"{k}" {op} ?'); params.append(val)
+        else:
+            where_parts.append(f'"{k}" = ?'); params.append(v)
+    return where_parts, params
+
+
+def adjacent_documents(doctype_slug: str, name: str, filters: dict = None,
+                       include_discarded: bool = False, order_by: str = None,
+                       order: str = "desc") -> dict:
+    """The records immediately before/after `name` in the same order+filters the
+    list uses — {"prev": name|None, "next": name|None}. `prev` is one step *up*
+    the list (toward the top), `next` one step *down*. Keyset queries (indexed,
+    not a full scan). Order defaults to creation DESC (the list default), with
+    `name` as a stable tie-break so rows sharing an order value still step 1:1."""
+    doctype = SLUG_TO_DOCTYPE.get(doctype_slug)
+    if not doctype:
+        raise ValueError(f"Unknown document type: {doctype_slug}")
+    db = get_db()
+    cols = db._get_table_columns(doctype)
+    oc = order_by if (order_by and order_by in cols) else "creation"
+    desc = str(order).lower() != "asc"
+
+    cur = db.sql(f'SELECT "{oc}" AS oc FROM "{doctype}" WHERE name = ?', [name])
+    if not cur:
+        return {"prev": None, "next": None}
+    cur_oc = cur[0]["oc"]
+
+    base_where, base_params = _filter_where(db, doctype, filters or {}, include_discarded)
+
+    def neighbor(direction):
+        # DESC list: next = tuple < current, prev = tuple > current (ASC flips).
+        going_less = (direction == "next") == desc
+        cmp = "<" if going_less else ">"
+        dir_sql = "DESC" if going_less else "ASC"
+        keyset = f'(("{oc}" {cmp} ?) OR ("{oc}" = ? AND name {cmp} ?))'
+        query = (f'SELECT name FROM "{doctype}" WHERE '
+                 + " AND ".join(base_where + [keyset])
+                 + f' ORDER BY "{oc}" {dir_sql}, name {dir_sql} LIMIT 1')
+        rows = db.sql(query, base_params + [cur_oc, cur_oc, name])
+        return rows[0]["name"] if rows else None
+
+    return {"prev": neighbor("prev"), "next": neighbor("next")}
+
+
 def _list_with_offset(db, doctype, doctype_slug, db_filters, limit, offset, order_clause="creation DESC"):
     where_parts = []
     params = []

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/frontend/src/api/client.ts

@@ -123,6 +123,18 @@ export const api = {
   getDocument: (doctype: string, name: string) =>
     request<any>(`/documents/${doctype}/${encodeURIComponent(name)}`),
 
+  // Prev/next record around `name` in the same order+filters the list uses.
+  adjacentDocument: (doctype: string, name: string, params?: Record<string, string | number | undefined>) =>
+    request<{ prev: string | null; next: string | null }>(
+      `/documents/${doctype}/${encodeURIComponent(name)}/adjacent${qs(params)}`,
+    ),
+
+  // Prev/next master record around `name` in the master list's order (name ASC).
+  adjacentMaster: (masterType: string, name: string) =>
+    request<{ prev: string | null; next: string | null }>(
+      `/masters/${masterType}/${encodeURIComponent(name)}/adjacent`,
+    ),
+
   createDocument: (doctype: string, data: any) =>
     request<any>(`/documents/${doctype}`, { method: "POST", body: JSON.stringify(data) }),
 

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/lambda_erp/database.py

@@ -99,10 +99,38 @@ def _pg_row_factory(cursor):
 class _PgConn:
     """Adapts a psycopg (v3) connection to the sqlite3 connection API the code
     uses. autocommit is off so the existing `_in_transaction` + single commit()
-    / rollback() flow gives the same atomicity as SQLite's implicit transaction."""
-
-    def __init__(self, raw):
+    / rollback() flow gives the same atomicity as SQLite's implicit transaction.
+
+    With autocommit off, even a plain SELECT opens a transaction that stays
+    open until commit/rollback — and these thread-local connections live as
+    long as their (pooled) thread, so a request whose last statement was a read
+    left the connection 'idle in transaction' forever, pinning ACCESS SHARE
+    locks on every table it touched. That starves any ALTER TABLE of its
+    ACCESS EXCLUSIVE lock, which made lock-safe plugin migrations time out on
+    every boot in production. The fix: after a read, when there is no pending
+    write and no explicit transaction, end the implicit transaction right away
+    (_maybe_release), so connections never idle inside one."""
+
+    def __init__(self, raw, in_explicit_txn=None):
         self._raw = raw
+        self._dirty = False  # uncommitted write on this connection
+        self._in_explicit_txn = in_explicit_txn or (lambda: False)
+
+    @staticmethod
+    def _is_read(sql):
+        s = sql.lstrip().lower()
+        return s.startswith("select") and "for update" not in s and "for share" not in s
+
+    def _maybe_release(self, sql):
+        if self._in_explicit_txn():
+            return
+        if self._is_read(sql):
+            # psycopg's default cursor has already buffered the full result set
+            # client-side, so the caller can still fetch after the rollback.
+            if not self._dirty:
+                self._safe_rollback()
+        else:
+            self._dirty = True
 
     def execute(self, sql, params=None):
         try:
@@ -114,7 +142,6 @@ class _PgConn:
                 cur.execute(sql.replace("%", "%%").replace("?", "%s"), list(params))
             else:
                 cur.execute(sql.replace("?", "%s"))
-            return cur
         except Exception:
             # A failed statement leaves the connection in an aborted transaction
             # (autocommit=False); every later query on this pooled/thread-local
@@ -122,28 +149,34 @@ class _PgConn:
             # so the connection stays usable, then re-raise the real error.
             self._safe_rollback()
             raise
+        self._maybe_release(sql)
+        return cur
 
     def executemany(self, sql, seq_params):
         try:
             cur = self._raw.cursor()
             cur.executemany(sql.replace("%", "%%").replace("?", "%s"),
                             [list(p) for p in seq_params])
-            return cur
         except Exception:
             self._safe_rollback()
             raise
+        self._dirty = True
+        return cur
 
     def _safe_rollback(self):
         try:
             self._raw.rollback()
+            self._dirty = False
         except Exception:
             pass
 
     def commit(self):
         self._raw.commit()
+        self._dirty = False
 
     def rollback(self):
         self._raw.rollback()
+        self._dirty = False
 
     def close(self):
         self._raw.close()
@@ -224,9 +257,11 @@ class Database:
 
         # autocommit off: matches SQLite's implicit transaction so the existing
         # _in_transaction + commit()/rollback() atomicity (GL submit/cancel) is
-        # preserved exactly.
+        # preserved exactly. in_explicit_txn lets the wrapper see the
+        # thread-local flag so reads inside submit/cancel keep their snapshot.
         return _PgConn(psycopg.connect(self.db_path, autocommit=False,
-                                       row_factory=_pg_row_factory))
+                                       row_factory=_pg_row_factory),
+                       in_explicit_txn=lambda: self._in_transaction)
 
     @property
     def conn(self):

{lambda_erp-0.6.3 → lambda_erp-0.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lambda-erp"
-version = "0.6.3"
+version = "0.6.5"
 description = "Core ERP logic - accounting, sales, purchasing, inventory"
 readme = "README.md"
 license = "Apache-2.0"