lambda-erp 1.1.7__tar.gz → 1.1.9__tar.gz

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lambda-erp
-Version: 1.1.7
+Version: 1.1.9
 Summary: Core ERP logic - accounting, sales, purchasing, inventory
 Author: TORUS INVESTMENTS AG
 License-Expression: Apache-2.0
@@ -261,7 +261,7 @@ Open `http://localhost:5173`. Vite proxies `/api/*` to the backend.
 
 ```
 OPENAI_API_KEY=sk-...
-LAMBDA_ERP_REPORT_MODEL=gpt-5.6-terra  # optional specialist override; default shown
+LAMBDA_ERP_REPORT_MODEL=gpt-6.1-sol  # optional specialist override; default shown
 LAMBDA_ERP_ADMIN_EMAIL=admin@example.com   # optional, seeds the admin at boot
 LAMBDA_ERP_ADMIN_PASSWORD=...              # optional, required with the line above
 LAMBDA_ERP_ADMIN_NAME=Administrator        # optional, display name for the seeded admin

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/README.md

@@ -233,7 +233,7 @@ Open `http://localhost:5173`. Vite proxies `/api/*` to the backend.
 
 ```
 OPENAI_API_KEY=sk-...
-LAMBDA_ERP_REPORT_MODEL=gpt-5.6-terra  # optional specialist override; default shown
+LAMBDA_ERP_REPORT_MODEL=gpt-6.1-sol  # optional specialist override; default shown
 LAMBDA_ERP_ADMIN_EMAIL=admin@example.com   # optional, seeds the admin at boot
 LAMBDA_ERP_ADMIN_PASSWORD=...              # optional, required with the line above
 LAMBDA_ERP_ADMIN_NAME=Administrator        # optional, display name for the seeded admin

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/chat.py

@@ -2860,7 +2860,7 @@ Users can attach PDFs and images (receipts, bills, contracts, screenshots) to th
 # ---------------------------------------------------------------------------
 # OpenAI report-spec specialist
 #
-# GPT-6 Luna acts as the planner/orchestrator. When it decides a report needs
+# GPT-6.1 Sol acts as the planner/orchestrator. When it decides a report needs
 # a custom analytics view it calls the create/update custom analytics tools.
 # Those handlers make a separate, narrowly prompted GPT-6.1 Sol call for the bounded
 # declarative report spec. Both roles use the existing OPENAI_API_KEY.
@@ -3148,7 +3148,7 @@ def _generate_report_spec_via_openai(
                 instructions=_REPORT_CODE_SYSTEM_PROMPT,
                 input=attempt_input,
                 max_output_tokens=4096,
-                reasoning={"effort": "low"},
+                reasoning={"effort": "medium"},
             )
             # Log every call for the admin dashboard. Only public_manager rows
             # count against the demo cap — other roles are logged for
@@ -3275,9 +3275,9 @@ async def generate_title(
 # Reasoning loop
 # ---------------------------------------------------------------------------
 
-# The agentic orchestrator model. Function tools on /v1/chat/completions
-# require reasoning_effort="none" for GPT-6 Luna (400 otherwise).
-ORCHESTRATOR_MODEL = "gpt-6-luna"
+# GPT-6.1 Sol requires Responses for function tools and does not support
+# reasoning effort "none", including tool-free wrap-ups after the step limit.
+ORCHESTRATOR_MODEL = "gpt-6.1-sol"
 
 
 # ---------------------------------------------------------------------------
@@ -3294,6 +3294,9 @@ ORCHESTRATOR_MODEL = "gpt-6-luna"
 # ---------------------------------------------------------------------------
 
 def _use_responses_api() -> bool:
+    # A legacy deployment flag must not route Sol 6.1 into an unsupported API.
+    if ORCHESTRATOR_MODEL == "gpt-6.1-sol":
+        return True
     # Default: the Responses API (needed for Office attachments + native
     # reasoning). Set ERP_CHAT_API=chat to fall back to Chat Completions.
     return os.environ.get("ERP_CHAT_API", "responses").strip().lower() != "chat"
@@ -3451,9 +3454,9 @@ def _shim_usage_from_responses(usage):
     return _ShimUsage(inp, out, cached)
 
 
-def _orchestrator_turn(client, messages, tools, max_tokens):
+def _orchestrator_turn(client, messages, tools, max_tokens, *, tool_choice="auto"):
     """One orchestrator LLM turn. Returns (message, usage) shaped like Chat
-    Completions, using either the Chat or Responses API per ERP_CHAT_API.
+    Completions. Sol 6.1 always uses Responses; compatible models honor ERP_CHAT_API.
     Blocking — call via asyncio.to_thread."""
     if _use_responses_api():
         instructions, input_items = _responses_request_from_chat(messages)
@@ -3462,7 +3465,7 @@ def _orchestrator_turn(client, messages, tools, max_tokens):
             instructions=instructions,
             input=input_items,
             tools=_responses_tools_from_chat(tools),
-            tool_choice="auto",
+            tool_choice=tool_choice,
             max_output_tokens=max_tokens,
             reasoning={"effort": _RESPONSES_REASONING_EFFORT},
         )
@@ -3471,7 +3474,7 @@ def _orchestrator_turn(client, messages, tools, max_tokens):
         model=ORCHESTRATOR_MODEL,
         messages=messages,
         tools=tools,
-        tool_choice="auto",
+        tool_choice=tool_choice,
         max_completion_tokens=max_tokens,
         # gpt-6-luna rejects function tools on /v1/chat/completions unless
         # reasoning_effort is "none" (400 otherwise).
@@ -3490,7 +3493,7 @@ async def run_thinking_loop(
 ):
     """Run the agentic reasoning loop.
 
-    The orchestrator uses GPT-6 Luna; the report specialist uses GPT-6.1 Sol.
+    The orchestrator and the report specialist use GPT-6.1 Sol.
     When GPT decides to call
     `create_custom_analytics_report` or `update_custom_analytics_report`
     with an intent/feedback hint, the tool handler itself delegates the
@@ -3638,8 +3641,8 @@ async def run_thinking_loop(
             print(f"[chat_llm] provider=openai model={model_name} session_id={session_id or '-'} iter={iteration + 1}", flush=True)
             await on_event({"type": "llm_provider", "provider": "openai", "model": model_name})
             try:
-                # One orchestrator turn via Chat Completions (default) or the
-                # Responses API (ERP_CHAT_API=responses). Returns Chat-shaped
+                # One orchestrator turn via Responses (required for Sol 6.1)
+                # or the legacy API for compatible models. Returns Chat-shaped
                 # (message, usage) either way, so everything below is unchanged.
                 message, usage = await asyncio.to_thread(
                     _orchestrator_turn, openai_client, messages, build_tools(user_info), max_completion,
@@ -3801,10 +3804,10 @@ async def run_thinking_loop(
     content = "I've reached the maximum number of reasoning steps. Here's what I've done so far — please check the results above."
     if not demo_mode:
         try:
-            wrap = await asyncio.to_thread(
-                openai_client.chat.completions.create,
-                model=ORCHESTRATOR_MODEL,
-                messages=messages + [{
+            wrap, usage = await asyncio.to_thread(
+                _orchestrator_turn,
+                openai_client,
+                messages + [{
                     "role": "user",
                     "content": (
                         "You hit the step limit before finishing. In the user's language, state "
@@ -3814,10 +3817,19 @@ async def run_thinking_loop(
                         "stands alone: do NOT refer to 'the results above' or to earlier messages."
                     ),
                 }],
-                max_completion_tokens=600,
-                reasoning_effort="none",
+                build_tools(user_info),
+                2048,
+                tool_choice="none",
+            )
+            demo_limiter.settle(
+                None, actual_cost_usd=cost_of_openai_call(ORCHESTRATOR_MODEL, usage),
+                ip=client_ip or "unknown", role=user_role, provider="openai",
+                model=ORCHESTRATOR_MODEL,
+                prompt_tokens=int(getattr(usage, "prompt_tokens", 0) or 0) if usage else 0,
+                completion_tokens=int(getattr(usage, "completion_tokens", 0) or 0) if usage else 0,
+                session_id=session_id,
             )
-            wrap_text = (wrap.choices[0].message.content or "").strip()
+            wrap_text = (wrap.content or "").strip()
             if wrap_text:
                 content = wrap_text
         except Exception:

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/erp_context.py

@@ -8,6 +8,17 @@ WORKFLOW_GUIDANCE = """Discover record types and inspect get_document_fields/get
 writes; use their canonical field names, required fields, link targets and PDF requirements.
 Resolve existing records by their returned name; never invent identifiers or silently choose
 between ambiguous matches. Custom document records use document tools, not master tools.
+Ground every written fact in the user's message or a retrieved record for the specific
+target entity. This applies to free-text notes, descriptions and activity bodies as well
+as structured fields. When the user switches company, lead or document, re-establish the
+target and its relationships; do not carry a person's name, employer, sender identity,
+contact details or other attributes over from the previous topic without explicit evidence.
+A known contact at a company is not proof that they sent an unsigned message. If the source
+only identifies a team/company, attribute it to that team/company, leave the person/contact
+unset and preserve the source wording. Ask only if identifying the person is necessary to
+perform the requested operation; never invent a sender to fill the gap.
+Keep dates, times and time zones consistent between structured fields, notes and the final
+answer. Convert the source time once; if the source zone is ambiguous, ask before writing.
 Create/update, submit, cancel and convert are separate business operations. A successful
 draft creation does not imply submission, stock movement or ledger posting. Check returned
 status and warnings. Correct validation errors using the field metadata and user information.

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/pdf.py

@@ -7,7 +7,7 @@ from jinja2 import Environment, FileSystemLoader, ChoiceLoader
 from weasyprint import HTML
 from lambda_erp.database import get_db
 from api.services import load_document, get_document_class
-from api.pdf_contract import prepare, validate_rendered_pdf, PDFError
+from api.pdf_contract import prepare, validate_rendered_pdf, PDFError, register_pdf_state_labels  # noqa: F401
 from api.remarks_md import render_remarks
 from lambda_erp.controllers.taxes_and_totals import split_by_frequency
 
@@ -229,6 +229,7 @@ def _render_commercial_pdf(doctype_slug, name, doc, contract):
     context = dict(
         doc=doc,
         pdf_status=contract["status"],
+        pdf_state_notice=contract["notice"],
         pdf_warnings=contract["warnings"],
         title=title,
         company_name=company_name,
@@ -334,8 +335,8 @@ def _render_proposal_pdf(name, proposal, contract):
         if quote.get('company') != proposal.get('company') or quote.get('customer') != proposal.get('customer'):
             raise PDFError('Proposal PDF: quotation company and customer must match')
         quote_contract = prepare('Quotation', quote)
-        # Each included offer must be rendered completely. Its state is printed
-        # alongside its number, including historical cancelled/voided offers.
+        # Each included offer must be rendered completely. A non-final state
+        # (draft, cancelled, discarded) is printed beside its number.
         contract['tokens'].extend(quote_contract['tokens'])
         contract['warnings'].extend(quote_contract['warnings'])
         items = quote.get("items", []) or []
@@ -352,6 +353,7 @@ def _render_proposal_pdf(name, proposal, contract):
             "letter": chr(ord("A") + i),
             "quotation": qname,
             "pdf_status": quote_contract["status"],
+            "pdf_state_notice": quote_contract["notice"],
             "title": row.get("position_title") or default_title or qname,
             "blurb": row.get("position_blurb") or quote.get("remarks") or "",
             "is_recommended": bool(row.get("is_recommended")),
@@ -373,6 +375,7 @@ def _render_proposal_pdf(name, proposal, contract):
     context = dict(
         proposal=proposal,
         pdf_status=contract["status"],
+        pdf_state_notice=contract["notice"],
         pdf_warnings=contract["warnings"],
         title=proposal.get("title") or "Offerte",
         company_name=company_name,
@@ -416,6 +419,7 @@ def _render_record_pdf(doctype, name, doc, contract):
     page_size_row = get_db().sql('SELECT value FROM "Settings" WHERE key = ?', ['pdf_page_size'])
     context = dict(
         title=contract['profile'].title, name=name, pdf_status=contract['status'],
+        pdf_state_notice=contract['notice'],
         pdf_warnings=contract['warnings'], print_fields=contract['fields'],
         print_tables=contract['tables'], print_labels={}, print_title=contract['profile'].title,
         company_info=company, company_name=company.get('company_name') or doc.get('company') or '',

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/pdf_contract.py

@@ -61,6 +61,31 @@ def resolve(table, name):
     return (db.get_value(table, name, display) if display in fields else None) or name
 
 
+# States a reader must not mistake for a final, issued document. Only these are
+# printed as a notice and required in the rendered text; a submitted invoice or
+# an ordinary record status carries no notice.
+NOTICE_STATES = ('Draft', 'Cancelled', 'Discarded')
+_state_labels = {}
+
+
+def register_pdf_state_labels(labels) -> None:
+    """Override the printed notice for non-final states, e.g. {'Draft': 'Entwurf'}.
+
+    Keys must be in NOTICE_STATES. The label is what templates print as
+    `pdf_state_notice` and what the rendered-text check then requires.
+    """
+    unknown = set(labels) - set(NOTICE_STATES)
+    if unknown:
+        raise ValueError(f'Unknown PDF notice states: {sorted(unknown)}')
+    if any(not str(label).strip() for label in labels.values()):
+        raise ValueError('PDF notice labels must not be empty')
+    _state_labels.update(labels)
+
+
+def notice_for(state):
+    return _state_labels.get(state, state) if state in NOTICE_STATES else ''
+
+
 def state_for(doctype, doc):
     from api.services import DOCUMENT_CLASSES
     if doc.get('discarded'):
@@ -87,9 +112,10 @@ def prepare(doctype, doc):
         if not any(not missing(doc.get(key)) for key in group):
             raise PDFError('PDF requires at least one of: ' + ', '.join(group), fields=group)
     state = state_for(doctype, doc)
-    tokens = [str(doc['name']), state]
+    notice = notice_for(state)
+    tokens = [str(doc['name'])] + ([notice] if notice else [])
     warnings = []
-    if state in {'Draft', 'Cancelled', 'Discarded'}:
+    if notice:
         warnings.append({'code': 'pdf_document_state', 'message': f'{doctype} {doc["name"]}: {state}'})
     company = {}
     if doc.get('company'):
@@ -213,7 +239,7 @@ def prepare(doctype, doc):
     if doctype == 'Subscription':
         party_currency = get_db().get_value(party_type, party_id, 'default_currency') if party_id else None
         fields.append({'key': 'currency', 'value': party_currency or company_currency})
-    return {'profile': profile, 'status': state, 'warnings': warnings, 'tokens': tokens,
+    return {'profile': profile, 'status': state, 'notice': notice, 'warnings': warnings, 'tokens': tokens,
             'fields': fields, 'tables': tables, 'party_name': party_name,
             'company': company, 'company_currency': company_currency}
 

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/templates/_record_base.html

@@ -16,7 +16,7 @@ tr { break-inside: avoid; } .brand { font-weight: bold; letter-spacing: .8pt; }
 {% macro label(key) %}{{ print_labels.get(key, key.replace('_',' ').capitalize()) }}{% endmacro %}
 {% block letterhead %}<div class="header"><div class="brand">{{ company_name }}</div>{% if company_info.get('address') %}<div class="muted">{{ company_info.get('address') }}</div>{% endif %}</div>{% endblock %}
 <h1>{{ print_title }}</h1>
-<div class="state">{{ name }} · {{ pdf_status }}</div>
+<div class="state">{{ name }} · {{ pdf_state_notice or pdf_status }}</div>
 {% for warning in pdf_warnings %}<div class="warning">{{ warning.message }}</div>{% endfor %}
 {% if party_name %}<p><strong>{{ party_name }}</strong></p>{% endif %}
 {% if company_currency %}<div class="muted">{{ label('company_currency') }}: {{ company_currency }}</div>{% endif %}

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/templates/document.html

@@ -58,10 +58,11 @@
   .remarks .rm-hr { border-top: 1px solid #d1d5db; margin: 6px 0; }
   .remarks em { font-style: italic; }
   .remarks strong { font-weight: 700; }
+  .state-notice { display: inline-block; margin-bottom: 8pt; padding: 3px 10px; border: 1.5px solid #b91c1c; border-radius: 4px; color: #b91c1c; font-size: 10pt; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; }
 </style>
 </head>
 <body>
-<div style="font-size:9pt; margin-bottom:8pt">{{ pdf_status }}</div>
+{% if pdf_state_notice %}<div class="state-notice">{{ pdf_state_notice }}</div>{% endif %}
 
 {# ---- Header ---- #}
 <div class="header">

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/api/templates/proposal.html

@@ -34,10 +34,11 @@
   table.lines td.desc { color: #333; }
 
   .footer { margin-top: 28px; padding-top: 10px; border-top: 1px solid #e5e7eb; font-size: 7.5pt; color: #999; text-align: center; }
+  .state-notice { display: inline-block; margin-bottom: 8pt; padding: 3px 10px; border: 1.5px solid #b91c1c; border-radius: 4px; color: #b91c1c; font-size: 10pt; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; }
 </style>
 </head>
 <body>
-<div style="font-size:9pt; margin-bottom:8pt">{{ pdf_status }}</div>
+{% if pdf_state_notice %}<div class="state-notice">{{ pdf_state_notice }}</div>{% endif %}
 
 <div class="header">
   <div><div class="company">{{ company_name or proposal.company or "" }}</div></div>
@@ -69,7 +70,7 @@
 {% if proposal.cover_letter %}<div class="cover">{{ proposal.cover_letter }}</div>{% endif %}
 
 {% for p in positions %}
-<div style="font-size:8pt">{{ p.quotation }} · {{ p.pdf_status }}</div>
+{% if p.pdf_state_notice %}<div style="font-size:8pt">{{ p.quotation }} · <span class="state-notice" style="font-size:8pt; padding:1px 6px; margin:0">{{ p.pdf_state_notice }}</span></div>{% endif %}
 <div class="position">
   <div class="pos-head">
     <span class="letter">{{ p.letter }}</span>

{lambda_erp-1.1.7 → lambda_erp-1.1.9}/pyproject.toml

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