Update app.py

app.py

@@ -23,8 +23,9 @@ MODEL_REPO = "teszenofficial/mtptz"
 # ======================
 # DESCARGA DEL MODELO
 # ======================
-print(f"--- SISTEMA MTP 1.1 ---")
+print("--- SISTEMA MTP 1.1 ---")
 print(f"Descargando/Verificando modelo desde {MODEL_REPO}...")
+
 repo_path = snapshot_download(
     repo_id=MODEL_REPO,
     repo_type="model",
@@ -40,6 +41,7 @@ from tokenizer import MTPTokenizer
 # CARGA DEL MODELO
 # ======================
 print("Cargando modelo en memoria...")
+
 with open(os.path.join(repo_path, "mtp_mini.pkl"), "rb") as f:
     model_data = pickle.load(f)
 
@@ -66,7 +68,7 @@ model.eval()
 print(f"🚀 MTP 1.1 listo y corriendo en: {DEVICE.upper()}")
 
 # ======================
-# PARÁMETROS AVANZADOS (AÑADIDOS)
+# PARÁMETROS DE GENERACIÓN (de mtp_chat.py)
 # ======================
 TEMPERATURE = 0.7
 TOP_K = 40
@@ -85,7 +87,7 @@ IDENTITY_QUERIES = [
 ]
 
 # ======================
-# UTILIDADES NUEVAS
+# GENERACIÓN REAL (FIX)
 # ======================
 def apply_repetition_penalty(logits, input_ids, penalty):
     for token_id in set(input_ids.view(-1).tolist()):
@@ -96,13 +98,13 @@ def apply_repetition_penalty(logits, input_ids, penalty):
     return logits
 
 
-def generate_advanced(full_prompt: str):
-    text_lower = full_prompt.lower().strip()
+def generate_response(full_prompt: str):
+    lower = full_prompt.lower()
     max_tokens = MAX_TOKENS
 
-    if any(x in text_lower for x in SHORT_RESPONSES):
+    if any(x in lower for x in SHORT_RESPONSES):
         max_tokens = 50
-    elif any(x in text_lower for x in IDENTITY_QUERIES):
+    elif any(x in lower for x in IDENTITY_QUERIES):
         max_tokens = 80
 
     tokens = [tokenizer.bos_id()] + tokenizer.encode(full_prompt)
@@ -113,21 +115,18 @@ def generate_advanced(full_prompt: str):
     with torch.no_grad():
         for _ in range(max_tokens):
             input_cond = input_ids[:, -model.max_seq_len:]
-
             logits, _ = model(input_cond)
-            next_logits = logits[:, -1, :].clone()
+            logits = logits[:, -1, :]
 
-            next_logits = apply_repetition_penalty(
-                next_logits, input_ids, REPETITION_PENALTY
-            )
+            logits = apply_repetition_penalty(logits, input_ids, REPETITION_PENALTY)
+            logits /= TEMPERATURE
 
-            next_logits /= TEMPERATURE
+            # Top-k
+            topk_vals, _ = torch.topk(logits, TOP_K)
+            logits[logits < topk_vals[:, -1].unsqueeze(1)] = -float("inf")
 
-            if TOP_K > 0:
-                min_val = torch.topk(next_logits, TOP_K)[0][..., -1, None]
-                next_logits[next_logits < min_val] = -float("inf")
-
-            sorted_logits, sorted_indices = torch.sort(next_logits, descending=True)
+            # Top-p
+            sorted_logits, sorted_indices = torch.sort(logits, descending=True)
             probs = torch.softmax(sorted_logits, dim=-1)
             cum_probs = torch.cumsum(probs, dim=-1)
 
@@ -136,9 +135,9 @@ def generate_advanced(full_prompt: str):
             remove[..., 0] = False
 
             indices_remove = remove.scatter(1, sorted_indices, remove)
-            next_logits[indices_remove] = -float("inf")
+            logits[indices_remove] = -float("inf")
 
-            probs = torch.softmax(next_logits, dim=-1)
+            probs = torch.softmax(logits, dim=-1)
             next_token = torch.multinomial(probs, 1)
 
             if next_token.item() == tokenizer.eos_id():
@@ -148,23 +147,25 @@ def generate_advanced(full_prompt: str):
             input_ids = torch.cat([input_ids, next_token], dim=1)
 
             if len(generated) > 30:
-                last = tokenizer.decode(generated[-5:])
-                if any(p in last for p in [".", "!", "?", "\n\n"]):
+                tail = tokenizer.decode(generated[-5:])
+                if any(p in tail for p in [".", "!", "?"]):
                     break
 
     if not generated:
-        return "No pude generar una respuesta."
+        return "Lo siento, no pude generar una respuesta."
 
     return tokenizer.decode(generated).strip()
 
+
 # ======================
-# API FASTAPI
+# FASTAPI
 # ======================
 app = FastAPI(title="MTP 1.1 API")
 
 class Prompt(BaseModel):
     text: str
 
+
 @app.post("/generate")
 def generate(prompt: Prompt):
     user_input = prompt.text.strip()
@@ -172,7 +173,7 @@ def generate(prompt: Prompt):
         return {"reply": ""}
 
     full_prompt = f"### Instrucción:\n{user_input}\n\n### Respuesta:\n"
-    response = generate_advanced(full_prompt)
+    response = generate_response(full_prompt)
 
     if "###" in response:
         response = response.split("###")[0].strip()
@@ -180,12 +181,11 @@ def generate(prompt: Prompt):
     return {"reply": response}
 
 # ======================
-# INTERFAZ WEB (HTML ORIGINAL COMPLETO)
+# UI (HTML COMPLETO)
 # ======================
 @app.get("/", response_class=HTMLResponse)
 def chat_ui():
-    return """
-<!DOCTYPE html>
+    return """<!DOCTYPE html>
 <html lang="es">
 <head>
 <meta charset="UTF-8">
@@ -195,7 +195,6 @@ def chat_ui():
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap" rel="stylesheet">
 <style>
-/* --- VARIABLES & THEME --- */
 :root {
     --bg-color: #131314;
     --surface-color: #1E1F20;
@@ -203,494 +202,53 @@ def chat_ui():
     --text-primary: #e3e3e3;
     --text-secondary: #9aa0a6;
     --user-bubble: #282a2c;
-    --bot-actions-color: #c4c7c5;
     --logo-url: url('https://i.postimg.cc/yxS54PF3/IMG-3082.jpg');
 }
-
-* { box-sizing: border-box; outline: none; -webkit-tap-highlight-color: transparent; }
-
-body {
-    margin: 0;
-    background-color: var(--bg-color);
-    font-family: 'Inter', sans-serif;
-    color: var(--text-primary);
-    height: 100dvh;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-}
-
-/* --- HEADER --- */
-header {
-    padding: 12px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background: rgba(19, 19, 20, 0.85);
-    backdrop-filter: blur(12px);
-    position: fixed;
-    top: 0;
-    width: 100%;
-    z-index: 50;
-    border-bottom: 1px solid rgba(255,255,255,0.05);
-}
-
-.brand-wrapper {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    cursor: pointer;
-}
-
-.brand-logo {
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    background-image: var(--logo-url);
-    background-size: cover;
-    background-position: center;
-    border: 1px solid rgba(255,255,255,0.1);
-}
-
-.brand-text {
-    font-weight: 500;
-    font-size: 1.05rem;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.version-badge {
-    font-size: 0.75rem;
-    background: rgba(74, 158, 255, 0.15);
-    color: #8ab4f8;
-    padding: 2px 8px;
-    border-radius: 12px;
-    font-weight: 600;
-}
-
-/* --- CHAT AREA --- */
-.chat-scroll {
-    flex: 1;
-    overflow-y: auto;
-    padding: 80px 20px 40px 20px;
-    display: flex;
-    flex-direction: column;
-    gap: 30px;
-    max-width: 850px;
-    margin: 0 auto;
-    width: 100%;
-    scroll-behavior: smooth;
-}
-
-/* Filas de Mensaje */
-.msg-row {
-    display: flex;
-    gap: 16px;
-    width: 100%;
-    opacity: 0;
-    transform: translateY(10px);
-    animation: slideUpFade 0.4s cubic-bezier(0.2, 0.8, 0.2, 1) forwards;
-}
-
-.msg-row.user { justify-content: flex-end; }
-.msg-row.bot { justify-content: flex-start; align-items: flex-start; }
-
-/* Contenido */
-.msg-content {
-    line-height: 1.6;
-    font-size: 1rem;
-    word-wrap: break-word;
-    max-width: 85%;
-}
-
-.user .msg-content {
-    background-color: var(--user-bubble);
-    padding: 10px 18px;
-    border-radius: 18px;
-    border-top-right-radius: 4px;
-    color: #fff;
-}
-
-.bot .msg-content-wrapper {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    width: 100%;
-}
-
-.bot .msg-text {
-    padding-top: 6px;
-    color: var(--text-primary);
-}
-
-/* Avatar Bot */
-.bot-avatar {
-    width: 34px;
-    height: 34px;
-    min-width: 34px;
-    border-radius: 50%;
-    background-image: var(--logo-url);
-    background-size: cover;
-    box-shadow: 0 2px 6px rgba(0,0,0,0.2);
-}
-
-/* Acciones Bot */
-.bot-actions {
-    display: flex;
-    gap: 10px;
-    opacity: 0;
-    transition: opacity 0.3s;
-    margin-top: 5px;
-}
-
-.action-btn {
-    background: transparent;
-    border: none;
-    color: var(--text-secondary);
-    cursor: pointer;
-    padding: 4px;
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-    transition: color 0.2s, background 0.2s;
-}
-
-.action-btn:hover {
-    color: var(--text-primary);
-    background: rgba(255,255,255,0.08);
-}
-
-.action-btn svg { width: 16px; height: 16px; fill: currentColor; }
-
-/* Efecto Escritura (BOLITA AZUL) */
-.typing-cursor::after {
-    content: '';
-    display: inline-block;
-    width: 10px;
-    height: 10px;
-    background: var(--accent-color);
-    border-radius: 50%;
-    margin-left: 5px;
-    vertical-align: middle;
-    animation: blink 1s infinite;
-}
-
-/* --- FOOTER & INPUT --- */
-.footer-container {
-    padding: 0 20px 20px 20px;
-    background: linear-gradient(to top, var(--bg-color) 85%, transparent);
-    position: relative;
-    z-index: 60;
-}
-
-.input-box {
-    max-width: 850px;
-    margin: 0 auto;
-    background: var(--surface-color);
-    border-radius: 28px;
-    padding: 8px 10px 8px 20px;
-    display: flex;
-    align-items: center;
-    border: 1px solid rgba(255,255,255,0.1);
-    transition: border-color 0.2s, box-shadow 0.2s;
-}
-
-.input-box:focus-within {
-    border-color: rgba(74, 158, 255, 0.5);
-    box-shadow: 0 0 0 2px rgba(74, 158, 255, 0.1);
-}
-
-#userInput {
-    flex: 1;
-    background: transparent;
-    border: none;
-    color: white;
-    font-size: 1rem;
-    font-family: inherit;
-    padding: 10px 0;
-}
-
-#mainBtn {
-    background: white;
-    color: black;
-    border: none;
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    margin-left: 8px;
-    transition: transform 0.2s;
-}
-
-#mainBtn:hover { transform: scale(1.05); }
-
-.disclaimer {
-    text-align: center;
-    font-size: 0.75rem;
-    color: #666;
-    margin-top: 12px;
-}
-
-/* --- ANIMACIONES --- */
-@keyframes slideUpFade {
-    from { opacity: 0; transform: translateY(15px); }
-    to { opacity: 1; transform: translateY(0); }
-}
-
-@keyframes blink { 0%, 100% { opacity: 1; } 50% { opacity: 0; } }
-
-@keyframes pulseAvatar {
-    0% { box-shadow: 0 0 0 0 rgba(74, 158, 255, 0.4); }
-    70% { box-shadow: 0 0 0 8px rgba(74, 158, 255, 0); }
-    100% { box-shadow: 0 0 0 0 rgba(74, 158, 255, 0); }
-}
-
-.pulsing { animation: pulseAvatar 1.5s infinite; }
-
-::-webkit-scrollbar { width: 8px; }
-::-webkit-scrollbar-track { background: transparent; }
-::-webkit-scrollbar-thumb { background: #333; border-radius: 4px; }
-
+*{box-sizing:border-box}
+body{margin:0;background:var(--bg-color);font-family:Inter;color:var(--text-primary);height:100vh;display:flex;flex-direction:column}
+header{padding:12px 20px;display:flex;align-items:center;gap:12px;border-bottom:1px solid rgba(255,255,255,.05)}
+.brand-logo{width:32px;height:32px;border-radius:50%;background-image:var(--logo-url);background-size:cover}
+.chat-scroll{flex:1;overflow-y:auto;padding:20px;max-width:850px;margin:auto;width:100%}
+.msg-row{margin-bottom:18px}
+.msg-row.user{text-align:right}
+.msg-row.bot{text-align:left}
+.msg-content{display:inline-block;padding:10px 16px;border-radius:18px;max-width:80%}
+.user .msg-content{background:var(--user-bubble)}
+.footer-container{padding:20px}
+.input-box{display:flex;background:var(--surface-color);border-radius:30px;padding:10px}
+#userInput{flex:1;background:transparent;border:none;color:white;font-size:16px}
+#mainBtn{background:white;border:none;border-radius:50%;width:36px;height:36px}
 </style>
 </head>
 <body>
-
 <header>
-    <div class="brand-wrapper" onclick="location.reload()">
-        <div class="brand-logo"></div>
-        <div class="brand-text">
-            MTP <span class="version-badge">1.1</span>
-        </div>
-    </div>
+<div class="brand-logo"></div>
+<strong>MTP 1.1</strong>
 </header>
-
 <div id="chatScroll" class="chat-scroll">
-    <!-- Bienvenida -->
-    <div class="msg-row bot" style="animation-delay: 0.1s;">
-        <div class="bot-avatar"></div>
-        <div class="msg-content-wrapper">
-            <div class="msg-text">
-                ¡Hola! Soy MTP 1.1. ¿En qué puedo ayudarte hoy?
-            </div>
-        </div>
-    </div>
+<div class="msg-row bot"><div class="msg-content">¡Hola! Soy MTP 1.1. ¿En qué puedo ayudarte?</div></div>
 </div>
-
 <div class="footer-container">
-    <div class="input-box">
-        <input type="text" id="userInput" placeholder="Escribe un mensaje..." autocomplete="off">
-        <button id="mainBtn" onclick="handleBtnClick()">
-            <!-- Icono dinámico -->
-        </button>
-    </div>
-    <div class="disclaimer">
-        MTP puede cometer errores. Considera verificar la información importante.
-    </div>
+<div class="input-box">
+<input id="userInput" placeholder="Escribe un mensaje..." />
+<button id="mainBtn" onclick="send()">➤</button>
+</div>
 </div>
-
 <script>
-const chatScroll = document.getElementById('chatScroll');
-const userInput = document.getElementById('userInput');
-const mainBtn = document.getElementById('mainBtn');
-
-// Variables de Estado
-let isGenerating = false;
-let abortController = null;
-let typingTimeout = null;
-let lastUserPrompt = "";
-
-// Iconos SVG
-const ICON_SEND = `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M22 2L11 13M22 2l-7 20-4-9-9-4 20-7z"></path></svg>`;
-const ICON_STOP = `<svg width="14" height="14" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="0"><rect x="2" y="2" width="20" height="20" rx="4" ry="4"></rect></svg>`;
-
-// Inicial
-mainBtn.innerHTML = ICON_SEND;
-
-// --- UTILS ---
-function scrollToBottom() {
-    chatScroll.scrollTop = chatScroll.scrollHeight;
+async function send(){
+ const i=document.getElementById('userInput');
+ const t=i.value.trim();
+ if(!t)return;
+ i.value='';
+ chatScroll.innerHTML+=`<div class="msg-row user"><div class="msg-content">${t}</div></div>`;
+ const r=await fetch('/generate',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({text:t})});
+ const d=await r.json();
+ chatScroll.innerHTML+=`<div class="msg-row bot"><div class="msg-content">${d.reply}</div></div>`;
+ chatScroll.scrollTop=chatScroll.scrollHeight;
 }
-
-function setBtnState(state) {
-    if (state === 'sending') {
-        mainBtn.innerHTML = ICON_STOP;
-        isGenerating = true;
-    } else {
-        mainBtn.innerHTML = ICON_SEND;
-        isGenerating = false;
-        abortController = null;
-    }
-}
-
-// --- CORE ---
-
-function handleBtnClick() {
-    if (isGenerating) {
-        stopGeneration();
-    } else {
-        sendMessage();
-    }
-}
-
-function stopGeneration() {
-    if (abortController) abortController.abort();
-    if (typingTimeout) clearTimeout(typingTimeout);
-    
-    // UI Limpieza
-    const activeCursor = document.querySelector('.typing-cursor');
-    if (activeCursor) activeCursor.classList.remove('typing-cursor');
-    
-    const activeAvatar = document.querySelector('.pulsing');
-    if (activeAvatar) activeAvatar.classList.remove('pulsing');
-
-    setBtnState('idle');
-    userInput.focus();
-}
-
-async function sendMessage(textOverride = null) {
-    const text = textOverride || userInput.value.trim();
-    if (!text) return;
-
-    lastUserPrompt = text;
-
-    if (!textOverride) {
-        userInput.value = '';
-        addMessage(text, 'user');
-    }
-    
-    setBtnState('sending');
-    abortController = new AbortController();
-
-    // Bot Placeholder
-    const botRow = document.createElement('div');
-    botRow.className = 'msg-row bot';
-    
-    const avatar = document.createElement('div');
-    avatar.className = 'bot-avatar pulsing'; 
-    
-    const wrapper = document.createElement('div');
-    wrapper.className = 'msg-content-wrapper';
-    
-    const msgText = document.createElement('div');
-    msgText.className = 'msg-text'; 
-
-    wrapper.appendChild(msgText);
-    botRow.appendChild(avatar);
-    botRow.appendChild(wrapper);
-    chatScroll.appendChild(botRow);
-    scrollToBottom();
-
-    try {
-        const response = await fetch('/generate', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ text: text }),
-            signal: abortController.signal
-        });
-
-        const data = await response.json();
-        
-        if (!isGenerating) return; 
-
-        avatar.classList.remove('pulsing');
-        const reply = data.reply || "No entendí eso.";
-        
-        await typeWriter(msgText, reply);
-        
-        if (isGenerating) {
-            addActions(wrapper, reply);
-            setBtnState('idle');
-        }
-
-    } catch (error) {
-        if (error.name === 'AbortError') {
-            msgText.textContent += " [Detenido]";
-        } else {
-            avatar.classList.remove('pulsing');
-            msgText.textContent = "Error de conexión.";
-            msgText.style.color = "#ff8b8b";
-            setBtnState('idle');
-        }
-    }
-}
-
-function addMessage(text, sender) {
-    const row = document.createElement('div');
-    row.className = `msg-row ${sender}`;
-    const content = document.createElement('div');
-    content.className = 'msg-content';
-    content.textContent = text;
-    row.appendChild(content);
-    chatScroll.appendChild(row);
-    scrollToBottom();
-}
-
-function typeWriter(element, text, speed = 12) {
-    return new Promise(resolve => {
-        let i = 0;
-        element.classList.add('typing-cursor');
-        
-        function type() {
-            if (!isGenerating) {
-                element.classList.remove('typing-cursor');
-                resolve();
-                return;
-            }
-
-            if (i < text.length) {
-                element.textContent += text.charAt(i);
-                i++;
-                scrollToBottom();
-                typingTimeout = setTimeout(type, speed + Math.random() * 5);
-            } else {
-                element.classList.remove('typing-cursor');
-                resolve();
-            }
-        }
-        type();
-    });
-}
-
-function addActions(wrapperElement, textToCopy) {
-    const actionsDiv = document.createElement('div');
-    actionsDiv.className = 'bot-actions';
-    
-    const copyBtn = document.createElement('button');
-    copyBtn.className = 'action-btn';
-    copyBtn.innerHTML = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>`;
-    copyBtn.onclick = () => {
-        navigator.clipboard.writeText(textToCopy);
-    };
-
-    const regenBtn = document.createElement('button');
-    regenBtn.className = 'action-btn';
-    regenBtn.innerHTML = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M23 4v6h-6"></path><path d="M1 20v-6h6"></path><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg>`;
-    regenBtn.onclick = () => {
-        sendMessage(lastUserPrompt);
-    };
-
-    actionsDiv.appendChild(copyBtn);
-    actionsDiv.appendChild(regenBtn);
-    wrapperElement.appendChild(actionsDiv);
-    
-    requestAnimationFrame(() => actionsDiv.style.opacity = "1");
-    scrollToBottom();
-}
-
-userInput.addEventListener('keydown', (e) => {
-    if (e.key === 'Enter') handleBtnClick();
-});
-
-window.onload = () => userInput.focus();
-
 </script>
 </body>
-</html>
-"""
+</html>"""
 
 # ======================
 # ENTRYPOINT