MES #20240829

.github/PULL_REQUEST_TEMPLATE/MEP_template.md

@@ -6,4 +6,5 @@ version:
 
 - [ ] version number
 - [ ] CI/CD tests pass
-- [ ] Add message on data review slack channel 
+- [ ] Add message on data review slack channel
+- [ ] ⚠️ I will click on **Merge Pull Request** and **NOT** *on Squash and merge*

.github/PULL_REQUEST_TEMPLATE/MES_template.md

@@ -6,4 +6,5 @@ version:
 
 - [ ] version number
 - [ ] CI/CD tests pass
-- [ ] Add message on data review slack channel 
+- [ ] Add message on data review slack channel
+- [ ] ⚠️ I will click on **Merge Pull Request** and **NOT** *on Squash and merge*

.github/pull_request_template.md

@@ -1,8 +1,8 @@
 ### Select PR template in preview mode:
+* [Ticket](?expand=1&template=Generic_template.md)
 * [Hotfix](?expand=1&template=Hotfix_template.md)
 * [MES](?expand=1&template=MES_template.md)
 * [MEP](?expand=1&template=MEP_template.md)
-* [Other](?expand=1&template=Generic_template.md)
 
 
 

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
     stages: [commit]
   - id: lint-check
     name: Linting (ruff)
-    entry: ruff check
+    entry: ruff check --fix
     language: system
     types: [python]
     stages: [commit]

apps/fraud/compliance/api/Dockerfile

@@ -1,15 +1,23 @@
-FROM python:3.9-slim
+FROM python:3.10-slim
+COPY --from=ghcr.io/astral-sh/uv:0.3.4 /uv /bin/uv
 
-ENV PYTHONUNBUFFERED True
-
-ENV APP_HOME /app
+ENV PYTHONUNBUFFERED=True
+ENV APP_HOME=/app
 WORKDIR $APP_HOME
+
 # Install libraries
 COPY ./requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-COPY ./src/main.py .
+RUN uv pip install -r requirements.txt --system
 COPY ./src .
-# Copy local code to the container
-COPY ./src/pcpapillon ./pcpapillon
 
-CMD exec gunicorn -k uvicorn.workers.UvicornWorker --bind :$PORT --workers 1 --threads 10 --preload --timeout 0 main:app
+# Conditionally copy the Google Cloud credentials file based on the argument
+ARG LOCAL=false
+ARG GOOGLE_CLOUD_PROJECT
+ENV GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT}
+RUN if [ "$LOCAL" = "true" ]; then \
+    mkdir -p /root/.config/gcloud && \
+    cp ./application_default_credentials.json /root/.config/gcloud/application_default_credentials.json; \
+    fi
+
+# Run the container
+CMD exec gunicorn -k uvicorn.workers.UvicornWorker --bind :$PORT --workers 1 --threads 10 --preload --timeout 0 main:app

apps/fraud/compliance/api/Makefile

@@ -1,5 +1,5 @@
 init:
-	pyenv install 3.9 -s
+	pyenv install 3.10 -s
 	@eval "$$(pyenv init -)" && pyenv virtualenv 3.9 api-data-fraud-compliance && pyenv local api-data-fraud-compliance
 
 install_with_uv:

apps/fraud/compliance/api/deploy_local.sh

@@ -1,2 +1,7 @@
-docker build -t pcpapillon --progress=plain .
-docker run -it -p 8080:8080 pcpapillon
+if [ ! -f ~/.config/gcloud/application_default_credentials.json ]; then
+    gcloud auth application-default login
+fi
+cp ~/.config/gcloud/application_default_credentials.json src/application_default_credentials.json
+docker build -t pcpapillon --build-arg LOCAL=true --build-arg GOOGLE_CLOUD_PROJECT=passculture-data-ehp .
+rm src/application_default_credentials.json
+docker run -p 8080:8080 -e "PORT=8080" pcpapillon

apps/fraud/compliance/api/requirements.in

@@ -1,4 +1,6 @@
-catboost==1.2
+apscheduler==3.10.4
+catboost==1.2.5
+cloudpickle==3.0.0
 dataclass-wizard==0.22.2
 fastapi-cloud-logging==1.1.0
 fastapi-versioning==0.10.0
@@ -8,14 +10,19 @@ google-cloud-logging==3.5.0
 google-cloud-secret-manager==2.2.0
 google-cloud-storage==2.9.0
 gunicorn==20.0.4
+ipython==8.24.0
 loguru==0.7.0
-mlflow==2.3.1
-numpy==1.22
+matplotlib==3.9.2
+mlflow==2.10.2
+numpy==1.26.4
 oauth2client==4.1.3
-pandas==2.0.1
+pandas==2.2.0
+psutil==5.9.8
 python-jose==3.3.0
 python-multipart==0.0.6
 ruff==0.4.7
+scikit-learn==1.5.0
+scipy==1.13.1
 sentence-transformers==2.2.2
-shap==0.41.0
+shap==0.46.0
 uvicorn==0.22.0