Update app.py

app.py

@@ -1,86 +1,105 @@
 import os
 import traceback
-import base64
 from typing import Dict
 import gradio as gr
 from huggingface_hub import InferenceClient
 import requests
+import base64
 
 # -----------------------------
-# Настройки GitHub
+# GitHub конфигурация
 # -----------------------------
 GITHUB_OWNER = "Tony14100"
 GITHUB_REPO = "Prompt-Tonic"
 GITHUB_REF = "main"
 GITHUB_PATH = "OzonConsultant"
+GITHUB_API_URL = f"https://api.github.com/repos/{GITHUB_OWNER}/{GITHUB_REPO}/contents/{GITHUB_PATH}?ref={GITHUB_REF}"
 
 LOCAL_PROMPT_FILE = "prompt_cache.txt"
 LOCAL_SHA_FILE = "prompt_cache_sha.txt"
 
+# -----------------------------
+# Загрузка системного промпта
+# -----------------------------
 def load_system_prompt():
     github_token = os.getenv("GITHUB_TOKEN")
     default_prompt = "Вы — полезный консультант по Ozon. Отвечайте на вопросы клиентов четко и профессионально."
     if not github_token:
         return default_prompt
+
     headers = {
         'Authorization': f'token {github_token}',
+        'User-Agent': 'Gradio-App-Request',
         'Accept': 'application/vnd.github.v3+json'
     }
+
     try:
-        url = f"https://api.github.com/repos/{GITHUB_OWNER}/{GITHUB_REPO}/contents/{GITHUB_PATH}?ref={GITHUB_REF}"
-        response = requests.get(url, headers=headers, timeout=10)
+        response = requests.get(GITHUB_API_URL, headers=headers, timeout=10)
         response.raise_for_status()
         data = response.json()
-        content_b64 = data.get("content")
-        current_sha = data.get("sha")
+        current_sha = data.get('sha')
+        if not current_sha:
+            return default_prompt
+
+        cached_sha = None
         if os.path.exists(LOCAL_SHA_FILE):
             with open(LOCAL_SHA_FILE, 'r') as f:
                 cached_sha = f.read().strip()
-            if cached_sha == current_sha and os.path.exists(LOCAL_PROMPT_FILE):
-                with open(LOCAL_PROMPT_FILE, 'r', encoding='utf-8') as f:
-                    return f.read().strip() or default_prompt
+
+        if cached_sha == current_sha and os.path.exists(LOCAL_PROMPT_FILE):
+            with open(LOCAL_PROMPT_FILE, 'r', encoding='utf-8') as f:
+                prompt = f.read().strip()
+                if prompt:
+                    return prompt
+
+        content_b64 = data.get('content')
+        if not content_b64:
+            return default_prompt
+
         prompt = base64.b64decode(content_b64).decode('utf-8').strip()
+        if not prompt:
+            return default_prompt
+
         with open(LOCAL_PROMPT_FILE, 'w', encoding='utf-8') as f:
             f.write(prompt)
         with open(LOCAL_SHA_FILE, 'w') as f:
             f.write(current_sha)
-        return prompt or default_prompt
-    except Exception as e:
-        print(f"[WARNING] GitHub fallback: {e}")
-        if os.path.exists("OzonConsultant.txt"):
-            try:
-                with open("OzonConsultant.txt", 'r', encoding='utf-8') as f:
-                    return f.read().strip() or default_prompt
-            except: pass
+
+        return prompt
+    except Exception:
         return default_prompt
 
 SYSTEM_PROMPT = load_system_prompt()
+
 MODEL_ID = "zai-org/GLM-4.5"
 MAX_TOKENS = 1024
 
 # -----------------------------
-# Клиент HF
+# Вспомогательные функции
 # -----------------------------
 def get_client() -> InferenceClient:
     token = os.getenv("HF_TOKEN") or os.getenv("HF_API_KEY")
     if not token:
-        raise RuntimeError("HF_TOKEN не найден")
+        raise RuntimeError("HF_TOKEN не найден. Добавь его в Secrets.")
     return InferenceClient(token=token)
 
 def reset_state():
     return {"messages": [], "system_used": False}
 
 def mock_predict(user_message: str):
-    return f"[Mock reply] {user_message}"
+    return f"[Mock reply] Вы написали: {user_message}"
 
 def on_user_message(user_message: str, state: Dict):
     if not user_message.strip():
         return [], state, gr.update(value="")
