feat: add Make (Integromat) integration

Author: Derssen

README.md

@@ -1,17 +1,20 @@
 # Telegram Balance Monitoring Bot
 
-A robust asynchronous Telegram bot designed to monitor financial balances across various API services (Zadarma, DIDWW) and manual subscription services (Wazzup, Streamtele, Callii). 
+A robust asynchronous Telegram bot designed to monitor financial balances across various API services (**Zadarma**, **DIDWW**, **Make**) and manual subscription services (**Wazzup**, **Streamtele**, **Callii**).
 
-The bot runs background scheduled tasks to check for low balances and notifies a specific administrative chat.
+The bot runs background scheduled tasks to check for low balances, calculates credit "runway" (burn rate), and notifies a specific administrative chat.
 
 ## Features
 
-* **API Integration**: Real-time balance checking for Zadarma and DIDWW.
+* **API Integration**:
+    * **Zadarma & DIDWW**: Real-time balance checking.
+    * **Make (Integromat)**: Monitoring of "Operations" credits, automatic subscription date synchronization, and advanced "Burn Rate" calculation (predicts if credits will run out before the monthly reset).
 * **Manual Tracking**: State management for services without APIs (Wazzup, Callii) via FSM (Finite State Machine).
 * **Recurring Payments**: Automatic tracking of monthly subscriptions and daily usage costs.
-* **Alerts**: 
+* **Smart Alerts**:
     * Low balance notifications.
-    * Monthly payment reminders.
+    * Monthly payment reminders (1 day in advance).
+    * "Friday Look-ahead": Checks if funds will last through the weekend.
     * Daily top-up reminders for high-consumption services.
 * **Security**: Restricted access to a specific target chat ID.
 
@@ -26,7 +29,7 @@ The bot runs background scheduled tasks to check for low balances and notifies a
 
 1.  **Clone the repository:**
     ```bash
-    git clone <repository-url>
+    git clone [https://github.com/derssen/telegram-balance-bot.git](https://github.com/derssen/telegram-balance-bot.git)
     cd telegram-balance-bot
     ```
 
@@ -42,7 +45,29 @@ The bot runs background scheduled tasks to check for low balances and notifies a
     ```
 
 4.  **Configuration:**
-    Create a `.env` file in the root directory (see `.env.example`).
+    Create a `.env` file in the root directory:
+    ```env
+    # Telegram
+    BOT_TOKEN=your_bot_token
+    TARGET_CHAT_ID=your_admin_chat_id
+
+    # Database
+    DATABASE_URL=sqlite+aiosqlite:///bot_db.sqlite3
+
+    # API Credentials (leave empty to disable service)
+    ZADARMA_KEY=
+    ZADARMA_SECRET=
+    DIDWW_KEY=
+
+    # Make (Integromat)
+    MAKE_API_KEY=your_token
+    MAKE_ORG_ID=your_org_id
+    MAKE_ZONE=eu1  # 'eu1' (default) or 'us1'
+
+    # Manual Services Costs
+    WAZZUP_DAILY_COST=400.0
+    CALLII_DAILY_COST=2.2
+    ```
 
 5.  **Run the bot:**
     ```bash
@@ -55,5 +80,9 @@ The bot runs background scheduled tasks to check for low balances and notifies a
 * `config.py`: Configuration and environment variable management.
 * `db/`: Database models and initialization.
 * `handlers/`: Telegram message and callback handlers.
-* `services/`: External API clients.
-* `scheduler/`: Background job logic.
+* `services/`: External API clients (Zadarma, DIDWW, Make).
+* `scheduler/`: Background job logic (API checks, daily deductions, planned alerts).
+
+## License
+
+This project is open-source and available under the MIT License.

config.py

@@ -12,17 +12,18 @@ class Config:
     TARGET_CHAT_ID: int = int(os.getenv("TARGET_CHAT_ID", -1))
 
     # Database
-    DATABASE_URL: str = os.getenv("DATABASE_URL", "sqlite+aiosqlite:///balances.sqlite3")
+    DATABASE_URL: str = os.getenv("DATABASE_URL", "sqlite+aiosqlite:///bot_db.sqlite3")
 
     # API Credentials
     ZADARMA_KEY: str = os.getenv("ZADARMA_KEY")
     ZADARMA_SECRET: str = os.getenv("ZADARMA_SECRET")
     WAZZUP_TOKEN: str = os.getenv("WAZZUP_TOKEN")
     DIDWW_KEY: str = os.getenv("DIDWW_KEY")
 
-    # NEW: Make Credentials
+    # Make Credentials & Config
     MAKE_API_KEY: str = os.getenv("MAKE_API_KEY")
     MAKE_ORG_ID: str = os.getenv("MAKE_ORG_ID")
+    MAKE_ZONE: str = os.getenv("MAKE_ZONE", "eu1") # eu1 or us1
 
     # Financial Constants
     LOW_BALANCE_THRESHOLD: float = 10.0
