aiteamutils 0.2.159__py3-none-any.whl → 0.2.161__py3-none-any.whl

aiteamutils/base_model.py

@@ -129,6 +129,16 @@ class BaseFileModel(BaseColumn):
         nullable=False,
         doc="MIME 타입"
     )
+    mime_type_main: Mapped[str] = mapped_column(
+        String,
+        nullable=False,
+        doc="MIME 타입 주 분류 (예: image, video, application 등)"
+    )
+    mime_type_sub: Mapped[str] = mapped_column(
+        String,
+        nullable=False,
+        doc="MIME 타입 부 분류 (예: jpeg, mp4, pdf 등)"
+    )
     size: Mapped[int] = mapped_column(
         nullable=False,
         doc="파일 크기(bytes)"

aiteamutils/base_service.py

@@ -37,7 +37,7 @@ class BaseService(Generic[ModelType]):
         self.additional_models = additional_models or {},
     
     #######################
-    # 입력 및 수정, 삭제 #
+    # 파일 관련 메서드 #
     #######################
     async def _separate_file_data(
         self,
@@ -52,7 +52,6 @@ class BaseService(Generic[ModelType]):
             Tuple[Dict[str, Any], Dict[str, Any]]: (파일 제외된 엔티티 데이터, 분리된 파일 데이터)
         """
         try:
-            logger.info("[파일 데이터 분리 시작]")
             entity_data_copy = entity_data.copy()
             separated_files = {}
             
@@ -62,11 +61,9 @@ class BaseService(Generic[ModelType]):
                 
                 # 파일 필드 체크 및 분리 (딕셔너리 수정 없이)
                 for field_name, files in extra_data.items():
-                    logger.info(f"[필드 검사] 필드명: {field_name}, 타입: {type(files)}")
                     if files and isinstance(files, (list, tuple)):
                         # 파일 객체를 포함하는 튜플/리스트인 경우만 처리
                         if any(isinstance(item, (tuple, list)) and len(item) == 2 and hasattr(item[0], 'read') for item in files):
-                            logger.info(f"[파일 필드 발견] {field_name}")
                             separated_files[field_name] = files
                             fields_to_remove.append(field_name)
                 
@@ -76,11 +73,9 @@ class BaseService(Generic[ModelType]):
                 
                 entity_data_copy['extra_data'] = extra_data
             
-            logger.info("[파일 데이터 분리 완료]")
             return entity_data_copy, separated_files
             
         except Exception as e:
-            logger.error(f"[파일 분리 중 에러 발생] {str(e)}")
             raise CustomException(
                 ErrorCode.INTERNAL_ERROR,
                 detail=str(e),
@@ -112,12 +107,10 @@ class BaseService(Generic[ModelType]):
                     source_function=f"{self.__class__.__name__}._save_files"
                 )
             
-            logger.info("[파일 저장 시작]")
             file_infos = {}
             from .files import FileHandler
             
             for field_name, files in separated_files.items():
-                logger.info(f"[필드 처리] {field_name}, 파일 수: {len(files)}")
                 saved_files = await FileHandler.save_files(
                     files=files,
                     storage_dir=storage_dir,
@@ -137,6 +130,8 @@ class BaseService(Generic[ModelType]):
                         'original_name': f['original_name'],
                         'storage_path': f['storage_path'],
                         'mime_type': f['mime_type'],
+                        'mime_type_main': f['mime_type_main'],
+                        'mime_type_sub': f['mime_type_sub'],
                         'size': f['size'],
                         'checksum': f['checksum'],
                         'column_name': f['column_name']
@@ -144,15 +139,12 @@ class BaseService(Generic[ModelType]):
                 ]
             
             await self.db_session.flush()
-            logger.info("[파일 저장 완료]")
             return file_infos
             
         except CustomException as e:
-            logger.error(f"[파일 저장 중 CustomException 발생] {e.error_code}: {e.detail}")
             await self._cleanup_saved_files(file_infos)
             raise e
         except Exception as e:
-            logger.error(f"[파일 저장 중 에러 발생] {str(e)}")
             await self._cleanup_saved_files(file_infos)
             raise CustomException(
                 ErrorCode.FILE_SYSTEM_ERROR,
@@ -167,7 +159,6 @@ class BaseService(Generic[ModelType]):
             from .files import FileHandler
             for file_list in file_infos.values():
                 for file_info in file_list:
-                    logger.info(f"[에러 복구] 파일 삭제: {file_info['storage_path']}")
                     await FileHandler.delete_files(file_info["storage_path"])
 
     async def _delete_files(
@@ -180,7 +171,6 @@ class BaseService(Generic[ModelType]):
             entity_result (Any): 삭제할 파일이 있는 엔티티
         """
         try:
-            logger.info("[파일 삭제 시작]")
             from .files import FileHandler
             
             # files 테이블에서 기존 파일 정보 조회
@@ -197,11 +187,9 @@ class BaseService(Generic[ModelType]):
                 }
             )
             existing_files = existing_files.fetchall()
-            logger.info(f"[기존 파일 조회 결과] {existing_files}")
             
             # 기존 파일 삭제
             for file_info in existing_files:
-                logger.info(f"[파일 삭제] {file_info[0]}")
                 await FileHandler.delete_files(file_info[0])
             
             # files 테이블에서 레코드 삭제
@@ -216,10 +204,8 @@ class BaseService(Generic[ModelType]):
                     "entity_ulid": entity_result.ulid
                 }
             )
-            logger.info("[파일 DB 레코드 삭제 완료]")
             
         except Exception as e:
-            logger.error(f"[파일 삭제 중 에러 발생] {str(e)}")
             raise CustomException(
                 ErrorCode.FILE_SYSTEM_ERROR,
                 detail=str(e),
@@ -227,6 +213,9 @@ class BaseService(Generic[ModelType]):
                 original_error=e
             )
 
+    #######################
+    # 입력 및 수정 메서드 #
+    #######################
     async def create(
         self,
         request: Request,
@@ -401,6 +390,9 @@ class BaseService(Generic[ModelType]):
                 original_error=e
             )
 
+    #######################
+    # 삭제 메서드 #
+    ####################### 
     async def delete(
         self,
         request: Request,

aiteamutils/files.py

@@ -48,6 +48,25 @@ class FileHandler:
                 original_error=e
             )
 
+    @staticmethod
+    def _split_mime_type(mime_type: str) -> Tuple[str, str]:
+        """MIME 타입을 주 타입과 부 타입으로 분리
+        
+        Args:
+            mime_type (str): MIME 타입 문자열 (예: "image/jpeg")
+            
+        Returns:
+            Tuple[str, str]: (주 타입, 부 타입) 튜플
+        """
+        try:
+            if not mime_type or '/' not in mime_type:
+                return 'application', 'octet-stream'
+            main_type, sub_type = mime_type.split('/', 1)
+            return main_type.lower(), sub_type.lower()
+        except Exception as e:
+            logger.error(f"[MIME 타입 분리 실패] {mime_type}: {str(e)}")
+            return 'application', 'octet-stream'
+
     @staticmethod
     async def _calculate_checksum(file: BinaryIO) -> str:
         """파일의 SHA-256 체크섬 계산
@@ -131,10 +150,17 @@ class FileHandler:
             # 파일 포인터 복구
             file.seek(current_position)
             
+            # MIME 타입 처리
+            mime_type = FileHandler._get_mime_type(original_name)
+            mime_type_main, mime_type_sub = FileHandler._split_mime_type(mime_type)
+            logger.info(f"[MIME 타입 분리] {mime_type} -> {mime_type_main}/{mime_type_sub}")
+            
             file_info = {
                 "original_name": original_name,
                 "storage_path": storage_path,
-                "mime_type": FileHandler._get_mime_type(original_name),
+                "mime_type": mime_type,
+                "mime_type_main": mime_type_main,
+                "mime_type_sub": mime_type_sub,
                 "size": os.path.getsize(storage_path),
                 "checksum": checksum,
                 "entity_name": entity_name,
@@ -202,12 +228,12 @@ class FileHandler:
                         text("""
                             INSERT INTO files (
                                 ulid, entity_name, entity_ulid, original_name, storage_path,
-                                mime_type, size, checksum, column_name, created_at, updated_at,
-                                is_deleted
+                                mime_type, mime_type_main, mime_type_sub, size, checksum, 
+                                column_name, created_at, updated_at, is_deleted
                             ) VALUES (
                                 :ulid, :entity_name, :entity_ulid, :original_name, :storage_path,
-                                :mime_type, :size, :checksum, :column_name, :created_at, :updated_at,
-                                :is_deleted
+                                :mime_type, :mime_type_main, :mime_type_sub, :size, :checksum,
+                                :column_name, :created_at, :updated_at, :is_deleted
                             ) RETURNING *
                         """),
                         {
@@ -217,6 +243,8 @@ class FileHandler:
                             "original_name": file_info["original_name"],
                             "storage_path": file_info["storage_path"],
                             "mime_type": file_info["mime_type"],
+                            "mime_type_main": file_info["mime_type_main"],
+                            "mime_type_sub": file_info["mime_type_sub"],
                             "size": file_info["size"],
                             "checksum": file_info["checksum"],
                             "column_name": column_name,
@@ -234,6 +262,8 @@ class FileHandler:
                         "original_name": row.original_name,
                         "storage_path": row.storage_path,
                         "mime_type": row.mime_type,
+                        "mime_type_main": row.mime_type_main,
+                        "mime_type_sub": row.mime_type_sub,
                         "size": row.size,
                         "checksum": row.checksum,
                         "column_name": row.column_name,

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.159"
+__version__ = "0.2.161"

{aiteamutils-0.2.159.dist-info → aiteamutils-0.2.161.dist-info}/METADATA

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

{aiteamutils-0.2.159.dist-info → aiteamutils-0.2.161.dist-info}/RECORD

@@ -1,17 +1,17 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
-aiteamutils/base_model.py,sha256=yBZqzTDF9PA4wCAvmYfG12FdVwLtxOEUCcA3z2i6fXU,4176
+aiteamutils/base_model.py,sha256=DFjDdNJ8dMFcWmeZwO1K69zPZE7tSu30SQ8si_1jhWk,4502
 aiteamutils/base_repository.py,sha256=Oy2zE1i5qx60Xf1tnsaKLyFWapiPqt5JH8NejwNrPWg,4647
-aiteamutils/base_service.py,sha256=uYEym6Cp2prK_ZbzAtrQaYLZRqn-AolTwoso_ASEqCk,22043
+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/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=pgf3ersezObyl17wAO3I2fb8m9t2OzWDX1mSjwAWm2Y,16035
-aiteamutils/files.py,sha256=Qq2w3VAEOzvsDirYtxRTN48LnIzf4TPUH2LftmyYtQk,12831
+aiteamutils/files.py,sha256=fxnCu9rErd4vCovMi0jy4adLUiA7rx_q4RdOL4wSgsU,14258
 aiteamutils/models.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
 aiteamutils/validators.py,sha256=_WHN6jqJQzKM5uPTg-Da8U2qqevS84XeKMkCCF4C_lY,9591
-aiteamutils/version.py,sha256=xr1O2ZYSzlPjLr1SLG4IBRNdFzNlMV4GLn1gHFE6Kd8,43
-aiteamutils-0.2.159.dist-info/METADATA,sha256=gmkHCBPBGe1kRWjRwOBNlhg8lywLG2N0EG4IXLNP-D0,1743
-aiteamutils-0.2.159.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.159.dist-info/RECORD,,
+aiteamutils/version.py,sha256=M1uxYIyHaq1jeL34T8UnMNaPGC2Tg5FBCVdajkMtNpE,43
+aiteamutils-0.2.161.dist-info/METADATA,sha256=MEeOAEX3rJiiOvxkeP2-P4pm2sMMSoUTzZQBu0Wt-KU,1743
+aiteamutils-0.2.161.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.161.dist-info/RECORD,,