fix(optimizer): implementar endpoints POST /api/genetic y proxy Express (v3.8.9)
This commit is contained in:
@@ -6,13 +6,20 @@ Provides asynchronous optimization jobs and genetic heuristic room assignment.
|
||||
from typing import Optional, Dict, Any, List
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
|
||||
from app.schemas.optimizer_dto import OptimizerJobRequestDTO, SpringBootSyncPayloadDTO
|
||||
from app.schemas.optimizer_dto import (
|
||||
OptimizerJobRequestDTO,
|
||||
SpringBootSyncPayloadDTO,
|
||||
GeneticPreviewRequestDTO,
|
||||
GeneticOptimizeRequestDTO,
|
||||
GeneticApplyRequestDTO
|
||||
)
|
||||
from app.services.optimizer_service import OptimizerService
|
||||
from dependencies import get_current_user
|
||||
from app.models.user import User
|
||||
from app.models.subject import Commission
|
||||
from app.models.classroom import Classroom
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
from app.models.genetic_algorithm import ReservationOptimizer
|
||||
|
||||
optimizer_router = APIRouter(prefix="/api/v1/optimizer", tags=["Optimizer"])
|
||||
genetic_router = APIRouter(prefix="/api/genetic", tags=["Genetic Heuristics"])
|
||||
@@ -129,3 +136,121 @@ def get_genetic_algorithm_status(current_user: User = Depends(get_current_user))
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@genetic_router.post("/preview-optimization")
|
||||
def preview_genetic_optimization(
|
||||
dto: GeneticPreviewRequestDTO,
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Previsualiza los resultados de la optimización genética para comisiones seleccionadas."""
|
||||
commissions = Commission.query.filter(
|
||||
Commission.id.in_(dto.commission_ids),
|
||||
Commission.active == True
|
||||
).all()
|
||||
|
||||
if not commissions:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="No se encontraron comisiones activas con los IDs proporcionados."
|
||||
)
|
||||
|
||||
commission_details = []
|
||||
for commission in commissions:
|
||||
commission_details.append({
|
||||
'id': commission.id,
|
||||
'code': commission.get_full_code(),
|
||||
'name': commission.subject.name if commission.subject else 'Sin Asignatura',
|
||||
'current_students': getattr(commission, 'current_students', 0) or 0,
|
||||
'max_students': commission.max_students or 30
|
||||
})
|
||||
|
||||
try:
|
||||
# Previsualización rápida con población y generaciones reducidas para respuesta inmediata
|
||||
optimizer = ReservationOptimizer(population_size=20, generations=25, workers=2)
|
||||
opt_result = optimizer.optimize_schedule(
|
||||
commission_ids=dto.commission_ids,
|
||||
admin_user_id=int(getattr(current_user, 'id'))
|
||||
)
|
||||
return {
|
||||
'success': True,
|
||||
'data': {
|
||||
'commission_details': commission_details,
|
||||
'optimization_result': {
|
||||
'assigned_reservations': opt_result.get('assigned_reservations', 0),
|
||||
'fitness_score': opt_result.get('fitness_score', 0.0),
|
||||
'conflicts': opt_result.get('conflicts', []),
|
||||
'total_requests': opt_result.get('total_requests', len(commissions))
|
||||
}
|
||||
}
|
||||
}
|
||||
except Exception as ex:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail=f"Error durante la previsualización: {str(ex)}"
|
||||
)
|
||||
|
||||
|
||||
@genetic_router.post("/optimize")
|
||||
def run_genetic_optimization(
|
||||
dto: GeneticOptimizeRequestDTO,
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Ejecuta la optimización heurística completa y genera el plan de reservas propuesto."""
|
||||
commissions = Commission.query.filter(
|
||||
Commission.id.in_(dto.commission_ids),
|
||||
Commission.active == True
|
||||
).all()
|
||||
|
||||
if not commissions:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="No se encontraron comisiones activas con los IDs proporcionados."
|
||||
)
|
||||
|
||||
try:
|
||||
optimizer = ReservationOptimizer(population_size=40, generations=60, workers=4)
|
||||
opt_result = optimizer.optimize_schedule(
|
||||
commission_ids=dto.commission_ids,
|
||||
admin_user_id=int(getattr(current_user, 'id')),
|
||||
start_date=dto.start_date,
|
||||
end_date=dto.end_date
|
||||
)
|
||||
return {
|
||||
'success': True,
|
||||
'data': opt_result
|
||||
}
|
||||
except Exception as ex:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail=f"Error durante la optimización: {str(ex)}"
|
||||
)
|
||||
|
||||
|
||||
@genetic_router.post("/apply-optimization")
|
||||
def apply_genetic_optimization(
|
||||
dto: GeneticApplyRequestDTO,
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Aplica y persiste las reservas optimizadas en la base de datos de Bedelía."""
|
||||
try:
|
||||
current_user_id = int(getattr(current_user, 'id'))
|
||||
for res in dto.reservations:
|
||||
if not res.get('user_id'):
|
||||
res['user_id'] = current_user_id
|
||||
|
||||
optimizer = ReservationOptimizer()
|
||||
applied = optimizer.apply_optimized_reservations(dto.reservations)
|
||||
return {
|
||||
'success': True,
|
||||
'data': {
|
||||
'applied_count': len(applied),
|
||||
'reservations': [r.to_dict() for r in applied]
|
||||
}
|
||||
}
|
||||
except Exception as ex:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail=f"Error al aplicar reservas optimizadas: {str(ex)}"
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user