Update app.py

app.py

@@ -9,9 +9,9 @@ import time
 from datetime import timedelta, datetime
 from branca.element import Figure
 
-from functions import decode_features, get_model
+from functions import decode_features, get_model, get_model1, get_model2
 
-def greet(name):
+def greet(total_pred_days):
 
     project = hopsworks.login()
     #api = project.get_dataset_api()
@@ -22,39 +22,62 @@ def greet(name):
     )
 
     # The latest available data timestamp
-    start_time = 1670972400000
+    start_time = 1635112800000
+
     #start_date = datetime.now() - timedelta(days=1)
     #start_time = int(start_date.timestamp()) * 1000
 
 
     X = feature_view.get_batch_data(start_time=start_time)
-    latest_date_unix = str(X.date.values[0])[:10]
+    latest_date_unix = str(X.datetime.values[0])[:10]
     latest_date = time.ctime(int(latest_date_unix))
-    print(X)
-
     model = get_model(project=project,
                       model_name="temp_model",
                       evaluation_metric="f1_score",
                       sort_metrics_by="max")
+    model1 = get_model1(project=project,
+                      model_name="tempmax_model",
+                      evaluation_metric="f1_score",
+                      sort_metrics_by="max") 
+    model2 = get_model2(project=project,
+                      model_name="tempmin_model",
+                      evaluation_metric="f1_score",
+                      sort_metrics_by="max")
+    X = X.drop(columns=["datetime"]).fillna(0)
 
     preds = model.predict(X)
+    
+    preds1= model1.predict(X)
+    
+    preds2= model2.predict(X)
+    
 
    # cities = [city_tuple[0] for city_tuple in cities_coords.keys()]
 
     next_day_date = datetime.today() + timedelta(days=1)
     next_day = next_day_date.strftime ('%d/%m/%Y')
     str1 = ""
-
-
-    for x in range(8):
-      if(x != 0):
-         str1 += (datetime.now() + timedelta(days=x)).strftime('%Y-%m-%d') + " predicted temperature:      " +  str(int(preds[len(preds) - 8 + x]))+"\n"
     
-    print(str1)
+    if(total_pred_days == ""):
+        return "Empty input"
+    
+    count = int(total_pred_days)
+    if count > 20:
+        str1 += "Warning: 20 days at most. " + '\n'
+        count = 20
+    if count <0:
+        str1 = "Invalid input."
+        return str1
+    
+    for x in range(count):
+        if (x != 0):
+            str1 += (datetime.now() + timedelta(days=x)).strftime('%Y-%m-%d') + " predicted temperature:      " +str(int(preds[len(preds) - count + x]))+ " predicted max temperature:      " +str(int(preds1[len(preds1) - count + x]))+ " predicted min temperature:      " +str(int(preds2[len(preds2) - count + x]))+"\n"
+    
+    #print(str1)
     return str1
 
 
-demo = gr.Interface(fn=greet, inputs="text", outputs="text")
+demo = gr.Interface(fn=greet, inputs = "text", outputs="text")