aiteamutils 0.2.139__py3-none-any.whl → 0.2.140__py3-none-any.whl

aiteamutils/base_model.py

@@ -109,6 +109,11 @@ class BaseFileModel(BaseColumn):
         nullable=False,
         doc="엔티티 ULID"
     )
+    column_name: Mapped[str] = mapped_column(
+        String,
+        nullable=False,
+        doc="컬럼 이름"
+    )
     original_name: Mapped[str] = mapped_column(
         String,
         nullable=False,

aiteamutils/base_service.py

@@ -107,35 +107,60 @@ class BaseService(Generic[ModelType]):
                 # 파일 처리 및 저장
                 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 = {}
+                    try:
+                        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,
+                                column_name=field_name.replace('_files', '')  # _files 접미사 제거
+                            )
+                            file_infos[field_name] = saved_files
                             
-                        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()
+                            # 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'],
+                                    'column_name': f['column_name']
+                                } for f in saved_files
+                            ]
+                        
+                        # extra_data 업데이트된 엔티티 저장
+                        await self.db_session.flush()
+                    except CustomException as e:
+                        # 파일 저장 실패 시 저장된 파일들 삭제
+                        for file_list in file_infos.values():
+                            for file_info in file_list:
+                                await FileHandler.delete_files(file_info["storage_path"])
+                        raise CustomException(
+                            e.error_code,
+                            detail=e.detail,
+                            source_function=f"{self.__class__.__name__}.create.file_processing",
+                            original_error=e
+                        )
+                    except Exception as e:
+                        # 파일 저장 실패 시 저장된 파일들 삭제
+                        for file_list in file_infos.values():
+                            for file_info in file_list:
+                                await FileHandler.delete_files(file_info["storage_path"])
+                        raise CustomException(
+                            ErrorCode.FILE_SYSTEM_ERROR,
+                            detail=str(e),
+                            source_function=f"{self.__class__.__name__}.create.file_processing",
+                            original_error=e
+                        )
 
                 # 결과 반환
                 if response_model:

aiteamutils/files.py

@@ -141,7 +141,8 @@ class FileHandler:
         storage_dir: str,
         entity_name: str,
         entity_ulid: str,
-        db_session: AsyncSession
+        db_session: AsyncSession,
+        column_name: str = None
     ) -> List[Dict[str, Any]]:
         """파일(들)을 저장하고 메타데이터 반환
         
@@ -151,6 +152,7 @@ class FileHandler:
             entity_name (str): 엔티티 이름
             entity_ulid (str): 엔티티 ULID
             db_session (AsyncSession): DB 세션
+            column_name (str): 파일이 속한 컬럼 이름
             
         Returns:
             List[Dict[str, Any]]: 저장된 파일들의 메타데이터 리스트
@@ -174,10 +176,10 @@ class FileHandler:
                 text("""
                     INSERT INTO files (
                         entity_name, entity_ulid, original_name, storage_path,
-                        mime_type, size, checksum
+                        mime_type, size, checksum, column_name
                     ) VALUES (
                         :entity_name, :entity_ulid, :original_name, :storage_path,
-                        :mime_type, :size, :checksum
+                        :mime_type, :size, :checksum, :column_name
                     ) RETURNING *
                 """),
                 {
@@ -187,7 +189,8 @@ class FileHandler:
                     "storage_path": file_info["storage_path"],
                     "mime_type": file_info["mime_type"],
                     "size": file_info["size"],
-                    "checksum": file_info["checksum"]
+                    "checksum": file_info["checksum"],
+                    "column_name": column_name
                 }
             )
             

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.139"
+__version__ = "0.2.140"

{aiteamutils-0.2.139.dist-info → aiteamutils-0.2.140.dist-info}/METADATA

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

{aiteamutils-0.2.139.dist-info → aiteamutils-0.2.140.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_model.py,sha256=yBZqzTDF9PA4wCAvmYfG12FdVwLtxOEUCcA3z2i6fXU,4176
 aiteamutils/base_repository.py,sha256=Oy2zE1i5qx60Xf1tnsaKLyFWapiPqt5JH8NejwNrPWg,4647
-aiteamutils/base_service.py,sha256=QSUzdIcV88EdmjEF7vMyrN5CjKhS6HTbsoXSp8P9Gag,14432
+aiteamutils/base_service.py,sha256=qzg7_rtnXFglg36RDsMScHkILrUbdsm67lmqicnFnlk,16051
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
 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/files.py,sha256=Dfi1rYMBZwV-3GMqZ77_I4BNMpnyL-OBaj9WwZVhCbs,8999
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
 aiteamutils/validators.py,sha256=_WHN6jqJQzKM5uPTg-Da8U2qqevS84XeKMkCCF4C_lY,9591
-aiteamutils/version.py,sha256=zSd70aa9K_B4_aJg7_D1oTM_3HSncLzFwXbLhIGYVA4,43
-aiteamutils-0.2.139.dist-info/METADATA,sha256=OmryJvAMZSQ69Szubzpbj94WBvAOv71nbu6eJdHyYuk,1743
-aiteamutils-0.2.139.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.139.dist-info/RECORD,,
+aiteamutils/version.py,sha256=lUYyf6EhBRHxkbymtXrWeCpibvn_CBwk1pD92zTG0TU,43
+aiteamutils-0.2.140.dist-info/METADATA,sha256=Y48xQbnxkdGCnlCjL7QuEfUyq4Ou0h65b6bUy3KkXck,1743
+aiteamutils-0.2.140.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.140.dist-info/RECORD,,