Update app.py

app.py

@@ -14,7 +14,7 @@ gmaps = googlemaps.Client(key=API_KEY)
 
 def get_business_suggestions(query, location):
     try:
-        if not query or len(query) < 3:  # Don't search for very short queries
+        if not query or len(query) < 3:
             return []
         response = gmaps.places_autocomplete(query, location=location)
         return [{"name": item["description"], "place_id": item["place_id"]} for item in response]
@@ -25,12 +25,12 @@ def get_business_suggestions(query, location):
 def get_google_maps_rank(keyword, location, business_name, business_place_id, search_radius_km, max_results=5):
     results = {"keyword": keyword, "source": "Google Maps", "rank": None, "name": None, "address": None}
     search_radius_m = search_radius_km * 1000
-    
+
     try:
         geocode = gmaps.geocode(location)
         if not geocode:
             return {"error": "Location not found"}
-            
+
         latlng = geocode[0]['geometry']['location']
 
         places_result = gmaps.places(
@@ -38,10 +38,10 @@ def get_google_maps_rank(keyword, location, business_name, business_place_id, se
             location=(latlng['lat'], latlng['lng']),
             radius=search_radius_m
         )
-        
+
         if 'results' not in places_result:
             return {"error": "No results found for this search"}
-            
+
         places = places_result['results'][:max_results]
 
         for rank, place in enumerate(places, 1):
@@ -62,19 +62,19 @@ def get_serp_rankings(keyword, location, website_url=None):
         geocode = gmaps.geocode(location)
         if not geocode:
             return {"error": "Location not found"}
-        
+
         params = {
             'key': SEARCH_API_KEY,
             'cx': CX,
             'q': f"{keyword} near {location}",
-            'gl': location.split(",")[-1].strip().lower(),  # Country code
+            'gl': location.split(",")[-1].strip().lower(),
             'num': 10,
             'lr': 'lang_en'
         }
-        
+
         response = requests.get("https://www.googleapis.com/customsearch/v1", params=params)
         results = response.json()
-        
+
         if "items" in results:
             for i, item in enumerate(results["items"], 1):
                 link = item.get("link", "")
@@ -86,7 +86,7 @@ def get_serp_rankings(keyword, location, website_url=None):
                         "title": item.get("title", "N/A"),
                         "link": link
                     }
