Update app.py

app.py

@@ -6,35 +6,18 @@ import plotly.graph_objs as go
 import plotly.express as px
 import numpy as np
 import matplotlib.pyplot as plt
+import json
 
-# Renewable energy data fetch function
-def get_renewable_energy_data(city_code):
-    url = f"https://energy-sustainability.jp/_ajax/renewable_energy/get/?code={city_code}"
-    response = requests.get(url)
-    if response.status_code != 200:
-        return None, "Failed to retrieve data."
-
-    data = response.json()
-    if not data:
-        return None, "No data found."
-
-    base_times = data[next(iter(data))]['x']
-    result_df = pd.DataFrame({"Time": base_times})
-
-    for energy_type, energy_data in data.items():
-        if 'x' in energy_data and 'y' in energy_data:
-            values = energy_data['y']
-            result_df[f"{energy_type} hourly capacity factor"] = values
-
-    return result_df, None
+def get_json():
+    """
+    ローカルのdata.json を取得する
+    """
+    with open('data.json') as f:
+    return json.load(f)
 
 # Optimize energy system and use MGA
-def optimize_energy_system(city_code, solar_cost, onshore_wind_cost, offshore_wind_cost, river_cost, battery_cost, yearly_demand, solar_range, wind_range, river_range, offshore_wind_range, thresholds, selected_tech):
-    data, error = get_renewable_energy_data(city_code)
-    if error:
-        st.error(error)
-        return None, None, None, None, None, None, None
-
+def optimize_energy_system(solar_cost, onshore_wind_cost, offshore_wind_cost, river_cost, battery_cost, yearly_demand, solar_range, wind_range, river_range, offshore_wind_range, thresholds, selected_tech):
+    data = get_json()
     for col in data.columns[1:]:
         data[col] = pd.to_numeric(data[col], errors='coerce')
     data = data.fillna(0)
@@ -163,7 +146,6 @@ st.title('Modeling to Generate Alternatives (MGA) in Renewable Energy System Opt
 # Sidebar Inputs
 with st.sidebar:
     st.header('Input Parameters')
-    city_code = st.text_input("Enter City Code", value="999999")
     solar_cost = st.number_input("Solar Capacity Cost (¥/MW)", value=80.0)
     onshore_wind_cost = st.number_input("Onshore Wind Capacity Cost (¥/MW)", value=120.0)
     offshore_wind_cost = st.number_input("Offshore Wind Capacity Cost (¥/MW)", value=180.0)
@@ -185,7 +167,7 @@ with st.sidebar:
 
 if st.button("Run MGA Optimization"):
     # 実行して alternative_solutions を取得
-    alternative_solutions = optimize_energy_system(city_code, solar_cost, onshore_wind_cost, offshore_wind_cost, river_cost, battery_cost, yearly_demand, solar_range, wind_range, river_range, offshore_wind_range, [t / 100 for t in thresholds], selected_technologies)
+    alternative_solutions = optimize_energy_system(solar_cost, onshore_wind_cost, offshore_wind_cost, river_cost, battery_cost, yearly_demand, solar_range, wind_range, river_range, offshore_wind_range, [t / 100 for t in thresholds], selected_technologies)
 
     if alternative_solutions:
         # # コスト積み上げ用データの収集