Project Uploaded

api_server.py

@@ -6,20 +6,29 @@ from flask import Flask, request, jsonify, send_from_directory
 from flask_cors import CORS
 from google_auth_oauthlib.flow import InstalledAppFlow
 from google.auth.transport.requests import Request
-from googleapiclient.discovery import build
+from googleapiclien t.discovery import build
 from googleapiclient.errors import HttpError
 from dotenv import load_dotenv
 
 load_dotenv()
 
-# Decode secrets at startup
+# --- MODIFICATION START ---
+# Define a writable directory
+WRITABLE_DIR = "/tmp"
+CREDENTIALS_PATH = os.path.join(WRITABLE_DIR, "credentials.json")
+COOKIES_PATH = os.path.join(WRITABLE_DIR, "facebook_cookies.pkl")
+TOKEN_PATH = os.path.join(WRITABLE_DIR, "token.pickle")
+
+# Decode secrets at startup into the /tmp directory
 if 'CREDENTIALS_B64' in os.environ:
-    with open('credentials.json', 'w') as f:
+    with open(CREDENTIALS_PATH, 'w') as f:
         f.write(base64.b64decode(os.environ['CREDENTIALS_B64']).decode('utf-8'))
 
 if 'FB_COOKIES_B64' in os.environ:
-    with open('facebook_cookies.pkl', 'wb') as f:
+    with open(COOKIES_PATH, 'wb') as f:
         f.write(base64.b64decode(os.environ['FB_COOKIES_B64']))
+# --- MODIFICATION END ---
+
 
 GROUPS_TXT   = os.environ.get("GROUPS_TXT", "groups.txt")
 SCRAPE_OUTDIR = os.environ.get("SCRAPE_OUTDIR", "scraped")
@@ -165,18 +174,24 @@ def slugify(url: str) -> str:
 
 def build_gmail_service():
     creds = None
-    if os.path.exists("token.pickle"):
-        with open("token.pickle", "rb") as token: creds = pickle.load(token)
+    # --- MODIFICATION START ---
+    if os.path.exists(TOKEN_PATH):
+        with open(TOKEN_PATH, "rb") as token: creds = pickle.load(token)
+    # --- MODIFICATION END ---
     if not creds or not creds.valid:
         if creds and creds.expired and creds.refresh_token:
             creds.refresh(Request())
         else:
-            if not os.path.exists("credentials.json"):
+            # --- MODIFICATION START ---
+            if not os.path.exists(CREDENTIALS_PATH):
                 log("credentials.json missing; Gmail unavailable", "warn", "gmail")
                 return None
-            flow = InstalledAppFlow.from_client_secrets_file("credentials.json", GMAIL_SCOPES)
+            flow = InstalledAppFlow.from_client_secrets_file(CREDENTIALS_PATH, GMAIL_SCOPES)
+            # --- MODIFICATION END ---
             creds = flow.run_local_server(port=0)
-        with open("token.pickle", "wb") as token: pickle.dump(creds, token)
+        # --- MODIFICATION START ---
+        with open(TOKEN_PATH, "wb") as token: pickle.dump(creds, token)
+        # --- MODIFICATION END ---
     try:
         return build("gmail", "v1", credentials=creds)
     except Exception as e:
@@ -251,7 +266,18 @@ def stream_process_lines(args: List[str], env: Optional[Dict[str, str]] = None,
     return rc
 
 def call_final5_for_group(group_url: str, out_json: str, analysis_json: str, recipients: List[str]) -> Dict[str, Any]:
-    args = [PYTHON_BIN, FINAL5_PATH, "--group", group_url, "--out", out_json, "--analysis-out", analysis_json, "--recipients", ",".join(recipients), "--sender", SENDER_EMAIL, "--headless"]
+    # --- MODIFICATION START ---
+    args = [
+        PYTHON_BIN, FINAL5_PATH,
+        "--group", group_url,
+        "--out", out_json,
+        "--analysis-out", analysis_json,
+        "--recipients", ",".join(recipients),
+        "--sender", SENDER_EMAIL,
+        "--cookies-file", COOKIES_PATH,  # Pass the correct path to the subprocess
+        "--headless"
+    ]
+    # --- MODIFICATION END ---
     if GEMINI_KEYS: args.extend(["--gemini-keys", ",".join(GEMINI_KEYS)])
     env = os.environ.copy()
     env["PYTHONUNBUFFERED"] = "1"

final5.py

@@ -22,6 +22,14 @@ from googleapiclient.errors import HttpError
 import google.generativeai as genai
 from google.api_core.exceptions import ResourceExhausted
 
+# --- MODIFICATION START ---
+# Define the same writable directory
+WRITABLE_DIR = "/tmp"
+CREDENTIALS_PATH = os.path.join(WRITABLE_DIR, "credentials.json")
+TOKEN_PATH = os.path.join(WRITABLE_DIR, "token.pickle")
+# --- MODIFICATION END ---
+
+
 def get_args():
     p = argparse.ArgumentParser(description="Scrape one FB group, analyze, and email alerts.")
     p.add_argument("--group", required=True)
@@ -29,7 +37,10 @@ def get_args():
     p.add_argument("--analysis-out", required=True)
     p.add_argument("--recipients", default="")
     p.add_argument("--sender", default=os.environ.get("SENDER_EMAIL", ""))
-    p.add_argument("--cookies-file", default=os.environ.get("FB_COOKIES_FILE","facebook_cookies.pkl"))
+    # --- MODIFICATION START ---
+    # Update the default path for the cookies file
+    p.add_argument("--cookies-file", default=os.path.join(WRITABLE_DIR, "facebook_cookies.pkl"))
+    # --- MODIFICATION END ---
     p.add_argument("--max-scrolls", type=int, default=int(os.environ.get("MAX_SCROLLS","5")))
     p.add_argument("--scroll-pause", type=float, default=float(os.environ.get("SCROLL_PAUSE","3")))
     p.add_argument("--gemini-keys", default="")
@@ -43,10 +54,12 @@ GMAIL_SCOPES = [
 
 def build_gmail_service():
     creds = None
-    if os.path.exists("token.pickle"):
+    # --- MODIFICATION START ---
+    if os.path.exists(TOKEN_PATH):
         try:
-            with open("token.pickle", "rb") as token:
+            with open(TOKEN_PATH, "rb") as token:
                 creds = pickle.load(token)
+        # --- MODIFICATION END ---
         except Exception:
             creds = None
     if not creds or not creds.valid:
@@ -56,13 +69,17 @@ def build_gmail_service():
             except Exception:
                 creds = None
         if not creds:
-            if not os.path.exists("credentials.json"):
-                print("[GMAIL] credentials.json missing; Gmail unavailable")
+            # --- MODIFICATION START ---
+            if not os.path.exists(CREDENTIALS_PATH):
+                print(f"[GMAIL] {CREDENTIALS_PATH} missing; Gmail unavailable")
                 return None
-            flow = InstalledAppFlow.from_client_secrets_file("credentials.json", GMAIL_SCOPES)
+            flow = InstalledAppFlow.from_client_secrets_file(CREDENTIALS_PATH, GMAIL_SCOPES)
+            # --- MODIFICATION END ---
             creds = flow.run_local_server(port=0)
-        with open("token.pickle", "wb") as token:
+        # --- MODIFICATION START ---
+        with open(TOKEN_PATH, "wb") as token:
             pickle.dump(creds, token)
+        # --- MODIFICATION END ---
     try:
         svc = build("gmail", "v1", credentials=creds)
         _ = svc.users().getProfile(userId="me").execute()
@@ -445,15 +462,6 @@ def main():
 
 if __name__ == "__main__":
     try:
-        # Decode secrets from environment variables and write to files
-        if 'CREDENTIALS_B64' in os.environ:
-            with open('credentials.json', 'w') as f:
-                f.write(base64.b64decode(os.environ['CREDENTIALS_B64']).decode('utf-8'))
-        
-        if 'FB_COOKIES_B64' in os.environ:
-            with open('facebook_cookies.pkl', 'wb') as f:
-                f.write(base64.b64decode(os.environ['FB_COOKIES_B64']))
-
         main()
     except Exception as e:
         print("Unhandled error:")