Merge main and resolve pycache conflicts

Author: dhabyap

__pycache__/ai_brain.cpython-310.pyc

@@ -13,21 +13,26 @@
 def get_system_instruction():
     categories_str = " | ".join([f'"{cat}"' for cat in config.TRANSACTION_CATEGORIES])
     instruction = f"""
-Kamu adalah asisten AI spesialis pencatatan keuangan pribadi. Tugasmu adalah mengekstrak data dari pesan pengguna ke format JSON murni.
+Kamu adalah asisten AI spesialis pencatatan keuangan pribadi. Tugasmu adalah mengekstrak data dari pesan pengguna ke format JSON MURNI dalam bentuk LIST (ARRAY).
 
 SKEMA JSON:
-{{
-  "tipe": "pemasukan" | "pengeluaran" | "investasi",
-  "item": "deskripsi singkat transaksi",
-  "nominal": angka integer,
-  "kategori": {categories_str}
-}}
+[
+  {{
+    "tipe": "pemasukan" | "pengeluaran" | "investasi" | "saldo",
+    "item": "deskripsi singkat transaksi",
+    "nominal": angka integer,
+    "kategori": {categories_str}
+  }},
+  ...
+]
 
 ATURAN KETAT:
-1. Konversi singkatan angka: "k" / "rb" = 1000, "jt" / "juta" = 1000000.
-2. Jika nominal dalam teks (misal: "setengah juta", "seratus ribu"), ubah ke angka integer (misal: 500000, 100000).
-3. Fokus pada uang masuk, keluar, atau investasi.
-4. Jawaban HANYA berupa JSON murni tanpa teks pengantar. Jika error, kembalikan {{"error": true}}.
+1. Gunakan format LIST [ ... ] meskipun hanya ada satu transaksi.
+2. Gunakan tipe "saldo" jika pengguna menyebutkan total uang/saldo saat ini (misal: "saldo saya 1 juta").
+3. Konversi singkatan angka: "k" / "rb" = 1000, "jt" / "juta" = 1000000.
+4. Jika nominal dalam teks (misal: "setengah juta", "seratus ribu"), ubah ke angka integer (misal: 500000, 100000).
+5. Fokus pada uang masuk, keluar, atau investasi/saldo.
+6. Jawaban HANYA berupa JSON murni tanpa teks pengantar. Jika tidak ada transaksi sama sekali, kembalikan [ {{ "error": true }} ].
 """
     return instruction
 
@@ -123,11 +128,17 @@ def extract_json_from_text(text: str) -> str:
             return text.split("```")[1].split("```")[0].strip()
         except: pass
 
-    # 3. Cari dari kurung kurawal pertama sampai terakhir (paling robust)
-    start_index = text.find('{')
-    end_index = text.rfind('}')
-    if start_index != -1 and end_index != -1 and end_index > start_index:
-        return text[start_index:end_index+1].strip()
+    # 3. Cari dari kurung siku pertama sampai terakhir (untuk list)
+    start_array = text.find('[')
+    end_array = text.rfind(']')
+    if start_array != -1 and end_array != -1 and end_array > start_array:
+        return text[start_array:end_array+1].strip()
+
+    # 4. Cari dari kurung kurawal pertama sampai terakhir (fallback jika AI mengembalikan single object)
+    start_obj = text.find('{')
+    end_obj = text.rfind('}')
+    if start_obj != -1 and end_obj != -1 and end_obj > start_obj:
+        return text[start_obj:end_obj+1].strip()
 
     return text
 
@@ -167,12 +178,26 @@ def get_json_data_from_text(text: str) -> dict:
 
             data = json.loads(json_text)
 
-            # Validasi minimal struktur data
-            if not any(k in data for k in ["tipe", "nominal", "item"]):
-                raise ValueError("JSON berhasil diparsing tapi struktur tidak sesuai")
+            # Normalisasi ke format LIST jika AI mengembalikan single object
+            if isinstance(data, dict):
+                data = [data]
+                
+            if not isinstance(data, list):
+                raise ValueError("Format respons AI bukan merupakan list JSON")
+
+            # Validasi minimal struktur data untuk setiap item
+            valid_items = []
+            for item in data:
+                if item.get("error"):
+                    continue
+                if any(k in item for k in ["tipe", "nominal", "item"]):
+                    valid_items.append(item)
+            
+            if not valid_items and any(item.get("error") for item in data):
+                 return {"error": True}
 
