herel/math-tables
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

fix: resolve ruff linting issues and improve code formatting

Browse Source
This commit is contained in:
Rene Luria
2025-09-26 08:25:02 +02:00
parent 28b1c80b50
commit 7284c60b93
2 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/gen_op.py
View File

@@ -1,21 +1,23 @@
#!/usr/bin/env python3
import random
import io
from fpdf import FPDF
def generer_nombre():
"""Génère un nombre naturel entre 1 et 9"""
return random.randint(1, 9)
def evaluer_expression(expr):
"""Évalue une expression mathématique en remplaçant × par *"""
try:
# Remplacer × par * pour l'évaluation
expr_eval = expr.replace('×', '*')
expr_eval = expr.replace("×", "*")
return eval(expr_eval)
except:
except Exception:
return -1 # En cas d'erreur, considérer comme négatif
def generer_expression():
"""Génère une expression aléatoire respectant les contraintes"""
# On choisit aléatoirement un type d'expression (avec ou sans parenthèses)
@@ -34,7 +36,7 @@ def generer_expression():
lambda: f"{generer_nombre()} + {generer_nombre()} × {generer_nombre()} - {generer_nombre()} × {generer_nombre()} + {generer_nombre()}",
lambda: f"({generer_nombre()} + {generer_nombre()}) × {generer_nombre()} - {generer_nombre()} + {generer_nombre()} - {generer_nombre()}",
]
# Essayer jusqu'à ce qu'on obtienne une expression avec résultat positif
while True:
choix = random.choice(expressions_positives)
@@ -43,53 +45,63 @@ def generer_expression():
if resultat >= 0:
return expr
def generer_feuille_exercices(n_exercices=20):
"""Génère une feuille d'exercices en format 2 colonnes"""
expressions = [generer_expression() for _ in range(n_exercices)]
# Format 2 colonnes : on affiche par paires
output = ""
for i in range(0, n_exercices, 2):
expr1 = f"{i+1}. {expressions[i]}"
expr2 = f"{i+2}. {expressions[i+1]}" if i+1 < len(expressions) else ""
expr1 = f"{i + 1}. {expressions[i]}"
expr2 = f"{i + 2}. {expressions[i + 1]}" if i + 1 < len(expressions) else ""
# Alignement pour deux colonnes
output += f"{expr1:<36} {expr2}\n" + " " * 36 + " \n" * 3
return output
def generer_pdf_exercices_en_memoire(n_exercices=20):
"""Génère une feuille d'exercices au format PDF en mémoire"""
pdf = FPDF()
pdf.add_page()
pdf.set_font("Helvetica", size=12)
# Titre
pdf.cell(200, 10, text="Feuille d'exercices d'opérations", new_x="LMARGIN", new_y="NEXT", align='C')
pdf.cell(
200,
10,
text="Feuille d'exercices d'opérations",
new_x="LMARGIN",
new_y="NEXT",
align="C",
)
pdf.ln(10)
# Contenu en 2 colonnes
expressions = [generer_expression() for _ in range(n_exercices)]
for i in range(0, n_exercices, 2):
# Colonne 1
expr1 = f"{i+1}. {expressions[i]}"
pdf.cell(90, 10, text=expr1, border=0, align='L')
expr1 = f"{i + 1}. {expressions[i]}"
pdf.cell(90, 10, text=expr1, border=0, align="L")
# Colonne 2
if i+1 < len(expressions):
expr2 = f"{i+2}. {expressions[i+1]}"
pdf.cell(90, 10, text=expr2, border=0, align='L')
if i + 1 < len(expressions):
expr2 = f"{i + 2}. {expressions[i + 1]}"
pdf.cell(90, 10, text=expr2, border=0, align="L")
pdf.ln(10)
# Espacement supplémentaire - ajout de deux lignes vides supplémentaires
pdf.ln(15)
# Retourner les données PDF en mémoire
return pdf.output()
def generer_pdf_exercices(n_exercices=20, output_file="exercices.pdf"):
"""Génère une feuille d'exercices au format PDF"""
pdf_data = generer_pdf_exercices_en_memoire(n_exercices)
# Sauvegarde du PDF
with open(output_file, "wb") as f:
f.write(pdf_data)

30
app/main.py
View File

@@ -6,7 +6,6 @@ import io
import boto3
import zipfile
import tempfile
import importlib.util
from botocore.exceptions import ClientError
from typing import List
from fastapi import FastAPI, Request, Form
@@ -20,12 +19,14 @@ import logging
# Import the functions from gen_op.py
from app.gen_op import generer_pdf_exercices_en_memoire
# Custom filter to exclude health check logs
class HealthCheckFilter(logging.Filter):
def filter(self, record: logging.LogRecord) -> bool:
# Exclude health check requests from logs
return "GET /health " not in record.getMessage()
# Apply the filter to Uvicorn's access logger
logging.getLogger("uvicorn.access").addFilter(HealthCheckFilter())
@@ -167,6 +168,7 @@ class ExerciseRequest(BaseModel):
max_table: int
num_exercises: int = 15
class OperationExerciseRequest(BaseModel):
num_exercises: int = 20
@@ -315,20 +317,22 @@ def create_math_exercises_pdf(
def create_operation_exercises_pdf(num_exercises: int = 20) -> str:
"""Crée un fichier PDF avec des exercices d'opérations et l'upload sur S3"""
import datetime
# Add timestamp to filename
timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
pdf_filename = f"exercices_operations_{num_exercises}_exercices_{timestamp}.pdf"
# Generate PDF in memory using gen-op functions
pdf_data = generer_pdf_exercices_en_memoire(num_exercises)
# Upload to S3
upload_success = upload_to_s3(pdf_data, S3_BUCKET_NAME, pdf_filename, "application/pdf")
upload_success = upload_to_s3(
pdf_data, S3_BUCKET_NAME, pdf_filename, "application/pdf"
)
if not upload_success:
raise Exception("Failed to upload PDF to S3")
return pdf_filename
@@ -479,7 +483,7 @@ async def bulk_download(filenames: str = Form(...)):
try:
# Parse the JSON string to get the list of filenames
filename_list = json.loads(filenames)
# Create a temporary zip file
with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as tmp_zip:
with zipfile.ZipFile(tmp_zip.name, "w") as zipf:
@@ -487,16 +491,16 @@ async def bulk_download(filenames: str = Form(...)):
file_data = download_from_s3(S3_BUCKET_NAME, filename)
if file_data:
zipf.writestr(filename, file_data)
# Read the zip file
with open(tmp_zip.name, "rb") as f:
zip_data = f.read()
# Clean up temporary file
import os
os.unlink(tmp_zip.name)
# Return streaming response with zip data
zip_filename = f"math_exercises_{len(filename_list)}_files.zip"
return StreamingResponse(
@@ -518,5 +522,5 @@ async def health_check():
if __name__ == "__main__":
import uvicorn
uvicorn.run(app, host="0.0.0.0", port=8000)