moved file uploads to aws s3

Author: ZeeshanML

check_s3.py

@@ -0,0 +1,53 @@
+"""
+Quick script to verify AWS S3 credentials and permissions.
+
+Run with: uv run check_s3.py
+
+This checks that your .env credentials can upload to and delete from your S3 bucket
+without needing to go through the full application flow.
+"""
+
+from io import BytesIO
+
+from botocore.exceptions import BotoCoreError, ClientError
+
+from config import settings
+from image_utils import _get_s3_client
+
+
+def check_s3_connection():
+    s3 = _get_s3_client()
+
+    print(f"Bucket: {settings.s3_bucket_name}")
+    print(f"Region: {settings.s3_region}")
+    print()
+
+    test_key = "profile_pics/test.txt"
+
+    # Test upload
+    try:
+        s3.upload_fileobj(
+            BytesIO(b"test"),
+            settings.s3_bucket_name,
+            test_key,
+            ExtraArgs={"ContentType": "text/plain"},
+        )
+        print("Upload: SUCCESS")
+    except (BotoCoreError, ClientError) as e:
+        print(f"Upload: FAILED - {e}")
+        return
+
+    # Test delete
+    try:
+        s3.delete_object(Bucket=settings.s3_bucket_name, Key=test_key)
+        print("Delete: SUCCESS")
+    except (BotoCoreError, ClientError) as e:
+        print(f"Delete: FAILED - {e}")
+        return
+
+    print()
+    print("All tests passed! Your S3 configuration is working.")
+
+
+if __name__ == "__main__":
+    check_s3_connection()

config.py

@@ -14,6 +14,13 @@ class Settings(BaseSettings):
     algorithm: str = "HS256"
     access_token_expire_minutes: int = 30
 
+    # S3 Configuration
+    s3_bucket_name: str
+    s3_region: str = "eu-north-1"
+    s3_access_key_id: SecretStr | None = None
+    s3_secret_access_key: SecretStr | None = None
+    s3_endpoint_url: str | None = None
+
     max_upload_size_bytes: int = 5 * 1024 * 1024
 
     posts_per_page: int = 10

image_utils.py

@@ -1,14 +1,28 @@
-from fileinput import filename
-from pickletools import optimize
-from termios import IMAXBEL
 import uuid
 from io import BytesIO
-from pathlib import Path
 from PIL import Image, ImageOps
+import boto3
+from starlette.concurrency import run_in_threadpool
+from config import settings
 
-PROFILE_PICS_DIR  = Path("media/profile_pics")
+def _get_s3_client():
+    return boto3.client(
+        "s3",
+        region_name=settings.s3_region,
+        aws_access_key_id=(
+            settings.s3_access_key_id.get_secret_value()
+            if settings.s3_access_key_id
+            else None
+        ),
+        aws_secret_access_key=(
+            settings.s3_secret_access_key.get_secret_value()
+            if settings.s3_secret_access_key
+            else None
+        ),
+        endpoint_url=settings.s3_endpoint_url,
+    )
 
-def process_profile_image(content: bytes) -> str:
+def process_profile_image(content: bytes) -> tuple[bytes, str]:
     with Image.open(BytesIO(content)) as original:
         img = ImageOps.exif_transpose(original)
         img = ImageOps.fit(img, (300, 300), method=Image.Resampling.LANCZOS)
@@ -17,17 +31,36 @@ def process_profile_image(content: bytes) -> str:
             img = img.convert("RGB")
 
         filename = f"{uuid.uuid4().hex}.jpg"
-        filepath = PROFILE_PICS_DIR / filename
-        PROFILE_PICS_DIR.mkdir(parents=True, exist_ok=True)
-        img.save(filepath, "JPEG", quality=85, optimize=True)
+        
+        output = BytesIO()
+        img.save(output, "JPEG", quality=85, optimize=True)
+        output.seek(0)
 
