fix subfolder

Author: eaidova

optimum/intel/openvino/modeling_base.py

@@ -608,8 +608,9 @@ def from_pretrained(
             )
 
         if export is None:
-            export = cls._check_export_status(model_id, revision, subfolder, cache_dir, local_files_only or HF_HUB_OFFLINE)
-
+            export = cls._check_export_status(
+                model_id, revision, subfolder, cache_dir, local_files_only or HF_HUB_OFFLINE
+            )
         if not export and trust_remote_code:
             logger.warning(
                 "The argument `trust_remote_code` is to be used along with export=True. It will be ignored."
@@ -642,15 +643,15 @@ def _check_export_status(
         local_files_only: bool = HF_HUB_OFFLINE,
     ):
         model_dir = Path(model_id)
-        if subfolder is not None:
+        if subfolder:
             model_dir = model_dir / subfolder
         if model_dir.is_dir():
             return (
                 not (model_dir / OV_XML_FILE_NAME).exists()
                 or not (model_dir / OV_XML_FILE_NAME.replace(".xml", ".bin")).exists()
             )
-        normalized_subfolder = None if subfolder is None else Path(subfolder).as_posix()
-        ov_model_path = OV_XML_FILE_NAME if subfolder is None else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
+        normalized_subfolder = None if not subfolder else Path(subfolder).as_posix()
+        ov_model_path = OV_XML_FILE_NAME if not subfolder else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
         cache_model_path = try_to_load_from_cache(
             model_id, ov_model_path, cache_dir=cache_dir, revision=revision or "main", repo_type="model"
         )
@@ -672,7 +673,7 @@ def _check_export_status(
                     for file in model_info.siblings
                     if normalized_subfolder is None or file.rfilename.startswith(normalized_subfolder)
                 ]
-                ov_model_path = OV_XML_FILE_NAME if subfolder is None else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
+                ov_model_path = OV_XML_FILE_NAME if not subfolder else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
                 return ov_model_path not in model_files or ov_model_path.replace(".xml", ".bin") not in model_files
             except Exception:
                 return True

optimum/intel/openvino/modeling_base_seq2seq.py

@@ -406,14 +406,14 @@ def _check_export_status(
             hf_api = HfApi()
             try:
                 model_info = hf_api.model_info(model_id, revision=revision or "main")
-                normalized_subfolder = None if subfolder is None else Path(subfolder).as_posix()
+                normalized_subfolder = None if not subfolder else Path(subfolder).as_posix()
                 model_files = [
                     file.rfilename
                     for file in model_info.siblings
                     if normalized_subfolder is None or file.rfilename.startswith(normalized_subfolder)
                 ]
                 for model_name in [OV_ENCODER_NAME, OV_DECODER_NAME]:
-                    ov_model_path = model_name if subfolder is None else f"{normalized_subfolder}/{model_name}"
+                    ov_model_path = model_name if not subfolder else f"{normalized_subfolder}/{model_name}"
                     if ov_model_path not in model_files or ov_model_path.replace(".xml", ".bin") not in model_files:
                         return True
                 return False

optimum/intel/openvino/modeling_diffusion.py

@@ -424,16 +424,16 @@ def _check_export_status(
 
         def check_model_part_status(model_id, subfolder, revision):
             model_dir = Path(model_id)
-            if subfolder is not None:
+            if subfolder:
                 model_dir = model_dir / subfolder
             if model_dir.is_dir():
                 return (
                     not (model_dir / OV_XML_FILE_NAME).exists()
                     or not (model_dir / OV_XML_FILE_NAME.replace(".xml", ".bin")).exists()
                 )
 
-            normalized_subfolder = None if subfolder is None else Path(subfolder).as_posix()
-            ov_model_path = OV_XML_FILE_NAME if subfolder is None else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
+            normalized_subfolder = None if not subfolder else Path(subfolder).as_posix()
+            ov_model_path = OV_XML_FILE_NAME if not subfolder else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
             cache_model_path = try_to_load_from_cache(
                 model_id, ov_model_path, cache_dir=cache_dir, revision=revision or "main", repo_type="model"
             )
@@ -455,9 +455,7 @@ def check_model_part_status(model_id, subfolder, revision):
                         for file in model_info.siblings
                         if normalized_subfolder is None or file.rfilename.startswith(normalized_subfolder)
                     ]
-                    ov_model_path = (
-                        OV_XML_FILE_NAME if subfolder is None else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
-                    )
+                    ov_model_path = OV_XML_FILE_NAME if not subfolder else f"{normalized_subfolder}/{OV_XML_FILE_NAME}"
                     return ov_model_path not in model_files or ov_model_path.replace(".xml", ".bin") not in model_files
                 except Exception:
                     return True