Update app.py

app.py

@@ -11,16 +11,16 @@ from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfbase.ttfonts import TTFont
 from reportlab.lib import colors
 
-# ========== НАСТРОЙКИ АВТОРИЗАЦИИ ==========
+# ========== АВТОРИЗАЦИЯ ==========
 AUTH_USERNAME = "admin"
 AUTH_PASSWORD = "12345"
-# ===========================================
+# =================================
 
-print("===== Application Startup =====")
-print(f"Time: {datetime.now()}")
-print(f"Gradio version: {gr.__version__}")
+print("=" * 40)
+print(f"App Start: {datetime.now()}")
+print(f"Gradio: {gr.__version__}")
 print(f"Auth: {AUTH_USERNAME} / *****")
-print("================================")
+print("=" * 40)
 
 
 class KDChecker:
@@ -28,41 +28,22 @@ class KDChecker:
         self.excel_db = pd.DataFrame()
         self.cabinet_list = []
         self.known_docs = ["Э3", "В4", "ПЭ3", "ВО", "ТЭ5", "СБ", "С5", "ОЛ", "Э1", "Э4", "Э7", "Д3", "Э6"]
-        print("[KDChecker] Initialized")
 
     def load_excel_db(self, excel_file):
-        """Загрузка Excel базы знаний"""
-        log = [f"[{datetime.now().strftime('%H:%M:%S')}] Начало загрузки"]
-        
+        """Загрузка Excel базы"""
         if excel_file is None:
-            return "❌ Файл не выбран", gr.Dropdown.update(choices=[], value=None)
-        
-        # Получаем путь к файлу
-        if isinstance(excel_file, str):
-            excel_path = excel_file
-        else:
-            excel_path = excel_file.name if hasattr(excel_file, 'name') else str(excel_file)
+            return "❌ Файл не выбран", gr.update(choices=[], value=None)
         
-        log.append(f"Путь: {excel_path}")
-        log.append(f"Тип: {type(excel_file)}")
+        excel_path = excel_file if isinstance(excel_file, str) else getattr(excel_file, 'name', str(excel_file))
         
         if not os.path.exists(excel_path):
-            log.append(f"❌ Файл не найден!")
-            return "\n".join(log), gr.Dropdown.update(choices=[], value=None)
-        
-        try:
-            file_size = os.path.getsize(excel_path)
-            log.append(f"Размер: {file_size} байт")
-        except Exception as e:
-            log.append(f"Ошибка размера: {e}")
+            return f"❌ Файл не найден: {excel_path}", gr.update(choices=[], value=None)
 
         all_data = []
         sheets_info = []
 
         try:
-            log.append("Читаю Excel...")
             xls = pd.read_excel(excel_path, sheet_name=None, header=None, engine='openpyxl')
-            log.append(f"Листов найдено: {len(xls)}")
 
             for sheet_name, df_raw in xls.items():
                 header_row = -1
@@ -80,7 +61,7 @@ class KDChecker:
                         header_row = i
                         break
 
-                if header_row != -1:
+                if header_row != -1 and cab_col < len(df_raw.columns) and rem_col < len(df_raw.columns):
                     df = pd.read_excel(excel_path, sheet_name=sheet_name, header=header_row, engine='openpyxl')
                     if cab_col < len(df.columns) and rem_col < len(df.columns):
                         df_sub = df.iloc[:, [cab_col, rem_col]]
@@ -94,24 +75,21 @@ class KDChecker:
                         sheets_info.append(f"'{sheet_name}': {len(df_sub)}")
 
             if not all_data:
-                log.append("❌ Данные не найдены ни на одном листе")
-                return "\n".join(log), gr.Dropdown.update(choices=[], value=None)
+                return "❌ Не найдены колонки 'Шкаф' и 'Примечание'", gr.update(choices=[], value=None)
 
             self.excel_db = pd.concat(all_data, ignore_index=True)
             self.cabinet_list = sorted(self.excel_db["Cabinet"].unique().tolist())
             
