From a474b4324b4e06adf42bc8e4a56bf3034c962cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Sat, 27 Jun 2026 13:06:21 +0400
Subject: [PATCH] =?UTF-8?q?fix:=20=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=85=D0=B0=D1=80=D0=B4=D0=BA=D0=BE=D0=B4=20API-=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B0=20(chat.cfm),=20verify=3DTrue=20(llm.py),=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D1=8F=D0=B7=D0=B0=D1=82=D1=8C=20llm=5Fprompt?=
 =?UTF-8?q?=20=D0=BE=D1=82=20Lucee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat.cfm               | 16 +++++++---------
 deploy/llm_prompt.py   | 22 ++++++----------------
 deploy/services/llm.py |  2 +-
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/chat.cfm b/chat.cfm
index 22dc1ce..f332eec 100644
--- a/chat.cfm
+++ b/chat.cfm
@@ -15,14 +15,12 @@
     <cfelseif NOT len(form.question)>
         <cfset result.error = "question required (POST field)">
     <cfelse>
-        <!--- Собрать все spec_rows --->
+        <!--- Собрать строки текущей спецификации --->
         <cfquery name="rowsData" datasource="baza">
-            SELECT d.filename, sr.row_num, sr.name, sr.price, sr.qty, sr.sum, sr.date_start
-            FROM spec_rows sr
-            JOIN supplements s ON sr.supplement_id = s.id
-            JOIN documents d ON s.document_id = d.id
-            WHERE s.contract_id = <cfqueryparam value="#url.contract_id#" cfsqltype="cf_sql_varchar">
-            ORDER BY s.created_at, sr.row_num
+            SELECT name, price, qty, sum, date_start
+            FROM spec_current
+            WHERE contract_id = <cfqueryparam value="#url.contract_id#" cfsqltype="cf_sql_varchar">
+            ORDER BY name
         </cfquery>
 
         <cfif rowsData.recordCount EQ 0>
@@ -32,7 +30,7 @@
             <cfset contextLines = []>
             <cfloop query="rowsData">
                 <cfset arrayAppend(contextLines,
-                    "[" & rowsData.filename & "] строка " & rowsData.row_num & ": " & rowsData.name &
+                    rowsData.name &
                     " | цена=" & rowsData.price & " | объём=" & rowsData.qty &
                     " | сумма=" & rowsData.sum & " | начало=" & rowsData.date_start
                 )>
@@ -50,7 +48,7 @@
 Ответь кратко и по делу, опираясь ТОЛЬКО на данные выше. Если данных недостаточно — скажи об этом.">
 
             <!--- Вызов LLM --->
-            <cfset apiKey = "sk-ucI5YvOticoOQ9Kuj5K9mQ">
+            <cfset apiKey = createObject("java", "java.lang.System").getenv("LLM_KEY")>
             <cfset llmPayload = {
                 "model": "gpt-oss-120b",
                 "messages": [{"role": "user", "content": prompt}],
diff --git a/deploy/llm_prompt.py b/deploy/llm_prompt.py
index ee2a1d1..5731efd 100644
--- a/deploy/llm_prompt.py
+++ b/deploy/llm_prompt.py
@@ -1,10 +1,8 @@
 """llm_prompt.py — Формирование промпта для LLM-анализа ДС.
-Читает активный промпт из БД (через Lucee API). При ошибке — fallback на хардкод."""
+Читает активный промпт из БД напрямую (db.prompts). При ошибке — fallback на хардкод."""
 
 import os
-import httpx
-
-LUCEE_URL = os.environ.get("LUCEE_URL", "https://contractor.luceek8s.dev.nubes.ru")
+from db import prompts as db_prompts
 
 # ── Fallback-промпты (если БД недоступна) ──────────────────────
 
@@ -178,19 +176,11 @@ EDGE-CASES:
 
 
 def _fetch_prompt(role: str) -> dict | None:
-    """Получить активный промпт из БД. Возвращает {id, body} или None."""
+    """Получить активный промпт из БД напрямую (а не через Lucee HTTP)."""
     try:
-        with httpx.Client(http2=True, timeout=10) as client:
-            resp = client.get(
-                f"{LUCEE_URL}/prompt.cfm",
-                params={"action": "get_active", "role": role},
-            )
-            resp.raise_for_status()
-            data = resp.json()
-            # Lucee serializeJSON → UPPERCASE keys, normalize to lowercase
-            data = {k.lower(): v for k, v in data.items()}
-            if data.get("ok") and data.get("body"):
-                return {"id": data.get("id", ""), "body": data["body"]}
+        row = db_prompts.get_active(role)
+        if row and row.get("body"):
+            return {"id": row.get("id", ""), "body": row["body"]}
     except Exception:
         pass
     return None
diff --git a/deploy/services/llm.py b/deploy/services/llm.py
index b88351d..abf73c1 100644
--- a/deploy/services/llm.py
+++ b/deploy/services/llm.py
@@ -16,7 +16,7 @@ def call_llm(current_spec, doc_text, build_prompt_fn):
         "max_tokens": 8000,
         "temperature": 0.1,
     }
-    with httpx.Client(http2=True, timeout=120, verify=False) as client:
+    with httpx.Client(http2=True, timeout=120, verify=True) as client:
         resp = client.post(
             LLM_URL,
             json=payload,