Résolution du merge

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ jobs:
 
       - uses: actions/checkout@v4
 
+<<<<<<< HEAD
       - name: Install Poetry 
         run: pip install poetry 
       
@@ -28,6 +29,13 @@ 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,10 +8,13 @@ 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,7 +5,15 @@ 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
@@ -17,6 +25,7 @@ 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"))
@@ -28,6 +37,16 @@ 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)
 

pyproject.toml

@@ -21,8 +21,12 @@ dependencies = [
     "catboost ==1.2.7",
     "numba ==0.59.1",
     "llvmlite ==0.42.0",
+<<<<<<< HEAD
     "ipykernel>=6.25,<7.0",
     "huggingface-hub = 1.3.1"
+=======
+    "ipykernel>=6.25,<7.0"
+>>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f
 ]
 
 

requirements.txt

@@ -6,9 +6,13 @@ Pygments==2.19.2
 pytest==9.0.2
 fastapi==0.115.0 
 uvicorn==0.30.1 
+<<<<<<< HEAD
 httpx==0.27.0
 huggingface-hub==1.3.1
 joblib==1.4.2
 pandas==2.2.2
 scikit-learn==1.4.2
-xgboost ==2.0.3
+xgboost ==2.0.3
+=======
+httpx==0.27.0
+>>>>>>> fc539b23b8706255fb5b2ad6d1e6a8bae3b8fb2f