change some sever type shi

server/meta.py

@@ -11,20 +11,43 @@ ACCESS_TOKEN = os.getenv("FB_PAGE_ACCESS_TOKEN")
 
 generated_fb_post = reactive.Value("")
 
-def generate_facebook_post(topic: str) -> str:
-    prompt = (
+def generate_facebook_post(topic: str, max_len: int = 500) -> str:
+    # Step 1: Initial post generation
+    gen_prompt = (
         f"You are a social media manager for a hobby e-commerce company called 'Ultima Supply'.\n"
-        f"Write a short, engaging Facebook post (max 500 characters) about: '{topic}'.\n"
-        f"Use casual and friendly tone. Include emojis and 3-5 relevant hashtags."
+        f"Write a short, engaging Facebook post (max {max_len} characters) about: '{topic}'.\n"
+        f"Use a casual and friendly tone. Include emojis and 3–5 SEO-relevant hashtags. Keep it under the character limit."
     )
-    return get_response(
-        input=prompt,
-        template=lambda x: x,
+
+    post = get_response(
+        input=gen_prompt,
+        template=lambda x: x.strip(),
         llm="gemini",
         md=False,
         temperature=0.9,
-        max_tokens=500
-    )
+        max_tokens=250
+    ).strip()
+
+    # Step 2: If too long, ask Gemini to shorten it
+    if len(post) <= max_len:
+        return post
+    else:
+        shorten_prompt = (
+            f"Shorten this Facebook post to {max_len} characters or fewer, but keep the friendly tone, emojis, and all original hashtags:\n\n"
+            f"{post}\n\n"
+            f"Only return the shortened post. Do not remove hashtags or change tone."
+        )
+
+        shortened = get_response(
+            input=shorten_prompt,
+            template=lambda x: x.strip(),
+            llm="gemini",
+            md=False,
+            temperature=0.7,
+            max_tokens=200
+        ).strip()
+
+        return shortened[:max_len]  # Hard cap fallback
 
 def post_to_facebook(message: str) -> str:
     url = f"https://graph.facebook.com/{PAGE_ID}/feed"

server/twitter.py

@@ -2,26 +2,19 @@ from shiny import reactive, render, ui
 import os
 import requests
 from bs4 import BeautifulSoup
-import tweepy
 from dotenv import load_dotenv, find_dotenv
+import tweepy
 from llm_connect import get_response
 
+# Load environment variables
 load_dotenv(find_dotenv(), override=True)
 
-BEARER_TOKEN = os.getenv("TWITTER_BEARER_TOKEN")
+# Load credentials
 API_KEY = os.getenv("TWITTER_ACC_API_KEY")
 API_SECRET = os.getenv("TWITTER_ACC_API_SECRET")
 ACCESS_TOKEN = os.getenv("TWITTER_ACC_ACCESS_TOKEN")
 ACCESS_TOKEN_SECRET = os.getenv("TWITTER_ACC_ACCESS_TOKEN_SECRET")
 
-client = tweepy.Client(
-    bearer_token=BEARER_TOKEN,
-    consumer_key=API_KEY,
-    consumer_secret=API_SECRET,
-    access_token=ACCESS_TOKEN,
-    access_token_secret=ACCESS_TOKEN_SECRET
-)
-
 generated_tweet = reactive.Value("")
 
 def scrape_shopify_blog(url: str) -> str:
@@ -36,36 +29,94 @@ def scrape_shopify_blog(url: str) -> str:
     except Exception as e:
         return f"❌ Error scraping blog: {e}"
 
-def generate_tweet_from_text(text: str) -> str:
-    prompt = (
+def generate_tweet_from_text(text: str, url: str='https://ultimasupply.com/blogs/news', max_len: int = 250) -> str:
+    # Step 1: Generate tweet from blog content
+    gen_prompt = (
         "You are a social media manager for a hobby e-commerce company called 'Ultima Supply'.\n"
-        "Write a detailed, engaging Twitter post (min 200 chars, max 280 chars) summarizing the Shopify blog content:\n"
-        f"{text}\n"
-        "Use casual, fun language. Include emojis and 3-5 relevant hashtags."
+        f"Write a single engaging Twitter post (max {max_len} characters) summarizing the following Shopify blog content:\n\n"
+        f"{text}\n\n"
+        f"The tweet MUST include this URL: {url}\n"
+        "Use casual, fun language. Add emojis and 3–5 SEO-relevant hashtags. Keep it under the character limit and make it attention-grabbing."
     )
-    return get_response(
-        input=prompt,
-        template=lambda x: x,
+
+
+    tweet = get_response(
+        input=gen_prompt,
+        template=lambda x: x.strip(),
         llm='gemini',
         md=False,
-        temperature=0.9,
-        max_tokens=500
-    )
+        temperature=0.6,
+        max_tokens=100
+    ).strip()
 
-def generate_tweet_from_topic(topic: str) -> str:
-    prompt = (
-        f"You are a social media manager for a hobby e-commerce company called 'Ultima Supply'.\n"
-        f"Write a detailed, engaging Twitter post (min 200 chars, max 280 chars) about: '{topic}'.\n"
-        f"Use casual, fun language. Include emojis and 3-5 SEO relevant hashtags."
+    print(f'Base Tweet: {tweet}')
+
+    # Step 2: If too long, ask Gemini to shorten it
+    if len(tweet) <= max_len:
+        return tweet
+    else:
+        shorten_prompt = (
+            f"You are shortening this tweet to {max_len} characters or fewer.\n"
+            f"YOU MUST KEEP ALL of the original SEO hashtags and the Shopify blog link intact in the final output.\n"
+            f"DO NOT remove or modify the link or any hashtags.\n\n"
+            f"Original tweet:\n{tweet}\n"
+        )
+
+        shortened = get_response(
+            input=shorten_prompt,
+            template=lambda x: x.strip(),
+            llm='gemini',
+            md=False,
+            temperature=0.5,
+            max_tokens=75
+        ).strip()
+
+        return shortened  # Final hard cap just in case
+
+
+def generate_tweet_from_topic(topic: str, max_len: int = 250) -> str:
+    # Step 1: Generate tweet from topic
+    gen_prompt = (
+        f"You are a social media manager for a hobby e-commerce brand called 'Ultima Supply'.\n"
+        f"Write a SHORT SINGLE SENTENCE Twitter post (max {max_len} characters) about: '{topic}'.\n"
+        f"Use casual, fun language. Include emojis and 3-5 SEO-relevant hashtags."
     )
-    return get_response(
-        input=prompt,
-        template=lambda x: x,
+
+    tweet = get_response(
+        input=gen_prompt,
+        template=lambda x: x.strip(),
         llm='gemini',
         md=False,
-        temperature=0.9,
-        max_tokens=500
-    )
+        temperature=0.6,
+        max_tokens=100
+    ).strip()
+
+    print(f'Base Tweet: {tweet}')
+
+    # Step 2: If too long, regenerate with shortening prompt
+    if len(tweet) <= max_len:
+        return tweet
+    else:
+        shorten_prompt = (
+            f"You are shortening this tweet to {max_len} characters or fewer.\n"
+            f"YOU MUST KEEP ALL of the original SEO hashtags and the Shopify blog link intact in the final output.\n"
+            f"DO NOT remove or modify the link or any hashtags.\n\n"
+            f"Original tweet:\n{tweet}\n"
+        )
+
+
+        shortened = get_response(
+            input=shorten_prompt,
+            template=lambda x: x.strip(),
+            llm='gemini',
+            md=False,
+            temperature=0.5,
+            max_tokens=75
+        ).strip()
+
+
+        return shortened  # Ensure hard cutoff if still too long
+
 
 def tweet_input_handler(url: str, topic: str) -> str:
     if url.strip():
@@ -78,15 +129,42 @@ def tweet_input_handler(url: str, topic: str) -> str:
     else:
         return "⚠️ Provide either a blog URL or a topic."
 
-def post_tweet(text: str) -> str:
+# Create Tweepy v2 Client
+def get_tweepy_client():
+    return tweepy.Client(
+        consumer_key=API_KEY,
+        consumer_secret=API_SECRET,
+        access_token=ACCESS_TOKEN,
+        access_token_secret=ACCESS_TOKEN_SECRET
+    )
+
+# Post tweet using Tweepy v2 Client
+def post_tweet_tweepy(tweet_text: str) -> str:
     try:
-        response = client.create_tweet(text=text)
-        print("✅ Tweet response:", response.data)
-        return f"✅ Tweet posted (ID: {response.data['id']})"
+        client = get_tweepy_client()
+        response = client.create_tweet(text=tweet_text)
+        tweet_id = response.data.get("id")
+        print("✅ Tweet posted:", tweet_id)
+        return f"✅ Tweet posted (ID: {tweet_id})"
     except Exception as e:
-        print("❌ Tweet error:", e)
+        print("❌ Failed to post tweet:", e)
         return f"❌ Failed to post tweet: {e}"
 
+# Check auth by attempting to fetch own user (optional)
+def check_twitter_connection() -> str:
+    try:
+        client = get_tweepy_client()
+        user_data = client.get_me()
+        if user_data and user_data.data:
+            username = user_data.data.username
+            print(f"✅ Connected to Twitter as @{username}")
+            return f"✅ Connected to Twitter as @{username}"
+        else:
+            return "❌ Unable to fetch Twitter account info."
+    except Exception as e:
+        print("❌ Connection check failed:", e)
+        return f"❌ Twitter auth error: {e}"
+
 # ---- EXPORT THIS FOR app.py TO CALL ----
 def server(input, output, session):
     @output
@@ -96,6 +174,7 @@ def server(input, output, session):
         url = input.shopify_url().strip()
         topic = input.tweet_topic().strip()
         tweet = tweet_input_handler(url, topic)
+        print("📝 Generated Tweet:\n", tweet)
         if tweet.startswith("⚠️"):
             return ui.HTML(f"<p><strong>{tweet}</strong></p>")
         generated_tweet.set(tweet)
@@ -105,7 +184,11 @@ def server(input, output, session):
     @render.text
     @reactive.event(input.post_btn_twt)
     def tweet_post_status():
+        status = check_twitter_connection()
+        if status.startswith("❌"):
+            return status
         tweet = generated_tweet()
+        print("📤 Attempting to post tweet:", tweet)
         if not tweet:
             return "⚠️ No tweet generated yet."
-        return post_tweet(tweet)
+        return post_tweet_tweepy(tweet)

ui/meta.py

@@ -2,12 +2,28 @@ from shiny import ui
 
 ui = ui.nav_panel(
     "Facebook Poster",
+
+    # Input for post topic
     ui.input_text("fb_topic", "Enter Topic", placeholder="e.g. New Anime Drop This Friday"),
+
+    # Generate button
     ui.div(
         ui.input_action_button("gen_btn_fb", "Generate Facebook Post", class_="btn-primary"),
         class_="mt-3 mb-2"
     ),
+
+    # Output: generated post
     ui.output_ui("fb_post_draft"),
-    ui.input_action_button("post_btn_fb", "Post to Facebook", class_="btn-success"),
-    ui.output_text("fb_post_status")
+
+    # Post button
+    ui.div(
+        ui.input_action_button("post_btn_fb", "Post to Facebook", class_="btn-success"),
+        class_="my-3"
+    ),
+
+    # Status message
+    ui.output_text("fb_post_status"),
+
+    # Optional: spacing/padding at bottom
+    class_="p-4"
 )