core-framework 0.12.2__py3-none-any.whl → 0.12.4__py3-none-any.whl

core/__init__.py

@@ -278,7 +278,7 @@ from core.exceptions import (
     MissingDependency,
 )
 
-__version__ = "0.12.2"
+__version__ = "0.12.4"
 __all__ = [
     # Models
     "Model",

core/auth/middleware.py

@@ -182,26 +182,65 @@ class AuthenticationMiddleware(BaseHTTPMiddleware):
         if User is None:
             return None
         
-        # Get database session
-        from core.database import get_read_session
+        # Bug #3 & #4 Fix: Get database session correctly
+        # The middleware runs outside FastAPI DI context, so we need to
+        # handle database session creation carefully
+        db = await self._get_db_session()
+        if db is None:
+            return None
         
-        async for db in get_read_session():
-            try:
-                # Convert user_id to correct type
-                user_id_converted = self._convert_user_id(user_id, User)
-                
-                user = await User.objects.using(db).filter(id=user_id_converted).first()
-                
-                if user is None:
-                    return None
-                
-                # Check if user is active
-                if hasattr(user, "is_active") and not user.is_active:
-                    return None
-                
-                return user
-            except Exception:
+        try:
+            # Convert user_id to correct type
+            user_id_converted = self._convert_user_id(user_id, User)
+            
+            user = await User.objects.using(db).filter(id=user_id_converted).first()
+            
+            if user is None:
                 return None
+            
+            # Check if user is active
+            if hasattr(user, "is_active") and not user.is_active:
+                return None
+            
+            return user
+        except Exception:
+            return None
+        finally:
+            await db.close()
+    
+    async def _get_db_session(self) -> Any | None:
+        """
+        Get a database session for authentication.
+        
+        Bug #3 & #4 Fix: Handles both initialized and uninitialized database states.
+        Creates session directly from engine if normal path fails.
+        
+        Returns:
+            AsyncSession or None if database not available
+        """
+        # Try 1: Use the standard get_read_session (if database is initialized)
+        try:
+            from core.database import get_read_session, _read_session_factory
+            
+            if _read_session_factory is not None:
+                return _read_session_factory()
+        except (RuntimeError, ImportError):
+            pass
+        
+        # Try 2: Create session from settings (lazy initialization)
+        try:
+            from core.config import get_settings
+            from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
+            
+            settings = get_settings()
+            db_url = getattr(settings, 'database_read_url', None) or getattr(settings, 'database_url', None)
+            
+            if db_url:
+                engine = create_async_engine(db_url, echo=False)
+                session_factory = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
+                return session_factory()
+        except Exception:
+            pass
         
         return None
     

core/auth/models.py

@@ -27,12 +27,14 @@ Uso:
 from __future__ import annotations
 
 from typing import Any, ClassVar, TYPE_CHECKING
+from uuid import UUID
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, inspect
 from sqlalchemy.orm import Mapped, relationship, declared_attr
 from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 
 from core.models import Model, Field
+from core.fields import AdvancedField
 from core.auth.base import get_password_hasher, get_auth_config
 from core.datetime import timezone, DateTime
 
@@ -56,6 +58,7 @@ def _get_pk_column_type(model_class: type) -> type:
     Detecta o tipo da coluna PK de um modelo.
     
     Bug #3 Fix: Detecção robusta do tipo de PK para FKs.
+    Verifica toda a cadeia de herança (MRO) para detectar corretamente.
     
     Suporta:
     - Integer (int)
@@ -69,7 +72,7 @@ def _get_pk_column_type(model_class: type) -> type:
     from sqlalchemy import Integer, BigInteger, String
     from sqlalchemy.dialects.postgresql import UUID as PG_UUID
     from sqlalchemy import Uuid
-    import uuid
+    import uuid as uuid_module
     
     # Verifica cache primeiro
     cache_key = f"{model_class.__module__}.{model_class.__name__}"
@@ -78,7 +81,30 @@ def _get_pk_column_type(model_class: type) -> type:
     
     detected_type = Integer  # Default
     
-    # Método 1: Tenta obter da tabela já mapeada
+    # Método 0 (MAIS IMPORTANTE): Verifica herança de AbstractUUIDUser
+    # Isso é verificado PRIMEIRO porque funciona mesmo durante o mapeamento
+    for base in model_class.__mro__:
+        base_name = base.__name__
+        # Verifica se herda de AbstractUUIDUser ou qualquer classe com UUID no nome
+        if base_name == "AbstractUUIDUser":
+            detected_type = PG_UUID
+            _pk_type_cache[cache_key] = detected_type
+            return detected_type
+    
+    # Método 1: Verifica annotations em TODA a cadeia de herança (MRO)
+    for base in model_class.__mro__:
+        annotations = getattr(base, "__annotations__", {})
+        if "id" in annotations:
+            ann = annotations["id"]
+            ann_str = str(ann)
+            
+            # Detecta UUID (vários formatos)
+            if "UUID" in ann_str or "uuid" in ann_str or "Uuid" in ann_str:
+                detected_type = PG_UUID
+                _pk_type_cache[cache_key] = detected_type
+                return detected_type
+    
+    # Método 2: Tenta obter da tabela já mapeada (se existir)
     if hasattr(model_class, "__table__"):
         pk_columns = [c for c in model_class.__table__.columns if c.primary_key]
         if pk_columns:
@@ -101,40 +127,41 @@ def _get_pk_column_type(model_class: type) -> type:
             _pk_type_cache[cache_key] = detected_type
             return detected_type
     
-    # Método 2: Tenta via annotations
-    annotations = getattr(model_class, "__annotations__", {})
-    
-    if "id" in annotations:
-        ann = annotations["id"]
-        ann_str = str(ann)
-        
-        # Detecta UUID (vários formatos)
-        if "UUID" in ann_str or "uuid" in ann_str or "Uuid" in ann_str:
-            detected_type = PG_UUID
-        # Detecta int
-        elif "int" in ann_str.lower() and "uuid" not in ann_str.lower():
-            detected_type = Integer
-        # Detecta str
-        elif "str" in ann_str.lower() and "uuid" not in ann_str.lower():
-            detected_type = String
-    
-    # Método 3: Verifica campos na classe (declared_attr ou column_property)
-    for attr_name in dir(model_class):
-        if attr_name == "id":
-            attr = getattr(model_class, attr_name, None)
+    # Método 3: Verifica atributo 'id' diretamente na classe e bases
+    for base in model_class.__mro__:
+        if hasattr(base, "id"):
+            attr = getattr(base, "id", None)
             if attr is not None:
-                # Pode ser um InstrumentedAttribute
+                # Pode ser um InstrumentedAttribute ou MappedColumn
                 if hasattr(attr, "type"):
                     attr_type = attr.type
                     if isinstance(attr_type, (PG_UUID, Uuid)):
                         detected_type = PG_UUID
                         break
+                    type_name = type(attr_type).__name__.upper()
+                    if "UUID" in type_name:
+                        detected_type = PG_UUID
+                        break
                 # Pode ser um mapped_column
                 if hasattr(attr, "property") and hasattr(attr.property, "columns"):
                     for col in attr.property.columns:
                         if isinstance(col.type, (PG_UUID, Uuid)):
                             detected_type = PG_UUID
                             break
+                        type_name = type(col.type).__name__.upper()
+                        if "UUID" in type_name:
+                            detected_type = PG_UUID
+                            break
+                # Verifica se é um MappedColumn com tipo definido
+                if hasattr(attr, "column") and hasattr(attr.column, "type"):
+                    col_type = attr.column.type
+                    if isinstance(col_type, (PG_UUID, Uuid)):
+                        detected_type = PG_UUID
+                        break
+                    type_name = type(col_type).__name__.upper()
+                    if "UUID" in type_name:
+                        detected_type = PG_UUID
+                        break
     
     _pk_type_cache[cache_key] = detected_type
     return detected_type
@@ -790,12 +817,9 @@ class AbstractUUIDUser(AbstractUser):
     
     __abstract__ = True
     
-    # Importa aqui para evitar circular import
-    from core.fields import AdvancedField
-    from uuid import UUID as UUIDType
-    
     # Override: usa UUID como PK
-    id: Mapped[UUIDType] = AdvancedField.uuid_pk()
+    # UUID importado no topo do módulo para resolução correta de tipos
+    id: Mapped[UUID] = AdvancedField.uuid_pk()
 
 
 # =============================================================================

core/middleware.py

@@ -736,11 +736,16 @@ class SecurityHeadersMiddleware(BaseMiddleware):
 # =============================================================================
 
 _builtin_middlewares.update({
+    # Pre-built middlewares from this module
     "timing": "core.middleware.TimingMiddleware",
     "request_id": "core.middleware.RequestIDMiddleware",
     "logging": "core.middleware.LoggingMiddleware",
     "maintenance": "core.middleware.MaintenanceModeMiddleware",
     "security_headers": "core.middleware.SecurityHeadersMiddleware",
+    # Auth middlewares (ensure they're registered even if initial dict failed)
+    "auth": "core.auth.middleware.AuthenticationMiddleware",
+    "authentication": "core.auth.middleware.AuthenticationMiddleware",
+    "optional_auth": "core.auth.middleware.OptionalAuthenticationMiddleware",
 })
 
 

core/migrations/engine.py

@@ -255,6 +255,71 @@ class MigrationEngine:
             index=col.index,
         )
     