@@ -46,21 +47,21 @@ class Config:
         'DIDWW': 'USD',
         'Streamtele': 'UAH',
         'Callii': 'USD',
-        'Make': 'Ops',  # Operations
+        'Make': 'Ops',
     }
 
     CURRENCY_SIGNS: dict = {
         'USD': '$',
         'UAH': '₴',
         'RUB': '₽',
-        'Ops': '⚡', # Icon for operations
+        'Ops': '⚡',
     }
 
-    # API Service Toggle
+    # API Service Toggle (Auto-detect based on keys)
     API_SERVICE_STATUSES: dict = {
-        'Zadarma': os.getenv("ZADARMA_ENABLED", "True").lower() in ('true', '1', 't'),
-        'DIDWW': os.getenv("DIDWW_ENABLED", "True").lower() in ('true', '1', 't'),
-        'Make': os.getenv("MAKE_ENABLED", "True").lower() in ('true', '1', 't'),
+        'Zadarma': bool(os.getenv("ZADARMA_KEY") and os.getenv("ZADARMA_SECRET")),
+        'DIDWW': bool(os.getenv("DIDWW_KEY")),
+        'Make': bool(os.getenv("MAKE_API_KEY") and os.getenv("MAKE_ORG_ID")),
     }
 
 SETTINGS = Config()

requirements.txt

@@ -3,4 +3,6 @@ sqlalchemy>=2.0.0
 aiohttp
 python-dotenv
 aiosqlite
-pytz
+pytz
+greenlet
+python-dateutil

services/api_clients.py

@@ -5,7 +5,6 @@
 import logging
 from abc import ABC, abstractmethod
 from typing import Optional, Dict, Any
-from datetime import datetime
 from config import SETTINGS
 
 logger = logging.getLogger(__name__)
@@ -63,7 +62,6 @@ async def get_balance(self) -> Optional[float]:
                 async with session.get(f"{self.api_url}balance") as response:
                     if response.status != 200: return None
                     data = await response.json()
-                    # Safe extraction logic
                     attrs = {}
                     if 'data' in data:
                         d = data['data']
@@ -75,15 +73,14 @@ async def get_balance(self) -> Optional[float]:
 
 class MakeClient(BaseClient):
     """
-    Client for Make (formerly Integromat) API.
-    Fetches operation usage and subscription renewal dates.
+    Client for Make (Integromat) API.
     """
     def __init__(self):
         self.token = SETTINGS.MAKE_API_KEY
         self.org_id = SETTINGS.MAKE_ORG_ID
-        # Using EU1 by default, but this should ideally match the user's region
-        self.api_url = f"https://eu1.make.com/api/v2/organizations/{self.org_id}"
-        self.cached_details = {} # To store details for the advanced check
+        self.zone = SETTINGS.MAKE_ZONE # eu1 or us1
+        self.api_url = f"https://{self.zone}.make.com/api/v2/organizations/{self.org_id}"
+        self.cached_details = {}
 
     async def get_details(self) -> Optional[Dict[str, Any]]:
         """Fetches full license details including usage and reset dates."""
@@ -96,13 +93,22 @@ async def get_details(self) -> Optional[Dict[str, Any]]:
                         return None
 
                     data = await response.json()
-                    license_data = data.get('license', {})
-                    limits = license_data.get('limits', {}).get('operations', {})
 
+                    # Log removed to reduce noise after fix, but structure is:
+                    # { 'organization': { 'operations': '14851', 'nextReset': '...', 'license': { 'operations': 20000 } } }
+                    
+                    org = data.get('organization', {})
+                    license_info = org.get('license', {})
+
+                    # Parsing logic based on provided logs
+                    usage = float(org.get('operations', 0)) # Value is string in JSON
+                    limit = float(license_info.get('operations', 0)) # Value is int/float
+                    reset_at = org.get('nextReset')
+
                     return {
-                        'usage': limits.get('usage', 0),
-                        'limit': limits.get('limit', 0),
-                        'reset_at': license_data.get('resetAt') # ISO String
+                        'usage': usage,
+                        'limit': limit,
+                        'reset_at': reset_at 
                     }
         except Exception as e:
             logger.error(f"Make API Connection Error: {e}")
@@ -112,13 +118,16 @@ async def get_balance(self) -> Optional[float]:
         """Returns REMAINING operations."""
         details = await self.get_details()
         if details:
-            # Cache details for the scheduler to use immediately after
             self.cached_details = details
-            remaining = details['limit'] - details['usage']
+            
+            limit = details.get('limit', 0)
+            usage = details.get('usage', 0)
+            remaining = limit - usage
+            
+            logger.info(f"Make Calc: Limit {limit} - Usage {usage} = {remaining}")
             return float(remaining)
         return None
 
-# Service Registry
 API_CLIENTS = {
     'Zadarma': ZadarmaClient(),
     'DIDWW': DIDWWClient(),