aiteamutils 0.2.136__py3-none-any.whl → 0.2.138__py3-none-any.whl

aiteamutils/base_repository.py

@@ -32,7 +32,7 @@ class BaseRepository(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.DB_CONNECTION_ERROR,
                 detail="Session cannot be None",
-                source_function=f"{self.__class__.__name__}.session"
+                source_function=f"base_repository.{self.__class__.__name__}.session"
             )
         self._session = value
    
@@ -57,7 +57,7 @@ class BaseRepository(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
-                source_function=f"{self.__class__.__name__}.create",
+                source_function=f"base_repository.{self.__class__.__name__}.create",
                 original_error=e
             )
         

aiteamutils/base_service.py

@@ -61,10 +61,35 @@ class BaseService(Generic[ModelType]):
                 raise CustomException(
                     ErrorCode.FORBIDDEN,
                     detail=f"{role_permission}",
-                    source_function=f"{self.__class__.__name__}.create"
+                    source_function=f"base_service.{self.__class__.__name__}.create.permission_result"
                 )
         
         try:
+            # 파일 데이터 분리
+            entity_data_copy = entity_data.copy()
+            separated_files = {}
+            
+            # extra_data 내의 파일 필드 분리
+            if 'extra_data' in entity_data_copy and isinstance(entity_data_copy['extra_data'], dict):
+                extra_data = entity_data_copy['extra_data'].copy()
+                file_fields = {k: v for k, v in extra_data.items() if k.endswith('_files')}
+                
+                if file_fields and not storage_dir:
+                    raise CustomException(
+                        ErrorCode.INVALID_INPUT,
+                        detail="storage_dir is required for file upload",
+                        source_function=f"base_service.{self.__class__.__name__}.create.file_fields"
+                    )
+                
+                # 파일 필드 분리 및 제거
+                for field_name, files in file_fields.items():
+                    if files:
+                        separated_files[field_name] = files
+                        # extra_data에서 파일 필드 제거
+                        del extra_data[field_name]
+                
+                entity_data_copy['extra_data'] = extra_data
+
             async with self.db_session.begin():
                 # 고유 검사 수행
                 if unique_check:
@@ -73,35 +98,44 @@ class BaseService(Generic[ModelType]):
                 if fk_check:
                     await validate_unique_fields(self.db_session, fk_check, find_value=False)
                 
-                # _files로 끝나는 키 처리
-                file_keys = [key for key in entity_data.keys() if key.endswith('_files')]
-                file_infos = {}
-                
-                if file_keys and not storage_dir:
-                    raise CustomException(
-                        ErrorCode.INVALID_INPUT,
-                        detail="storage_dir is required for file upload",
-                        source_function=f"{self.__class__.__name__}.create"
-                    )
-                
-                # 먼저 엔티티를 생성하여 ULID를 얻음
+                # 엔티티 생성
                 result = await self.repository.create(
-                    entity_data=entity_data,
+                    entity_data=entity_data_copy,
                     exclude_entities=exclude_entities
                 )
                 
