Update app.py

app.py

@@ -1,210 +1,201 @@
-from fastapi import FastAPI, HTTPException, status
-from fastapi.responses import StreamingResponse
-import instaloader
-import requests
-import os
-import time
-import logging
-import random
-from functools import wraps
-
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO,
-    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-)
-logger = logging.getLogger(__name__)
-
-app = FastAPI(title="Instagram Stories API", docs_url=None, redoc_url=None)
-
-# Environment variables
-INSTAGRAM_USERNAME = os.getenv('INSTAGRAM_USERNAME')
-INSTAGRAM_PASSWORD = os.getenv('INSTAGRAM_PASSWORD')
-
-# Session configuration
-SESSION_DIR = "/tmp/instagram_sessions"
-SESSION_FILE = os.path.join(SESSION_DIR, f"session-{INSTAGRAM_USERNAME}") if INSTAGRAM_USERNAME else None
-
-# Create session directory if not exists
-os.makedirs(SESSION_DIR, exist_ok=True)
-
-USER_AGENTS = [
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15",
-    "Mozilla/5.0 (Linux; Android 10; SM-G981B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36"
-]
-
-def get_instaloader() -> instaloader.Instaloader:
-    """Create and configure Instaloader instance with proper parameters"""
-    L = instaloader.Instaloader(
-        sleep=True,
-        request_timeout=300,
-        max_connection_attempts=2,
-        user_agent=random.choice(USER_AGENTS),
-        # CORRECTED PARAMETER NAME:
-        delay_seconds=15  # Changed from sleep_seconds to delay_seconds
-    )
+from fastapi import FastAPI, HTTPException, status  
+import instaloader  
+import os  
+import time  
+import logging  
+import random  
+from functools import wraps  
+
+# Configure logging  
+logging.basicConfig(  
+    level=logging.INFO,  
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'  
+)  
+logger = logging.getLogger(__name__)  
+
+app = FastAPI(title="Instagram Stories API", docs_url=None, redoc_url=None)  
+
+# Environment variables  
+INSTAGRAM_USERNAME = os.getenv('INSTAGRAM_USERNAME')  
+INSTAGRAM_PASSWORD = os.getenv('INSTAGRAM_PASSWORD')  
+
+# Session configuration  
+SESSION_DIR = "/tmp/instagram_sessions"  
+SESSION_FILE = os.path.join(SESSION_DIR, f"session-{INSTAGRAM_USERNAME}") if INSTAGRAM_USERNAME else None  
+
+# Create session directory if not exists  
+os.makedirs(SESSION_DIR, exist_ok=True)  
+
+USER_AGENTS = [  
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",  
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15",  
+    "Mozilla/5.0 (Linux; Android 10; SM-G981B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36"  
+]  
+
+def get_instaloader() -> instaloader.Instaloader:  
+    """Create and configure Instaloader instance with proper parameters"""  
+    L = instaloader.Instaloader(  
+        sleep=True,  
+        request_timeout=300,  
+        max_connection_attempts=2,  
+        user_agent=random.choice(USER_AGENTS),  
+    )  
     
-    if not INSTAGRAM_USERNAME or not INSTAGRAM_PASSWORD:
-        logger.error("Instagram credentials not configured")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="Server configuration error"
-        )
-
-    try:
-        if SESSION_FILE and os.path.exists(SESSION_FILE):
-            logger.info(f"Attempting to load session from {SESSION_FILE}")
-            try:
-                L.load_session_from_file(INSTAGRAM_USERNAME, SESSION_FILE)
-                logger.info("Session loaded successfully")
-                # Verify session is still valid
-                test_profile = instaloader.Profile.from_username(L.context, INSTAGRAM_USERNAME)
-                if not test_profile.is_verified:
-                    raise Exception("Session validation failed")
-                return L
-            except Exception as e:
-                logger.warning(f"Session load failed: {str(e)}, performing fresh login")
-
-        logger.info("Starting fresh login process")
-        L.login(INSTAGRAM_USERNAME, INSTAGRAM_PASSWORD)
+    if not INSTAGRAM_USERNAME or not INSTAGRAM_PASSWORD:  
+        logger.error("Instagram credentials not configured")  
+        raise HTTPException(  
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,  
+            detail="Server configuration error"  
+        )  
+
+    try:  
+        if SESSION_FILE and os.path.exists(SESSION_FILE):  
+            logger.info(f"Attempting to load session from {SESSION_FILE}")  
+            try:  
+                L.load_session_from_file(INSTAGRAM_USERNAME, SESSION_FILE)  
+                logger.info("Session loaded successfully")  
+                # Verify session is still valid  
+                test_profile = instaloader.Profile.from_username(L.context, INSTAGRAM_USERNAME)  
+                if not test_profile.is_verified:  
+                    raise Exception("Session validation failed")  
+                return L  
+            except Exception as e:  
+                logger.warning(f"Session load failed: {str(e)}, performing fresh login")  
+
+        logger.info("Starting fresh login process")  
+        L.login(INSTAGRAM_USERNAME, INSTAGRAM_PASSWORD)  
         
