first commit

.gitignore

@@ -0,0 +1,26 @@
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# SQLite
+*.db
+*.sqlite3
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

Dockerfile

@@ -0,0 +1,25 @@
+# Use the official Python base image
+FROM python:3.10-slim
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies (required for some Python packages like asyncpg)
+RUN apt-get update && apt-get install -y \
+    gcc \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements file
+COPY requirements.txt .
+
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application
+COPY . .
+
+# Expose the port FastAPI will run on (Hugging Face Spaces defaults to 7860)
+EXPOSE 7860
+
+# Command to run the application
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]

bot/__init__.py

@@ -0,0 +1 @@
+# Init for bot module

bot/handlers.py

@@ -0,0 +1,112 @@
+from aiogram import Router, types
+from aiogram.filters import Command
+from services.fx_service import fx_service, ALLOWED_CURRENCIES
+from db.session import get_session
+from db.models import User, Subscription, Threshold
+from sqlalchemy import select
+import logging
+
+logger = logging.getLogger(__name__)
+router = Router()
+
+@router.message(Command("start"))
+async def cmd_start(message: types.Message):
+    """Registers user and sends welcome message."""
+    chat_id = message.chat.id
+    # Create an async session explicitly since we're in a handler, not a FastAPI endpoint
+    from db.session import async_session
+    async with async_session() as session:
+        result = await session.execute(select(User).where(User.chat_id == chat_id))
+        user = result.scalar_one_or_none()
+        if not user:
+            new_user = User(chat_id=chat_id)
+            session.add(new_user)
+            await session.commit()
+            
+    currencies_str = ", ".join(ALLOWED_CURRENCIES)
+    await message.answer(
+        f"Welcome to FlyRates! 🌍💸\n\n"
+        f"I can track real-time exchange rates for you.\n"
+        f"Supported Currencies: {currencies_str}\n\n"
+        f"Commands:\n"
+        f"/current <base> <target> - Get live rate (e.g., /current USD EUR)\n"
+        f"/subscribe <base> <target> <daily/hourly> - Get automated updates\n"
+        f"/threshold <base> <target> << or >> <value> - Get alerts (e.g., /threshold USD EUR < 0.90)"
+    )
+
+@router.message(Command("current"))
+async def cmd_current(message: types.Message):
+    """Fetches the current exchange rate."""
+    args = message.text.split()[1:]
+    if len(args) != 2:
+        await message.answer("Usage: /current <base_currency> <target_currency>\nExample: /current USD EUR")
+        return
+
+    base, target = args[0].upper(), args[1].upper()
+    rate = await fx_service.get_rate(base, target)
+    
+    if rate:
+        await message.answer(f"📈 Current Rate:\n1 {base} = {rate} {target}")
+    else:
+        await message.answer("❌ Failed to fetch rate. Please check if the currencies are supported or try again later.")
+
+@router.message(Command("subscribe"))
+async def cmd_subscribe(message: types.Message):
+    """Subscribes the user to periodic updates."""
+    args = message.text.split()[1:]
+    if len(args) not in [2, 3]:
+        await message.answer("Usage: /subscribe <base> <target> [daily|hourly]\nExample: /subscribe USD EUR daily")
+        return
+
+    base, target = args[0].upper(), args[1].upper()
+    freq = args[2].lower() if len(args) == 3 else "daily"
+
+    if not fx_service.is_valid_currency(base) or not fx_service.is_valid_currency(target):
+        await message.answer("❌ Invalid currency pair.")
+        return
+        
+    if freq not in ["daily", "hourly"]:
+         await message.answer("❌ Frequency must be 'daily' or 'hourly'.")
+         return
+
+    from db.session import async_session
+    async with async_session() as session:
+        sub = Subscription(chat_id=message.chat.id, base_currency=base, target_currency=target, frequency=freq)
+        session.add(sub)
+        await session.commit()
+
+    await message.answer(f"✅ Subscribed to {freq} updates for {base} to {target}.")
+
+@router.message(Command("threshold"))
+async def cmd_threshold(message: types.Message):
+    """Sets a threshold alert."""
+    args = message.text.split()[1:]
+    if len(args) != 4:
+        await message.answer("Usage: /threshold <base> <target> <condition> <value>\nExample: /threshold USD EUR < 0.90")
+        return
+
+    base, target, condition, value_str = args[0].upper(), args[1].upper(), args[2], args[3]
+    
+    try:
+        value = float(value_str)
+    except ValueError:
+        await message.answer("❌ Value must be a number.")
+        return
+
+    if condition not in ['<', '>', '<=', '>=']:
+        await message.answer("❌ Condition must be one of: <, >, <=, >=")
+        return
+
+    from db.session import async_session
+    async with async_session() as session:
+        threshold = Threshold(
+            chat_id=message.chat.id, 
+            base_currency=base, 
+            target_currency=target, 
+            condition=condition, 
+            target_value=value
+        )
+        session.add(threshold)
+        await session.commit()
+
+    await message.answer(f"✅ Alert set! I will notify you when 1 {base} {condition} {value} {target}.")

