Changes accepted

.github/workflows/ci.yml

@@ -20,7 +20,6 @@ jobs:
 
       - uses: actions/checkout@v4
 
-<<<<<<< HEAD
       - name: Install Poetry 
         run: pip install poetry 
       
@@ -29,13 +28,6 @@ jobs:
         
       - name: Run tests 
         run: poetry run pytest
-=======
-      - name: Install dependencies
-        run: |
-          pip install .
-          pip install -r requirements.txt
-          pip install pytest
->>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f
 
       - name: Run tests
         run: pytest

App/main.py

@@ -8,13 +8,10 @@ app = FastAPI(
     version="0.1.0"
 )
 
-<<<<<<< HEAD
 @app.get("/") 
 def root(): 
     return {"status": "API OK"}
 
-=======
->>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f
 @app.post("/predict")
 def predict(data: EmployeeFeatures):
     """

App/predict.py

@@ -5,15 +5,7 @@ import json
 from pathlib import Path
 from huggingface_hub import hf_hub_download
 
-<<<<<<< HEAD
 MODEL_REPO = "Diaure/xgb_model"
-=======
-MODEL_REPO = "Diaure/Futurisys-Model"
-
-# Chemin des fichiers
-chemin_model = Path(hf_hub_download(repo_id=MODEL_REPO, filename="modele_final_xgb.joblib"))
-chemin_mapping = Path(hf_hub_download(repo_id=MODEL_REPO, filename="mapping_classes.json"))
->>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f
 
 # Variables chargées
 model = None
@@ -25,7 +17,6 @@ Features = list(EmployeeFeatures.model_fields.keys())
 # Chargement des fichiers: fonction pour charger le modèle, le mapping afin de permettre à l'API de démarrer m^me si les éléments ne sont pas présents
 def files_load():
     global model, classes_mapping
-<<<<<<< HEAD
 
     if model is None:
         chemin_model = Path(hf_hub_download(repo_id=MODEL_REPO, filename="modele_final_xgb.joblib"))
@@ -37,16 +28,6 @@ def files_load():
         chemin_mapping = Path(hf_hub_download(repo_id=MODEL_REPO, filename="mapping_classes.json"))
         # if not chemin_mapping.exists():
         #     raise RuntimeError("Mapping des classes introuvable.")
-=======
-    if model is None:
-        if not chemin_model.exists():
-            raise RuntimeError("Eléments du modèle introuvable.")
-        model =joblib.load(chemin_model)
-
-    if classes_mapping is None:
-        if not chemin_mapping.exists():
-            raise RuntimeError("Mapping des classes introuvable.")
->>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f
         with open(chemin_mapping) as f:
             classes_mapping = json.load(f)