-            result = f"✅ База загружена!\n\n"
-            result += f"📊 Записей: {len(self.excel_db)}\n"
-            result += f"🗄️ Шкафов: {len(self.cabinet_list)}\n"
-            result += f"📋 Листы: {', '.join(sheets_info)}"
+            msg = f"✅ База загружена!\n\n"
+            msg += f"📊 Записей: {len(self.excel_db)}\n"
+            msg += f"🗄️ Шкафов: {len(self.cabinet_list)}\n"
+            msg += f"📋 Листы: {', '.join(sheets_info)}"
             
-            return result, gr.Dropdown.update(choices=self.cabinet_list, value=None)
+            return msg, gr.update(choices=self.cabinet_list, value=None)
 
         except Exception as e:
-            log.append(f"❌ ОШИБКА: {str(e)}")
             import traceback
-            log.append(traceback.format_exc())
-            return "\n".join(log), gr.Dropdown.update(choices=[], value=None)
+            return f"❌ Ошибка: {e}\n\n{traceback.format_exc()}", gr.update(choices=[], value=None)
 
     def extract_text(self, pdf_path):
         try:
@@ -134,19 +112,15 @@ class KDChecker:
 
     def determine_doc_type(self, filename):
         fname = filename.upper()
-        if "С2" in fname: return "С2"
-        if "ПЭ3" in fname or "ПЕРЕЧЕНЬ" in fname: return "ПЭ3"
-        if "Э3" in fname or "СХЕМА ЭЛЕКТРИЧЕСКАЯ" in fname: return "Э3"
-        if "Э4" in fname: return "Э4"
-        if "В4" in fname or "СПЕЦИФИКАЦИЯ" in fname: return "В4"
-        if "ВО" in fname or "Э7" in fname or "ГАБАРИТ" in fname: return "ВО"
-        if "ТЭ5" in fname or "ТАБЛИЦА" in fname: return "ТЭ5"
-        if "СБ" in fname: return "СБ"
-        if "С5" in fname: return "С5"
-        if "ОЛ" in fname: return "ОЛ"
-        if "Э1" in fname: return "Э1"
-        if "Э6" in fname or "ЗАЗЕМЛЕНИЯ" in fname: return "Э6"
-        if "Д3" in fname or "МОНТАЖ" in fname: return "Д3"
+        doc_map = {
+            "С2": ["С2"], "ПЭ3": ["ПЭ3", "ПЕРЕЧЕНЬ"], "Э3": ["Э3", "СХЕМА ЭЛЕКТРИЧЕСКАЯ"],
+            "Э4": ["Э4"], "В4": ["В4", "СПЕЦИФИКАЦИЯ"], "ВО": ["ВО", "Э7", "ГАБАРИТ"],
+            "ТЭ5": ["ТЭ5", "ТАБЛИЦА"], "СБ": ["СБ"], "С5": ["С5"], "ОЛ": ["ОЛ"],
+            "Э1": ["Э1"], "Э6": ["Э6", "ЗАЗЕМЛЕНИЯ"], "Д3": ["Д3", "МОНТАЖ"]
+        }
+        for doc_type, patterns in doc_map.items():
+            if any(p in fname for p in patterns):
+                return doc_type
         return "UNKNOWN"
 
     def get_remarks(self, cabinet_key, is_clean=True):
@@ -203,17 +177,13 @@ class KDChecker:
         if not files:
             return "❌ Загрузите PDF файлы", None
         if self.excel_db.empty:
-            return "❌ Сначала загрузите Excel базу!", None
+            return "❌ Сначала загрузите Excel!", None
 
-        # Получаем пути к файлам
         file_paths = []
         for f in files:
-            if isinstance(f, str):
-                file_paths.append(f)
-            else:
-                file_paths.append(f.name if hasattr(f, 'name') else str(f))
+            fp = f if isinstance(f, str) else getattr(f, 'name', str(f))
+            file_paths.append(fp)
 
-        checklist = {}
         detected_cabinet = "Не определен"
         method = ""
         is_manual = False
@@ -223,10 +193,7 @@ class KDChecker:
             method = "manual"
             is_manual = True
         else:
-            all_text = ""
-            for fp in file_paths:
-                all_text += self.extract_text(fp) + "\n"
-
+            all_text = "".join(self.extract_text(fp) for fp in file_paths)
             numbers = self.find_decimal_numbers(all_text)
             db_keys = set(self.excel_db["Cabinet_Clean"].tolist())
 
@@ -244,85 +211,65 @@ class KDChecker:
                             detected_cabinet = cab
                             method = "name"
                             break
-                    if method == "name":
+                    if method:
                         break
 
         if detected_cabinet == "Не определен":
-            return "⚠️ Шкаф не определён. Выберите вручную из списка.", None
-
-        is_clean = (method == "number")
-        remarks = self.get_remarks(detected_cabinet, is_clean=is_clean)
+            return "⚠️ Шкаф не определён. Выберите вручную.", None
 
+        remarks = self.get_remarks(detected_cabinet, is_clean=(method == "number"))
         if not remarks:
-            return f"⚠️ Шкаф '{detected_cabinet}' найден, но замечаний нет.", None
+            return f"⚠️ Для '{detected_cabinet}' замечаний нет.", None
 
+        checklist = {}
         for fp in file_paths:
             fname = os.path.basename(fp)
             dtype = self.determine_doc_type(fname)
-
-            tasks = []
-            if dtype in remarks:
-                tasks.extend(remarks[dtype])
-            if "ALL" in remarks and dtype != "С2":
-                tasks.extend(remarks["ALL"])
-
+            tasks = remarks.get(dtype, []) + (remarks.get("ALL", []) if dtype != "С2" else [])
             if tasks:
                 checklist[fname] = list(dict.fromkeys(tasks))
 
-        title = detected_cabinet
-        if is_manual:
-            title += " (ручной выбор)"
-
+        title = detected_cabinet + (" (ручной)" if is_manual else "")
+        
         try:
             pdf_path = self.create_pdf(title, checklist)
         except Exception as e:
             return f"❌ Ошибка PDF: {e}", None
 
         total = sum(len(v) for v in checklist.values())
-        method_str = "Ручной" if is_manual else ("По номеру" if is_clean else "По названию")
-
-        result = f"✅ Готово!\n\n"
-        result += f"📂 Шкаф: {detected_cabinet}\n"
-        result += f"🔍 Метод: {method_str}\n"
-        result += f"📄 Файлов: {len(file_paths)}\n"
-        result += f"🚩 Замечаний: {total}"
+        method_name = {"manual": "Ручной", "number": "По номеру", "name": "По названию"}.get(method, "?")
 
-        return result, pdf_path
+        return f"✅ Готово!\n\n📂 {detected_cabinet}\n🔍 {method_name}\n📄 Файлов: {len(file_paths)}\n🚩 Замечаний: {total}", pdf_path
 
     def create_pdf(self, cabinet, data):
         path = os.path.join(tempfile.gettempdir(), "CheckList.pdf")
         c = canvas.Canvas(path, pagesize=A4)
-        width, height = A4
+        w, h = A4
         font = 'Helvetica'
 
-        y = height - 50
+        y = h - 50
         c.setFont(font, 16)
-        c.drawString(50, y, "CHECK-LIST KD")
-        
+        c.drawString(50, y, "CHECK-LIST")
         y -= 25
         c.setFont(font, 12)
-        cab_display = cabinet[:50] + "..." if len(cabinet) > 50 else cabinet
-        c.drawString(50, y, f"Cabinet: {cab_display}")
-        c.drawString(400, y, f"Date: {datetime.now().strftime('%d.%m.%Y')}")
-        
+        c.drawString(50, y, f"Cabinet: {cabinet[:50]}")
+        c.drawString(400, y, datetime.now().strftime('%d.%m.%Y'))
         y -= 20
-        c.line(50, y, width - 50, y)
+        c.line(50, y, w - 50, y)
         y -= 30
 
         if not data:
-            c.drawString(50, y, "No remarks for loaded files.")
+            c.drawString(50, y, "No remarks.")
             c.save()
             return path
 
-        for filename, tasks in data.items():
+        for fname, tasks in data.items():
             if y < 100:
                 c.showPage()
-                y = height - 50
-                c.setFont(font, 12)
-
+                y = h - 50
             c.setFillColor(colors.darkblue)
             c.setFont(font, 11)
-            c.drawString(50, y, f"File: {filename}")
+            c.drawString(50, y, f"File: {fname}")
             c.setFillColor(colors.black)
             y -= 18
             c.setFont(font, 10)
@@ -330,85 +277,64 @@ class KDChecker:
             for task in tasks:
                 if y < 60:
                     c.showPage()