+    def _topological_sort_tables(self, tables: list[TableState]) -> list[TableState]:
+        """
+        Bug #5 Fix: Ordena tabelas em ordem topológica baseada em FKs.
+        
+        Tabelas referenciadas por FKs são criadas ANTES das que as referenciam.
+        
+        Args:
+            tables: Lista de TableState a ordenar
+            
+        Returns:
+            Lista ordenada topologicamente
+        """
+        if not tables:
+            return []
+        
+        # Mapeia nome -> tabela
+        table_map = {t.name: t for t in tables}
+        
+        # Constrói grafo de dependências
+        # dependencias[A] = {B, C} significa A depende de B e C (A tem FK para B e C)
+        dependencies: dict[str, set[str]] = {t.name: set() for t in tables}
+        
+        for table in tables:
+            for fk in table.foreign_keys:
+                ref_table = fk.references_table
+                # Só adiciona dependência se a tabela referenciada também está sendo criada
+                # (tabelas já existentes não precisam ser consideradas)
+                if ref_table in table_map:
+                    dependencies[table.name].add(ref_table)
+        
+        # Algoritmo de Kahn para ordenação topológica
+        result = []
+        
+        # Encontra tabelas sem dependências (grau de entrada 0)
+        no_deps = [name for name, deps in dependencies.items() if not deps]
+        
+        while no_deps:
+            # Remove uma tabela sem dependências
+            name = no_deps.pop(0)
+            result.append(table_map[name])
+            
+            # Remove esta tabela das dependências de outras
+            for other_name, deps in dependencies.items():
+                if name in deps:
+                    deps.remove(name)
+                    # Se não tem mais dependências, adiciona à fila
+                    if not deps and other_name not in [t.name for t in result]:
+                        no_deps.append(other_name)
+        
+        # Verifica ciclo (se sobrou alguma tabela com dependências)
+        remaining = [t for t in tables if t not in result]
+        if remaining:
+            # Há um ciclo - adiciona as tabelas restantes no final
+            # (o banco vai falhar, mas pelo menos o erro será claro)
+            import warnings
+            cycle_tables = [t.name for t in remaining]
+            warnings.warn(
+                f"Circular FK dependency detected involving tables: {cycle_tables}. "
+                "Migration may fail. Consider breaking the cycle with nullable FKs.",
+                RuntimeWarning,
+            )
+            result.extend(remaining)
+        
+        return result
+    
     def _diff_to_operations(self, diff: SchemaDiff) -> list[Operation]:
         """Converte SchemaDiff em lista de operações."""
         from core.migrations.operations import CreateEnum, DropEnum, AlterEnum
