Fix: pooler fallback agresivo (mais regiões + session pooler), fix SQLite %s→?, fix finetuning queries, pooler retry em todas tentativas

modules/database_pg.py

@@ -120,7 +120,12 @@ class DatabasePG:
     # ================================================================
     # CONEXÃO
     # ================================================================
-    _SUPAVISOR_REGIONS = ['us-east-1', 'us-west-1', 'eu-west-1', 'sa-east-1']
+    _SUPAVISOR_REGIONS = [
+        'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2',
+        'eu-west-1', 'eu-west-2', 'eu-west-3', 'eu-central-1',
+        'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'ap-northeast-2',
+        'sa-east-1', 'ca-central-1', 'me-south-1', 'af-south-1'
+    ]
 
     def _is_ipv6_only(self, host: str) -> bool:
         """Check if hostname resolves only to IPv6 (no A record)."""
@@ -164,17 +169,18 @@ class DatabasePG:
         # Supavisor user format: postgres.<ref>
         pooler_user = f"postgres.{ref}"
 
-        # Try each region and return the first one that resolves to IPv4
+        # Try each region: first transaction pooler (6543), then session pooler (5432)
         for region in self._SUPAVISOR_REGIONS:
             pooler_host = f"aws-0-{region}.pooler.supabase.com"
-            try:
-                _orig_getaddrinfo(pooler_host, 6543, socket.AF_INET, socket.SOCK_STREAM)
-                pooler_dsn = f"postgresql://{pooler_user}:{password}@{pooler_host}:6543/postgres?sslmode=require"
-                logger.info(f"Supavisor pooler found: {pooler_host} ({region})")
-                return pooler_dsn
-            except (socket.gaierror, OSError):
-                logger.debug(f"Supavisor region {region} not reachable via IPv4, trying next...")
-                continue
+            for pool_port, pool_name in [(6543, 'transaction'), (5432, 'session')]:
+                try:
+                    _orig_getaddrinfo(pooler_host, pool_port, socket.AF_INET, socket.SOCK_STREAM)
+                    pooler_dsn = f"postgresql://{pooler_user}:{password}@{pooler_host}:{pool_port}/postgres?sslmode=require"
+                    logger.info(f"Supavisor {pool_name} pooler found: {pooler_host} ({region}:{pool_port})")
+                    return pooler_dsn
+                except (socket.gaierror, OSError):
+                    logger.debug(f"Supavisor {pool_name} pooler {region}:{pool_port} not reachable via IPv4, trying next...")
+                    continue
 
         logger.warning("All Supavisor pooler regions unreachable via IPv4")
         return None
@@ -227,10 +233,13 @@ class DatabasePG:
         import re
         match = re.match(r'postgresql://([^:]+):([^@]+)@([^:/]+)(?::(\d+))?/(.+)', dsn)
         if match:
-            user, password, host, port, dbname = match.groups()
-            ipv4_host = self._resolve_host_to_ipv4(host)
+            user, password, host, port, dbname_full = match.groups()
+            dbname = dbname_full.split('?')[0]
             port = port or '5432'
-            dsn = f"postgresql://{user}:{password}@{ipv4_host}:{port}/{dbname}"
+            ipv4_host = self._resolve_host_to_ipv4(host)
+            if ipv4_host != host:
+                dsn = f"postgresql://{user}:{password}@{ipv4_host}:{port}/{dbname_full}"
+                logger.debug(f"Replaced hostname with IPv4 in DSN: {host} -> {ipv4_host}")
         if 'connect_timeout' not in dsn:
             sep = '&' if '?' in dsn else '?'
             dsn = f"{dsn}{sep}connect_timeout=10"
@@ -259,19 +268,25 @@ class DatabasePG:
             except psycopg2.OperationalError as e:
                 # Try Supavisor pooler fallback if direct connection fails
                 pooler_dsn = self._conn_params.get('pooler_dsn')
-                if pooler_dsn and attempt == 0:
-                    logger.warning(f"Direct connection failed ({e}), trying Supavisor pooler...")
+                if pooler_dsn:
+                    logger.warning(f"Direct connection failed (attempt {attempt + 1}), trying Supavisor pooler...")
                     try:
                         conn = self._connect_with_dsn(pooler_dsn, keepalive_opts)
                         conn.autocommit = False
-                        # Update the primary DSN so future retries use pooler directly
                         self._conn_params['dsn'] = pooler_dsn
-                        del self._conn_params['pooler_dsn']
+                        if 'pooler_dsn' in self._conn_params:
+                            del self._conn_params['pooler_dsn']
                         logger.success("Connected via Supavisor pooler")
                         return conn
                     except Exception as pooler_err:
                         logger.error(f"Supavisor pooler also failed: {pooler_err}")
-                # ✅ Reconnect one-shot: SSL closed mid-handshake (Render idle drop).
+                        # If pooler fails, rebuild pooler DSN with next region
+                        if attempt < self.max_retries - 1:
+                            new_pooler_dsn = self._build_supavisor_dsn(params.get('dsn', ''))
+                            if new_pooler_dsn:
+                                self._conn_params['pooler_dsn'] = new_pooler_dsn
+                                logger.info("Retrying with next Supavisor region...")
+                # Reconnect one-shot: SSL closed mid-handshake (Render idle drop).
                 if 'SSL connection has been closed' in str(e) and attempt < self.max_retries - 1:
                     time.sleep(self.retry_delay * (2 ** attempt))
                     continue

modules/finetuning_pipeline.py

@@ -552,18 +552,15 @@ class FinetuningPipeline:
                          tone_level, hostility_score, emotion_label, quality_score,
                          embedding_input, embedding_output, similarity_score)
                         VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
-                        RETURNING id;
                     """), (user_id, conversation_id, input_message, expected_response,
                           tone_level, hostility_score, emotion_label, auto_quality,
                           input_emb_bytes.tobytes(), output_emb_bytes.tobytes(), similarity))
                     
-                    result = cur.fetchone()
-                    if result is None:
-                        self.logger.error(f"❌ [FINETUNING] RETURNING não retornou ID: Verifique se a tabela está OK")
+                    example_id = cur.lastrowid
+                    if not example_id:
+                        self.logger.error(f"❌ [FINETUNING] lastrowid não retornou ID")
                         return -1
                     
-                    # RealDictCursor retorna dict, não tupla - acessa por chave
-                    example_id = result['id'] if isinstance(result, dict) else result[0]
                     self.logger.info(f"✅ [FINETUNING] Exemplo #{example_id} armazenado | Emotion={emotion_label} | Similarity={similarity:.3f}")
                     return example_id
                 except Exception as cur_err:
@@ -733,9 +730,9 @@ class FinetuningPipeline:
                 cur.execute(self.db._prepare_query("""
                     INSERT INTO training_cycles (cycle_number, cycle_type, status)
                     VALUES (%s, %s, 'started')
-                    RETURNING id;
                 """), (current_cycle, cycle_type))
                 
+                session_id = f"cycle_{current_cycle}_{int(time.time())}"
                 self.logger.info(f"🚀 [CYCLE {current_cycle}] Tipo={cycle_type} | Session={session_id}")
                 return session_id
         except Exception as e: