banko-ai-assistant 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

banko_ai/cli.py

@@ -60,6 +60,7 @@ def run(host, port, debug, generate_data, no_data, clear_data, background):
     # Generate data if not explicitly disabled
     if not no_data:
         click.echo("🔍 Checking database setup...")
+        click.echo(f"Using database: {config.database_url}")
         click.echo(f"Generating {generate_data} sample expense records...")
         generator = EnhancedExpenseGenerator(config.database_url)
         
@@ -207,6 +208,7 @@ def start(host, port, generate_data, no_data, clear_data):
     # Generate data if not explicitly disabled
     if not no_data:
         click.echo("🔍 Checking database setup...")
+        click.echo(f"Using database: {config.database_url}")
         click.echo(f"Generating {generate_data} sample expense records...")
         generator = EnhancedExpenseGenerator(config.database_url)
         

banko_ai/vector_search/generator.py

@@ -86,46 +86,56 @@ class EnhancedExpenseGenerator:
             "Internet Provider", "Phone Company", "Water Company"
         ]
         
-        # Use the exact categories from the original CSV
+        # Use the exact categories from the original CSV with appropriate merchants
         self._categories = {
             "Groceries": {
                 "items": ["Fresh produce", "Dairy products", "Meat and poultry", "Pantry staples", "Organic foods", "Beverages", "Snacks"],
+                "merchants": ["Whole Foods", "Local Market", "Costco", "Walmart", "Target"],
                 "amount_range": (10, 150)
             },
             "Home Improvement": {
                 "items": ["Tools", "Hardware", "Paint", "Lumber", "Electrical supplies", "Plumbing supplies", "Garden supplies"],
+                "merchants": ["Home Depot", "Lowe's", "Ace Hardware", "IKEA"],
                 "amount_range": (20, 500)
             },
             "Electronics": {
                 "items": ["Smartphone", "Laptop", "Tablet", "Headphones", "Camera", "Gaming console", "Smart home device"],
+                "merchants": ["Apple Store", "Best Buy", "Amazon", "Target", "Walmart"],
                 "amount_range": (50, 1000)
             },
             "Subscription": {
                 "items": ["Streaming service", "Software subscription", "Gym membership", "News subscription", "Cloud storage", "Music service"],
+                "merchants": ["Netflix", "Spotify", "Planet Fitness", "Electric Company", "Internet Provider"],
                 "amount_range": (10, 50)
             },
             "Shopping": {
                 "items": ["Clothing", "Shoes", "Accessories", "Home decor", "Books", "Toys", "Beauty products"],
+                "merchants": ["Amazon", "Target", "Walmart", "IKEA", "Best Buy"],
                 "amount_range": (15, 200)
             },
             "Restaurant": {
                 "items": ["Dinner", "Lunch", "Breakfast", "Takeout", "Delivery", "Catering", "Fine dining"],
+                "merchants": ["McDonald's", "Italian Bistro", "Chipotle", "Subway", "Pizza Hut", "Domino's"],
                 "amount_range": (15, 100)
             },
             "Transport": {
                 "items": ["Uber ride", "Lyft ride", "Taxi", "Bus fare", "Train ticket", "Flight", "Car rental"],
+                "merchants": ["Uber", "Lyft", "Delta Airlines"],
                 "amount_range": (5, 500)
             },
             "Fuel": {
                 "items": ["Gas fill-up", "Electric charging", "Diesel fuel", "Premium gas", "Regular gas"],
+                "merchants": ["Shell Gas Station", "Tesla Supercharger", "Exxon", "Chevron", "BP"],
                 "amount_range": (20, 100)
             },
             "Travel": {
                 "items": ["Flight", "Hotel", "Car rental", "Travel insurance", "Airport parking", "Baggage fee"],
+                "merchants": ["Delta Airlines", "Hilton Hotels"],
                 "amount_range": (100, 2000)
             },
             "Coffee": {
                 "items": ["Coffee", "Espresso", "Latte", "Cappuccino", "Pastry", "Sandwich", "Breakfast"],
+                "merchants": ["Starbucks", "Local Market", "Whole Foods", "Costco"],
                 "amount_range": (3, 25)
             }
         }
@@ -142,8 +152,8 @@ class EnhancedExpenseGenerator:
         category = random.choice(list(self.categories.keys()))
         category_data = self.categories[category]
         