-        L.context._session.headers.update({
-            'Accept-Language': 'en-US,en;q=0.9',
-            'Accept-Encoding': 'gzip, deflate, br',
-            'Referer': 'https://www.instagram.com/',
-            'DNT': '1',
-        })
+        L.context._session.headers.update({  
+            'Accept-Language': 'en-US,en;q=0.9',  
+            'Accept-Encoding': 'gzip, deflate, br',  
+            'Referer': 'https://www.instagram.com/',  
+            'DNT': '1',  
+        })  
         
-        if SESSION_FILE:
-            L.save_session_to_file(SESSION_FILE)
-            logger.info(f"Saved new session to {SESSION_FILE}")
+        if SESSION_FILE:  
+            L.save_session_to_file(SESSION_FILE)  
+            logger.info(f"Saved new session to {SESSION_FILE}")  
         
-        return L
-
-    except instaloader.exceptions.BadCredentialsException as e:
-        logger.error("Invalid credentials: %s", str(e))
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Invalid Instagram credentials"
-        )
-    except instaloader.exceptions.TwoFactorAuthRequiredException as e:
-        logger.error("2FA required: %s", str(e))
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Two-factor authentication required"
-        )
-    except Exception as e:
-        logger.error("Login failed: %s", str(e))
-        raise HTTPException(
-            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-            detail="Instagram login service unavailable"
-        )
-
-# Rest of the code remains the same as previous version...
-
-
-def handle_instagram_errors(func):
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        try:
-            return await func(*args, **kwargs)
-        except instaloader.exceptions.QueryReturnedBadRequestException as e:
-            logger.error("API error 400: %s", str(e))
-            raise HTTPException(
-                status_code=status.HTTP_429_TOO_MANY_REQUESTS,
-                detail="Instagram rate limit exceeded"
-            )
-        except instaloader.exceptions.ConnectionException as e:
-            logger.error("Connection error: %s", str(e))
-            raise HTTPException(
-                status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                detail="Instagram service unavailable"
-            )
-        except Exception as e:
-            logger.error("Unexpected error: %s", str(e))
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail="Internal server error"
-            )
-    return wrapper
-
-@app.get("/stories/{username}")
-@handle_instagram_errors
-async def get_stories(username: str):
-    """Retrieve stories with enhanced anti-detection measures"""
-    logger.info(f"Processing request for @{username}")
+        return L  
+
+    except instaloader.exceptions.BadCredentialsException as e:  
+        logger.error("Invalid credentials: %s", str(e))  
+        raise HTTPException(  
+            status_code=status.HTTP_401_UNAUTHORIZED,  
+            detail="Invalid Instagram credentials"  
+        )  
+    except instaloader.exceptions.TwoFactorAuthRequiredException as e:  
+        logger.error("2FA required: %s", str(e))  
+        raise HTTPException(  
+            status_code=status.HTTP_401_UNAUTHORIZED,  
+            detail="Two-factor authentication required"  
+        )  
+    except Exception as e:  
+        logger.error("Login failed: %s", str(e))  
+        raise HTTPException(  
+            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,  
+            detail="Instagram login service unavailable"  
+        )  
+
+def handle_instagram_errors(func):  
+    @wraps(func)  
+    async def wrapper(*args, **kwargs):  
+        try:  
+            return await func(*args, **kwargs)  
+        except instaloader.exceptions.QueryReturnedBadRequestException as e:  
+            logger.error("API error 400: %s", str(e))  
+            raise HTTPException(  
+                status_code=status.HTTP_429_TOO_MANY_REQUESTS,  
+                detail="Instagram rate limit exceeded"  
+            )  
+        except instaloader.exceptions.ConnectionException as e:  
+            logger.error("Connection error: %s", str(e))  
+            raise HTTPException(  
+                status_code=status.HTTP_503_SERVICE_UNAVAILABLE,  
+                detail="Instagram service unavailable"  
+            )  
+        except Exception as e:  
+            logger.error("Unexpected error: %s", str(e))  
+            raise HTTPException(  
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,  
+                detail="Internal server error"  
+            )  
+    return wrapper  
+
+@app.get("/stories/{username}")  
+@handle_instagram_errors  
+async def get_stories(username: str):  
+    """Retrieve stories with enhanced anti-detection measures"""  
+    logger.info(f"Processing request for @{username}")  
     
-    try:
-        L = get_instaloader()
-        logger.info("Instaloader instance configured")
+    try:  
+        L = get_instaloader()  
+        logger.info("Instaloader instance configured")  
         