+
     messages = state["messages"]
     if not state["system_used"]:
-        messages.insert(0, {"role":"system","content":SYSTEM_PROMPT})
-        state["system_used"]=True
-    messages.append({"role":"user","content":user_message})
+        messages.insert(0, {"role": "system", "content": SYSTEM_PROMPT})
+        state["system_used"] = True
+
+    messages.append({"role": "user", "content": user_message})
+    assistant_reply = ""
     try:
         client = get_client()
         response = client.chat_completion(
@@ -91,38 +110,72 @@ def on_user_message(user_message: str, state: Dict):
             stream=False,
         )
         assistant_reply = response.choices[0].message["content"].strip()
-    except Exception as e:
-        print(f"[DEBUG] Ошибка модели: {e}")
+    except Exception:
         assistant_reply = mock_predict(user_message)
-    messages.append({"role":"assistant","content":assistant_reply})
-    state["messages"]=messages
-    chat_history = [{"role":m["role"],"content":m["content"]} for m in messages if m["role"]!="system"]
+
+    messages.append({"role": "assistant", "content": assistant_reply})
+    state["messages"] = messages
+
+    chat_history = []
+    for msg in messages:
+        if msg["role"] != "system" and msg["content"].strip():
+            chat_history.append({"role": msg["role"], "content": msg["content"]})
+
     return chat_history, state, gr.update(value="")
 
 # -----------------------------
 # UI
 # -----------------------------
 def build_ui():
-    with gr.Blocks(css="""
-        .chat-container {width:60%; float:left;}
-        .banner-container {width:35%; float:right; position:sticky; top:0;}
-        .chatbot .message {white-space: pre-wrap;}
-    """) as app:
+    LOGO_URL = "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS5Z1B-LcytPRiWBQGi6OLAdz5UIfijjAgrNg&s"
+    css = """
+    .chat-column { width: 400px; float: left; }
+    .ad-column { position: fixed; right: 0; top: 0; width: 200px; height: 100vh; background-color: #f0f0f0; padding: 10px; overflow: auto; }
+    .gr-chat-message { white-space: pre-wrap; }
+    """
+    with gr.Blocks(css=css) as app:
+        # Логотип
+        gr.HTML(f"""
+            <div style="text-align:center; margin-bottom:10px;">
+                <img src="{LOGO_URL}" width="100" height="100" style="border-radius:50%;">
+            </div>
+        """)
+        gr.Markdown("**Спроси меня**")
+
         with gr.Row():
-            with gr.Column(scale=3, elem_classes="chat-container"):
-                chat = gr.Chatbot(height=600)
-                input_box = gr.Textbox(placeholder="Введите сообщение…")
+            with gr.Column(elem_classes="chat-column"):
+                chat = gr.Chatbot(height=550)
+                input_box = gr.Textbox(placeholder="Введите сообщение…", label="Сообщение")
                 state = gr.State(reset_state())
-                input_box.submit(on_user_message, inputs=[input_box,state], outputs=[chat,state,input_box])
+                input_box.submit(
+                    on_user_message,
+                    inputs=[input_box, state],
+                    outputs=[chat, state, input_box]
+                )
                 clear_btn = gr.Button("Очистить чат")
-                clear_btn.click(lambda: ([], reset_state(), gr.update(value="")), None, [chat,state,input_box])
-            with gr.Column(scale=2, elem_classes="banner-container"):
-                gr.Markdown("### 📢 Рекламный баннер")
-                gr.HTML('<a href="https://example.com" target="_blank"><img src="https://via.placeholder.com/300x600" style="width:100%;"></a>')
+                clear_btn.click(
+                    lambda: ([], reset_state(), gr.update(value="")),
+                    None,
+                    [chat, state, input_box]
+                )
+
+            with gr.Column(elem_classes="ad-column"):
+                gr.HTML("""
+                    <h4>Реклама</h4>
+                    <a href="https://example.com" target="_blank">Перейти на баннер</a>
+                    <p>Баннер всегда виден при скролле.</p>
+                """)
     return app
 
 app = build_ui()
 
-if __name__=="__main__":
+if __name__ == "__main__":
+    try:
+        get_client()
+    except Exception as e:
+        print(f"[WARNING] HF_TOKEN: {e}")
+
     app.queue(max_size=5)
-    app.launch(server_name="0.0.0.0", server_port=7860, debug=True)
+    app.launch(server_name="0.0.0.0", server_port=7860, debug=True, share=False)
+
+