move all conditions to allow_skip_check_trace

Author: eaidova

optimum/exporters/openvino/convert.py

@@ -47,7 +47,6 @@
     _transformers_version,
     compare_versions,
     is_openvino_tokenizers_version,
-    is_openvino_version,
     is_tokenizers_version,
     is_transformers_version,
 )
@@ -437,9 +436,7 @@ def ts_patched_forward(*args, **kwargs):
             patcher.patched_forward = ts_patched_forward
 
             ts_decoder_kwargs = {}
-            if (library_name == "diffusers" or allow_skip_tracing_check(model)) and is_openvino_version(
-                ">=", "2025.0"
-            ):
+            if allow_skip_tracing_check(library_name, model):
                 ts_decoder_kwargs["trace_kwargs"] = {"check_trace": False}
 
             with patcher:

optimum/exporters/openvino/utils.py

@@ -26,7 +26,7 @@
 from optimum.exporters import TasksManager
 from optimum.exporters.onnx.base import OnnxConfig
 from optimum.intel.utils import is_transformers_version
-from optimum.intel.utils.import_utils import is_safetensors_available
+from optimum.intel.utils.import_utils import is_openvino_version, is_safetensors_available
 from optimum.utils import is_diffusers_available
 from optimum.utils.save_utils import maybe_save_preprocessors
 
@@ -317,7 +317,11 @@ def save_preprocessors(
 SKIP_CHECK_TRACE_MODELS = ("deepseek", "deepseek-v2", "deepseek-v3")
 
 
-def allow_skip_tracing_check(model):
+def allow_skip_tracing_check(library_name, model):
+    if is_openvino_version("<", "2025.0.0"):
+        return False
+    if library_name == "diffusers":
+        return True
     config = getattr(model, "config", {})
     model_type = getattr(config, "model_type", "").replace("_", "-")
     return model_type in SKIP_CHECK_TRACE_MODELS