-    return filename
+    return output.read(), filename
 
 
-def delete_profile_image(filename: str | None) -> None:
+def _upload_to_s3(file_bytes: bytes, key: str) -> None:
+    s3 = _get_s3_client()
+    s3.upload_fileobj(
+        BytesIO(file_bytes),
+        settings.s3_bucket_name,
+        key,
+        ExtraArgs={"ContentType": "image/jpeg"},
+    )
+
+
+def _delete_from_s3(key: str) -> None:
+    s3 = _get_s3_client()
+    s3.delete_object(Bucket=settings.s3_bucket_name, Key=key)
+
+
+async def upload_profile_image(file_bytes: bytes, filename: str) -> None:
+    key = f"profile_pics/{filename}"
+    await run_in_threadpool(_upload_to_s3, file_bytes, key)
+
+
+async def delete_profile_image(filename: str | None) -> None:
     if filename is None:
         return
-
-    filepath = PROFILE_PICS_DIR / filename
-    if filepath.exists():
-        filepath.unlink()
+    key = f"profile_pics/{filename}"
+    await run_in_threadpool(_delete_from_s3, key)

main.py

@@ -29,7 +29,6 @@ async def lifespan(_app: FastAPI):
 app = FastAPI(lifespan=lifespan)
 
 app.mount("/static", StaticFiles(directory="static"), name="static")
-app.mount("/media", StaticFiles(directory="media"), name="media")
 
 templates = Jinja2Templates(directory="templates")
 

models.py

@@ -6,6 +6,8 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from database import Base
+from config import settings
+
 
 
 class User(Base):
@@ -28,7 +30,7 @@ class User(Base):
     @property
     def image_path(self) -> str:
         if self.image_file:
-            return f"/media/profile_pics/{self.image_file}"
+            return f"https://{settings.s3_bucket_name}.s3.{settings.s3_region}.amazonaws.com/profile_pics/{self.image_file}"
         return "/static/profile_pics/default.jpg"
 
 

pyproject.toml

@@ -8,6 +8,7 @@ dependencies = [
     "aiosmtplib>=5.1.0",
     "aiosqlite>=0.22.1",
     "alembic>=1.18.4",
+    "boto3>=1.42.90",
     "fastapi[standard]>=0.128.1",
     "greenlet>=3.3.1",
     "pillow>=12.1.1",

routers/users.py

@@ -15,8 +15,10 @@
 from database import get_db
 from schemas import PostResponse, UserCreate, UserPrivate, UserPublic, UserUpdate, Token, PaginatedPostsResponse, ChangePasswordRequest, ForgotPasswordRequest, ResetPasswordRequest
 from auth import create_access_token, hash_password, verify_password, CurrentUser, generate_reset_token, hash_reset_token
-from image_utils import delete_profile_image, process_profile_image
+from image_utils import delete_profile_image, process_profile_image, upload_profile_image
 from email_utils import send_password_reset_email
+from botocore.exceptions import ClientError
+
 
 router = APIRouter()
 
@@ -342,7 +344,7 @@ async def delete_user(
     await db.commit()
 
     if old_filename:
-        delete_profile_image(old_filename)
+        await delete_profile_image(old_filename)
 
 
 @router.patch("/{user_id}/picture", response_model=UserPrivate)
@@ -367,21 +369,31 @@ async def upload_profile_picture(
         )
 
     try:
-        new_filename = await run_in_threadpool(process_profile_image, content)
+        processed_bytes,new_filename = await run_in_threadpool(process_profile_image, content)
     except UnidentifiedImageError as err:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="Invalid image file. Please upload a valid image (JPEG, PNG, GIF, WebP).",
         ) from err
 
+    # Upload to S3 (also runs in threadpool via async wrapper)
+    try:
+        await upload_profile_image(processed_bytes, new_filename)
+    except ClientError as err:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Failed to upload image. Please try again.",
+        ) from err
+
+
     old_filename = current_user.image_file
 
     current_user.image_file = new_filename
     await db.commit()
     await db.refresh(current_user)
 
     if old_filename:
-        delete_profile_image(old_filename)
+        await delete_profile_image(old_filename)
 
     return current_user
 
@@ -409,6 +421,6 @@ async def delete_user_picture(
     await db.commit()
     await db.refresh(current_user)
 
-    delete_profile_image(old_filename)
+    await delete_profile_image(old_filename)
 
     return current_user