-        # Randomized delay before profile request
-        delay = random.uniform(2.5, 5.5)
-        logger.debug(f"Applying initial delay of {delay:.2f}s")
-        time.sleep(delay)
+        # Randomized delay before profile request  
+        delay = random.uniform(2.5, 5.5)  
+        logger.debug(f"Applying initial delay of {delay:.2f}s")  
+        time.sleep(delay)  
         
-        # Profile lookup with retry
-        for attempt in range(3):
-            try:
-                logger.info(f"Fetching profile (attempt {attempt+1}/3)")
-                profile = instaloader.Profile.from_username(L.context, username)
-                break
-            except instaloader.exceptions.QueryReturnedBadRequestException:
-                wait_time = (attempt + 1) * 10
-                logger.warning(f"Rate limited, waiting {wait_time}s")
-                time.sleep(wait_time)
-        else:
-            raise HTTPException(
-                status.HTTP_429_TOO_MANY_REQUESTS,
-                "Too many attempts to access Instagram"
-            )
-
-        logger.info(f"Access check for @{username}")
-        if not profile.has_public_story and not profile.is_followed_by_viewer:
-            logger.warning("Private profile access denied")
-            raise HTTPException(
-                status.HTTP_403_FORBIDDEN,
-                "No accessible stories for this profile"
-            )
-
-        # Additional delay before story fetch
-        time.sleep(random.uniform(1.5, 3.5))
+        # Profile lookup with retry  
+        for attempt in range(3):  
+            try:  
+                logger.info(f"Fetching profile (attempt {attempt+1}/3)")  
+                profile = instaloader.Profile.from_username(L.context, username)  
+                break  
+            except instaloader.exceptions.QueryReturnedBadRequestException:  
+                wait_time = (attempt + 1) * 10  
+                logger.warning(f"Rate limited, waiting {wait_time}s")  
+                time.sleep(wait_time)  
+        else:  
+            raise HTTPException(  
+                status.HTTP_429_TOO_MANY_REQUESTS,  
+                "Too many attempts to access Instagram"  
+            )  
+
+        logger.info(f"Access check for @{username}")  
+        if not profile.has_public_story and not profile.is_followed_by_viewer:  
+            logger.warning("Private profile access denied")  
+            raise HTTPException(  
+                status.HTTP_403_FORBIDDEN,  
+                "No accessible stories for this profile"  
+            )  
+
+        # Additional delay before story fetch  
+        time.sleep(random.uniform(1.5, 3.5))  
         
-        logger.info("Fetching stories")
-        stories = []
-        try:
-            for story in L.get_stories(userids=[profile.userid]):
-                for item in story.get_items():
-                    stories.append({
-                        "id": str(item.mediaid),
-                        "url": item.url,
-                        "type": "video" if item.is_video else "image",
-                        "timestamp": item.date_utc.isoformat(),
-                        "views": item.view_count if item.is_video else None,
-                    })
-        except instaloader.exceptions.QueryReturnedNotFoundException:
-            logger.error("Stories not found")
-            raise HTTPException(
-                status.HTTP_404_NOT_FOUND,
-                "Stories not available"
-            )
-
-        if not stories:
-            logger.info("No active stories found")
-            raise HTTPException(
-                status.HTTP_404_NOT_FOUND,
-                "No active stories available"
-            )
-
-        # Final randomized delay
-        time.sleep(random.uniform(0.5, 1.5))
+        logger.info("Fetching stories")  
+        stories = []  
+        try:  
+            for story in L.get_stories(userids=[profile.userid]):  
+                for item in story.get_items():  
+                    stories.append({  
+                        "id": str(item.mediaid),  
+                        "url": item.url,  
+                        "type": "video" if item.is_video else "image",  
+                        "timestamp": item.date_utc.isoformat(),  
+                        "views": item.view_count if item.is_video else None,  
+                    })  
+        except instaloader.exceptions.QueryReturnedNotFoundException:  
+            logger.error("Stories not found")  
+            raise HTTPException(  
+                status.HTTP_404_NOT_FOUND,  
+                "Stories not available"  
+            )  
+
+        if not stories:  
+            logger.info("No active stories found")  
+            raise HTTPException(  
+                status.HTTP_404_NOT_FOUND,  
+                "No active stories available"  
+            )  
+
+        # Final randomized delay  
+        time.sleep(random.uniform(0.5, 1.5))  
         
-        logger.info(f"Returning {len(stories)} stories")
-        return {"data": stories}
+        logger.info(f"Returning {len(stories)} stories")  
+        return {"data": stories}  
 
-    except Exception as e:
-        logger.error(f"Critical failure: {str(e)}")
-        raise
-
-# Keep the download endpoint from previous version
+    except Exception as e:  
+        logger.error(f"Critical failure: {str(e)}")  
+        raise