-            print(f"[ai_brain] Memanfaatkan tenaga {provider.capitalize()} berhasil!")
-            return data
+            print(f"[ai_brain] Memanfaatkan tenaga {provider.capitalize()} berhasil! ({len(valid_items)} transaksi)")
+            return valid_items
 
         except Exception as e:
             # Jika KeyError / Network Error / Rate Limit / Parsing Error dll

__pycache__/database.cpython-310.pyc

@@ -1,7 +1,7 @@
 import io
 import json
 from flask import Flask, render_template, request, redirect, url_for, flash, send_file, Response
-from utils.excel_generator import generate_excel_report
+from utils.excel_builder import build_excel
 import database
 from datetime import datetime
 
@@ -160,7 +160,7 @@ def export_excel():
         flash("Gagal mengambil data transaksi untuk export.", "error")
         return redirect(url_for('index'))
 
-    wb = generate_excel_report(transactions, user_label, month_label, include_user_info=True)
+    wb = build_excel(transactions, user_label, month_label, include_user_info=True)
 
     # Simpan ke buffer memori
     buf = io.BytesIO()

ai_brain.py

@@ -1,5 +1,6 @@
 import os
 import mysql.connector
+from mysql.connector import pooling
 from datetime import datetime
 from dotenv import load_dotenv
 
@@ -9,6 +10,27 @@
 DB_USER = os.getenv("DB_USER", "root")
 DB_PASSWORD = os.getenv("DB_PASSWORD", "")
 DB_NAME = os.getenv("DB_NAME", "finance_bot")
+DB_POOL_SIZE = int(os.getenv("DB_POOL_SIZE", "5"))
+
+# Konfigurasi Koneksi
+db_config = {
+    "host": DB_HOST,
+    "user": DB_USER,
+    "password": DB_PASSWORD,
+    "database": DB_NAME
+}
+
+# Inisialisasi Connection Pool
+try:
+    db_pool = pooling.MySQLConnectionPool(
+        pool_name="finance_bot_pool",
+        pool_size=DB_POOL_SIZE,
+        **db_config
+    )
+    print(f"Connection pool created with size: {DB_POOL_SIZE}")
+except mysql.connector.Error as err:
+    print(f"Error creating connection pool: {err}")
+    db_pool = None
 
 def get_base_connection():
     return mysql.connector.connect(
@@ -18,12 +40,9 @@ def get_base_connection():
     )
 
 def get_connection():
-    return mysql.connector.connect(
-        host=DB_HOST,
-        user=DB_USER,
-        password=DB_PASSWORD,
-        database=DB_NAME
-    )
+    if db_pool:
+        return db_pool.get_connection()
+    return mysql.connector.connect(**db_config)
 
 def init_db():
     # Buat database jika belum ada
@@ -669,3 +688,25 @@ def get_all_transactions_export(month_str=None, user_id=None):
     finally:
         cursor.close()
         conn.close()
+
+def get_user_balance(user_id):
+    """
+    Menghitung total saldo saat ini dari user (Pemasukan - Pengeluaran - Investasi).
+    """
+    conn = get_connection()
+    try:
+        cursor = conn.cursor(dictionary=True)
+        # Hitung saldo: sum income - sum expense - sum investment
+        cursor.execute('''
+            SELECT 
+                SUM(CASE WHEN tipe = 'pemasukan' THEN nominal ELSE 0 END) - 
+                SUM(CASE WHEN tipe = 'pengeluaran' THEN nominal ELSE 0 END) - 
+                SUM(CASE WHEN tipe = 'investasi' THEN nominal ELSE 0 END) as balance
+            FROM transactions 
+            WHERE user_id = %s
+        ''', (user_id,))
+        res = cursor.fetchone()
+        return res['balance'] if res['balance'] is not None else 0
+    finally:
+        cursor.close()
+        conn.close()

