Update app.py

app.py

@@ -1,4 +1,3 @@
-from pytrends.request import TrendReq
 import streamlit as st
 import pandas as pd
 import xml.etree.ElementTree as ET
@@ -9,9 +8,31 @@ import hmac
 import os
 import time
 from PIL import Image
-from trend_crawl2 import crawl_url
+from trend_crawl import get_trends
+
 import re
 
+TREND_TOPICS = {
+    1: "Autos and Vehicles",
+    2: "Beauty and Fashion",
+    3: "Business and Finance",
+    20: "Climate",
+    4: "Entertainment",
+    5: "Food and Drink",
+    6: "Games",
+    7: "Health",
+    8: "Hobbies and Leisure",
+    9: "Jobs and Education",
+    10: "Law and Government",
+    11: "Other",
+    13: "Pets and Animals",
+    14: "Politics",
+    15: "Science",
+    16: "Shopping",
+    17: "Sports",
+    18: "Technology",
+    19: "Travel and Transportation"
+}
 
 def parse_url(url):
     response = requests.get(url)
@@ -157,8 +178,7 @@ def display_articles_for_category(category):
     checkbox_statuses = {}
     urls = []
 
-
-    trending_data = st.session_state["real_trending_searches"][selected_country][category]
+    trending_data = st.session_state["real_trending_searches"][selected_country][selected_country][category]
 
     if st.session_state.get("reset", False):
         for idx, (topic, data) in enumerate(trending_data.items()):
@@ -234,8 +254,6 @@ country_list = {
     "Austria" : "AT"
 }
 
-pytrend = TrendReq(hl='de-AT', tz=360, timeout=(10,50))
-
 if 'base_load_finished' not in st.session_state:
     st.session_state["real_trending_searches"] = {}
     st.session_state["base_data"] = {}
@@ -248,13 +266,11 @@ if 'base_load_finished' not in st.session_state or st.session_state.reset:
         for country_name, pn_option in country_list.items():
             st.session_state["base_data"][pn_option] = {}
             st.session_state["real_trending_searches"][pn_option] = {}
-            #st.session_state["today"][pn_option] = pytrend.today_searches(pn=pn_option)
-            print("crawl start")
-            st.session_state["base"][pn_option] = crawl_url(url=f"https://trends.google.com/trends/trendingsearches/daily?geo={pn_option}&category=2")
-            st.session_state["real_trending_searches"][pn_option] = convert_into_dict(st.session_state["base"][pn_option])
-            print(f"{country_name} finished")
+            st.session_state["real_trending_searches"][pn_option] = get_trends([pn_option]) 
+
         st.session_state["base_load_finished"]= True
 
+
 MAX_CHECKED = 3
 
 def check_password():
@@ -310,12 +326,11 @@ fixed_order = [
 ]
 
 if 'selected_option' not in st.session_state:
-    st.session_state['selected_option'] = "default_value"  # You can set a default value as needed
+    st.session_state['selected_option'] = "default_value"  
 
 img = Image.open(r"heute_tensora.png")
 st.sidebar.image(img)
 
-# Now, you can safely use st.session_state['selected_option']
 # Selectbox to choose a country
 selected_country = st.sidebar.selectbox("Choose a Country", ["AT", "DE"])
 feed_url1 = f'https://trends.google.de/trends/trendingsearches/daily/rss?geo={selected_country}'
@@ -340,16 +355,12 @@ st.warning("Die aufgelisteten Keywörter für erhöhte Reichweite in den Übersc
 #            continue
 
 if selected_option == "Realzeit Anfragen":
-    
-    raw_choices_list = list(st.session_state["real_trending_searches"][selected_country].keys())
-    print(raw_choices_list)
-    cleaned_to_raw_mapping = {re.sub(r"\s\(\d+\)$", "", choice): choice for choice in raw_choices_list}
-
-    choices_list = [category for category in fixed_order if category in cleaned_to_raw_mapping]
-
-    auswahl = st.selectbox("Select Ressort", choices_list, index=0)
+    available_topics = st.session_state["real_trending_searches"][selected_country][selected_country].keys()
+    filtered_topics = [topic for topic in TREND_TOPICS.values() if topic in available_topics]
+    all_topics = ["All categories"] + filtered_topics
+    auswahl = st.selectbox("Select Ressort", all_topics, index=0)
 
-    display_articles_for_category(cleaned_to_raw_mapping[auswahl])
+    display_articles_for_category(auswahl)
 
 elif selected_option == "Trends von Gestern":
     st.error("Aktuell nicht Erreichbar")