Update app.py

app.py

@@ -23,17 +23,18 @@ def fetch_user_activity(user_id):
     response = supabase.table("user_activity").select("*").eq("actor_user_id", user_id).execute()
     return response.data
 
+
 def fetch_safe_content():
     # Posts
     posts = supabase.table("posts").select("id, caption").execute().data
     moderated_posts = supabase.table("content_moderation").select("post_id, result, post_type").eq("post_type","post").execute().data
-    safe_posts = {p["post_id"] for p in moderated_posts if p["result"]=="safe"}
+    safe_posts = {p["post_id"] for p in moderated_posts if p["result"] == "safe"}
     safe_post_ids = [p["id"] for p in posts if (p["id"] in safe_posts) or (p["id"] not in [m["post_id"] for m in moderated_posts])]
 
     # Trendz
     trendz = supabase.table("trendz").select("id, caption").execute().data
     moderated_trendz = supabase.table("content_moderation").select("post_id, result, post_type").eq("post_type","trendz").execute().data
-    safe_trendz = {t["post_id"] for t in moderated_trendz if t["result"]=="safe"}
+    safe_trendz = {t["post_id"] for t in moderated_trendz if t["result"] == "safe"}
     safe_trendz_ids = [t["id"] for t in trendz if (t["id"] in safe_trendz) or (t["id"] not in [m["post_id"] for m in moderated_trendz])]
 
     return safe_post_ids, safe_trendz_ids, posts, trendz
@@ -43,25 +44,36 @@ def recommend(user_id, top_n=5):
     activities = fetch_user_activity(user_id)
     safe_post_ids, safe_trendz_ids, posts, trendz = fetch_safe_content()
 
-    summaries = [a["content_summary"] for a in activities if a["content_summary"]]
+    summaries = [a["content_summary"] for a in activities if a.get("content_summary")]
+
+    # Flatten keywords
+    keywords = []
+    for summary in summaries:
+        keywords.extend(summary.lower().split())
 
+    # Post scoring
     post_scores = {}
     for p in posts:
         if p["id"] in safe_post_ids:
-            score = sum([p["caption"].lower().count(word.lower()) for word in summaries for word in word.split()])
+            caption = (p.get("caption") or "").lower()
+            score = sum(caption.count(word) for word in keywords)
             post_scores[p["id"]] = score
 
+    # Trendz scoring
     trendz_scores = {}
     for t in trendz:
         if t["id"] in safe_trendz_ids:
-            score = sum([t["caption"].lower().count(word.lower()) for word in summaries for word in word.split()])
+            caption = (t.get("caption") or "").lower()
+            score = sum(caption.count(word) for word in keywords)
             trendz_scores[t["id"]] = score
 
     recommended_posts = [pid for pid,_ in sorted(post_scores.items(), key=lambda x:x[1], reverse=True)[:top_n]]
     recommended_trendz = [tid for tid,_ in sorted(trendz_scores.items(), key=lambda x:x[1], reverse=True)[:top_n]]
 
+    # fallback random safe content if no match
     if not recommended_posts and safe_post_ids:
         recommended_posts = list(np.random.choice(safe_post_ids, min(top_n, len(safe_post_ids)), replace=False))
+
     if not recommended_trendz and safe_trendz_ids:
         recommended_trendz = list(np.random.choice(safe_trendz_ids, min(top_n, len(safe_trendz_ids)), replace=False))
 
@@ -87,9 +99,9 @@ def store_recommendations(user_id, recommended_posts, recommended_trendz):
 def root():
     return {"message": "AI Recommender API is running"}
 
+
 @app.get("/recommend/all")
 def recommend_all(x_api_key: str = Header(None)):
-    # ✅ Security check
     if x_api_key != API_TOKEN:
         raise HTTPException(status_code=403, detail="Forbidden")
 
@@ -98,16 +110,14 @@ def recommend_all(x_api_key: str = Header(None)):
         for u in users:
             posts, trendz = recommend(u["id"])
             store_recommendations(u["id"], posts, trendz)
+
         return {"message": f"✅ Updated recommendations for {len(users)} users"}
     except Exception as e:
         return {"error": str(e)}
 
 
-
-
 @app.get("/recommend/{user_id}")
 def recommend_single_user(user_id: str, x_api_key: str = Header(None)):
-    # ✅ Security check
     if x_api_key != API_TOKEN:
         raise HTTPException(status_code=403, detail="Forbidden")
 
@@ -123,3 +133,55 @@ def recommend_single_user(user_id: str, x_api_key: str = Header(None)):
         }
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+
+# ========================================
+# 4️⃣ NEW — POSTS ONLY ENDPOINT
+# ========================================
+@app.get("/recommend/posts/{user_id}")
+def recommend_user_posts(user_id: str, x_api_key: str = Header(None)):
+    if x_api_key != API_TOKEN:
+        raise HTTPException(status_code=403, detail="Forbidden")
+
+    try:
+        posts, _ = recommend(user_id)
+
+        supabase.table("user_recommendations").upsert({
+            "user_id": user_id,
+            "recommended_post_ids": posts,
+            "generated_at": datetime.now(timezone.utc).isoformat()
+        }).execute()
+
+        return {
+            "message": "✅ Post recommendations generated successfully",
+            "user_id": user_id,
+            "recommended_posts": posts
+        }
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+# ========================================
+# 5️⃣ NEW — TRENDZ ONLY ENDPOINT
+# ========================================
+@app.get("/recommend/trendz/{user_id}")
+def recommend_user_trendz(user_id: str, x_api_key: str = Header(None)):
+    if x_api_key != API_TOKEN:
+        raise HTTPException(status_code=403, detail="Forbidden")
+
+    try:
+        _, trendz = recommend(user_id)
+
+        supabase.table("user_recommendations").upsert({
+            "user_id": user_id,
+            "recommended_trendz_ids": trendz,
+            "generated_at": datetime.now(timezone.utc).isoformat()
+        }).execute()
+
+        return {
+            "message": "✅ Trendz recommendations generated successfully",
+            "user_id": user_id,
+            "recommended_trendz": trendz
+        }
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))