@@ -960,25 +960,6 @@ async def search_owned_files(
960960 resolved_fmds .append (convert_db_to_model (updated_fmd ))
961961 return resolved_fmds
962962
963- def _create_file_metadata_from_s3_object (
964- self , s3_obj : S3MetaData , user_id : UserID
965- ) -> FileMetaData | None :
966- """Create FileMetaData from S3 object, return None if invalid."""
967- try :
968- return FileMetaData .from_simcore_node (
969- user_id = user_id ,
970- file_id = TypeAdapter (SimcoreS3FileID ).validate_python (s3_obj .object_key ),
971- bucket = self .simcore_bucket_name ,
972- location_id = self .get_location_id (),
973- location_name = self .get_location_name (),
974- sha256_checksum = None ,
975- file_size = s3_obj .size ,
976- last_modified = s3_obj .last_modified ,
977- entity_tag = s3_obj .e_tag ,
978- )
979- except (ValidationError , ValueError ):
980- return None
981-
982963 async def _process_s3_page_results (
983964 self ,
984965 current_page_results : list [FileMetaData ],
@@ -1032,18 +1013,27 @@ async def _search_project_s3_files(
10321013 and len (s3_obj .object_key .split ("/" ))
10331014 >= min_parts_for_valid_s3_object
10341015 ):
1035- file_meta = self ._create_file_metadata_from_s3_object (
1036- s3_obj , user_id
1016+ file_meta = FileMetaData .from_simcore_node (
1017+ user_id = user_id ,
1018+ file_id = TypeAdapter (SimcoreS3FileID ).validate_python (
1019+ s3_obj .object_key
1020+ ),
1021+ bucket = self .simcore_bucket_name ,
1022+ location_id = self .get_location_id (),
1023+ location_name = self .get_location_name (),
1024+ sha256_checksum = None ,
1025+ file_size = s3_obj .size ,
1026+ last_modified = s3_obj .last_modified ,
1027+ entity_tag = s3_obj .e_tag ,
10371028 )
1038- if file_meta :
1039- current_page_results .append (file_meta )
1040-
1041- if len (current_page_results ) >= items_per_page :
1042- processed_results = await self ._process_s3_page_results (
1043- current_page_results
1044- )
1045- yield processed_results
1046- current_page_results = []
1029+ current_page_results .append (file_meta )
1030+
1031+ if len (current_page_results ) >= items_per_page :
1032+ processed_results = await self ._process_s3_page_results (
1033+ current_page_results
1034+ )
1035+ yield processed_results
1036+ current_page_results = []
10471037
10481038 if current_page_results :
10491039 processed_results = await self ._process_s3_page_results (
0 commit comments