@@ -284,8 +349,9 @@ class MigrationEngine:
                 new_values=new_enum.values,
             ))
         
-        # 3. Criar tabelas
-        for table in diff.tables_to_create:
+        # 3. Criar tabelas (BUG #5 FIX: em ordem topológica)
+        sorted_tables = self._topological_sort_tables(diff.tables_to_create)
+        for table in sorted_tables:
             columns = [self._column_state_to_def(col) for col in table.columns.values()]
             foreign_keys = [
                 ForeignKeyDef(

{core_framework-0.12.2.dist-info → core_framework-0.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: core-framework
-Version: 0.12.2
+Version: 0.12.4
 Summary: Core Framework - Django-inspired, FastAPI-powered. Alta performance, baixo acoplamento, produtividade extrema.
 Project-URL: Homepage, https://github.com/SorPuti/core-framework
 Project-URL: Documentation, https://github.com/SorPuti/core-framework#readme

{core_framework-0.12.2.dist-info → core_framework-0.12.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-core/__init__.py,sha256=Ka6DK8M7VOnG9iIsEhx17UFdtVRaZGZD7EIttp1-GGE,12058
+core/__init__.py,sha256=LpMfN4s5QgM0suYMegcYK7uf2m8dIH90qOsbM5IWSNs,12058
 core/app.py,sha256=sCA3mJI696i7MIjrPxfOr5zEYt0njarQfHHy3EAajk4,21071
 core/choices.py,sha256=rhcL3p2dB7RK99zIilpmoTFVcibQEIaRpz0CY0kImCE,10502
 core/config.py,sha256=2-MVF9nLoYmxpYYH_Gzn4-Sa3MU87YZskRPtlNyhg6Q,14049
@@ -7,7 +7,7 @@ core/datetime.py,sha256=bzqlAj3foA-lzbhXjlEiDNR2D-nwXu9mpxpdcUb-Pmw,32730
 core/dependencies.py,sha256=LrNLbmQhXoCPRvoRPRMGNo0w6_l4NLGWeeTHzpUU36M,11582
 core/exceptions.py,sha256=cdcffeYnMzCbS4hApOYNmPVNbPUpKcrgJbi3nKhqTuI,22702
 core/fields.py,sha256=F2NdToowkJ_LFvPN9KVyxIFES1AlVDy7WkEp-8UiBpA,9327
-core/middleware.py,sha256=kQ8APXerC9fzKHkGhTjrTYfjAvfCpOtQE-IjCPurvxo,23172
+core/middleware.py,sha256=MZVw7smJ2MiycYvkaYIC2cNpyqYGk3m-eeoDandqZU4,23506
 core/models.py,sha256=jdNdjRPKBZiOBOgg8CmDYBwmuWdD7twCIpqINLGY4Q4,33788
 core/permissions.py,sha256=HQu_eNBEodJyR50CYcFvdCw9LlEfhI5vJbljV5VIs7M,10162
 core/querysets.py,sha256=Z87-U06Un_xA9GKwcjXx0yzw6F_xf_tvG_rBT5UGL9c,22678
@@ -22,8 +22,8 @@ core/auth/backends.py,sha256=R-siIE8TrNqDHkCx42zXN1WVvvuWOun1nj8D5elrC9g,10425
 core/auth/base.py,sha256=Q7vXgwTmgdmyW7G8eJmDket2bKB_8YFnraZ_kK9_gTs,21425
 core/auth/decorators.py,sha256=tmC7prKUvHuzQ3J872nM6r83DR9d82dCLXKLvUB1Os8,12288
 core/auth/hashers.py,sha256=0gIf67TU0k5H744FADpyh9_ugxA7m3mhYPZxLh_lEtc,12808
-core/auth/middleware.py,sha256=pei2C1uy2WqyJeSGMYBwh0jj4Ong2I0_vmSi2y6F6jA,9425
-core/auth/models.py,sha256=qT31MJoHOTbYJPr_KPKn4wCpSVC4vkgBHWFEfL-meG0,32654
+core/auth/middleware.py,sha256=r4F3AIb4k9Z7gbTwcyG-MVWCyGikQqP54IHNKmyNtdc,10963
+core/auth/models.py,sha256=aEE7deQKPS1aH0Btzzh3Z1Bwuqy8zvLZwu4JFEmiUNk,34058
 core/auth/permissions.py,sha256=v3ykAgNpq5wJ0NkuC_FuveMctOkDfM9Xp11XEnUAuBg,12461
 core/auth/schemas.py,sha256=L0W96dOD348rJDGeu1K5Rz3aJj-GdwMr2vbwwsYfo2g,3469
 core/auth/tokens.py,sha256=jk-TnMRdVGPhy6pWqSF2Ef8RTqLrP6Mkuo5GvRQh9no,8489
@@ -61,7 +61,7 @@ core/messaging/redis/producer.py,sha256=F9NA1GpYvN-wdW5Ilzi49rrAmxfBmicXX3l6sABW
 core/migrations/__init__.py,sha256=OF_7XQ9x9V_BWr3d8vDZk8W5QYT0RO3ZXNFnOg8UgDI,1908
 core/migrations/analyzer.py,sha256=QiwG_Xf_-Mb-Kp4hstkF8xNJD0Tvxgz20vqvYZ6xEXM,27287
 core/migrations/cli.py,sha256=mR3lIFTlXSvupFOPVlfuC-urJyDfNFR9nqYZn4TjIco,12019
-core/migrations/engine.py,sha256=tggCEV1FuFFyNkcGOlDZSryepUYHWfZ4irb0sbsWWZo,28821
+core/migrations/engine.py,sha256=jk8-wX8aKNBidUGyQ7ckHcUsukNJYpgSva-Sp-Iu-L4,31590
 core/migrations/migration.py,sha256=Xv5MSNLvGAR9wnuMc4GRwciUSuU22AxWlWZP-hsVliI,2748
 core/migrations/operations.py,sha256=wZLui76zU-MDiJfyn3l3NBRGJw1V4XF8tViSV3kvN6A,28651
 core/migrations/state.py,sha256=eb_EYTE1tG-xQIwliS_-QTgr0y8-Jj0Va4C3nfpMrd4,15324
@@ -78,7 +78,7 @@ example/auth.py,sha256=zBpLutb8lVKnGfQqQ2wnyygsSutHYZzeJBuhnFhxBaQ,4971
 example/models.py,sha256=xKdx0kJ9n0tZ7sCce3KhV3BTvKvsh6m7G69eFm3ukf0,4549
 example/schemas.py,sha256=wJ9QofnuHp4PjtM_IuMMBLVFVDJ4YlwcF6uQm1ooKiY,6139
 example/views.py,sha256=GQwgQcW6yoeUIDbF7-lsaZV7cs8G1S1vGVtiwVpZIQE,14338
-core_framework-0.12.2.dist-info/METADATA,sha256=ulG99_nW-of7nHPyV8Ybq4QEAVSyeHh2lqwmvy42XiE,12791
-core_framework-0.12.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-core_framework-0.12.2.dist-info/entry_points.txt,sha256=lQ65IAOpieqU1VcHCUReeyandpyy8IKGix6IkJW_4Is,39
-core_framework-0.12.2.dist-info/RECORD,,
+core_framework-0.12.4.dist-info/METADATA,sha256=YJACIGfMLNMWJNHuGVX2ltcOvKdZDajmp6GLc_GFzNA,12791
+core_framework-0.12.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+core_framework-0.12.4.dist-info/entry_points.txt,sha256=lQ65IAOpieqU1VcHCUReeyandpyy8IKGix6IkJW_4Is,39
+core_framework-0.12.4.dist-info/RECORD,,