-        # Select merchant from the full merchant list (matching original CSV)
-        merchant = random.choice(self.merchants)
+        # Select merchant from category-specific merchants
+        merchant = random.choice(category_data["merchants"])
         
         # Generate amount within category range
         amount = round(random.uniform(*category_data["amount_range"]), 2)
@@ -242,10 +252,12 @@ class EnhancedExpenseGenerator:
                         df = pd.DataFrame(batch)
                         df.to_sql('expenses', conn, if_exists='append', index=False, method='multi')
                         # Transaction is automatically committed when exiting the context
-                        total_inserted += len(batch)
-                        batch_num = i//batch_size + 1
-                        print(f"✅ Batch {batch_num}/{total_batches}: {len(batch)} records inserted (Total: {total_inserted})")
-                        break  # Success, exit retry loop
+                        
+                    # Only increment counter after successful transaction
+                    total_inserted += len(batch)
+                    batch_num = i//batch_size + 1
+                    print(f"✅ Batch {batch_num}/{total_batches}: {len(batch)} records inserted (Total: {total_inserted})")
+                    break  # Success, exit retry loop
                         
                 except OperationalError as e:
                     # Check if it's a CockroachDB serialization failure (SQL state 40001)
@@ -319,14 +331,31 @@ class EnhancedExpenseGenerator:
     def get_expense_count(self) -> int:
         """Get the current number of expenses in the database."""
         try:
+            # Ensure tables exist first
+            self._ensure_tables_exist()
+            
             from sqlalchemy import text
             with self.engine.connect() as conn:
                 result = conn.execute(text("SELECT COUNT(*) FROM expenses"))
                 return result.scalar()
         except Exception as e:
             print(f"Error getting expense count: {e}")
+            if "connection" in str(e).lower() or "refused" in str(e).lower():
+                print("💡 Make sure CockroachDB is running:")
+                print("   cockroach start --insecure")
+                print("   Or set DATABASE_URL to your database connection string")
             return 0
     