dashboard.py

@@ -13,7 +13,7 @@
 
 from openpyxl.utils import get_column_letter
 
-from utils.excel_generator import generate_excel_report
+from utils.excel_builder import build_excel
 import database
 from config import MONTH_NAMES
 
@@ -100,7 +100,7 @@ def export_excel(message):
 
         # ── Buat file Excel ────────────────────────────────────────────
         try:
-            wb = generate_excel_report(transactions, first_name, period_label, include_user_info=False)
+            wb = build_excel(transactions, first_name, period_label, include_user_info=False)
             buf = io.BytesIO()
             wb.save(buf)
             buf.seek(0)

database.py

@@ -1,5 +1,10 @@
 import database
 from ai_brain import get_json_data_from_text
+import time
+
+# Dictionary untuk menyimpan timestamp pemrosesan AI terakhir per user (Rate Limiting)
+last_ai_calls = {}
+RATE_LIMIT_COOLDOWN = 10  # detik
 
 def register_handlers(bot):
     # Gunakan lambda yang menangkap semua teks, tapi pastikan bukan command
@@ -20,44 +25,85 @@ def handle_text(message):
         # Show typing status while processing
         bot.send_chat_action(message.chat.id, 'typing')
 
+        # --- RATE LIMITING CHECK ---
+        now = time.time()
+        if user_id in last_ai_calls:
+            elapsed = now - last_ai_calls[user_id]
+            if elapsed < RATE_LIMIT_COOLDOWN:
+                remaining = int(RATE_LIMIT_COOLDOWN - elapsed)
+                bot.reply_to(message, f"⚠️ *Terlalu cepat!* Mohon tunggu {remaining} detik lagi sebelum mencatat transaksi baru... 🙏", parse_mode='Markdown')
+                return
+        
+        # Update timestamp pemrosesan terakhir
+        last_ai_calls[user_id] = now
+        
         # Process text with AI
-        data = get_json_data_from_text(text)
+        results = get_json_data_from_text(text)
 
-        if data.get("error"):
+        # Jika hasil bukan list (misal {"error": true}), handle error
+        if isinstance(results, dict) and results.get("error"):
             bot.reply_to(message, "❌ Maaf, saya tidak menangkap adanya transaksi keuangan. Pastikan formatnya jelas (contoh: 'beli makan 20rb' atau 'gajian 4 juta').")
             return
 
-        tipe = data.get("tipe", "").lower()
-        item = data.get("item", "")
-        nominal = float(data.get("nominal", 0))
-        kategori = data.get("kategori", "")
+        success_count = 0
+        summary_lines = []
 
-        # Save to database based on type
         try:
-            # Sekarang hanya fokus pada pemasukan, pengeluaran, dan investasi
-            if tipe in ["pemasukan", "pengeluaran", "investasi"]:
-                last_id = database.insert_transaction(user_id, tipe, item, nominal, kategori)
+            for data in results:
+                tipe = data.get("tipe", "").lower()
+                item = data.get("item", "")
+                nominal = float(data.get("nominal", 0))
+                kategori = data.get("kategori", "")
 
