fix(types): resolucion integral de tipado estatico, Pyright 0 errores y bump a v3.8.1
This commit is contained in:
@@ -177,8 +177,8 @@ class GeneticAlgorithm:
|
||||
"""Run genetic algorithm with high concurrency to find optimal reservation schedule"""
|
||||
import concurrent.futures
|
||||
|
||||
classrooms_dict: Dict[int, Classroom] = {int(c.id): c for c in available_classrooms}
|
||||
requests_dict = {r.commission_id: r for r in requests}
|
||||
classrooms_dict: Dict[int, Classroom] = {int(getattr(c, 'id')): c for c in available_classrooms}
|
||||
requests_dict = {getattr(r, 'commission_id'): r for r in requests}
|
||||
|
||||
# Initialize population
|
||||
population = self._initialize_population(requests, available_classrooms, start_date, end_date)
|
||||
@@ -262,8 +262,8 @@ class GeneticAlgorithm:
|
||||
end_time = start_time + duration
|
||||
|
||||
gene = Gene(
|
||||
commission_id=request.commission_id,
|
||||
classroom_id=int(classroom.id),
|
||||
commission_id=getattr(request, 'commission_id'),
|
||||
classroom_id=int(getattr(classroom, 'id')),
|
||||
start_time=start_time,
|
||||
end_time=end_time,
|
||||
expected_attendees=request.expected_attendees,
|
||||
@@ -309,7 +309,8 @@ class GeneticAlgorithm:
|
||||
# Change classroom
|
||||
suitable_classrooms = [c for c in classrooms if c.capacity >= gene_to_mutate.expected_attendees]
|
||||
if suitable_classrooms:
|
||||
gene_to_mutate.classroom_id = int(random.choice(suitable_classrooms).id)
|
||||
selected_room = random.choice(suitable_classrooms)
|
||||
gene_to_mutate.classroom_id = int(getattr(selected_room, 'id'))
|
||||
|
||||
elif mutation_type == 'time':
|
||||
# Slightly adjust time
|
||||
|
||||
@@ -56,17 +56,21 @@ class MilestoneGrade(db.Model):
|
||||
@property
|
||||
def is_passed(self) -> bool:
|
||||
"""Determina si la nota está aprobada (>= 4.00 y no ausente)."""
|
||||
if self.is_absent or self.score is None:
|
||||
if getattr(self, 'is_absent', False):
|
||||
return False
|
||||
return bool(float(self.score) >= 4.0)
|
||||
score_val = getattr(self, 'score', None)
|
||||
if score_val is None:
|
||||
return False
|
||||
return float(score_val) >= 4.0
|
||||
|
||||
@property
|
||||
def display_score(self) -> str:
|
||||
"""Representación textual estándar: 'Ausente', '7.5' o '-'."""
|
||||
if self.is_absent:
|
||||
if getattr(self, 'is_absent', False):
|
||||
return 'Ausente'
|
||||
if self.score is not None:
|
||||
val = float(self.score)
|
||||
score_val = getattr(self, 'score', None)
|
||||
if score_val is not None:
|
||||
val = float(score_val)
|
||||
return f'{val:.1f}' if val % 1 != 0 else f'{int(val)}'
|
||||
return '-'
|
||||
|
||||
|
||||
@@ -131,9 +131,9 @@ class Role(db.Model):
|
||||
if access_level not in ACCESS_LEVELS:
|
||||
access_level = 'none'
|
||||
|
||||
for p in self.permissions:
|
||||
if p.module == module:
|
||||
p.access_level = access_level
|
||||
for p in getattr(self, 'permissions', []):
|
||||
if getattr(p, 'module', None) == module:
|
||||
setattr(p, 'access_level', access_level)
|
||||
return p
|
||||
|
||||
new_perm = Permission(role=self, module=module, access_level=access_level)
|
||||
@@ -141,14 +141,16 @@ class Role(db.Model):
|
||||
return new_perm
|
||||
|
||||
def to_dict(self):
|
||||
perms = getattr(self, 'permissions', [])
|
||||
users_list = getattr(self, 'users', [])
|
||||
return {
|
||||
'id': self.id,
|
||||
'name': self.name,
|
||||
'description': self.description,
|
||||
'is_system': self.is_system,
|
||||
'created_at': self.created_at.isoformat() if self.created_at else None,
|
||||
'user_count': len(self.users) if self.users else 0,
|
||||
'permissions': {p.module: p.access_level for p in self.permissions}
|
||||
'user_count': len(list(users_list)) if users_list else 0,
|
||||
'permissions': {getattr(p, 'module', ''): getattr(p, 'access_level', '') for p in perms}
|
||||
}
|
||||
|
||||
def __repr__(self):
|
||||
|
||||
@@ -10,8 +10,10 @@ class _hybrid_setting_method:
|
||||
|
||||
def __get__(self, instance, owner):
|
||||
if instance is None:
|
||||
return lambda *args, **kwargs: self.cls_func(owner, *args, **kwargs)
|
||||
return lambda *args, **kwargs: self.inst_func(instance, *args, **kwargs)
|
||||
cls_target = self.cls_func
|
||||
return lambda *args, **kwargs: cls_target(owner, *args, **kwargs) if callable(cls_target) else None
|
||||
inst_target = self.inst_func
|
||||
return lambda *args, **kwargs: inst_target(instance, *args, **kwargs) if callable(inst_target) else None
|
||||
|
||||
|
||||
class SystemSetting(db.Model):
|
||||
@@ -54,6 +56,7 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_decrypted_value(cls, key, default=None):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
@@ -78,6 +81,7 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_masked_value(cls, key, default=''):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
|
||||
Reference in New Issue
Block a user