aiteamutils 0.2.128__py3-none-any.whl → 0.2.129__py3-none-any.whl

aiteamutils/database.py

@@ -11,7 +11,7 @@ from typing import (
 )
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, and_, or_
-from sqlalchemy.orm import DeclarativeBase, joinedload, selectinload, noload
+from sqlalchemy.orm import DeclarativeBase, joinedload, selectinload
 from sqlalchemy.exc import SQLAlchemyError
 from datetime import datetime
 from contextlib import asynccontextmanager
@@ -448,16 +448,17 @@ async def list_entities(
         List[Dict[str, Any]]: 쿼리 결과 리스트.
     """
     try:
-        # 메인 모델과 조인된 모델의 모든 컬럼을 명시적으로 선택
+        # 명시적 조인이 있는 경우
         if explicit_joins:
-            query = select(model, *explicit_joins).select_from(model)
+            query = select(model, *explicit_joins)
             for join_target in explicit_joins:
                 query = query.outerjoin(join_target)
+        # 명시적 조인이 없는 경우
         else:
             query = select(model)
-
-        # 불필요한 lazy loading 방지를 위해 noload 옵션 추가
-        query = query.options(noload('*'))
+            if loading_joins:
+                for join_option in loading_joins:
+                    query = query.options(join_option)
 
         # 필터 조건 적용
         if filters:
@@ -485,7 +486,7 @@ async def list_entities(
 
         result = await session.execute(query)
         
-        return result.unique().scalars().all()
+        return result.scalars().unique().all()
     except SQLAlchemyError as e:
         raise CustomException(
             ErrorCode.DB_READ_ERROR,
@@ -502,18 +503,17 @@ async def get_entity(
     loading_joins: Optional[List[Any]] = None
 ) -> ModelType:
     try:
-        # project 정보도 함께 select
-        query = select(model, *[join_target for join_target in (explicit_joins or [])])
-
-        # 명시적 조인 적용
+        # 명시적 조인이 있는 경우
         if explicit_joins:
+            query = select(model, *explicit_joins)
             for join_target in explicit_joins:
-                query = query.outerjoin(join_target)  # LEFT OUTER JOIN 적용
-
-        # 조인 로딩 적용 (제거 가능)
-        if loading_joins:
-            for join_option in loading_joins:
-                query = query.options(join_option)
+                query = query.outerjoin(join_target)
+        # 명시적 조인이 없는 경우
+        else:
+            query = select(model)
+            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.128"
+__version__ = "0.2.129"

{aiteamutils-0.2.128.dist-info → aiteamutils-0.2.129.dist-info}/METADATA

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

{aiteamutils-0.2.128.dist-info → aiteamutils-0.2.129.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=rs0PcH1sXvDxrDVrt2obOVG3pjkxITci7gI0O4LBgMI,20224
+aiteamutils/database.py,sha256=9E5vFC22qeAhU-M4bfzNO53rg43y3CSAsSqrwHmEOHI,20175
 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=MP8cUhHdHhWOdkGTtsxbeIs15ZLja70gxlZbWTXsnfA,43
-aiteamutils-0.2.128.dist-info/METADATA,sha256=NWIu-gt09mx7QmhNnBLVdSCy68UgHI1hDzUT-X0HtIk,1719
-aiteamutils-0.2.128.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.128.dist-info/RECORD,,
+aiteamutils/version.py,sha256=d_-Dlw9uKxvmVtrtYblYVCPX-bJvQt2CYRY9_LVZUJE,43
+aiteamutils-0.2.129.dist-info/METADATA,sha256=VXFPjrbhCzEIQw3ZGSkV4VrsqTAfoH-02cfYsgCx3sI,1719
+aiteamutils-0.2.129.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.129.dist-info/RECORD,,