fix(optimizer): implementar endpoints POST /api/genetic y proxy Express (v3.8.9)

This commit is contained in:
2026-10-23 17:16:48 -03:00
parent 7da12d90cc
commit e89f1b0457
10 changed files with 395 additions and 25 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ from typing import Any
from database import db, get_db, engine, SessionLocal, session
from config.config import Config
__version__ = "3.8.8"
__version__ = "3.8.9"
class DummyContext:
def __enter__(self):
+25 -11
View File
@@ -250,6 +250,8 @@ class GeneticAlgorithm:
for request in requests:
# Random classroom selection (with capacity constraint)
suitable_classrooms = [c for c in classrooms if c.capacity >= request.expected_attendees]
if not suitable_classrooms and classrooms:
suitable_classrooms = [max(classrooms, key=lambda c: getattr(c, 'capacity', 0))]
if not suitable_classrooms:
continue
@@ -308,6 +310,8 @@ class GeneticAlgorithm:
if mutation_type == 'classroom':
# Change classroom
suitable_classrooms = [c for c in classrooms if c.capacity >= gene_to_mutate.expected_attendees]
if not suitable_classrooms and classrooms:
suitable_classrooms = [max(classrooms, key=lambda c: getattr(c, 'capacity', 0))]
if suitable_classrooms:
selected_room = random.choice(suitable_classrooms)
gene_to_mutate.classroom_id = int(getattr(selected_room, 'id'))
@@ -439,13 +443,26 @@ class ReservationOptimizer:
def apply_optimized_reservations(self, reservation_data: List[Dict]) -> List[Reservation]:
"""Apply the optimized reservations to the database with ISO string parsing and conflict avoidance"""
applied_reservations = []
valid_keys = {
'classroom_id', 'commission_id', 'user_id', 'start_time',
'end_time', 'purpose', 'status', 'expected_attendees',
'shift', 'virtual_link', 'notes'
}
for item in reservation_data:
data = dict(item)
if isinstance(data.get('start_time'), str):
data['start_time'] = datetime.fromisoformat(data['start_time'].replace('Z', '+00:00'))
if isinstance(data.get('end_time'), str):
data['end_time'] = datetime.fromisoformat(data['end_time'].replace('Z', '+00:00'))
# Normalizar fechas a objetos datetime naive (UTC)
for time_field in ('start_time', 'end_time'):
val = data.get(time_field)
if isinstance(val, str):
dt = datetime.fromisoformat(val.replace('Z', '+00:00'))
data[time_field] = dt.replace(tzinfo=None) if dt.tzinfo else dt
elif isinstance(val, datetime) and val.tzinfo:
data[time_field] = val.replace(tzinfo=None)
if not data.get('classroom_id') or not data.get('start_time') or not data.get('end_time'):
continue
# Check for physical room conflicts before creating
conflicts = Reservation.find_conflicts(
@@ -455,13 +472,10 @@ class ReservationOptimizer:
)
if not conflicts:
# Ensure status enum value compatibility
if 'status' in data and isinstance(data['status'], str):
try:
data['status'] = ReservationStatus(data['status']).value
except ValueError:
data['status'] = ReservationStatus.CONFIRMED.value
reservation = Reservation(**data)
# Las reservas aplicadas pasan a estado CONFIRMED
data['status'] = ReservationStatus.CONFIRMED.value
filtered_data = {k: v for k, v in data.items() if k in valid_keys}
reservation = Reservation(**filtered_data)
db.session.add(reservation)
applied_reservations.append(reservation)
else:
+33
View File
@@ -47,3 +47,36 @@ class SpringBootSyncPayloadDTO(BaseModel):
commissions: List[SpringBootCommissionDTO] = Field(..., min_length=1)
classrooms: Optional[List[SpringBootClassroomDTO]] = None
options: Optional[Dict[str, Any]] = None
class GeneticPreviewRequestDTO(BaseModel):
"""Contrato para la previsualización heurística de asignaciones."""
commission_ids: List[int] = Field(..., min_length=1, description="Lista de IDs de comisiones a previsualizar")
dry_run: bool = Field(default=True, description="Indicador de simulación sin persistencia")
@field_validator('commission_ids')
@classmethod
def validate_ids(cls, v: List[int]) -> List[int]:
if not v or len(v) == 0:
raise ValueError("Debe suministrar al menos una comisión para previsualizar.")
return list(set(v))
class GeneticOptimizeRequestDTO(BaseModel):
"""Contrato para la ejecución completa del algoritmo genético."""
commission_ids: List[int] = Field(..., min_length=1, description="Lista de IDs de comisiones a optimizar")
start_date: Optional[datetime] = Field(None, description="Fecha de inicio (ISO format)")
end_date: Optional[datetime] = Field(None, description="Fecha de fin (ISO format)")
@field_validator('commission_ids')
@classmethod
def validate_ids(cls, v: List[int]) -> List[int]:
if not v or len(v) == 0:
raise ValueError("Debe suministrar al menos una comisión para optimizar.")
return list(set(v))
class GeneticApplyRequestDTO(BaseModel):
"""Contrato para aplicar las reservas optimizadas en Bedelía."""
reservations: List[Dict[str, Any]] = Field(..., min_length=1, description="Lista de reservas a persistir")