bug fix

README.md

@@ -5,7 +5,6 @@ colorFrom: blue
 colorTo: pink
 sdk: streamlit
 sdk_version: 1.21.0
-python_version: 3.10.0
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -65,6 +65,32 @@ def predict(model, dataloader):
 #preds.rename(columns={'time_idx_x':'time_idx'},inplace=True)
 #preds.drop(columns=['time_idx_y'],inplace=True)
 
+def generate_plot(df, predictions):
+    fig, axs = plt.subplots(2, 2, figsize=(8, 6))
+    
+    # Plot scatter plots for each group
+    axs[0, 0].scatter(df.loc[df['Group'] == '4', 'Date'], df.loc[df['Group'] == '4', 'sales'], color='red', marker='o')
+    axs[0, 0].set_title('Article Group 1')
+    
+    axs[0, 1].scatter(df.loc[df['Group'] == '7', 'Date'], df.loc[df['Group'] == '7', 'sales'], color='blue', marker='o')
+    axs[0, 1].set_title('Article Group 2')
+    
+    axs[1, 0].scatter(df.loc[df['Group'] == '1', 'Date'], df.loc[df['Group'] == '1', 'sales'], color='green', marker='o')
+    axs[1, 0].set_title('Article Group 3')
+    
+    axs[1, 1].scatter(df.loc[df['Group'] == '6', 'Date'], df.loc[df['Group'] == '6', 'sales'], color='yellow', marker='o')
+    axs[1, 1].set_title('Article Group 4')
+    
+    # Adjust spacing between subplots
+    plt.tight_layout()
+    
+    for ax in axs.flat:
+        ax.set_xlim(df['Date'].min(), df['Date'].max())
+        ax.set_ylim(df['sales'].min(), df['sales'].max())
+    
+    st.pyplot(fig)
+    
+
 def main():
     ## Initiate Data
     with open('data/parameters.pkl', 'rb') as f:
@@ -72,7 +98,7 @@ def main():
     model = TemporalFusionTransformer.load_from_checkpoint('model/tft_check.ckpt', map_location=torch.device('cpu'))
     
     df = pd.read_pickle('data/test_data.pkl')
-    df = df.loc[(df["Branch"] == 15) & (df["Group"].isin(["6","7","4","1"]))]
+    df = df.loc[(df["Branch"] == "15") & (df["Group"].isin(["6","7","4","1"]))]
     
     rain_mapping = {
         "Yes" : 1,
@@ -110,31 +136,9 @@ def main():
     
     datepicker = st.date_input("Start of Forecast", datetime.date(2022, 12, 24), min_value=datetime.date(2022, 6, 26) + datetime.timedelta(days = 35), max_value=datetime.date(2023, 6, 26) - datetime.timedelta(days = 30))
     
-    fig, axs = plt.subplots(2, 2, figsize=(8, 6))
-    
-    # Plot scatter plots for each group
-    axs[0, 0].scatter(df.loc[df['Group'] == '4', 'Date'], df.loc[df['Group'] == '4', 'sales'], color='red', marker='o')
-    axs[0, 0].set_title('Article Group 1')
-    
-    axs[0, 1].scatter(df.loc[df['Group'] == '7', 'Date'], df.loc[df['Group'] == '7', 'sales'], color='blue', marker='o')
-    axs[0, 1].set_title('Article Group 2')
-    
-    axs[1, 0].scatter(df.loc[df['Group'] == '1', 'Date'], df.loc[df['Group'] == '1', 'sales'], color='green', marker='o')
-    axs[1, 0].set_title('Article Group 3')
-    
-    axs[1, 1].scatter(df.loc[df['Group'] == '6', 'Date'], df.loc[df['Group'] == '6', 'sales'], color='yellow', marker='o')
-    axs[1, 1].set_title('Article Group 4')
-    
-    # Adjust spacing between subplots
-    plt.tight_layout()
-    
-    for ax in axs.flat:
-        ax.set_xlim(df['Date'].min(), df['Date'].max())
-        ax.set_ylim(df['sales'].min(), df['sales'].max())
-    
-    st.pyplot(fig)
-    
-    st.button("Forecast Sales", type="primary")
+    if st.button("Forecast Sales", type="primary"):
+        converted_data = prepare_dataset(parameters, df, rain, temperature, datepicker)
+        generate_plot(converted_data)
 
 if __name__ == '__main__':
     main()

requirements.txt

@@ -22,7 +22,7 @@ decorator==5.1.1
 executing==1.2.0
 fonttools==4.38.0
 frozenlist==1.3.3
-fsspec
+fsspec==2022.11.0
 future==0.18.3
 google-auth==2.16.0
 google-auth-oauthlib==0.4.6
@@ -49,7 +49,7 @@ multidict==6.0.4
 nest-asyncio==1.5.6
 numpy==1.23.5
 oauthlib==3.2.2
-optuna
+optuna==2.10.1
 packaging==23.0
 pandas==1.5.2
 parso==0.8.3
@@ -72,8 +72,8 @@ Pygments==2.14.0
 pyparsing==3.0.9
 pyperclip==1.8.2
 python-dateutil==2.8.2
-pytorch-forecasting
-pytorch-lightning
+pytorch-forecasting==0.10.3
+pytorch-lightning==1.9.0
 pytz==2022.7.1
 PyYAML==6.0
 pyzmq==25.0.0
@@ -81,7 +81,7 @@ requests==2.28.2
 requests-futures==1.0.0
 requests-oauthlib==1.3.1
 rsa==4.9
-scikit-learn==1.2.2
+scikit-learn==1.1.3
 scipy==1.10.0
 six==1.16.0
 SQLAlchemy==1.4.46
@@ -93,8 +93,10 @@ tensorboard-data-server==0.6.1
 tensorboard-plugin-wit==1.8.1
 tensorboardX==2.5.1
 threadpoolctl==3.1.0
-torch
+torch==1.10.2
+torchaudio==0.10.2
 torchmetrics==0.11.0
+torchvision==0.11.3
 tornado==6.2
 tqdm==4.64.1
 traitlets==5.9.0