+    def _ensure_tables_exist(self):
+        """Ensure database tables exist."""
+        try:
+            from ..utils.database import DatabaseManager
+            db_manager = DatabaseManager(self.database_url)
+            db_manager.create_tables()
+        except Exception as e:
+            print(f"Error creating tables: {e}")
+            # Continue anyway - tables might already exist
+    
     def generate_and_save(
         self, 
         count: int, 

banko_ai/vector_search/search.py

@@ -70,9 +70,9 @@ class VectorSearchEngine:
                     merchant,
                     shopping_type,
                     expense_amount,
-                    embedding <=> :search_embedding as similarity_score
+                    embedding <-> :search_embedding as similarity_score
                 FROM expenses
-                ORDER BY embedding <=> :search_embedding
+                ORDER BY embedding <-> :search_embedding
                 LIMIT :limit
             """)
             
@@ -465,7 +465,7 @@ class VectorSearchEngine:
                     merchant,
                     expense_amount,
                     expense_date,
-                    1 - (embedding <=> %s) as similarity_score,
+                    1 - (embedding <-> %s) as similarity_score,
                     shopping_type,
                     payment_method,
                     recurring,

banko_ai/web/app.py

@@ -620,7 +620,7 @@ def create_app() -> Flask:
     def ai_status():
         """Endpoint to check the status of AI services and database."""
         # Check database status
-        db_connected, db_message, table_exists, record_count = db_manager.test_connection()
+        db_connected, db_message, table_exists, record_count = check_database_connection(config.database_url)
         
         status = {
             'current_service': config.ai_service,

{banko_ai_assistant-1.0.14.dist-info → banko_ai_assistant-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: banko-ai-assistant
-Version: 1.0.14
+Version: 1.0.16
 Summary: AI-powered expense analysis and RAG system with CockroachDB vector search and multi-provider AI support
 Author-email: Virag Tripathi <virag.tripathi@gmail.com>
 License-Expression: MIT

{banko_ai_assistant-1.0.14.dist-info → banko_ai_assistant-1.0.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
 banko_ai/__init__.py,sha256=G1InyKemqQxP9xx6yGZgolBmrmOLSpBXqGYY8LaFOeo,568
 banko_ai/__main__.py,sha256=U-KkrXtL8JNIyV25PE5v_eYhlhjR7jd6kG-txfYfs0M,709
-banko_ai/cli.py,sha256=mInMRG4JK-iQoauNvJ8ZVzkWHemTW9GwC2xhXY_SX1g,13762
+banko_ai/cli.py,sha256=7lMeDRIuJjeAkrVMzw2YmJp4t10KLGP7TRIywUSOkeU,13884
 banko_ai/ai_providers/__init__.py,sha256=JdBgw5Mji2pe9nU-aiRYUmJuZk0q8KbcMtbpMJC5Dq8,483
 banko_ai/ai_providers/aws_provider.py,sha256=-tR-8tlEeSL-Fspx05tTMFguvQylkW_pz0PI2XJEByM,13074
 banko_ai/ai_providers/base.py,sha256=zbuAgkHIfJ0YkG83LXzieJuvXBcB2-nx7NhbL-I4Pf0,4725
@@ -151,14 +151,14 @@ banko_ai/utils/database.py,sha256=sJYAFTApkWReEJuMbbBDiz7XfgiiEd6lPSSyF6BQDpk,77
 banko_ai/utils/migration.py,sha256=j1lYUVZyYMcMvxZUOFymoK19QTPqkDZFXD-iysVCnQo,4764
 banko_ai/vector_search/__init__.py,sha256=vYksnkUU4FA8XBNzYZIH4FoGjXCx9oIbrDeapSzrNuE,621
 banko_ai/vector_search/enrichment.py,sha256=tgAImLehkp2kL46vI5GEHsE8B5E4gT3PweXZLqqKei4,8097
-banko_ai/vector_search/generator.py,sha256=KAXp8wr7xXI9hzYRslyMhYaFHbticbWpT-a2RmJgmy4,16087
-banko_ai/vector_search/search.py,sha256=I-DgxTqib_VbRKX0Ttk9QmzGcAW2hLYm0_Y9HXSaibQ,18763
+banko_ai/vector_search/generator.py,sha256=6SV6_RZ4M4-TfJvxlXHZY1p-zcLKpIJm0p871nmEjmI,17837
+banko_ai/vector_search/search.py,sha256=RiDxqcRblAFSmxMvxy9nRRrw22OtVMHP5_rsvQsS_MU,18763
 banko_ai/web/__init__.py,sha256=hjWVVxYpIZhOAN1qBf4xTd36a5AUHM03Q8BF8pykhJQ,363
-banko_ai/web/app.py,sha256=Qdd9gIccFJ5NeEYFiwKS3evFNbba6t5LNs733isloWE,32127
+banko_ai/web/app.py,sha256=Temx39TX19idHrlrUwb_2QLr1GSZZVjqhyJC299NFMY,32145
 banko_ai/web/auth.py,sha256=js6qIixSFHyLbETDm8GNLCPrDkCDcaQZPFOrqtZP1uw,2125
-banko_ai_assistant-1.0.14.dist-info/licenses/LICENSE,sha256=skG0LkywIClj8fgSIXiG6o9vUDJ678BKBObIyJ19OMw,1075
-banko_ai_assistant-1.0.14.dist-info/METADATA,sha256=9R77jDJBrhg4ZdOmhIA_C7Ep7IV23KhKAAuvXfN7YD4,13505
-banko_ai_assistant-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-banko_ai_assistant-1.0.14.dist-info/entry_points.txt,sha256=IxPjBjMvbpCp-ikCA43bOSbYboTGPX4HYcZlvu2_vcA,47
-banko_ai_assistant-1.0.14.dist-info/top_level.txt,sha256=xNMa9Z67UssefOQ2ubFObtqUYIfYmCIclfz0xdo5OPE,9
-banko_ai_assistant-1.0.14.dist-info/RECORD,,
+banko_ai_assistant-1.0.16.dist-info/licenses/LICENSE,sha256=skG0LkywIClj8fgSIXiG6o9vUDJ678BKBObIyJ19OMw,1075
+banko_ai_assistant-1.0.16.dist-info/METADATA,sha256=BuVSoi6etHKRv2qq6rLW5FucRSzlUSuZip87XXi0y-g,13505
+banko_ai_assistant-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+banko_ai_assistant-1.0.16.dist-info/entry_points.txt,sha256=IxPjBjMvbpCp-ikCA43bOSbYboTGPX4HYcZlvu2_vcA,47
+banko_ai_assistant-1.0.16.dist-info/top_level.txt,sha256=xNMa9Z67UssefOQ2ubFObtqUYIfYmCIclfz0xdo5OPE,9
+banko_ai_assistant-1.0.16.dist-info/RECORD,,