Fix non-working app.

parcaster · Dec 1, 2023 · b5f4ad8 · b5f4ad8
1 parent 1bcf382
commit b5f4ad8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app.py b/app.py
@@ -1,10 +1,9 @@
 import json
 from flask import Flask, jsonify, request
-from deploy.predict import Predict
-
+from deploy.single_prediction import SinglePrediction
 
 app = Flask(__name__)
-predict = Predict("deploy/model_scripted.pt")
+single_prediction = SinglePrediction("deploy/model_scripted.pt", "data/preprocessing/raw_features_2024.csv")
 
 
 @app.route('/')
@@ -24,7 +23,7 @@ def predict():
         date = request.json['date']
         print(date)
 
-        output_dicts = predict.predict_for_date(date)
+        output_dicts = single_prediction.predict_for_date(date)
         return jsonify(output_dicts)
 
 

diff --git a/deploy/predict.py → deploy/single_prediction.py b/deploy/predict.py → deploy/single_prediction.py
@@ -5,11 +5,10 @@
 batch_size = 1  # Required for model input
 parking_data_labels = ["P24", "P44", "P42", "P33", "P23", "P25", "P21", "P31", "P53", "P32", "P22", "P52", "P51",
                        "P43"]  # TODO get these from metadata file
-raw_features_path = "data/preprocessing/raw_features_2024.csv"
 
 
-class Predict:
-    def __init__(self, model_path):
+class SinglePrediction:
+    def __init__(self, model_path, raw_features_path):
         self.single_prediction_features = SinglePredictionFeatures(raw_features_path)
         self.device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
         self.model = torch.jit.load(model_path, map_location=self.device)
@@ -37,5 +36,5 @@ def predict_for_date(self, date):
 
 
 if __name__ == "__main__":
-    predict = Predict("model_scripted.pt")
+    predict = SinglePrediction("model_scripted.pt", "../data/preprocessing/raw_features_2024.csv")
     print(predict.predict_for_date("2023-10-09 00:00"))