bot/scheduler.py

@@ -0,0 +1,60 @@
+import logging
+from aiogram import Bot
+from db.session import async_session
+from db.models import Subscription, Threshold
+from sqlalchemy import select
+from services.fx_service import fx_service
+
+logger = logging.getLogger(__name__)
+
+async def process_subscriptions(bot: Bot, frequency: str):
+    """Processes scheduled subscriptions."""
+    logger.info(f"Processing {frequency} subscriptions...")
+    async with async_session() as session:
+        result = await session.execute(select(Subscription).where(Subscription.frequency == frequency))
+        subscriptions = result.scalars().all()
+
+        for sub in subscriptions:
+            rate = await fx_service.get_rate(sub.base_currency, sub.target_currency)
+            if rate:
+                try:
+                    await bot.send_message(
+                        chat_id=sub.chat_id,
+                        text=f"🔔 Scheduled Update ({frequency}):\n1 {sub.base_currency} = {rate} {sub.target_currency}"
+                    )
+                except Exception as e:
+                    logger.error(f"Failed to send sub update to {sub.chat_id}: {e}")
+
+async def process_thresholds(bot: Bot):
+    """Processes active thresholds."""
+    logger.info("Processing thresholds...")
+    async with async_session() as session:
+        result = await session.execute(select(Threshold).where(Threshold.is_active == True))
+        thresholds = result.scalars().all()
+
+        for thresh in thresholds:
+            rate = await fx_service.get_rate(thresh.base_currency, thresh.target_currency)
+            if rate is None:
+                continue
+
+            triggered = False
+            if thresh.condition == '<' and rate < thresh.target_value:
+                triggered = True
+            elif thresh.condition == '>' and rate > thresh.target_value:
+                triggered = True
+            elif thresh.condition == '<=' and rate <= thresh.target_value:
+                triggered = True
+            elif thresh.condition == '>=' and rate >= thresh.target_value:
+                triggered = True
+
+            if triggered:
+                try:
+                    await bot.send_message(
+                        chat_id=thresh.chat_id,
+                        text=f"🚨 ALERT Triggered!\n\n1 {thresh.base_currency} is now {rate} {thresh.target_currency}\n(Condition: {thresh.condition} {thresh.target_value})"
+                    )
+                    # Deactivate the threshold after triggering to prevent spam
+                    thresh.is_active = False
+                    await session.commit()
+                except Exception as e:
+                    logger.error(f"Failed to send alert to {thresh.chat_id}: {e}")

core/__init__.py

@@ -0,0 +1 @@
+# Init for core module

core/config.py

@@ -0,0 +1,13 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from typing import Optional
+
+class Settings(BaseSettings):
+    bot_token: str = ""
+    webhook_url: Optional[str] = None
+    fx_api_key: str = ""
+    database_url: str = "sqlite+aiosqlite:///./flyrates.db"
+    log_level: str = "INFO"
+
+    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8", extra="ignore")
+
+settings = Settings()

db/__init__.py

@@ -0,0 +1 @@
+# Init for db module

db/models.py

@@ -0,0 +1,41 @@
+from sqlalchemy import Column, Integer, String, Float, DateTime, Boolean, ForeignKey
+from sqlalchemy.orm import declarative_base, relationship
+from datetime import datetime, timezone
+
+Base = declarative_base()
+
+class User(Base):
+    __tablename__ = "users"
+
+    chat_id = Column(Integer, primary_key=True, index=True)
+    created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
+
+    subscriptions = relationship("Subscription", back_populates="user", cascade="all, delete-orphan")
+    thresholds = relationship("Threshold", back_populates="user", cascade="all, delete-orphan")
+
+class Subscription(Base):
+    __tablename__ = "subscriptions"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    chat_id = Column(Integer, ForeignKey("users.chat_id"))
+    base_currency = Column(String(3), nullable=False)
+    target_currency = Column(String(3), nullable=False)
+    # Frequency could be 'daily', 'hourly'
+    frequency = Column(String(20), default="daily")
+    created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
+
+    user = relationship("User", back_populates="subscriptions")
+
+class Threshold(Base):
+    __tablename__ = "thresholds"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    chat_id = Column(Integer, ForeignKey("users.chat_id"))
+    base_currency = Column(String(3), nullable=False)
+    target_currency = Column(String(3), nullable=False)
+    condition = Column(String(5), nullable=False) # e.g., '<', '>', '<=', '>='
+    target_value = Column(Float, nullable=False)
+    is_active = Column(Boolean, default=True)
+    created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
+
+    user = relationship("User", back_populates="thresholds")

db/session.py

