aiteamutils 0.2.162__py3-none-any.whl → 0.2.163__py3-none-any.whl

aiteamutils/database.py

@@ -8,7 +8,8 @@ from typing import (
     List, 
     Optional, 
     AsyncGenerator,
-    Union
+    Union,
+    Tuple
 )
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, and_, or_
@@ -20,12 +21,19 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from fastapi import Request
 from ulid import ULID
 from sqlalchemy import MetaData, Table, insert
+from sqlalchemy.sql.elements import BinaryExpression
 
 #패키지 라이브러리
 from .exceptions import ErrorCode, CustomException
 
 ModelType = TypeVar("ModelType", bound=DeclarativeBase)
 
+JoinTarget = Union[
+    DeclarativeBase,  # 모델
+    Tuple[DeclarativeBase, BinaryExpression],  # (모델, 조인 조건)
+    Tuple[DeclarativeBase, BinaryExpression, str]  # (모델, 조인 조건, 조인 타입)
+]
+
 ##################
 # 전처리 #
 ##################
@@ -255,6 +263,61 @@ def build_conditions(
 ##################
 # 쿼리 실행 #
 ##################
+async def execute_query(
+    session: AsyncSession,
+    model: Type[ModelType],
+    explicit_joins: Optional[List[JoinTarget]] = None,
+    loading_joins: Optional[List[Any]] = None,
+    conditions: Optional[List[BinaryExpression]] = None,
+) -> Select:
+    """
+    쿼리 실행을 위한 공통 함수
+    
+    Args:
+        session: 데이터베이스 세션
+        model: 기본 모델
+        explicit_joins: 명시적 조인 설정
+            - 모델만 전달: 기본 outer join
+            - (모델, 조건): 조건부 outer join
+            - (모델, 조건, 'inner'/'left'/'right'): 조인 타입 지정
+        loading_joins: Relationship 로딩 설정 (joinedload, selectinload 등)
+        conditions: WHERE 조건들
+    """
+    # 1. 기본 쿼리 생성
+    query = select(model)
+    
+    # 2. 명시적 조인 처리
+    if explicit_joins:
+        for join_target in explicit_joins:
+            if isinstance(join_target, DeclarativeBase):
+                # 모델만 전달된 경우
+                query = query.outerjoin(join_target)
+            elif isinstance(join_target, tuple):
+                if len(join_target) == 2:
+                    # (모델, 조건)이 전달된 경우
+                    target_model, join_condition = join_target
+                    query = query.outerjoin(target_model, join_condition)
+                elif len(join_target) == 3:
+                    # (모델, 조건, 조인타입)이 전달된 경우
+                    target_model, join_condition, join_type = join_target
+                    if join_type == 'inner':
+                        query = query.join(target_model, join_condition)
+                    elif join_type == 'left':
+                        query = query.outerjoin(target_model, join_condition)
+                    elif join_type == 'right':
+                        query = query.outerjoin(target_model, join_condition, full=True)
+    
+    # 3. Relationship 로딩 설정
+    if loading_joins:
+        for join_option in loading_joins:
+            query = query.options(join_option)
+    
+    # 4. 조건 적용
+    if conditions:
+        query = query.where(and_(*conditions))
+    
+    return query
+
 async def create_entity(
     session: AsyncSession,
     model: Type[ModelType],
@@ -428,49 +491,22 @@ async def list_entities(
     skip: int = 0,
     limit: int = 100,
     filters: Optional[List[Dict[str, Any]]] = None,
-    explicit_joins: Optional[List[Any]] = None,
+    explicit_joins: Optional[List[JoinTarget]] = None,
     loading_joins: Optional[List[Any]] = None,
     order: Optional[List[Dict[str, str]]] = None
 ) -> List[Dict[str, Any]]:
-    """
-    엔터티 리스트를 필터 및 조건에 따라 가져오는 함수.
-
-    Args:
-        session: SQLAlchemy AsyncSession.
-        model: SQLAlchemy 모델.
-        skip: 페이지네이션 시작 위치.
-        limit: 페이지네이션 크기.
-        filters: 필터 조건 딕셔너리.
-            예시:
-            filters = {
-                "search": {"field": "username", "operator": "like", "value": "%admin%"},
-                "name": {"field": "name", "operator": "like", "value": "%John%"},
-                "role_ulid": {"field": "role_ulid", "operator": "eq", "value": "1234"}
-            }
-
-        joins: 조인 옵션.
-            예시:
-            joins = [
-                selectinload(YourModel.related_field),  # 관련된 필드를 함께 로드
-                joinedload(YourModel.another_related_field)  # 다른 관계된 필드를 조인
-            ]
-
-    Returns:
-        List[Dict[str, Any]]: 쿼리 결과 리스트.
-    """
     try:
+        # 필터 조건 생성
+        conditions = build_conditions(filters, model) if filters else None
+        
         # 기본 쿼리 생성
-        if explicit_joins:
-            query = select(model, *explicit_joins)
-            for join_target in explicit_joins:
-                query = query.outerjoin(join_target)
-        else:
-            query = select(model)
-
-        # 필터 조건 적용
-        if filters:
-            conditions = build_conditions(filters, model)
-            query = query.where(and_(*conditions))
+        query = await execute_query(
+            session=session,
+            model=model,
+            explicit_joins=explicit_joins,
+            loading_joins=loading_joins,
+            conditions=conditions
+        )
 
         # 정렬 조건 적용
         if order:
@@ -505,25 +541,21 @@ async def get_entity(
     session: AsyncSession,
     model: Type[ModelType],
     conditions: Dict[str, Any],
-    explicit_joins: Optional[List[Any]] = None,
+    explicit_joins: Optional[List[JoinTarget]] = None,
     loading_joins: Optional[List[Any]] = None
 ) -> ModelType:
     try:
-        query = select(model)
-
-        # 명시적 조인 적용
-        if explicit_joins:
-            for join_target in explicit_joins:
-                query = query.outerjoin(join_target)
-
-        # 조인 로딩 적용
-        if loading_joins:
-            for join_option in loading_joins:
-                query = query.options(join_option)
-
-        if conditions:
-            for key, value in conditions.items():
-                query = query.where(getattr(model, key) == value)
+        # 조건을 리스트로 변환
+        condition_list = [getattr(model, key) == value for key, value in conditions.items()]
+        
+        # 쿼리 실행
+        query = await execute_query(
+            session=session,
+            model=model,
+            explicit_joins=explicit_joins,
+            loading_joins=loading_joins,
+            conditions=condition_list
+        )
 
         result = await session.execute(query)
         return result.scalars().unique().one_or_none()

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.162"
+__version__ = "0.2.163"

{aiteamutils-0.2.162.dist-info → aiteamutils-0.2.163.dist-info}/METADATA

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

{aiteamutils-0.2.162.dist-info → aiteamutils-0.2.163.dist-info}/RECORD

@@ -4,13 +4,13 @@ aiteamutils/base_repository.py,sha256=Oy2zE1i5qx60Xf1tnsaKLyFWapiPqt5JH8NejwNrPW
 aiteamutils/base_service.py,sha256=JIeRtFn1Ll4Qcq3v88pgS9lmEQLQoVyyOKqYR8n02S4,21192
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=msvBKtxWeQVOo0v2Q9i2azuTNtnUItuNNar52gdRZTo,20418
+aiteamutils/database.py,sha256=zXYhdUVgAisz4BuXZPPbvVLZ9lwRe7aVQP8J1AVE88Y,21771
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=sgIVulllKMM9InTltaB7VD6i7DiQvCoycexsV-BiIBY,16570
 aiteamutils/files.py,sha256=fxnCu9rErd4vCovMi0jy4adLUiA7rx_q4RdOL4wSgsU,14258
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
 aiteamutils/validators.py,sha256=_WHN6jqJQzKM5uPTg-Da8U2qqevS84XeKMkCCF4C_lY,9591
-aiteamutils/version.py,sha256=vAvqE9V77cH7vOSwbqingOdyP4KA12olJ1Dj_9Br2jQ,43
-aiteamutils-0.2.162.dist-info/METADATA,sha256=LS01DV_fpROE_i2VnNwkeRx0KQ82VBeRAi4XveycukA,1743
-aiteamutils-0.2.162.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.162.dist-info/RECORD,,
+aiteamutils/version.py,sha256=MbP3Sxzx6eYugMlpPFw2qfjDxYmMdJwa_4K4MStAl1s,43
+aiteamutils-0.2.163.dist-info/METADATA,sha256=pgSEMmDcvxJrKq3Y-CmLEuXgd2K5vKvm8SQfa3jIuvA,1743
+aiteamutils-0.2.163.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.163.dist-info/RECORD,,