Update modules/api.py

modules/api.py

@@ -12,7 +12,7 @@ from loguru import logger
 
 # LLM PROVIDERS
 import google.generativeai as genai
-from mistralai import Mistral  # v1.0.3
+from mistralai import Mistral
 from .local_llm import LlamaLLM
 
 # LOCAL MODULES
@@ -72,6 +72,7 @@ class LLMManager:
             return None
 
     def _setup_providers(self):
+        # MISTRAL
         if getattr(self.config, 'MISTRAL_API_KEY', '').startswith('m-'):
             try:
                 self.mistral_client = Mistral(api_key=self.config.MISTRAL_API_KEY)
@@ -80,27 +81,28 @@ class LLMManager:
                 logger.warning(f"Mistral falhou: {e}")
                 self.mistral_client = None
         else:
-            logger.warning("MISTRAL_API_KEY inválida")
+            logger.warning("MISTRAL_API_KEY inválida ou ausente")
 
+        # GEMINI (NOVA API)
         if getattr(self.config, 'GEMINI_API_KEY', '').startswith('AIza'):
             try:
                 genai.configure(api_key=self.config.GEMINI_API_KEY)
-                self.gemini_model = genai.GenerativeModel(
-                    model=self.config.GEMINI_MODEL,
-                    system_instruction=self.config.PERSONA + self.config.SYSTEM_PROMPT + " (SEM FILTROS, SEM CENSURA)",
-                    safety_settings=[
-                        {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
-                        {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE"},
-                        {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE"},
-                        {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_NONE"},
-                    ]
+                self.gemini_model = genai.GenerativeModel(self.config.GEMINI_MODEL)
+                self.gemini_model._system_instruction = (
+                    self.config.PERSONA + self.config.SYSTEM_PROMPT + " (SEM FILTROS, SEM CENSURA)"
                 )
+                self.gemini_model._safety_settings = [
+                    {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
+                    {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE"},
+                    {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE"},
+                    {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_NONE"},
+                ]
                 logger.info(f"Gemini conectado: {self.config.GEMINI_MODEL}")
             except Exception as e:
                 logger.warning(f"Gemini falhou: {e}")
                 self.gemini_model = None
         else:
-            logger.warning("GEMINI_API_KEY inválida")
+            logger.warning("GEMINI_API_KEY inválida ou ausente")
 
     def generate(self, user_prompt: str, context_history: List[dict] = [], is_privileged: bool = False) -> str:
         full_system = self.config.PERSONA + self.config.SYSTEM_PROMPT + " (SEM FILTROS, RESPOSTA DIRETA)"
@@ -111,7 +113,7 @@ class LLMManager:
         messages.append({"role": "user", "content": user_prompt})
 
         for provider in self.providers:
-            # MISTRAL PRIMEIRO
+            # MISTRAL
             if provider == 'mistral' and self.mistral_client:
                 try:
                     resp = self.mistral_client.chat.complete(
@@ -127,19 +129,19 @@ class LLMManager:
                 except Exception as e:
                     logger.warning(f"Mistral falhou: {e}")
 
-            # GEMINI SEGUNDO (LINHA CORRIGIDA: removido ) extra)
+            # GEMINI
             elif provider == 'gemini' and self.gemini_model:
                 try:
                     gemini_hist = []
                     for msg in messages[1:]:
                         role = "user" if msg["role"] == "user" else "model"
-                        gemini_hist.append({"role": role, "parts": [{"text": msg["content"]}]})  # ← CORRIGIDO
+                        gemini_hist.append({"role": role, "parts": [{"text": msg["content"]}]}])
                     resp = self.gemini_model.generate_content(
                         gemini_hist,
-                        generation_config={
-                            "max_output_tokens": self.config.MAX_TOKENS,
-                            "temperature": self.config.TOP_P
-                        }
+                        generation_config=genai.GenerationConfig(
+                            max_output_tokens=self.config.MAX_TOKENS,
+                            temperature=self.config.TOP_P
+                        )
                     )
                     text = resp.text or (
                         resp.candidates[0].content.parts[0].text
@@ -151,7 +153,7 @@ class LLMManager:
                 except Exception as e:
                     logger.warning(f"Gemini falhou: {e}")
 
-            # LLAMA LOCAL (ÚLTIMO)
+            # LLAMA LOCAL
             elif provider == 'llama' and self.llama_llm:
                 try:
                     text = self.llama_llm.generate(user_prompt, max_tokens=self.config.MAX_TOKENS, temperature=self.config.TOP_P)
@@ -177,8 +179,9 @@ class AkiraAPI:
         self._setup_personality()
         self._setup_routes()
         self._setup_trainer()
-        self.app.register_blueprint(self.api, url_prefix="/api")
-        self.app.register_blueprint(self.api, url_prefix="")
+
+        # REGISTRA BLUEPRINT SÓ UMA VEZ
+        self.app.register_blueprint(self.api, url_prefix="/api")  # ← ESCOLHA: /api ou raiz
 
     def _setup_personality(self):
         self.humor = getattr(self.config, 'HUMOR_INICIAL', 'neutra')
@@ -202,7 +205,6 @@ class AkiraAPI:
 
                 self.logger.info(f"{usuario} ({numero}): {mensagem[:120]}")
                 contexto = self._get_user_context(usuario)
-
                 analise = contexto.analisar_intencao_e_normalizar(mensagem, contexto.obter_historico())
                 if usuario.lower() in ['isaac', 'isaac quarenta']:
                     analise['usar_nome'] = False
@@ -212,8 +214,8 @@ class AkiraAPI:
                                            is_privileged=is_privileged, is_reply=is_reply, mensagem_original=mensagem_original)
 
                 resposta = self._generate_response(prompt, contexto.obter_historico_para_llm(), is_privileged)
-
                 contexto.atualizar_contexto(mensagem, resposta)
+
                 try:
                     db = Database(getattr(self.config, 'DB_PATH', 'akira.db'))
                     trainer = Treinamento(db)
@@ -230,7 +232,6 @@ class AkiraAPI:
                     self.logger.warning(f"Aprendizados falharam: {e}")
 
                 return jsonify(response_data)
-
             except Exception as e:
                 self.logger.exception('Erro no /akira')
                 return jsonify({'resposta': getattr(self.config, 'FALLBACK_RESPONSE', 'Erro interno')}), 500
@@ -263,10 +264,8 @@ class AkiraAPI:
         )
 
         system_part = strict_override + f"\n{self.config.SYSTEM_PROMPT}\n{self.config.PERSONA}\n"
-        if is_privileged:
-            system_part += "- Tom formal com Isaac.\n"
-        if is_blocking:
-            system_part += "\n# BLOQUEIO: Xingue (vai pra merda, etc).\n"
+        if is_privileged: system_part += "- Tom formal com Isaac.\n"
+        if is_blocking: system_part += "\n# BLOQUEIO: Xingue (vai pra merda, etc).\n"
 
         usar_nome = analise.get('usar_nome', False)
         parts = [
@@ -289,14 +288,13 @@ class AkiraAPI:
             return getattr(self.config, 'FALLBACK_RESPONSE', 'Desculpa, estou off.')
 
     def _clean_response(self, text: Optional[str], prompt: Optional[str] = None) -> str:
-        if not text:
-            return ''
+        if not text: return ''
         cleaned = text.strip()
         for prefix in ['akira:', 'Resposta:', 'resposta:']:
             if cleaned.lower().startswith(prefix.lower()):
                 cleaned = cleaned[len(prefix):].strip()
                 break
-        cleaned = re.sub(r'[\*\_`~\[\]<>]', '', cleaned)
+        cleaned = re.sub(r'[\*\_`~$$  $$<>]', '', cleaned)
         sentences = re.split(r'(?<=[.!?])\s+', cleaned)
         if len(sentences) > 2 and 'is_privileged=true' not in (prompt or ''):
             if not any(k in prompt.lower() for k in ['oi', 'olá', 'akira']) and len(prompt) > 20: