fix api internal error

src/api.py

@@ -8,76 +8,89 @@ from inference import inferenceAPI
 from inference_t5 import inferenceAPI_t5
 
 
-# ------ INFERENCE MODEL --------------------------------------------------------------
+# ------ INFERENCE MODEL ------------------------------------------------------
 # appel de la fonction inference, adaptee pour une entree txt
 def summarize(text: str):
-    if choisir_modele.var == 'lstm' :
+    if choisir_modele.var == "lstm":
         return " ".join(inferenceAPI(text))
     elif choisir_modele.var == "fineTunedT5":
         text = inferenceAPI_t5(text)
-        return re.sub("<extra_id_0> ","",text)
-# ----------------------------------------------------------------------------------
+        return re.sub("<extra_id_0> ", "", text)
+
+
+# ----------------------------------------------------------------------------
 
 
 def choisir_modele(choixModele):
     print("ON A RECUP LE CHOIX MODELE")
-    if choixModele == "lstm" :
-        choisir_modele.var ='lstm'
+    if choixModele == "lstm":
+        choisir_modele.var = "lstm"
     elif choixModele == "fineTunedT5":
         choisir_modele.var = "fineTunedT5"
-    else :
-        "le modele n'est pas defini"
 
 
-# -------- API ---------------------------------------------------------------------
+# -------- API ---------------------------------------------------------------
 app = FastAPI()
 
 # static files pour envoi du css au navigateur
 templates = Jinja2Templates(directory="templates")
 app.mount("/templates", StaticFiles(directory="templates"), name="templates")
 
+
 @app.get("/")
 async def index(request: Request):
-    return templates.TemplateResponse("index.html.jinja", {"request": request})
+    return templates.TemplateResponse(
+        "index.html.jinja", {"request": request, "current_route": "/"}
+    )
+
 
 @app.get("/model")
-async def index(request: Request):
-    return templates.TemplateResponse("index.html.jinja", {"request": request})
+async def get_model(request: Request):
+    return templates.TemplateResponse(
+        "index.html.jinja", {"request": request, "current_route": "/model"}
+    )
+
 
 @app.get("/predict")
-async def index(request: Request):
-    return templates.TemplateResponse("index.html.jinja", {"request": request})
+async def get_prediction(request: Request):
+    return templates.TemplateResponse(
+        "index.html.jinja", {"request": request, "current_route": "/predict"}
+    )
 
 
 @app.post("/model")
-async def choix_model(request: Request, choixModel:str = Form(None)):
+async def choix_model(request: Request, choixModel: str = Form(None)):
     print(choixModel)
     if not choixModel:
         erreur_modele = "Merci de saisir un modèle."
         return templates.TemplateResponse(
-        "index.html.jinja", {"request": request, "text": erreur_modele}
+            "index.html.jinja", {"request": request, "text": erreur_modele}
         )
-    else :
+    else:
         choisir_modele(choixModel)
         print("C'est bon on utilise le modèle demandé")
         return templates.TemplateResponse(
-        "index.html.jinja", {"request": request}
+            "index.html.jinja", {"request": request}
         )
 
 
-# retourner le texte, les predictions et message d'erreur si formulaire envoye vide
+# retourner le texte, les predictions et message d'erreur si formulaire envoye
+# vide
 @app.post("/predict")
 async def prediction(request: Request, text: str = Form(None)):
-    if not text :
+    if not text:
         error = "Merci de saisir votre texte."
         return templates.TemplateResponse(
-        "index.html.jinja", {"request": request, "text": error}
-    )
-    else :
+            "index.html.jinja", {"request": request, "text": error}
+        )
+    else:
         summary = summarize(text)
         return templates.TemplateResponse(
-            "index.html.jinja", {"request": request, "text": text, "summary": summary}
+            "index.html.jinja",
+            {"request": request, "text": text, "summary": summary},
         )
+
+
 # ------------------------------------------------------------------------------------
 
 

templates/index.html.jinja

@@ -49,7 +49,7 @@
                     <label for="selectModel">Choose a model :</label>
                     <select name="choixModel" class="selectModel" id="choixModel">
                         <option value="lstm">LSTM</option>
-                        <option value="fineTunedT5">Fine-tuned T5</option>
+                        <option value="fineTunedT5" selected>Fine-tuned T5</option>
                     </select>
                 </form>
                 <button form ="choixModel" class='search_bn' type="submit" class="btn btn-primary btn-block btn-large" rows="1" cols="50">Select model</button>
@@ -71,9 +71,13 @@
                 </table>
             </div>
             <div class="buttons">
-                <!-- <button id="submit" type="submit" onclick=submitBothForms()>SUBMIT</button> -->
+                {% if current_route == "/" %}
+                <button>Merci de sélectionner un modèle</button>
+                {% else %}
+                 <!-- <button id="submit" type="submit" onclick=submitBothForms()>SUBMIT</button> -->
                 <button form ="my_form" class='search_bn' type="submit" class="btn btn-primary btn-block btn-large" rows="1" cols="50">Go !</button>
                 <button form ="my_form" type="button" value="Reset" onclick="customReset();">Reset</button>
+                {% endif %}
             </div>
 
             <div class="copyright">

templates/site_style/css/main.css

@@ -246,6 +246,7 @@ textarea {
 				background: #3B353C;
 			}
 
+
 /* Header */
 
 	#header {
@@ -469,4 +470,5 @@ textarea {
 		justify-content: center;
 		margin-top: 20px;
 	  }
+
 	}