-                # 파일 처리
-                for file_key in file_keys:
-                    files_data = entity_data.pop(file_key)  # 파일 데이터 추출 및 제거
-                    if files_data:
-                        from .files import FileHandler
-                        file_infos[file_key] = await FileHandler.save_files(
-                            files=files_data,
+                # 파일 처리 및 저장
+                file_infos = {}
+                if separated_files:
+                    from .files import FileHandler
+                    for field_name, files in separated_files.items():
+                        saved_files = await FileHandler.save_files(
+                            files=files,
                             storage_dir=storage_dir,
                             entity_name=self.model.__tablename__,
                             entity_ulid=result.ulid,
                             db_session=self.db_session
                         )
+                        file_infos[field_name] = saved_files
+                        
+                        # extra_data 업데이트
+                        if not hasattr(result, 'extra_data'):
+                            result.extra_data = {}
+                        if not result.extra_data:
+                            result.extra_data = {}
+                            
+                        result.extra_data[field_name] = [
+                            {
+                                'original_name': f['original_name'],
+                                'storage_path': f['storage_path'],
+                                'mime_type': f['mime_type'],
+                                'size': f['size'],
+                                'checksum': f['checksum']
+                            } for f in saved_files
+                        ]
+                    
+                    # extra_data 업데이트된 엔티티 저장
+                    await self.db_session.flush()
 
                 # 결과 반환
                 if response_model:
@@ -126,7 +160,7 @@ class BaseService(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
-                source_function=f"{self.__class__.__name__}.create",
+                source_function=f"base_service.{self.__class__.__name__}.create",
                 original_error=e
             )
         
@@ -153,7 +187,7 @@ class BaseService(Generic[ModelType]):
                     raise CustomException(
                         ErrorCode.INVALID_INPUT,
                         detail="Either 'ulid' or 'conditions' must be provided.",
-                        source_function="database.update_entity"
+                        source_function=f"base_service.{self.__class__.__name__}.update.ulid_or_conditions"
                     )
 
                 # ulid로 조건 생성
@@ -162,7 +196,7 @@ class BaseService(Generic[ModelType]):
                         raise CustomException(
                             ErrorCode.VALIDATION_ERROR,
                             detail=ulid,
-                            source_function=f"{self.__class__.__name__}.update"
+                            source_function=f"base_service.{self.__class__.__name__}.update.ulid_or_conditions"
                         )
                     
                     conditions = {"ulid": ulid}
@@ -183,7 +217,7 @@ class BaseService(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
-                source_function=f"{self.__class__.__name__}.update",
+                source_function=f"base_service.{self.__class__.__name__}.update",
                 original_error=e
             )
 
@@ -201,14 +235,14 @@ class BaseService(Generic[ModelType]):
                 raise CustomException(
                     ErrorCode.VALIDATION_ERROR,
                     detail=ulid,
-                    source_function=f"{self.__class__.__name__}.delete"
+                    source_function=f"base_service.{self.__class__.__name__}.delete.ulid_validation"
                 )
             
             if not ulid and not conditions:
                 raise CustomException(
                     ErrorCode.INVALID_INPUT,
                     detail="Either 'ulid' or 'conditions' must be provided.",
-                    source_function="database.update_entity"
+                    source_function=f"base_service.{self.__class__.__name__}.delete.ulid_or_conditions"
                 )
 
             # ulid로 조건 생성
@@ -226,7 +260,7 @@ class BaseService(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
-                source_function=f"{self.__class__.__name__}.delete",
+                source_function=f"base_service.{self.__class__.__name__}.delete",
                 original_error=e
             )
 
@@ -282,7 +316,7 @@ class BaseService(Generic[ModelType]):
         except Exception as e:
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
-                source_function=f"{self.__class__.__name__}.list",
+                source_function=f"base_service.{self.__class__.__name__}.list",
                 original_error=e
             )
         
@@ -304,7 +338,7 @@ class BaseService(Generic[ModelType]):
                 raise CustomException(
                     ErrorCode.INVALID_INPUT,
                     detail="Either 'ulid' or 'conditions' must be provided.",
-                    source_function="database.update_entity"
+                    source_function=f"base_service.{self.__class__.__name__}.get.ulid_or_conditions"
                 )
 
             # ulid로 조건 생성
@@ -313,7 +347,7 @@ class BaseService(Generic[ModelType]):
                     raise CustomException(
                         ErrorCode.VALIDATION_ERROR,
                         detail=ulid,
-                        source_function=f"{self.__class__.__name__}.update"
+                        source_function=f"base_service.{self.__class__.__name__}.get.ulid_validation"
                     )
                 
                 conditions = {"ulid": ulid}
@@ -331,7 +365,7 @@ class BaseService(Generic[ModelType]):
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
-                source_function=f"{self.__class__.__name__}.get",
+                source_function=f"base_service.{self.__class__.__name__}.get",
                 original_error=e
             )
 

aiteamutils/database.py

