lambda-erp 0.7.0__tar.gz → 0.8.0__tar.gz

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/PKG-INFO

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

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/api/chat.py

@@ -467,7 +467,7 @@ TOOLS = [
                 "type": "object",
                 "properties": {
                     "doctype": {"type": "string", "enum": DOCUMENT_SLUGS, "description": "Document type slug"},
-                    "filters": {"type": "object", "description": "Optional filters on any column. Equality: {\"status\": \"Draft\", \"customer\": \"CUST-001\"}. Comparison (value = a 2-item array [op, value]): {\"grand_total\": [\">\", 100]}, {\"fit\": [\"!=\", \"A\"]}. NULL checks (1-item array): {\"fit\": [\"is null\"]}, {\"main_email\": [\"is not null\"]}. Allowed ops: =, !=, >, <, >=, <=, like, not like, is null, is not null.", "default": {}},
+                    "filters": {"type": "object", "description": "Optional filters on any column. Equality: {\"status\": \"Draft\", \"customer\": \"CUST-001\"}. Comparison (value = a 2-item array [op, value]): {\"grand_total\": [\">\", 100]}, {\"fit\": [\"!=\", \"A\"]}. NULL checks (1-item array): {\"fit\": [\"is null\"]}, {\"main_email\": [\"is not null\"]}. Allowed ops: =, !=, >, <, >=, <=, like, not like, is null, is not null. Free-text search: {\"search\": \"acme\"} matches the doctype's default text columns; narrow it with {\"search\": \"acme\", \"search_fields\": [\"company_name\", \"tags\"]}.", "default": {}},
                     "order_by": {"type": "string", "description": "Optional column to sort by (e.g. \"occurred_at\" for a timeline). Defaults to creation."},
                     "order": {"type": "string", "enum": ["asc", "desc"], "description": "Sort direction (default desc)", "default": "desc"},
                     "limit": {"type": "integer", "description": "Max results (default 20, max 500)", "default": 20},
@@ -1317,6 +1317,18 @@ def _handle_list_documents(args):
     # within the tool-result budget. Use get_document to drill into one doc.
     doctype = args["doctype"]
     filters = args.get("filters") or {}
+    # Chat callers routinely pass `search` but omit `search_fields`; with no fields
+    # the free-text search silently no-ops and returns the newest N by creation
+    # (2026-08-13: tag lookups on leads "found nothing"). Default the columns to the
+    # doctype's registered chat fields so document search matches a record the way
+    # search_masters already does for masters. The frontend never hits this — its
+    # UI config always sends search_fields.
+    if filters.get("search") and not filters.get("search_fields"):
+        registered = (services.CHAT_DOCTYPES.get(doctype) or {}).get("fields") or []
+        valid = set(services.document_columns(doctype) or [])
+        default_fields = [f for f in registered if f in valid]
+        if default_fields:
+            filters = {**filters, "search_fields": default_fields}
     err = _validate_filter_columns(doctype, filters)
     if err:
         return {"error": err}

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/api/main.py

@@ -19,7 +19,7 @@ from api.auth import router as auth_router, COOKIE_NAME, decode_token
 from api.oauth import router as oauth_router
 from api.attachments import router as attachments_router
 from api.chat import chat_websocket, router as chat_router
-from api.routers import admin, documents, masters, reports, setup as setup_router, bank_reconciliation, analytics, accounting, proposals, chat_api, mcp
+from api.routers import admin, documents, masters, reports, setup as setup_router, bank_reconciliation, analytics, accounting, proposals, chat_api, mcp, availability
 
 
 def load_plugins() -> None:
@@ -106,6 +106,7 @@ app.include_router(attachments_router, prefix="/api")
 app.include_router(documents.router, prefix="/api")
 app.include_router(proposals.router, prefix="/api")
 app.include_router(masters.router, prefix="/api")
+app.include_router(availability.router, prefix="/api")
 app.include_router(reports.router, prefix="/api")
 app.include_router(analytics.router, prefix="/api")
 app.include_router(setup_router.router, prefix="/api")

lambda_erp-0.8.0/api/routers/availability.py

@@ -0,0 +1,154 @@
+"""Rental availability endpoint.
+
+Exposes the Reservation availability engine (lambda_erp/assets/reservation.py)
+over REST so the booking form can check "is this free?" before saving and the
+fleet calendar can render free vs booked. Read-only — posts nothing.
+
+See docs/RENTAL_UI_PLAN.md (Phase 1). The overlap rule itself lives in one
+place (reservation.overlapping_reservations); this router only surfaces it.
+"""
+
+from fastapi import APIRouter, Depends, Query, HTTPException
+
+from lambda_erp.database import get_db
+from lambda_erp.exceptions import ValidationError
+from lambda_erp.assets.reservation import (
+    pool_capacity,
+    committed_qty,
+    available_qty,
+    available_assets,
+    overlapping_reservations,
+)
+from api.auth import require_role
+
+router = APIRouter(
+    prefix="/availability",
+    tags=["availability"],
+    dependencies=[Depends(require_role("viewer"))],
+)
+
+
+@router.get("")
+def check_availability(
+    item_code: str = Query(..., description="Item (machine type) to check."),
+    from_datetime: str = Query(..., alias="from", description="Window start (YYYY-MM-DD or YYYY-MM-DD HH:MM:SS)."),
+    to_datetime: str = Query(..., alias="to", description="Window end; half-open [from, to)."),
+    warehouse: str | None = Query(None, description="Optional yard/warehouse to scope the pool."),
+    exclude: str | None = Query(None, description="Reservation name to ignore (editing an existing hire)."),
+):
+    """Availability of an item over a window: total pool, how many are committed,
+    how many are free, and which specific units are pickable.
+
+    - `available_qty` counts free capacity (pooled + pinned commitments both
+      reduce it).
+    - `available_assets` are the units with no overlapping commitment of their
+      own — what dispatch assigns from. A unit can be absent from this list yet
+      `available_qty` still be > 0 (a pooled booking reduced the count without
+      naming a unit); the form should respect both.
+    """
+    db = get_db()
+    try:
+        capacity = pool_capacity(db, item_code, warehouse)
+        committed = committed_qty(db, item_code, warehouse, from_datetime, to_datetime, exclude)
+        avail_qty = available_qty(db, item_code, warehouse, from_datetime, to_datetime, exclude)
+        units = available_assets(db, item_code, warehouse, from_datetime, to_datetime, exclude)
+        overlap = overlapping_reservations(
+            db, from_dt=from_datetime, to_dt=to_datetime,
+            item_code=item_code, warehouse=warehouse, exclude=exclude,
+        )
+    except ValidationError as e:
+        raise HTTPException(status_code=422, detail=str(e))
+
+    return {
+        "item_code": item_code,
+        "warehouse": warehouse,
+        "from": from_datetime,
+        "to": to_datetime,
+        "capacity": capacity,
+        "committed": committed,
+        "available_qty": avail_qty,
+        "available": avail_qty > 0,
+        "available_assets": [
+            {
+                "name": a.get("name"),
+                "asset_tag": a.get("asset_tag"),
+                "warehouse": a.get("warehouse"),
+                "status": a.get("status"),
+                "meter_reading": a.get("meter_reading"),
+            }
+            for a in units
+        ],
+        "overlapping": overlap,
+    }
+
+
+@router.get("/calendar")
+def calendar_feed(
+    from_datetime: str = Query(..., alias="from", description="Window start (YYYY-MM-DD or with time)."),
+    to_datetime: str = Query(..., alias="to", description="Window end; half-open [from, to)."),
+    warehouse: str | None = Query(None, description="Optional yard/warehouse to scope both lanes and bars."),
+    item_code: str | None = Query(None, description="Optional item (machine type) to scope to."),
+):
+    """Feed for the fleet availability timeline: the asset lanes (rows) plus the
+    reservations that occupy them within the window (bars).
+
+    - `assets` are the active, non-retired units (optionally scoped by yard /
+      item) — the timeline's Y axis.
+    - `reservations` are the blocking hires overlapping [from, to) — the bars —
+      via the single canonical overlap rule (overlapping_reservations), enriched
+      with the party for a bar label. Pooled bookings (no `asset`) carry a null
+      `asset`; the caller renders them on an item lane or a "pool" row.
+    """
+    db = get_db()
+
+    asset_filters: dict = {"disabled": 0}
+    if warehouse:
+        asset_filters["warehouse"] = warehouse
+    if item_code:
+        asset_filters["item_code"] = item_code
+    assets = [
+        {
+            "name": a.get("name"),
+            "asset_tag": a.get("asset_tag"),
+            "item_code": a.get("item_code"),
+            "warehouse": a.get("warehouse"),
+            "status": a.get("status"),
+            "meter_reading": a.get("meter_reading"),
+        }
+        for a in db.get_all("Asset", filters=asset_filters, fields=["*"], order_by="item_code, asset_tag")
+        if a.get("status") != "Retired"
+    ]
+
+    try:
+        rows = overlapping_reservations(
+            db, from_dt=from_datetime, to_dt=to_datetime,
+            item_code=item_code, warehouse=warehouse,
+        )
+    except ValidationError as e:
+        raise HTTPException(status_code=422, detail=str(e))
+
+    reservations = []
+    for r in rows:
+        extra = db.get_value("Reservation", r["name"], ["party_type", "party", "purpose"]) or {}
+        reservations.append({
+            "name": r.get("name"),
+            "item_code": r.get("item_code"),
+            "asset": r.get("asset"),
+            "warehouse": r.get("warehouse"),
+            "qty": r.get("qty"),
+            "from_datetime": r.get("from_datetime"),
+            "to_datetime": r.get("to_datetime"),
+            "status": r.get("status"),
+            "party_type": extra.get("party_type"),
+            "party": extra.get("party"),
+            "purpose": extra.get("purpose"),
+        })
+
+    return {
+        "from": from_datetime,
+        "to": to_datetime,
+        "warehouse": warehouse,
+        "item_code": item_code,
+        "assets": assets,
+        "reservations": reservations,
+    }

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/api/services.py

@@ -483,7 +483,10 @@ def _search_clause(db, doctype: str, doctype_slug: str, search, search_fields):
     parts, params = [], []
     for f in (search_fields or []):
         if f in cols:
-            parts.append(f'LOWER("{f}") LIKE LOWER(?)')
+            # CAST to text so non-text search_fields (e.g. an int/bool column a
+            # caller names) don't blow up Postgres with "lower(integer) does not
+            # exist" — matches the master path (_handle_search_masters, 2026-08-13).
+            parts.append(f'LOWER(CAST("{f}" AS TEXT)) LIKE LOWER(?)')
             params.append(like)
     extra = []
     seen = set()

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/frontend/src/api/client.ts

@@ -70,6 +70,56 @@ function qs(params?: Record<string, string | number | undefined>) {
   return s ? `?${s}` : "";
 }
 
+// --- Rental types (asset availability + fleet calendar feed) ---
+export interface AvailabilityAsset {
+  name: string;
+  asset_tag: string | null;
+  warehouse: string | null;
+  status: string | null;
+  meter_reading: number | null;
+}
+export interface AvailabilityResult {
+  item_code: string;
+  warehouse: string | null;
+  from: string;
+  to: string;
+  capacity: number;
+  committed: number;
+  available_qty: number;
+  available: boolean;
+  available_assets: AvailabilityAsset[];
+  overlapping: unknown[];
+}
+export interface CalendarAsset {
+  name: string;
+  asset_tag: string | null;
+  item_code: string | null;
+  warehouse: string | null;
+  status: string | null;
+  meter_reading: number | null;
+}
+export interface CalendarReservation {
+  name: string;
+  item_code: string | null;
+  asset: string | null;
+  warehouse: string | null;
+  qty: number | null;
+  from_datetime: string;
+  to_datetime: string;
+  status: string | null;
+  party_type: string | null;
+  party: string | null;
+  purpose: string | null;
+}
+export interface FleetCalendarFeed {
+  from: string;
+  to: string;
+  warehouse: string | null;
+  item_code: string | null;
+  assets: CalendarAsset[];
+  reservations: CalendarReservation[];
+}
+
 export const api = {
   // Generic request (used by sidebar for chat sessions)
   request,
@@ -256,6 +306,13 @@ export const api = {
   stockBalance: (params?: Record<string, string>) =>
     request<{ rows: any[] }>(`/reports/stock-balance${qs(params)}`),
 
+  // --- Rentals: availability + fleet calendar (docs/RENTAL_UI_PLAN.md) ---
+  availability: (params: { item_code: string; from: string; to: string; warehouse?: string; exclude?: string }) =>
+    request<AvailabilityResult>(`/availability${qs(params)}`),
+
+  fleetCalendar: (params: { from: string; to: string; warehouse?: string; item_code?: string }) =>
+    request<FleetCalendarFeed>(`/availability/calendar${qs(params)}`),
+
   dashboardSummary: (company?: string) =>
     request<any>(`/reports/dashboard-summary${qs({ company })}`),
 

{lambda_erp-0.7.0 → lambda_erp-0.8.0}/pyproject.toml

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