ver3

.gitattributes

@@ -1,35 +0,0 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text

.python-version

@@ -0,0 +1 @@
+3.11

README.md

@@ -1,12 +1,3 @@
----
-title: Smart Reader Backend
-emoji: 🐨
-colorFrom: pink
-colorTo: indigo
-sdk: docker
-pinned: false
----
-
 # Smart Reader Backend
 
 This is the FastAPI backend for the Smart Reader application, designed to be deployed on HuggingFace Spaces.
@@ -30,7 +21,7 @@ DATABASE_URL=sqlite:///./smart_reader.db
    ```
 2. Run the application:
    ```bash
-   uvicorn app.main:app --reload --port 8080
+   uvicorn main:app --reload --port 8080
    ```
 
 ## Docker

app/db/database.py

@@ -1,44 +1,12 @@
-import os
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-db_url = os.environ.get("DATABASE_URL", "").strip().strip("\"'")
-
-if db_url.startswith("postgres://"):
-    db_url = db_url.replace("postgres://", "postgresql://", 1)
-
-if not db_url or db_url == "DATABASE_URL" or not (db_url.startswith("postgresql://") or db_url.startswith("sqlite://")):
-    print("[Database Info] DATABASE_URL is missing or invalid. Using default local SQLite database.")
-    SQLALCHEMY_DATABASE_URL = "sqlite:///./smart_reader.db"
-else:
-    if "supabase" in db_url and "sslmode" not in db_url:
-        if "?" in db_url:
-            db_url += "&sslmode=require"
-        else:
-            db_url += "?sslmode=require"
-    SQLALCHEMY_DATABASE_URL = db_url
-
-if SQLALCHEMY_DATABASE_URL.startswith("sqlite"):
-    engine = create_engine(
-        SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-    )
-else:
-    try:
-        temp_engine = create_engine(SQLALCHEMY_DATABASE_URL, pool_pre_ping=True, connect_args={"connect_timeout": 5})
-        with temp_engine.connect() as conn:
-            pass
-        engine = temp_engine
-        masked = SQLALCHEMY_DATABASE_URL
-        if "@" in masked:
-            p = masked.split("@")
-            masked = f"{p[0].split(':')[0]}:****@{p[1]}"
-        print(f"[Database Info] CONNECTED TO REMOTE POSTGRESQL: {masked}")
-    except Exception as e:
-        print(f"[Database Warning] Could not connect to PostgreSQL ({e}). Falling back to local SQLite database.")
-        SQLALCHEMY_DATABASE_URL = "sqlite:///./smart_reader.db"
-        engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
+SQLALCHEMY_DATABASE_URL = "sqlite:///./smart_reader.db"
 
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
+)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()
@@ -49,6 +17,3 @@ def get_db():
         yield db
     finally:
         db.close()
-
-
-

app/main.py

@@ -17,8 +17,8 @@ from app.services.scraper import scrape_article_url
 from app.security import get_password_hash, verify_password, create_access_token, get_current_user, ACCESS_TOKEN_EXPIRE_MINUTES
 from datetime import timedelta, datetime
 import random
-import requests
-import traceback
+import smtplib
+from email.mime.text import MIMEText
 from fastapi.security import OAuth2PasswordRequestForm
 
 # Load environment variables from .env file
@@ -27,21 +27,6 @@ load_dotenv()
 # Initialize database tables
 models.Base.metadata.create_all(bind=engine)
 
-# Auto-sync PostgreSQL primary key sequences if connected to Postgres
-if not str(engine.url).startswith("sqlite"):
-    try:
-        from sqlalchemy import text
-        with engine.connect() as conn:
-            for table_name in ["articles", "users", "comments", "comment_ratings"]:
-                try:
-                    conn.execute(text(f"SELECT setval(pg_get_serial_sequence('{table_name}', 'id'), COALESCE((SELECT MAX(id) FROM {table_name}), 0) + 1, false);"))
-                    conn.commit()
-                except Exception as seq_err:
-                    print(f"[Sequence Sync Warning] Could not sync sequence for {table_name}: {seq_err}")
-            print("[Database Info] Primary key sequences synchronized successfully.")
-    except Exception as e:
-        print(f"[Database Warning] Sequence sync error: {e}")
-
 app = FastAPI(title="Smart Reader API", version="1.0.0")
 
 # --- CORS Middleware Configuration ---
@@ -141,53 +126,29 @@ def generate_ai_summary(content: str) -> str:
 
 # --- Auth Endpoints ---
 
-def send_verification_email(to_email: str, code: str) -> bool:
+def send_verification_email(to_email: str, code: str):
     # For development, just print the code.
     print(f"\n{'='*40}")
     print(f"VERIFICATION CODE FOR {to_email}: {code}")
     print(f"{'='*40}\n")
     
-    api_key = os.environ.get("BREVO_API_KEY")
-    if not api_key:
-        print("[Brevo Email Error]: BREVO_API_KEY environment variable is not set.")
-        return False
-
-    url = "https://api.brevo.com/v3/smtp/email"
-    headers = {
-        "accept": "application/json",
-        "api-key": api_key,
-        "content-type": "application/json"
-    }
-    payload = {
-        "sender": {
-            "name": "Smart Reader",
-            "email": "smartreadercommunity1@gmail.com"
-        },
-        "to": [
-            {
-                "email": to_email
-            }
-        ],
-        "subject": "كود تفعيل حسابك - Smart Reader",
-        "htmlContent": f"<div dir='rtl' style='font-family: Arial, sans-serif; padding: 25px; background-color: #f4f4f7;'><div style='max-width: 500px; margin: 0 auto; background: #ffffff; padding: 30px; border-radius: 16px; box-shadow: 0 4px 12px rgba(0,0,0,0.05); text-align: center;'><h2 style='color: #4f46e5; margin-bottom: 10px;'>Smart Reader</h2><p style='color: #4b5563; font-size: 16px;'>كود التفعيل الخاص بحسابك هو:</p><div style='background: #eef2ff; border: 2px dashed #6366f1; border-radius: 12px; padding: 15px; margin: 20px 0;'><span style='color: #4338ca; font-size: 32px; font-weight: bold; letter-spacing: 6px;'>{code}</span></div><p style='color: #9ca3af; font-size: 14px;'>هذا الكود صالح لمدة 10 دقائق فقط.</p></div></div>"
-    }
-
-    try:
-        response = requests.post(url, json=payload, headers=headers, timeout=15)
-        if response.status_code in (200, 201, 202):
-            print(f"[Brevo Email Success] Status Code: {response.status_code}")
-            print(f"[Brevo Email Response Body]: {response.text}")
-            return True
-        else:
-            print(f"[Brevo Email Failure] Status Code: {response.status_code}")
-            print(f"[Brevo Email Response Body]: {response.text}")
-            print(f"[Brevo Email Response Headers]: {dict(response.headers)}")
-            print(f"[Brevo Email Exception Traceback]: None (HTTP Status {response.status_code})")
-            return False
-    except Exception as e:
-        print(f"[Brevo Email Exception Failure]: {e}")
-        print(f"[Brevo Email Exception Traceback]:\n{traceback.format_exc()}")
-        return False
+    # Real email sending logic (needs valid SMTP credentials in .env)
+    sender_email = os.environ.get("SMTP_EMAIL")
+    sender_password = os.environ.get("SMTP_PASSWORD")
+    
+    if sender_email and sender_password:
+        try:
+            msg = MIMEText(f"كود التفعيل الخاص بك هو: {code}\n\nهذا الكود صالح لمدة 10 دقائق فقط.")
+            msg['Subject'] = 'كود تفعيل حسابك - Smart Reader'
+            msg['From'] = sender_email
+            msg['To'] = to_email
+
+            server = smtplib.SMTP_SSL('smtp.gmail.com', 465)
+            server.login(sender_email, sender_password)
+            server.send_message(msg)
+            server.quit()
+        except Exception as e:
+            print(f"Error sending email: {e}")
 
 @app.post("/api/v1/auth/request-verification")
 def request_verification(req: schemas.EmailVerificationRequest, db: Session = Depends(get_db)):
@@ -261,7 +222,7 @@ def login(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depend
 
 @app.get("/api/v1/articles", response_model=List[schemas.ArticleResponse])
 def get_articles(db: Session = Depends(get_db)):
-    articles = db.query(models.Article).order_by(models.Article.id.desc()).all()
+    articles = db.query(models.Article).all()
     return articles
 
 @app.get("/api/v1/ai/articles/{article_id}/summary")
@@ -331,56 +292,30 @@ def rate_comment(comment_id: int, rating_in: schemas.CommentRatingCreate, db: Se
     return comment
 
 
-@app.delete("/api/v1/comments/{comment_id}")
-def delete_comment(comment_id: int, db: Session = Depends(get_db), current_user: models.User = Depends(get_current_user)):
-    comment = db.query(models.Comment).filter(models.Comment.id == comment_id).first()
-    if not comment:
-        raise HTTPException(status_code=404, detail="التعليق غير موجود")
-        
-    if comment.user_id != current_user.id:
-        raise HTTPException(status_code=403, detail="غير مصرح لك بحذف هذا التعليق")
-        
-    # Delete associated ratings
-    db.query(models.CommentRating).filter(models.CommentRating.comment_id == comment_id).delete()
-    db.delete(comment)
-    db.commit()
-    return {"message": "تم حذف التعليق بنجاح", "id": comment_id}
-
-
 # --- 🚀 Upgraded Scraping Endpoint ---
 @app.post("/api/v1/articles/scrape", response_model=schemas.ArticleResponse)
 def scrape_and_add_article(req: schemas.ScrapeRequest, db: Session = Depends(get_db)):
-    print(f"[Scrape] Starting scrape for URL: {req.url}")
-    try:
-        scraped_data = scrape_article_url(req.url)
-        print(f"[Scrape] Result - title: {scraped_data.get('title')}, category: {scraped_data.get('category')}, content_len: {len(scraped_data.get('content',''))}")
-    except Exception as e:
-        print(f"[Scrape] Exception during scraping: {e}\n{traceback.format_exc()}")
-        raise HTTPException(status_code=500, detail=f"خطأ في جلب المقال: {str(e)}")
-
-    if scraped_data.get("category") == "خطأ":
-        print(f"[Scrape] Scraping failed, returning 422")
-        raise HTTPException(status_code=422, detail=scraped_data.get("content", "فشل جلب المقال"))
-
-    try:
-        print(f"[Scrape] Saving to DB...")
-        db_article = models.Article(
-            title=scraped_data["title"][:255],
-            content=scraped_data["content"],
-            category=scraped_data["category"][:100],
-            author=scraped_data["author"][:100],
-            image=(scraped_data["image"] or "")[:500],
-            summary=""
-        )
-        db.add(db_article)
-        db.commit()
-        db.refresh(db_article)
-        print(f"[Scrape] Saved successfully, id={db_article.id}")
-        return db_article
-    except Exception as e:
-        print(f"[Scrape] DB error: {e}\n{traceback.format_exc()}")
-        db.rollback()
-        raise HTTPException(status_code=500, detail=f"خطأ في حفظ المقال: {str(e)}")
+    scraped_data = scrape_article_url(req.url)
+    
+    # Auto-generate next ID
+    max_id_article = db.query(models.Article).order_by(models.Article.id.desc()).first()
+    next_id = (max_id_article.id + 1) if max_id_article else 1
+    
+    db_article = models.Article(
+        id=next_id,
+        title=scraped_data["title"],
+        content=scraped_data["content"],
+        category=scraped_data["category"],
+        author=scraped_data["author"],
+        image=scraped_data["image"],
+        summary=""  # Generate on demand
+    )
+    
+    db.add(db_article)
+    db.commit()
+    db.refresh(db_article)
+    
+    return db_article
 
 # --- 📁 File Upload Endpoint ---
 import io
@@ -418,7 +353,11 @@ async def upload_document(file: UploadFile = File(...), db: Session = Depends(ge
             raise HTTPException(status_code=400, detail="لم نتمكن من قراءة أي نص من الملف")
             
         # Add to database as article
+        max_id_article = db.query(models.Article).order_by(models.Article.id.desc()).first()
+        next_id = (max_id_article.id + 1) if max_id_article else 1
+        
         db_article = models.Article(
+            id=next_id,
             title=title,
             content=content_text.strip(),
             category="مستند مرفوع",
@@ -436,8 +375,6 @@ async def upload_document(file: UploadFile = File(...), db: Session = Depends(ge
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"حدث خطأ أثناء معالجة الملف: {str(e)}")
 
-from fastapi.responses import StreamingResponse
-
 # --- 🚀 Upgraded Chatbot (RAG) Endpoint ---
 @app.post("/api/v1/ai/articles/{article_id}/chat")
 def chat_with_article(article_id: int, chat_req: schemas.ChatRequest, db: Session = Depends(get_db)):
@@ -447,16 +384,16 @@ def chat_with_article(article_id: int, chat_req: schemas.ChatRequest, db: Sessio
         
     api_key = os.environ.get("GROQ_API_KEY")
     if not api_key or not api_key.strip():
+        # Fallback offline replies
         user_msg = chat_req.message.lower()
         if any(greeting in user_msg for greeting in ["مرحباً", "hello", "hi", "سلام", "هلا"]):
-            reply_text = "أهلاً بك! أنا مساعدك الذكي لقراءة وتلخيص هذا المقال. كيف يمكنني مساعدتك اليوم؟"
-        elif any(kw in user_msg for kw in ["لخص", "ملخص", "summary", "summarize"]):
-            summary_text = article.summary if article.summary else generate_ai_summary(article.content)
-            reply_text = f"إليك ملخص سريع للمقال:\n{summary_text}"
-        else:
-            reply_text = "أهلاً بك! لم يتم ضبط مفتاح Groq API Key في ملف `.env` بعد. يمكنك الحصول عليه مجاناً من https://console.groq.com"
+            return {"reply": "أهلاً بك! أنا مساعدك الذكي لقراءة وتلخيص هذا المقال. كيف يمكنني مساعدتك اليوم؟"}
         
-        return {"reply": reply_text}
+        if any(kw in user_msg for kw in ["لخص", "ملخص", "summary", "summarize"]):
+            summary_text = article.summary if article.summary else generate_ai_summary(article.content)
+            return {"reply": f"إليك ملخص سريع للمقال:\n{summary_text}"}
+            
+        return {"reply": f"أهلاً بك! لم يتم ضبط مفتاح Groq API Key في ملف `.env` بعد. يمكنك الحصول عليه مجاناً من https://console.groq.com"}
         
     try:
         from groq import Groq
@@ -473,23 +410,20 @@ def chat_with_article(article_id: int, chat_req: schemas.ChatRequest, db: Sessio
 المحتوى:
 {article.content[:4000]}"""
         
-        # Build messages safely (filtering out empty messages)
+        # Build messages from history
         messages = [{"role": "system", "content": system_prompt}]
         if chat_req.history:
             for h in chat_req.history:
-                if h.content and h.content.strip():
-                    role = "user" if h.role == "user" else "assistant"
-                    messages.append({"role": role, "content": h.content.strip()})
-        messages.append({"role": "user", "content": chat_req.message.strip()})
+                role = "user" if h.role == "user" else "assistant"
+                messages.append({"role": role, "content": h.content})
+        messages.append({"role": "user", "content": chat_req.message})
         
         response = client.chat.completions.create(
             model="llama-3.3-70b-versatile",
             messages=messages,
             max_tokens=1024,
         )
-        reply_text = response.choices[0].message.content.strip()
-        return {"reply": reply_text}
-
+        return {"reply": response.choices[0].message.content.strip()}
     except Exception as e:
         print(f"Groq Chat error: {e}")
         return {"reply": f"حدث خطأ أثناء الاتصال بالذكاء الاصطناعي: {str(e)}"}

app/security.py

@@ -2,7 +2,7 @@ import os
 from datetime import datetime, timedelta
 from typing import Optional
 import jwt
-from passlib.context import CryptContext
+import bcrypt
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from sqlalchemy.orm import Session
@@ -10,7 +10,7 @@ from app.db.database import get_db
 from app.models import models
 
 # Password hashing setup
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+# We use bcrypt directly to bypass a known incompatibility between passlib and bcrypt >= 4.0.0
 
 # JWT Setup
 SECRET_KEY = os.environ.get("SECRET_KEY", "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7")
@@ -19,11 +19,15 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 60 * 24 * 7 # 7 days
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/auth/login")
 
-def verify_password(plain_password, hashed_password):
-    return pwd_context.verify(plain_password, hashed_password)
+def verify_password(plain_password: str, hashed_password: str) -> bool:
+    try:
+        return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password.encode('utf-8'))
+    except Exception:
+        return False
 
-def get_password_hash(password):
-    return pwd_context.hash(password)
+def get_password_hash(password: str) -> str:
+    salt = bcrypt.gensalt()
+    return bcrypt.hashpw(password.encode('utf-8'), salt).decode('utf-8')
 
 def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
     to_encode = data.copy()

db_migrate.py

@@ -0,0 +1,25 @@
+import sqlite3
+
+def run_migration():
+    conn = sqlite3.connect('smart_reader.db')
+    cursor = conn.cursor()
+
+    # Check if 'email' column exists in 'users' table
+    cursor.execute("PRAGMA table_info(users)")
+    columns = [col[1] for col in cursor.fetchall()]
+    
+    if 'email' not in columns:
+        print("Adding 'email' column to users table...")
+        cursor.execute("ALTER TABLE users ADD COLUMN email VARCHAR(100)")
+        cursor.execute("CREATE UNIQUE INDEX ix_users_email ON users (email)")
+
+    if 'hashed_password' not in columns:
+        print("Adding 'hashed_password' column to users table...")
+        cursor.execute("ALTER TABLE users ADD COLUMN hashed_password VARCHAR(255)")
+
+    conn.commit()
+    conn.close()
+    print("Migration finished successfully.")
+
+if __name__ == "__main__":
+    run_migration()

main.py

@@ -0,0 +1,6 @@
+def main():
+    print("Hello from smart-reader-backend!")
+
+
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -0,0 +1,23 @@
+[project]
+name = "smart-reader-backend"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "fastapi>=0.115.8",
+    "uvicorn>=0.34.0",
+    "sqlalchemy>=2.0.38",
+    "pydantic>=2.10.6",
+    "google-generativeai>=0.8.4",
+    "beautifulsoup4>=4.12.3",
+    "python-dotenv>=1.0.1",
+    "requests>=2.32.3",
+    "groq>=0.13.1",
+    "python-multipart>=0.0.20",
+    "PyPDF2>=3.0.1",
+    "python-docx>=1.1.2",
+    "passlib>=1.7.4",
+    "bcrypt>=4.0.1",
+    "PyJWT>=2.8.0",
+]

requirements.txt

@@ -13,4 +13,3 @@ python-docx==1.1.2
 passlib==1.7.4
 bcrypt==4.0.1
 PyJWT==2.8.0
-psycopg2-binary==2.9.10

test_search.py

@@ -0,0 +1,31 @@
+import urllib.request
+import urllib.parse
+import json
+import re
+
+q = "محمد نجيب"
+max_results = 9
+
+is_arabic = bool(re.search(r'[\u0600-\u06FF]', q))
+lang = "ar" if is_arabic else "en"
+
+url = f"https://{lang}.wikipedia.org/w/api.php?action=query&list=search&srsearch={urllib.parse.quote(q)}&utf8=&format=json&srlimit={max_results}"
+req = urllib.request.Request(url, headers={'User-Agent': 'SmartReader/1.0'})
+
+with urllib.request.urlopen(req, timeout=10) as response:
+    data = json.loads(response.read().decode('utf-8'))
+
+results = []
+for item in data.get('query', {}).get('search', []):
+    title = item.get('title', '')
+    snippet_html = item.get('snippet', '')
+    snippet = re.sub(r'<[^>]+>', '', snippet_html)
+    article_url = f"https://{lang}.wikipedia.org/wiki/{urllib.parse.quote(title.replace(' ', '_'))}"
+    results.append({
+        "title": title,
+        "url": article_url,
+        "snippet": snippet,
+        "source": "ويكيبيديا" if is_arabic else "Wikipedia"
+    })
+
+print(json.dumps(results, indent=2, ensure_ascii=False))