Update app.py

app.py

@@ -1,4 +1,4 @@
-# slack_reporter/app.py – med förbättrad loggning
+# slack_reporter/app.py – med Imgur och lokal visning av grafer
 import os
 import time
 import schedule
@@ -8,7 +8,7 @@ import requests
 import logging
 import re
 from datetime import datetime, timedelta
-from huggingface_hub import HfApi, hf_hub_download
+from huggingface_hub import hf_hub_download
 import gradio as gr
 
 # --- Loggning ---
@@ -23,6 +23,7 @@ REPO_ID = "ChargeNodeEurope/logfiles"
 LOG_FILENAME = "logs/conversation_log.txt"
 WEBHOOK_URL = os.environ.get("SLACK_WEBHOOK_URL")
 HF_TOKEN = os.environ.get("HF_TOKEN")
+IMGUR_CLIENT_ID = os.environ.get("IMGUR_CLIENT_ID")  # Du måste lägga till denna i dina Secrets
 
 # --- Funktion: Skapa grafer ---
 def generate_graphs(df):
@@ -62,31 +63,18 @@ def generate_graphs(df):
 
     return user_graph_path, hourly_graph_path
 
-# --- Funktion: Ladda upp grafer till Hugging Face Hub ---
-def upload_graphs_to_hub(user_graph_path, hourly_graph_path):
-    api = HfApi()
-    api.upload_file(
-        path_or_fileobj=user_graph_path,
-        path_in_repo="graphs/daily_users.png",
-        repo_id=REPO_ID,
-        repo_type="dataset",
-        token=HF_TOKEN
-    )
-    logging.info("Uploader lyckades: daily_users.png")
-
-    api.upload_file(
-        path_or_fileobj=hourly_graph_path,
-        path_in_repo="graphs/hourly_msgs.png",
-        repo_id=REPO_ID,
-        repo_type="dataset",
-        token=HF_TOKEN
-    )
-    logging.info("Uploader lyckades: hourly_msgs.png")
-
-    return (
-        f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/graphs/daily_users.png",
-        f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/graphs/hourly_msgs.png"
-    )
+# --- Funktion: Ladda upp bilder till Imgur ---
+def upload_to_imgur(image_path):
+    headers = {"Authorization": f"Client-ID {IMGUR_CLIENT_ID}"}
+    with open(image_path, 'rb') as img:
+        response = requests.post("https://api.imgur.com/3/image", headers=headers, files={"image": img})
+    if response.status_code == 200:
+        link = response.json()["data"]["link"]
+        logging.info(f"Imgur upload success: {link}")
+        return link
+    else:
+        logging.error(f"Imgur upload failed: {response.text}")
+        return None
 
 # --- Funktion: Skicka Slack-meddelande ---
 def send_to_slack(user_url, hourly_url):
@@ -151,7 +139,6 @@ def run_report():
             logging.info("Loggfil läst som JSONL.")
         except Exception as e:
             logging.warning(f"Kunde inte läsa logg som JSONL: {e}")
-            logging.info("Försöker läsa som textlogg istället...")
             df = parse_legacy_log(log_path)
 
         if df.empty:
@@ -163,10 +150,14 @@ def run_report():
             logging.warning("Grafer kunde inte skapas.")
             return "⚠️ Inga data att rapportera."
 
-        user_url, hourly_url = upload_graphs_to_hub(user_graph, hourly_graph)
-        send_to_slack(user_url, hourly_url)
-        logging.info("Rapport skickad till Slack.")
-        return "✅ Slack-meddelande skickat med grafer."
+        user_url = upload_to_imgur(user_graph)
+        hourly_url = upload_to_imgur(hourly_graph)
+
+        if user_url and hourly_url:
+            send_to_slack(user_url, hourly_url)
+            return "✅ Slack-meddelande skickat med grafer."
+        else:
+            return "⚠️ Kunde inte ladda upp grafer till Imgur."
 
     except Exception as e:
         logging.error(f"Fel vid körning: {e}", exc_info=True)
@@ -183,14 +174,20 @@ def run_schedule():
 import threading
 threading.Thread(target=run_schedule, daemon=True).start()
 
-# --- Gradio-knapp för manuell körning ---
+# --- Gradio UI ---
 with gr.Blocks() as app:
     gr.Markdown("# Slack Reporter - ChargeNode")
     gr.Markdown("Tryck på knappen för att generera dagens rapport och posta till Slack.")
     btn = gr.Button("Skicka nu")
     output = gr.Textbox()
-    btn.click(fn=run_report, outputs=output)
+    image1 = gr.Image(label="Unika användare (14 dagar)")
+    image2 = gr.Image(label="Meddelanden per timme (72h)")
 
-if __name__ == "__main__":
-    app.launch()
+    def manual_run():
+        result = run_report()
+        return result, "daily_users.png", "hourly_msgs.png"
 
+    btn.click(fn=manual_run, outputs=[output, image1, image2])
+
+if __name__ == "__main__":
+    app.launch()