From 21d53b6ac814503522138986a9adcf3f3d402da3 Mon Sep 17 00:00:00 2001
From: Disty0 <semihgulec2005@gmail.com>
Date: Thu, 28 Sep 2023 19:53:52 +0300
Subject: [PATCH] Cleanup

---
 modules/devices.py                 | 17 ++++++++++-------
 modules/intel/openvino/__init__.py |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/devices.py b/modules/devices.py
index 346f178ba..07fe25938 100644
--- a/modules/devices.py
+++ b/modules/devices.py
@@ -33,13 +33,16 @@ def get_gpu_info():
             return ''
 
     if not torch.cuda.is_available():
-        if hasattr(shared.cmd_opts, "use_openvino") and shared.cmd_opts.use_openvino:
-            from importlib.metadata import version as libmodule_version
-            return {
-                'device': get_openvino_device(),
-                'openvino': libmodule_version("openvino"),
-            }
-        else:
+        try:
+            if shared.cmd_opts.use_openvino:
+                from importlib.metadata import version as libmodule_version
+                return {
+                    'device': get_openvino_device(),
+                    'openvino': libmodule_version("openvino"),
+                }
+            else:
+                return {}
+        except Exception:
             return {}
     else:
         try:
diff --git a/modules/intel/openvino/__init__.py b/modules/intel/openvino/__init__.py
index df61dc882..e0581fd97 100644
--- a/modules/intel/openvino/__init__.py
+++ b/modules/intel/openvino/__init__.py
@@ -90,7 +90,7 @@ def get_openvino_device():
     core = Core()
     try:
         return core.get_property(get_device(), "FULL_DEVICE_NAME")
-    except:
+    except Exception:
         return "OpenVINO"
 
 def cache_root_path():