-                if tipe == "pemasukan":
-                    icon = "🟢"
-                elif tipe == "investasi":
-                    icon = "🔵"
-                else:
-                    icon = "🔴"
-                    
-                reply = (
-                    f"{icon} *Berhasil dicatat!*\n\n"
-                    f"🔹 *Tipe:* {tipe.capitalize()}\n"
-                    f"🔹 *Item:* {item}\n"
-                    f"🔹 *Nominal:* Rp {nominal:,.0f}\n"
-                    f"🔹 *Kategori:* {kategori.replace('_', ' ').capitalize()}\n\n"
-                    f"🆔 *ID:* `T-{last_id}`"
-                )
+                # Save to database based on type
+                try:
+                    if tipe == "saldo":
+                        # Reconcile balance
+                        current_balance = database.get_user_balance(user_id)
+                        diff = nominal - current_balance
+                        
+                        if diff == 0:
+                            summary_lines.append(f"💰 *Saldo:* Sudah sesuai di angka Rp {nominal:,.0f}")
+                            success_count += 1
+                            continue
+
+                        # Determine if reconciliation is income or expense
+                        rec_tipe = "pemasukan" if diff > 0 else "pengeluaran"
+                        rec_nominal = abs(diff)
+                        rec_item = "Penyesuaian Saldo"
+                        
+                        last_id = database.insert_transaction(user_id, rec_tipe, rec_item, rec_nominal, "lainnya")
+                        
+                        icon = "💰"
+                        summary_lines.append(
+                            f"{icon} *Saldo disesuaikan:* Rp {current_balance:,.0f} ➔ Rp {nominal:,.0f} (`T-{last_id}`)"
+                        )
+                        success_count += 1
+
+                    elif tipe in ["pemasukan", "pengeluaran", "investasi"]:
+                        last_id = database.insert_transaction(user_id, tipe, item, nominal, kategori)
+                        
+                        if tipe == "pemasukan":
+                            icon = "🟢"
+                        elif tipe == "investasi":
+                            icon = "🔵"
+                        else:
+                            icon = "🔴"
+                        
+                        summary_lines.append(
+                            f"{icon} *{tipe.capitalize()}:* {item} — Rp {nominal:,.0f} (`T-{last_id}`)"
+                        )
+                        success_count += 1
+                except Exception as e:
+                    print(f"Error inserting transaction: {e}")
+
+            if success_count > 0:
+                reply = "✅ *Berhasil mencatat " + (f"{success_count} transaksi" if success_count > 1 else "transaksi") + ":*\n\n"
+                reply += "\n".join(summary_lines)
                 bot.reply_to(message, reply, parse_mode='Markdown')
-                
             else:
-                bot.reply_to(message, "❌ Tipe data tidak dikenali dari hasil AI. Pastikan AI mengembalikan format yang benar.")
-                
+                bot.reply_to(message, "❌ Gagal mencatat transaksi. Pastikan format pesan sudah benar.")
+
         except Exception as e:
             print(f"Error in handle_text: {e}")
             bot.reply_to(message, "❌ Terjadi kesalahan sistem saat memproses permintaan Anda. Silakan coba lagi nanti.")

handlers/export.py

@@ -0,0 +1,32 @@
+## 🔴 Prioritas: High | Kategori: Bug
+
+**File:** `database.py`, baris 85-86
+
+## Masalah
+Blok migration menggunakan `except: pass` tanpa logging sama sekali. Ini menyembunyikan error nyata selain "kolom sudah ada".
+
+## Kode Bermasalah
+```python
+try:
+    cursor.execute("ALTER TABLE users ADD COLUMN has_accepted_disclaimer TINYINT(1) DEFAULT 0")
+    conn.commit()
+except:
+    pass  # Kolom sudah ada
+```
+
+## Solusi
+Tangkap exception spesifik MySQL error 1060 (Duplicate column):
+
+```python
+import mysql.connector
+
+try:
+    cursor.execute("ALTER TABLE users ADD COLUMN has_accepted_disclaimer TINYINT(1) DEFAULT 0")
+    conn.commit()
+except mysql.connector.errors.DatabaseError as e:
+    if e.errno == 1060:  # Duplicate column name — normal, abaikan
+        pass
+    else:
+        print(f"[database] Migration error: {e}")
+        raise  # Re-raise error yang tidak dikenal
+```

handlers/nlp_message.py

@@ -3,9 +3,9 @@
 from openpyxl.utils import get_column_letter
 from datetime import datetime
 
-def generate_excel_report(transactions, user_label, period_label, include_user_info=False):
+def build_excel(transactions, user_label, period_label, include_user_info=False):
     """
-    Unified Excel generator for transaction reports.
+    Unified Excel builder for transaction reports.
     
     Args:
         transactions (list): List of transaction dictionaries.