-                    y = height - 50
+                    y = h - 50
                     c.setFont(font, 10)
-
                 c.rect(50, y - 2, 8, 8, stroke=1, fill=0)
-
-                # Разбивка на строки
+                
                 words = task.replace('\n', ' ').split()
-                lines = []
-                line = ""
-                for w in words:
-                    if len(line) + len(w) < 85:
-                        line += w + " "
+                lines, line = [], ""
+                for word in words:
+                    if len(line) + len(word) < 85:
+                        line += word + " "
                     else:
                         lines.append(line.strip())
-                        line = w + " "
+                        line = word + " "
                 if line:
                     lines.append(line.strip())
 
-                for i, ln in enumerate(lines):
+                for ln in lines:
                     if y < 40:
                         c.showPage()
-                        y = height - 50
+                        y = h - 50
                         c.setFont(font, 10)
                     c.drawString(65, y, ln)
                     y -= 12
-
                 y -= 5
-
             y -= 15
-            c.setStrokeColor(colors.lightgrey)
-            c.line(50, y, width - 50, y)
-            c.setStrokeColor(colors.black)
-            y -= 10
 
         c.save()
         return path
 
 
-# ========== СОЗДАНИЕ ИНТЕРФЕЙСА ==========
+# ========== ИНТЕРФЕЙС ==========
 checker = KDChecker()
 
-with gr.Blocks(title="КД Checker") as app:
+with gr.Blocks(title="КД Checker", theme=gr.themes.Soft()) as app:
     gr.Markdown("# ✅ Генератор чек-листов КД")
-    gr.Markdown("Загрузите Excel базу и PDF чертежи для формирования чек-листа.")
-
+    
     with gr.Row():
         with gr.Column():
-            gr.Markdown("### 📁 1. База знаний (Excel)")
-            db_input = gr.File(label="Загрузить .xlsx файл", file_types=[".xlsx", ".xls"])
-            cabinet_dropdown = gr.Dropdown(label="Или выберите шкаф вручную", choices=[], interactive=True)
-            db_status = gr.Textbox(label="Статус", lines=6)
-
+            gr.Markdown("### 📁 База знаний")
+            db_input = gr.File(label="Excel (.xlsx)", file_types=[".xlsx", ".xls"], type="filepath")
+            cabinet_dd = gr.Dropdown(label="Шкаф вручную", choices=[], interactive=True)
+            db_status = gr.Textbox(label="Статус", lines=5)
+            
         with gr.Column():
-            gr.Markdown("### 📄 2. Чертежи (PDF)")
-            pdf_input = gr.File(label="Загрузить PDF", file_count="multiple", file_types=[".pdf"])
-            run_btn = gr.Button("🔍 Сф��рмировать чек-лист", variant="primary")
+            gr.Markdown("### 📄 Чертежи")
+            pdf_input = gr.File(label="PDF файлы", file_count="multiple", file_types=[".pdf"], type="filepath")
+            run_btn = gr.Button("🔍 Сформировать", variant="primary")
 
     with gr.Row():
-        result_text = gr.Textbox(label="Результат", lines=6)
-        result_pdf = gr.File(label="📥 Скачать PDF")
-
-    # События
-    db_input.change(
-        fn=checker.load_excel_db,
-        inputs=[db_input],
-        outputs=[db_status, cabinet_dropdown]
-    )
-
-    run_btn.click(
-        fn=checker.check_files,
-        inputs=[pdf_input, cabinet_dropdown],
-        outputs=[result_text, result_pdf]
-    )
-
-# ========== ЗАПУСК ==========
+        result_txt = gr.Textbox(label="Результат", lines=5)
+        result_pdf = gr.File(label="📥 PDF")
+
+    db_input.change(checker.load_excel_db, [db_input], [db_status, cabinet_dd])
+    run_btn.click(checker.check_files, [pdf_input, cabinet_dd], [result_txt, result_pdf])
+
+
 if __name__ == "__main__":
     app.launch(
         server_name="0.0.0.0",
         server_port=7860,
-        auth=(AUTH_USERNAME, AUTH_PASSWORD),
-        auth_message="Введите логин и пароль"
+        auth=(AUTH_USERNAME, AUTH_PASSWORD)
     )