Update app.py

app.py

@@ -2,17 +2,18 @@ import streamlit as st
 import requests
 from bs4 import BeautifulSoup
 import pandas as pd
-from google.oauth2.service_account import Credentials
-import gspread
 import plotly.express as px
 import plotly.graph_objects as go
+from plotly.subplots import make_subplots
+from google.oauth2.service_account import Credentials
+import gspread
 
 # Google Sheets credentials
 SCOPE = ['https://www.googleapis.com/auth/spreadsheets']
 SERVICE_ACCOUNT_FILE = "realtime-441511-f5708eabdf26.json"
 SPREADSHEET_URL = "https://docs.google.com/spreadsheets/d/1tIsXCbB8P6ZxdnZNnv7S7BBWbbT7lrSjW990zG-vQAA/edit?gid=0#gid=0"
 
-# Streamlit app
+# Streamlit app setup
 st.title("Booking.com 台南飯店資料爬取與分析")
 st.sidebar.header("功能選擇")
 mode = st.sidebar.selectbox("選擇模式", ["資料爬取", "資料視覺化", "上傳至 Google Sheet"])
@@ -42,51 +43,25 @@ def scrape_booking_hotel():
         hotel_cards = soup.find_all('div', {'data-testid': 'property-card'})
 
         for hotel in hotel_cards:
-            try:
-                name_elem = hotel.find('div', {'data-testid': 'title'})
-                name = name_elem.text.strip() if name_elem else "無資料"
-                price_elem = hotel.find('span', {'data-testid': 'price-and-discounted-price'})
-                price = price_elem.text.strip() if price_elem else "無資料"
-                
-                # 清洗價格資料
-                price = (
-                    price.replace('TWD', '')
-                    .replace(' ', '')
-                    .replace(',', '')
-                    .strip()
-                )
-                price = int(price) if price.isdigit() else None
-                
-                rating_container = hotel.find('div', {'class': 'a3b8729ab1'})
-                rating_elem = rating_container.find('div', {'class': 'ac4a7896c7'}) if rating_container else None
-                rating = rating_elem.text.strip() if rating_elem else "無評分"
-                description_elem = hotel.find('div', {'data-testid': 'recommended-units'})
-                
-                if description_elem:
-                    room_type = description_elem.find('h4')
-                    room_type = room_type.text.strip() if room_type else ""
-                    bed_info = description_elem.find('div')
-                    bed_info = bed_info.text.strip() if bed_info else ""
-                    cancellation = description_elem.find('strong', text='可免費取消')
-                    cancellation = "可免費取消" if cancellation else ""
-                    payment = description_elem.find('strong', text='無需訂金')
-                    payment = "無需訂金" if payment else ""
-                    description = f"{room_type} | {bed_info} | {cancellation} | {payment}".strip(' |')
-                else:
-                    description = "無說明"
-                
-                hotels_data.append({
-                    '飯店名稱': name,
-                    '價格': price,
-                    '評分': rating,
-                    '說明': description
-                })
-            except AttributeError:
-                continue
+            name = hotel.find('div', {'data-testid': 'title'}).text.strip() if hotel.find('div', {'data-testid': 'title'}) else "無資料"
+            price_elem = hotel.find('span', {'data-testid': 'price-and-discounted-price'})
+            price = price_elem.text.strip().replace('TWD', '').replace(',', '').strip() if price_elem else "無資料"
+            rating_elem = hotel.find('div', {'class': 'a3b8729ab1'})
+            rating = rating_elem.text.strip() if rating_elem else "無評分"
+            description_elem = hotel.find('div', {'data-testid': 'recommended-units'})
+            if description_elem:
+                room_type = description_elem.find('h4').text.strip() if description_elem.find('h4') else ""
+                bed_info = description_elem.find('div').text.strip() if description_elem.find('div') else ""
+                cancellation = "可免費取消" if description_elem.find('strong', text='可免費取消') else ""
+                payment = "無需訂金" if description_elem.find('strong', text='無需訂金') else ""
+                description = f"{room_type} | {bed_info} | {cancellation} | {payment}".strip(' |')
+            else:
+                description = "無說明"
 
