Update ui.py

ui.py

@@ -1,66 +1,126 @@
 import gradio as gr
-import httpx
 import json
+from db import SessionLocal, Post, Keyword
+from services.llm import summarize_trends_llm, generate_week_plan_llm
+from services.trend_monitor import fetch_trend_samples
+from services.scheduler import schedule_post_job
 
 def build_ui(fastapi_app):
-    base = ""  # 同一プロセスなので相対パスでOK
-
     async def do_summarize(platforms, keywords_csv, brand, limit, language):
         keywords = [k.strip() for k in keywords_csv.split(",") if k.strip()]
-        async with httpx.AsyncClient() as client:
-            r = await client.post(f"{base}/api/summarize_trends", json={
-                "platforms": platforms, "keywords": keywords, "brand": brand,
-                "limit": int(limit), "language": language
-            })
-        r.raise_for_status()
-        data = r.json()
-        items = data["items"]
-        summary = data["summary"]
+        items = await fetch_trend_samples(platforms, keywords, int(limit))
+        summary = await summarize_trends_llm(items, brand, language)
         return json.dumps(items, ensure_ascii=False, indent=2), summary
 
     async def do_generate_plan(brand, language, platforms, keywords_csv, start_date, tone, cta, image_style_hint):
         keywords = [k.strip() for k in keywords_csv.split(",") if k.strip()]
-        async with httpx.AsyncClient() as client:
-            r = await client.post(f"{base}/api/generate_week_plan", json={
-                "brand": brand, "language": language, "platforms": platforms,
-                "keywords": keywords, "start_date": (start_date or None),
-                "tone": tone, "cta": cta, "image_style_hint": image_style_hint
-            })
-        r.raise_for_status()
-        posts = r.json()
-        return json.dumps(posts, ensure_ascii=False, indent=2)
+        posts = await generate_week_plan_llm(
+            brand=brand,
+            language=language,
+            platforms=platforms,
+            keywords=keywords,
+            start_date=(start_date or None),
+            tone=tone,
+            cta=cta,
+            image_style_hint=image_style_hint,
+        )
+        # DB保存
+        session = SessionLocal()
+        try:
+            out = []
+            for p in posts:
+                post = Post(
+                    platform=p.platform,
+                    scheduled_at=p.scheduled_at,
+                    text=p.text,
+                    image_prompt=p.image_prompt,
+                    status="draft",
+                )
+                session.add(post)
+                session.flush()
+                out.append({
+                    "id": post.id,
+                    "platform": post.platform,
+                    "scheduled_at": post.scheduled_at,
+                    "text": post.text,
+                    "image_prompt": post.image_prompt,
+                    "status": post.status,
+                })
+            session.commit()
+            return json.dumps(out, ensure_ascii=False, indent=2)
+        finally:
+            session.close()
 
     async def do_list_calendar():
-        async with httpx.AsyncClient() as client:
-            r = await client.get(f"{base}/api/calendar")
-        r.raise_for_status()
-        return json.dumps(r.json(), ensure_ascii=False, indent=2)
+        session = SessionLocal()
+        try:
+            posts = session.query(Post).order_by(Post.scheduled_at.asc().nulls_last()).all()
+            out = [{
+                "id": p.id,
+                "platform": p.platform,
+                "scheduled_at": p.scheduled_at,
+                "text": p.text,
+                "image_prompt": p.image_prompt,
+                "status": p.status,
+            } for p in posts]
+            return json.dumps({"events": out}, ensure_ascii=False, indent=2)
+        finally:
+            session.close()
 
     async def do_approve(post_id):
-        async with httpx.AsyncClient() as client:
-            r = await client.post(f"{base}/api/approve_post/{int(post_id)}")
-        r.raise_for_status()
-        return json.dumps(r.json(), ensure_ascii=False, indent=2)
+        session = SessionLocal()
+        try:
+            post = session.get(Post, int(post_id))
+            if not post:
+                return json.dumps({"error": "post not found"}, ensure_ascii=False)
+            post.status = "approved"
+            session.commit()
+            return json.dumps({
+                "id": post.id, "platform": post.platform, "scheduled_at": post.scheduled_at,
+                "text": post.text, "image_prompt": post.image_prompt, "status": post.status
+            }, ensure_ascii=False, indent=2)
+        finally:
+            session.close()
 
     async def do_schedule(post_id, iso):
-        async with httpx.AsyncClient() as client:
-            r = await client.post(f"{base}/api/schedule_post/{int(post_id)}", json={"scheduled_at": iso})
-        r.raise_for_status()
-        return json.dumps(r.json(), ensure_ascii=False, indent=2)
+        session = SessionLocal()
+        try:
+            post = session.get(Post, int(post_id))
+            if not post:
+                return json.dumps({"error": "post not found"}, ensure_ascii=False)
+            if post.status != "approved":
+                return json.dumps({"error": "post must be approved before scheduling"}, ensure_ascii=False)
+            post.scheduled_at = iso
+            post.status = "scheduled"
+            session.commit()
+            # 予約ジョブ登録
+            schedule_post_job(post.id, post.platform, post.text, post.image_prompt, post.scheduled_at)
+            return json.dumps({
+                "id": post.id, "platform": post.platform, "scheduled_at": post.scheduled_at,
+                "text": post.text, "image_prompt": post.image_prompt, "status": post.status
+            }, ensure_ascii=False, indent=2)
+        finally:
+            session.close()
 
     async def save_keywords(keywords_csv):
-        keywords = [k.strip() for k in keywords_csv.split(",") if k.strip()]
-        async with httpx.AsyncClient() as client:
-            r = await client.post(f"{base}/api/keywords", json={"keywords": keywords})
-        r.raise_for_status()
-        return "保存しました"
+        kws = [k.strip() for k in keywords_csv.split(",") if k.strip()]
+        session = SessionLocal()
+        try:
+            session.query(Keyword).delete()
+            for kw in kws:
+                session.add(Keyword(text=kw))
+            session.commit()
+            return "保存しました"
+        finally:
+            session.close()
 
     async def load_keywords():
-        async with httpx.AsyncClient() as client:
-            r = await client.get(f"{base}/api/keywords")
-        r.raise_for_status()
-        data = r.json()
-        return ", ".join(data.get("keywords", []))
+        session = SessionLocal()
+        try:
+            kws = [k.text for k in session.query(Keyword).all()]
+            return ", ".join(kws)
+        finally:
+            session.close()
 
     with gr.Blocks(title="SNS運用AIライト") as demo:
         gr.Markdown("## SNS運用AIライト — 競合/トレンド要約 → 1週間案 → 承認 → 予約投稿")
@@ -93,7 +153,7 @@ def build_ui(fastapi_app):
             gr.Markdown("承認→予約→公開（APScheduler）が動きます。")
             post_id = gr.Number(label="Post ID")
             approve_btn = gr.Button("承認する")
-            schedule_iso = gr.Textbox(label="予約日時（ISO, 例: 2025-09-01T09:00:00Z）")
+            schedule_iso = gr.Textbox(label="予約日時（ISO, 例: 2025-09-01T09:00:00Z または +09:00）")
             schedule_btn = gr.Button("予約に登録")
             out = gr.Code(label="レスポンス", language="json")
             approve_btn.click(do_approve, [post_id], [out])