aiteamutils 0.2.130__py3-none-any.whl → 0.2.132__py3-none-any.whl

aiteamutils/database.py

@@ -7,11 +7,12 @@ from typing import (
     Dict, 
     List, 
     Optional, 
-    AsyncGenerator
+    AsyncGenerator,
+    Union
 )
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, and_, or_
-from sqlalchemy.orm import DeclarativeBase, joinedload, selectinload
+from sqlalchemy.orm import DeclarativeBase, joinedload, selectinload, contains_eager
 from sqlalchemy.exc import SQLAlchemyError
 from datetime import datetime
 from contextlib import asynccontextmanager
@@ -151,21 +152,36 @@ def process_response(
     if not entity:
         return None
 
+    print(f"\n[DEBUG] Processing entity: {entity.__class__.__name__}")
+    print(f"[DEBUG] Entity dict: {entity.__dict__}")
+
     # 모든 필드 처리
     result = process_columns(entity)
+    print(f"[DEBUG] After process_columns: {result}")
     
     # Relationship 처리 (이미 로드된 관계만 처리)
     for relationship in entity.__mapper__.relationships:
+        print(f"\n[DEBUG] Processing relationship: {relationship.key}")
         if not relationship.key in entity.__dict__:
+            print(f"[DEBUG] Relationship {relationship.key} not in entity.__dict__")
             continue
             
         try:
             value = getattr(entity, relationship.key)
+            print(f"[DEBUG] Relationship value: {value}")
+            
             # response_model이 있는 경우 해당 필드의 annotation type을 가져옴
             nested_response_model = None
             if response_model and relationship.key in response_model.model_fields:
                 field_info = response_model.model_fields[relationship.key]
                 nested_response_model = field_info.annotation
+                print(f"[DEBUG] Found nested response model for {relationship.key}: {nested_response_model}")
+                
+                # Optional[ProjectResponse] 같은 경우 실제 모델 추출
+                if hasattr(nested_response_model, '__origin__') and nested_response_model.__origin__ is Union:
+                    print(f"[DEBUG] Extracting actual model from Union type: {nested_response_model.__args__}")
+                    nested_response_model = next((t for t in nested_response_model.__args__ if hasattr(t, 'model_fields')), None)
+                    print(f"[DEBUG] Extracted model: {nested_response_model}")
             
             if value is not None:
                 if isinstance(value, list):
@@ -174,23 +190,39 @@ def process_response(
                         for item in value
                     ]
                 else:
+                    print(f"[DEBUG] Processing single value with model: {nested_response_model}")
                     result[relationship.key] = process_response(value, nested_response_model)
+                print(f"[DEBUG] After processing relationship {relationship.key}: {result[relationship.key]}")
             else:
                 result[relationship.key] = None
-        except Exception:
+        except Exception as e:
+            print(f"[DEBUG] Error processing relationship {relationship.key}: {str(e)}")
+            import traceback
+            print(f"[DEBUG] Full traceback: {traceback.format_exc()}")
             result[relationship.key] = None
 
+    print(f"\n[DEBUG] Before response model processing: {result}")
     # response_model이 있는 경우 필터링
     if response_model:
+        print(f"[DEBUG] Response model fields: {response_model.model_fields}")
         # 현재 키 목록을 저장
         current_keys = list(result.keys())
         # response_model에 없는 키 제거
         for key in current_keys:
             if key not in response_model.model_fields:
+                print(f"[DEBUG] Removing key not in response model: {key}")
                 result.pop(key)
         # 모델 검증 및 업데이트
-        result.update(response_model(**result).model_dump())
+        try:
+            validated_result = response_model(**result).model_dump()
+            print(f"[DEBUG] After validation: {validated_result}")
+            result.update(validated_result)
+        except Exception as e:
+            print(f"[DEBUG] Error during validation: {str(e)}")
+            import traceback
+            print(f"[DEBUG] Full validation traceback: {traceback.format_exc()}")
             
+    print(f"[DEBUG] Final result: {result}")
     return result
 
 ##################
@@ -448,17 +480,17 @@ async def list_entities(
         List[Dict[str, Any]]: 쿼리 결과 리스트.
     """
     try:
-        # 명시적 조인이 있는 경우
+        query = select(model)
+
+        # 명시적 조인 적용
         if explicit_joins:
-            query = select(model, *explicit_joins)
             for join_target in explicit_joins:
                 query = query.outerjoin(join_target)
-        # 명시적 조인이 없는 경우
-        else:
-            query = select(model)
-            if loading_joins:
-                for join_option in loading_joins:
-                    query = query.options(join_option)
+
+        # 조인 로딩 적용
+        if loading_joins:
+            for join_option in loading_joins:
+                query = query.options(join_option)
 
         # 필터 조건 적용
         if filters:
@@ -485,8 +517,7 @@ async def list_entities(
         query = query.limit(limit).offset(skip)
 
         result = await session.execute(query)
-        
-        return result.scalars().unique().all()
+        return result.unique().scalars().all()
     except SQLAlchemyError as e:
         raise CustomException(
             ErrorCode.DB_READ_ERROR,
@@ -503,17 +534,17 @@ async def get_entity(
     loading_joins: Optional[List[Any]] = None
 ) -> ModelType:
     try:
-        # 명시적 조인이 있는 경우
+        query = select(model)
+
+        # 명시적 조인 적용
         if explicit_joins:
-            query = select(model, *explicit_joins)
             for join_target in explicit_joins:
                 query = query.outerjoin(join_target)
-        # 명시적 조인이 없는 경우
-        else:
-            query = select(model)
-            if loading_joins:
-                for join_option in loading_joins:
-                    query = query.options(join_option)
+
+        # 조인 로딩 적용
+        if loading_joins:
+            for join_option in loading_joins:
+                query = query.options(join_option)
 
         if conditions:
             for key, value in conditions.items():

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.130"
+__version__ = "0.2.132"

{aiteamutils-0.2.130.dist-info → aiteamutils-0.2.132.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.130
+Version: 0.2.132
 Summary: AI Team Utilities
 Project-URL: Homepage, https://github.com/yourusername/aiteamutils
 Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues

{aiteamutils-0.2.130.dist-info → aiteamutils-0.2.132.dist-info}/RECORD

@@ -4,12 +4,12 @@ aiteamutils/base_repository.py,sha256=vzBw3g3jCJetTDblZvZenEGXk89Qu_65_02C7QTcf8
 aiteamutils/base_service.py,sha256=nHikjwGp29QrQPr2W8Ye9sKxmVS_8prRG3Nu42TU1Ms,10670
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=9E5vFC22qeAhU-M4bfzNO53rg43y3CSAsSqrwHmEOHI,20175
+aiteamutils/database.py,sha256=XwgienPxjGr-PXdfYg6RDOLinNywNk1enYWegB-86uQ,22042
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=pgf3ersezObyl17wAO3I2fb8m9t2OzWDX1mSjwAWm2Y,16035
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
 aiteamutils/validators.py,sha256=msOrha36xWsapm4VAh63YmFq1GVyC9tzZcjXYFCEZ_g,11949
-aiteamutils/version.py,sha256=5aeO7zjAJZOoyv7QoPV87xtSy3aI2ZThWMEkD64jV1k,43
-aiteamutils-0.2.130.dist-info/METADATA,sha256=xNXV2bfD3s3Q60uE1K3G5KZAMKNq11enqX-OIbFHBk8,1719
-aiteamutils-0.2.130.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.130.dist-info/RECORD,,
+aiteamutils/version.py,sha256=j19bkYR2Nt5EhQU7qr9qZbsT-v5l9WzURNYBBdlPff8,43
+aiteamutils-0.2.132.dist-info/METADATA,sha256=R7s9jHRbAWS6PJXas8sWCOuUGIqIXIpjLhe5QEOpE7s,1719
+aiteamutils-0.2.132.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.132.dist-info/RECORD,,