Ultralytics Code Refactor https://ultralytics.com/actions (#16940)

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

ultralytics/cfg/__init__.py

@@ -639,7 +639,7 @@ def smart_value(v):
     else:
         try:
             return eval(v)
-        except:  # noqa E722
+        except Exception:
             return v
 
 

ultralytics/data/utils.py

@@ -65,7 +65,7 @@ def exif_size(img: Image.Image):
                 rotation = exif.get(274, None)  # the EXIF key for the orientation tag is 274
                 if rotation in {6, 8}:  # rotation 270 or 90
                     s = s[1], s[0]
-        except:  # noqa E722
+        except Exception:
             pass
     return s
 

ultralytics/nn/autobackend.py

@@ -46,7 +46,7 @@ def default_class_names(data=None):
     if data:
         try:
             return yaml_load(check_yaml(data))["names"]
-        except:  # noqa E722
+        except Exception:
             pass
     return {i: f"class{i}" for i in range(999)}  # return default if above errors
 

ultralytics/nn/tasks.py

@@ -963,7 +963,6 @@ def parse_model(d, ch, verbose=True):  # model_dict, input_channels(3)
                     args[j] = locals()[a] if a in locals() else ast.literal_eval(a)
                 except ValueError:
                     pass
-
         n = n_ = max(round(n * depth), 1) if n > 1 else n  # depth gain
         if m in {
             Classify,
@@ -1102,7 +1101,7 @@ def guess_model_scale(model_path):
         (str): The size character of the model's scale, which can be n, s, m, l, or x.
     """
     try:
-        return re.search(r"yolo[v]?\d+([nslmx])", Path(model_path).stem).group(1)  # n, s, m, l, or x
+        return re.search(r"yolo[v]?\d+([nslmx])", Path(model_path).stem).group(1)  # noqa, returns n, s, m, l, or x
     except AttributeError:
         return ""
 
@@ -1139,7 +1138,7 @@ def guess_model_task(model):
     if isinstance(model, dict):
         try:
             return cfg2task(model)
-        except:  # noqa E722
+        except Exception:
             pass
 
     # Guess from PyTorch model
@@ -1147,12 +1146,12 @@ def guess_model_task(model):
         for x in "model.args", "model.model.args", "model.model.model.args":
             try:
                 return eval(x)["task"]
-            except:  # noqa E722
+            except Exception:
                 pass
         for x in "model.yaml", "model.model.yaml", "model.model.model.yaml":
             try:
                 return cfg2task(eval(x))
-            except:  # noqa E722
+            except Exception:
                 pass
 
         for m in model.modules():

ultralytics/solutions/analytics.py

@@ -61,11 +61,11 @@ class Analytics(BaseSolution):
         self.extract_tracks(im0)  # Extract tracks
 
         if self.type == "line":
-            for box in self.boxes:
+            for _ in self.boxes:
                 self.total_counts += 1
             im0 = self.update_graph(frame_number=frame_number)
             self.total_counts = 0
-        elif self.type == "pie" or self.type == "bar" or self.type == "area":
+        elif self.type in {"pie", "bar", "area"}:
             self.clswise_count = {}
             for box, cls in zip(self.boxes, self.clss):
                 if self.names[int(cls)] in self.clswise_count:

ultralytics/solutions/heatmap.py

@@ -52,7 +52,8 @@ class Heatmap(ObjectCounter):
         Returns:
             im0 (ndarray): Processed image for further usage
         """
-        self.heatmap = np.zeros_like(im0, dtype=np.float32) * 0.99 if not self.initialized else self.heatmap
+        if not self.initialized:
+            self.heatmap = np.zeros_like(im0, dtype=np.float32) * 0.99
         self.initialized = True  # Initialize heatmap only once
 
         self.annotator = Annotator(im0, line_width=self.line_width)  # Initialize annotator

ultralytics/utils/__init__.py

@@ -526,7 +526,7 @@ def read_device_model() -> str:
     try:
         with open("/proc/device-tree/model") as f:
             return f.read()
-    except:  # noqa E722
+    except Exception:
         return ""
 
 
@@ -584,7 +584,7 @@ def is_docker() -> bool:
     try:
         with open("/proc/self/cgroup") as f:
             return "docker" in f.read()
-    except:  # noqa E722
+    except Exception:
         return False
 
 
@@ -623,7 +623,7 @@ def is_online() -> bool:
         for dns in ("1.1.1.1", "8.8.8.8"):  # check Cloudflare and Google DNS
             socket.create_connection(address=(dns, 80), timeout=2.0).close()
             return True
-    except:  # noqa E722
+    except Exception:
         return False
 
 

ultralytics/utils/callbacks/tensorboard.py

@@ -50,7 +50,7 @@ def _log_tensorboard_graph(trainer):
             LOGGER.info(f"{PREFIX}model graph visualization added ✅")
             return
 
-        except:  # noqa E722
+        except Exception:
             # Fallback to TorchScript export steps (RTDETR)
             try:
                 model = deepcopy(de_parallel(trainer.model))

ultralytics/utils/checks.py

@@ -277,7 +277,7 @@ def check_latest_pypi_version(package_name="ultralytics"):
         response = requests.get(f"https://pypi.org/pypi/{package_name}/json", timeout=3)
         if response.status_code == 200:
             return response.json()["info"]["version"]
-    except:  # noqa E722
+    except Exception:
         return None
 
 
@@ -299,7 +299,7 @@ def check_pip_update_available():
                     f"Update with 'pip install -U ultralytics'"
                 )
                 return True
-        except:  # noqa E722
+        except Exception:
             pass
     return False
 
@@ -715,7 +715,7 @@ def git_describe(path=ROOT):  # path must be a directory
     """Return human-readable git description, i.e. v5.0-5-g3e25f1e https://git-scm.com/docs/git-describe."""
     try:
         return subprocess.check_output(f"git -C {path} describe --tags --long --always", shell=True).decode()[:-1]
-    except:  # noqa E722
+    except Exception:
         return ""
 
 

ultralytics/utils/downloads.py

@@ -60,7 +60,7 @@ def is_url(url, check=False):
             with request.urlopen(url) as response:
                 return response.getcode() == 200  # check if exists online
         return True
-    except:  # noqa E722
+    except Exception:
         return False
 
 

ultralytics/utils/plotting.py

@@ -1117,7 +1117,7 @@ def plot_images(
                             im[y : y + h, x : x + w, :][mask] = (
                                 im[y : y + h, x : x + w, :][mask] * 0.4 + np.array(color) * 0.6
                             )
-                        except:  # noqa E722
+                        except Exception:
                             pass
                 annotator.fromarray(im)
     if not save:

ultralytics/utils/torch_utils.py

@@ -119,7 +119,7 @@ def get_cpu_info():
             info = cpuinfo.get_cpu_info()  # info dict
             string = info.get(k[0] if k[0] in info else k[1] if k[1] in info else k[2], "unknown")
             PERSISTENT_CACHE["cpu_info"] = string.replace("(R)", "").replace("CPU ", "").replace("@ ", "")
-        except:  # noqa E722
+        except Exception:
             pass
     return PERSISTENT_CACHE.get("cpu_info", "unknown")