-            
+
             return {
                 "keyword": keyword,
                 "source": "Google Search",
@@ -100,8 +100,45 @@ def get_serp_rankings(keyword, location, website_url=None):
 
 def save_to_excel(data, filename="my_website_rankings.xlsx"):
     try:
-        df = pd.DataFrame(data)
+        now = datetime.now()
+        current_date = now.strftime("%Y-%m-%d")
+        current_time = now.strftime("%H:%M:%S")
+
+        combined_data = {}
+
+        for entry in data:
+            keyword = entry["Keyword"]
+            if keyword not in combined_data:
+                combined_data[keyword] = {
+                    "Date": current_date,
+                    "Time": current_time,
+                    "Keyword": keyword,
+                    "Google Maps Rank": "-",
+                    "Google Maps Business Name": "-",
+                    "Google Maps Address": "-",
+                    "SERP Rank": "-",
+                    "SERP Title": "-",
+                    "SERP Link": "-"
+                }
+
+            if entry["Source"] == "Google Maps":
+                combined_data[keyword]["Google Maps Rank"] = entry["Rank"]
+                combined_data[keyword]["Google Maps Business Name"] = entry.get("Business Name", "-")
+                combined_data[keyword]["Google Maps Address"] = entry.get("Address", "-")
+            elif entry["Source"] == "Google Search":
+                combined_data[keyword]["SERP Rank"] = entry["Rank"]
+                combined_data[keyword]["SERP Title"] = entry.get("Title", "-")
+                combined_data[keyword]["SERP Link"] = entry.get("Link", "-")
+
+        df = pd.DataFrame(list(combined_data.values()))
+        column_order = [
+            "Date", "Time", "Keyword",
+            "Google Maps Rank", "Google Maps Business Name", "Google Maps Address",
+            "SERP Rank", "SERP Title", "SERP Link"
+        ]
+        df = df[column_order]
         df.to_excel(filename, index=False, engine='openpyxl')
+
         st.success(f"✅ Your website rankings saved to **{filename}**")
         st.download_button(
             label="📥 Download Excel File",
@@ -117,24 +154,20 @@ st.set_page_config(page_title="Business Rank Checker", layout="wide")
 st.title("📊 Business Rank Checker")
 st.markdown("Check your business ranking on Google Maps and search results")
 
-# Initialize session state variables
 if 'business_selection' not in st.session_state:
     st.session_state.business_selection = None
 if 'business_place_id' not in st.session_state:
     st.session_state.business_place_id = None
 
-# User Inputs
 with st.form("search_form"):
     col1, col2 = st.columns(2)
     with col1:
         location = st.text_input("📍 Target Location", "Nottingham, MD, USA")
     with col2:
         search_radius_km = st.slider("🔍 Search Radius (km)", 1, 20, 2)
-    
-    # Business name input with real-time suggestions
+
     business_query = st.text_input("🏢 Your Business Name", "", key="business_query")
-    
-    # Show suggestions as you type (appears automatically)
+
     if st.session_state.business_query and len(st.session_state.business_query) >= 3:
         suggestions = get_business_suggestions(st.session_state.business_query, location)
         if suggestions:
@@ -145,7 +178,6 @@ with st.form("search_form"):
                 key="business_suggestion_select",
                 label_visibility="collapsed"
             )
-            # Update the selected business in session state
             if selected_option:
                 st.session_state.business_selection = selected_option
                 st.session_state.business_place_id = next(
@@ -154,7 +186,7 @@ with st.form("search_form"):
                 )
         elif len(st.session_state.business_query) >= 3:
             st.warning("No matching businesses found")
-    
+
     website_url = st.text_input("🌐 Your Website URL", "", help="Enter your website to check if it appears in search results")
     keywords_input = st.text_input("📌 Search Keywords (comma separated)", "Phone repair, mobile repair")
     
@@ -162,29 +194,27 @@ with st.form("search_form"):
 
 if submitted and st.session_state.business_selection and st.session_state.business_place_id:
     keywords = [kw.strip() for kw in keywords_input.split(",") if kw.strip()]
-    
+
     if not keywords:
         st.warning("Please enter at least one search keyword")
         st.stop()
-    
-    my_website_rankings = []  # Store only your website's rankings
-    
+
+    my_website_rankings = []
+
     with st.spinner("Analyzing rankings..."):
         for keyword in keywords:
             st.subheader(f"🔍 Results for keyword: '{keyword}'")
             
-            # Google Maps Results
             st.markdown("### 📌 Google Maps Rankings")
             maps_rankings = get_google_maps_rank(
                 keyword, location, 
                 st.session_state.business_selection, st.session_state.business_place_id, 
                 search_radius_km
             )
-            
+
             if "error" in maps_rankings:
                 st.error(f"Error: {maps_rankings['error']}")
             else:
-                # Add to Excel data
                 my_website_rankings.append({
                     "Keyword": keyword,
                     "Source": "Google Maps",
@@ -192,20 +222,16 @@ if submitted and st.session_state.business_selection and st.session_state.busine
                     "Business Name": maps_rankings["name"],
                     "Address": maps_rankings["address"]
                 })
-                
-                # Display in app
                 st.markdown(f"#### Your Business: **{st.session_state.business_selection}**")
                 st.write(f"Rank: {maps_rankings['rank']}")
                 st.write(f"Address: {maps_rankings['address']}")
-            
-            # SERP Results
+
             st.markdown(f"### 🌐 Search Results for '{keyword}' in {location}")
             serp_results = get_serp_rankings(keyword, location, website_url)
-            
+
             if "error" in serp_results:
                 st.error(serp_results["error"])
             else:
-                # Add to Excel data
                 my_website_rankings.append({
                     "Keyword": keyword,
                     "Source": "Google Search",
@@ -213,15 +239,13 @@ if submitted and st.session_state.business_selection and st.session_state.busine
                     "Title": serp_results["title"],
                     "Link": serp_results["link"]
                 })
-                
-                # Display in app
+
                 st.write(f"Rank: {serp_results['rank']}")
                 if serp_results['rank'] != f"Not in top {10}":
                     st.write(f"Title: {serp_results['title']}")
                     st.write(f"Link: {serp_results['link']}")
-            
-            st.markdown("---")  # Separator between keywords
-        
-        # Save your website's rankings to Excel
+
+            st.markdown("---")
+
         if my_website_rankings:
-            save_to_excel(my_website_rankings)
+            save_to_excel(my_website_rankings)