-        df = pd.DataFrame(hotels_data).drop_duplicates()
-        return df
+            hotels_data.append({'飯店名稱': name, '價格': price, '評分': rating, '說明': description})
+        return pd.DataFrame(hotels_data).drop_duplicates()
     except requests.RequestException:
+        st.error("無法從網站獲取資料")
         return pd.DataFrame()
 
 def clean_rating(x):
@@ -94,51 +69,28 @@ def clean_rating(x):
         return 0
     return float(str(x).replace('分數', '').replace('分', ''))
 
+def upload_to_google_sheets(df):
+    creds = Credentials.from_service_account_file(SERVICE_ACCOUNT_FILE, scopes=SCOPE)
+    gs = gspread.authorize(creds)
+    sheet = gs.open_by_url(SPREADSHEET_URL)
+    worksheet = sheet.get_worksheet(0)
+    worksheet.update([df.columns.values.tolist()] + df.astype(str).values.tolist())
+    return "資料已成功上傳到 Google Sheet！"
+
+# Visualization functions
 def create_price_rating_scatter(df):
-    if df.empty:
-        st.warning("數據為空，無法生成圖表。")
-        return None
-    fig = px.scatter(
-        df,
-        x='價格',
-        y='評分',
-        text='飯店名稱',
-        size='價格',  # 點大小基於價格
-        color='評分',
-        title='台南飯店價格與評分關係圖',
-        labels={'價格': '房價 (TWD)', '評分': '評分 (0-10)'}
-    )
+    fig = px.scatter(df, x='價格', y='評分', text='飯店名稱', size='價格', color='評分',
+                     title='台南飯店價格與評分關係圖', labels={'價格': '房價 (TWD)', '評分': '評分 (0-10)'})
     fig.update_layout(height=600, title_x=0.5)
     return fig
 
 def create_price_distribution(df):
-    if df.empty:
-        st.warning("數據為空，無法生成圖表。")
-        return None
     fig = go.Figure()
-    fig.add_trace(go.Histogram(
-        x=df['價格'],
-        name='價格分布',
-        nbinsx=10,
-        marker_color='rgb(55, 83, 109)'
-    ))
-    fig.add_trace(go.Box(
-        x=df['價格'],
-        name='價格箱型圖',
-        marker_color='rgb(26, 118, 255)'
-    ))
+    fig.add_trace(go.Histogram(x=df['價格'], name='價格分布', nbinsx=10, marker_color='rgb(55, 83, 109)'))
+    fig.add_trace(go.Box(x=df['價格'], name='價格箱型圖', marker_color='rgb(26, 118, 255)'))
     fig.update_layout(title_text='台南飯店價格分布', title_x=0.5, height=500)
     return fig
 
-def upload_to_google_sheets(df):
-    creds = Credentials.from_service_account_file(SERVICE_ACCOUNT_FILE, scopes=SCOPE)
-    gs = gspread.authorize(creds)
-    sheet = gs.open_by_url(SPREADSHEET_URL)
-    worksheet = sheet.get_worksheet(0)
-    df1 = df.astype(str)
-    worksheet.update([df1.columns.values.tolist()] + df1.values.tolist())
-    return "資料已成功上傳到 Google Sheet！"
-
 # Streamlit app implementation
 if mode == "資料爬取":
     st.header("爬取台南飯店資料")
@@ -159,15 +111,10 @@ elif mode == "資料視覺化":
         df['評分'] = df['評分'].apply(clean_rating)
         df = df.dropna(subset=['價格'])
 
-        st.write(f"有效數據行數：{len(df)}")
-        st.write(f"價格缺失值數量：{df['價格'].isna().sum()}")
-
         scatter_fig = create_price_rating_scatter(df)
-        if scatter_fig:
-            st.plotly_chart(scatter_fig)
+        st.plotly_chart(scatter_fig)
         dist_fig = create_price_distribution(df)
-        if dist_fig:
-            st.plotly_chart(dist_fig)
+        st.plotly_chart(dist_fig)
     except Exception as e:
         st.error(f"讀取或分析資料時發生錯誤：{e}")
 
@@ -178,4 +125,4 @@ elif mode == "上傳至 Google Sheet":
         result = upload_to_google_sheets(df)
         st.success(result)
     except Exception as e:
-        st.error(f"上傳資料時發生錯誤：{e}")
+        st.error(f"上傳資料時發生錯誤：{e}")