@@ -0,0 +1,36 @@
+import logging
+from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
+from core.config import settings
+from db.models import Base
+
+logger = logging.getLogger(__name__)
+
+# Initialize the async engine
+engine = create_async_engine(
+    settings.database_url,
+    echo=(settings.log_level == "DEBUG"),
+    future=True,
+)
+
+# Create an async session factory
+async_session = async_sessionmaker(
+    bind=engine,
+    class_=AsyncSession,
+    expire_on_commit=False,
+    autoflush=False
+)
+
+async def init_db():
+    """Initializes the database and creates all tables."""
+    try:
+        async with engine.begin() as conn:
+            await conn.run_sync(Base.metadata.create_all)
+        logger.info("Database initialized successfully.")
+    except Exception as e:
+        logger.error(f"Error initializing database: {e}")
+        raise
+
+async def get_session() -> AsyncSession:
+    """Dependency to get a database session."""
+    async with async_session() as session:
+        yield session

main.py

@@ -0,0 +1,64 @@
+import logging
+from contextlib import asynccontextmanager
+from fastapi import FastAPI, Request, Response
+from aiogram import Bot, Dispatcher, types
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+
+from core.config import settings
+from db.session import init_db
+from bot.handlers import router as bot_router
+from bot.scheduler import process_subscriptions, process_thresholds
+
+# Configure Logging
+logging.basicConfig(level=getattr(logging, settings.log_level))
+logger = logging.getLogger(__name__)
+
+# Initialize Aiogram
+bot = Bot(token=settings.bot_token)
+dp = Dispatcher()
+dp.include_router(bot_router)
+
+# Initialize Scheduler
+scheduler = AsyncIOScheduler()
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # 1. Initialize Database
+    await init_db()
+
+    # 2. Setup Webhook (if URL is provided)
+    if settings.webhook_url:
+        webhook_info = await bot.get_webhook_info()
+        if webhook_info.url != f"{settings.webhook_url}/webhook":
+            await bot.set_webhook(url=f"{settings.webhook_url}/webhook")
+            logger.info(f"Webhook set to {settings.webhook_url}/webhook")
+    else:
+        logger.warning("WEBHOOK_URL not set. Running in webhook mode requires a public URL.")
+
+    # 3. Setup Scheduled Jobs
+    scheduler.add_job(process_thresholds, 'interval', minutes=10, args=[bot])
+    scheduler.add_job(process_subscriptions, 'cron', hour=8, args=[bot, 'daily'])
+    scheduler.add_job(process_subscriptions, 'interval', hours=1, args=[bot, 'hourly'])
+    scheduler.start()
+
+    yield
+
+    # Shutdown logic
+    scheduler.shutdown()
+    if settings.webhook_url:
+        await bot.delete_webhook()
+    await bot.session.close()
+
+app = FastAPI(lifespan=lifespan)
+
+@app.post("/webhook")
+async def telegram_webhook(request: Request):
+    """Endpoint for Telegram to send updates to."""
+    update = types.Update.model_validate(await request.json(), context={"bot": bot})
+    await dp.feed_update(bot, update)
+    return Response(status_code=200)
+
+@app.get("/health")
+async def health_check():
+    """Health check endpoint required by Hugging Face Spaces."""
+    return {"status": "ok"}

requirements.txt

@@ -0,0 +1,10 @@
+fastapi==0.111.0
+uvicorn==0.29.0
+aiogram==3.5.0
+SQLAlchemy==2.0.30
+aiosqlite==0.20.0
+asyncpg==0.29.0
+aiohttp==3.9.5
+pydantic==2.7.1
+pydantic-settings==2.2.1
+APScheduler==3.10.4

services/__init__.py

@@ -0,0 +1 @@
+# Init for services module

services/fx_service.py

@@ -0,0 +1,51 @@
+import aiohttp
+import logging
+from typing import Optional
+from core.config import settings
+
+logger = logging.getLogger(__name__)
+
+ALLOWED_CURRENCIES = {
+    "USD", "GBP", "EUR", "AED", "SAR", 
+    "AUD", "INR", "JPY", "CNY", "QAR"
+}
+
+class FXService:
+    def __init__(self):
+        self.api_key = settings.fx_api_key
+        # Using ExchangeRate-API as an example.
+        self.base_url = f"https://v6.exchangerate-api.com/v6/{self.api_key}"
+
+    def is_valid_currency(self, currency: str) -> bool:
+        """Validates if the currency is supported in Phase 1."""
+        return currency.upper() in ALLOWED_CURRENCIES
+
+    async def get_rate(self, base_currency: str, target_currency: str) -> Optional[float]:
+        """Fetches the real-time exchange rate."""
+        base_currency = base_currency.upper()
+        target_currency = target_currency.upper()
+
+        if not self.is_valid_currency(base_currency) or not self.is_valid_currency(target_currency):
+            logger.warning(f"Invalid currency pair requested: {base_currency}/{target_currency}")
+            return None
+            
+        if not self.api_key:
+            logger.error("FX_API_KEY is not set.")
+            return None
+
+        url = f"{self.base_url}/pair/{base_currency}/{target_currency}"
+
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url) as response:
+                    if response.status == 200:
+                        data = await response.json()
+                        return data.get("conversion_rate")
+                    else:
+                        logger.error(f"Failed to fetch rate. Status: {response.status}")
+                        return None
+        except Exception as e:
+            logger.error(f"Exception during API call: {e}")
+            return None
+
+fx_service = FXService()