@@ -341,7 +341,7 @@ async def update_entity(
             raise CustomException(
                 ErrorCode.NOT_FOUND,
                 detail=f"{model.__name__}|{conditions}.",
-                source_function="database.update_entity"
+                source_function="database.update_entity.not_entity"
             )
 
         # 기존 데이터를 딕셔너리로 변환
@@ -394,7 +394,7 @@ async def delete_entity(
             raise CustomException(
                 ErrorCode.NOT_FOUND,
                 detail=f"{model.__name__}|{conditions}.",
-                source_function="database.delete_entity"
+                source_function="database.delete_entity.not_entity"
             )
 
         entity.is_deleted = True

aiteamutils/validators.py

@@ -1,12 +1,12 @@
 """유효성 검사 관련 유틸리티 함수들을 모아둔 모듈입니다."""
 
-from typing import Type, Dict, Any, Callable, TypeVar, Optional, List, Union
+from typing import Type, Dict, Any, Callable, TypeVar, Optional, List, Union, Annotated
 from functools import wraps
 from sqlalchemy import Table
 from sqlalchemy.ext.asyncio import AsyncSession
 from fastapi import Request
 from inspect import signature
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, field_validator, Field
 from datetime import datetime, date
 import re
 
@@ -234,64 +234,3 @@ class Validator:
                 source_function="Validator.validate_datetime",
                 original_error=str(e)
             )
-
-def _create_validator(field_names: tuple[str, ...], 
-                     validate_func: Callable,
-                     field_type: Type,
-                     error_code: ErrorCode,
-                     source_prefix: str):
-    """공통 validator 생성 함수
-    Args:
-        field_names: 검증할 필드명들
-        validate_func: 실제 검증을 수행할 함수
-        field_type: 필드 타입 (date 또는 datetime)
-        error_code: 에러 발생시 사용할 에러 코드
-        source_prefix: 에러 발생시 사용할 source_function 접두사
-    """
-    def decorator(cls):
-        for field_name in field_names:
-            field = cls.model_fields.get(field_name)
-            if field:
-                field.annotation = Optional[field_type]
-                field.default = None
-                
-            @field_validator(field_name, mode='before')
-            @classmethod
-            def validate(cls, value: Any, info: Any) -> Any:
-                # 빈 값 처리를 가장 먼저, 더 엄격하게
-                if not value or str(value).strip() == "":
-                    return None
-                try:
-                    return validate_func(value, field_name)
-                except CustomException as e:
-                    raise e
-                except Exception as e:
-                    raise CustomException(
-                        error_code=error_code,
-                        detail=f"{field_name}|{value}",
-                        source_function=f"{source_prefix}.{field_name}",
-                        original_error=str(e)
-                    )
-            setattr(cls, f'validate_{field_name}', validate)
-        return cls
-    return decorator
-
-def date_validator(*field_names: str):
-    """날짜 필드 유효성 검사 데코레이터"""
-    return _create_validator(
-        field_names=field_names,
-        validate_func=Validator.validate_date,
-        field_type=date,
-        error_code=ErrorCode.VALIDATION_ERROR,
-        source_prefix="date_validator"
-    )
-
-def datetime_validator(*field_names: str):
-    """날짜+시간 필드 유효성 검사 데코레이터"""
-    return _create_validator(
-        field_names=field_names,
-        validate_func=Validator.validate_datetime,
-        field_type=datetime,
-        error_code=ErrorCode.VALIDATION_ERROR,
-        source_prefix="datetime_validator"
-    )

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.136"
+__version__ = "0.2.138"

{aiteamutils-0.2.136.dist-info → aiteamutils-0.2.138.dist-info}/METADATA

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

{aiteamutils-0.2.136.dist-info → aiteamutils-0.2.138.dist-info}/RECORD

@@ -1,16 +1,16 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
 aiteamutils/base_model.py,sha256=0rs4cjnF2ea3Q2vBTj6F64BGk7ZglJsChsS7ne_R_tg,4056
-aiteamutils/base_repository.py,sha256=vzBw3g3jCJetTDblZvZenEGXk89Qu_65_02C7QTcf8Q,4615
-aiteamutils/base_service.py,sha256=jWN0QTIIe5SkNitA_EP2GF0t1tyrCm1VftQtR3hJMT8,12507
+aiteamutils/base_repository.py,sha256=Oy2zE1i5qx60Xf1tnsaKLyFWapiPqt5JH8NejwNrPWg,4647
+aiteamutils/base_service.py,sha256=QSUzdIcV88EdmjEF7vMyrN5CjKhS6HTbsoXSp8P9Gag,14432
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=_aiS_akyJHHFSWZCmPcO82_O32xdUnXlNrPW5KhzxaA,20396
+aiteamutils/database.py,sha256=msvBKtxWeQVOo0v2Q9i2azuTNtnUItuNNar52gdRZTo,20418
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=pgf3ersezObyl17wAO3I2fb8m9t2OzWDX1mSjwAWm2Y,16035
 aiteamutils/files.py,sha256=tdvivl3XLNv7Al7H1gGFczmrHM8XlQpiZsEc2xQ_UTU,8829
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
-aiteamutils/validators.py,sha256=msOrha36xWsapm4VAh63YmFq1GVyC9tzZcjXYFCEZ_g,11949
-aiteamutils/version.py,sha256=GEzMhIGk9CTUp2zEaaKPPRMurlXlp9MeMYAAzWYudjo,43
-aiteamutils-0.2.136.dist-info/METADATA,sha256=qXiXhvObJ6S8Xlm7NrCwLUMQn6cTLZXnJa-IEDgZ7PY,1719
-aiteamutils-0.2.136.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.136.dist-info/RECORD,,
+aiteamutils/validators.py,sha256=_WHN6jqJQzKM5uPTg-Da8U2qqevS84XeKMkCCF4C_lY,9591
+aiteamutils/version.py,sha256=xZySMcOyLEq-gP55_1pxieeIS9BbYr1Tg7GT4OJHMjI,43
+aiteamutils-0.2.138.dist-info/METADATA,sha256=Hc55YOzeewQdyvH7AGj17BxER6ZiOIptMcPCY87XyXE,1719
+aiteamutils-0.2.138.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.138.dist-info/RECORD,,