pyppbox 3.7b1__tar.gz → 3.8b1__tar.gz

{pyppbox-3.7b1/pyppbox.egg-info → pyppbox-3.8b1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pyppbox
-Version: 3.7b1
+Version: 3.8b1
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV
@@ -57,6 +57,17 @@ Requires-Dist: PyQt6
 Requires-Dist: sfps
 Requires-Dist: pyppbox-torchreid
 Requires-Dist: vsensebox-ultralytics>=8.3.5
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: maintainer
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # 🐍📦 [**pyppbox**](https://github.com/rathaumons/pyppbox)
 

{pyppbox-3.7b1 → pyppbox-3.8b1}/RELEASENOTES.md

@@ -12,7 +12,15 @@
 
 ## **pyppbox V3 - Make Simpler and Faster**
 
-* `pyppbox` [v3.7b1](https://github.com/rathaumons/pyppbox/tree/v3.7b1) - The Last V3
+* `pyppbox` [v3.8b1](https://github.com/rathaumons/pyppbox/tree/v3.8b1) - The Last V3
+
+  - Add `show_footnote` option to `visualizePeople()`
+  - Optimize and enhance general performance
+  - Correct typos and improve documentation
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `pyppbox` [v3.7b1](https://github.com/rathaumons/pyppbox/tree/v3.7b1) - ~~The Last V3~~
 
   - Sync `pyppbox.utils.persontools.Person`'s misc across frames in all trackers
   - Improve and add `--use-numid` for using number id in MOT as the real id in `pyppbox` format

{pyppbox-3.7b1 → pyppbox-3.8b1}/pyppbox/__init__.py

@@ -47,7 +47,7 @@ from pyppbox.gui.guitools import (
 )
 
 
-__version__ = '3.7b1'
+__version__ = '3.8b1'
 __author__ = 'Ratha SIV'
 __description__ = 'Toolbox for people detecting, tracking, and re-identifying.'
 __homepage__ = 'https://rathaumons.github.io/pyppbox'

{pyppbox-3.7b1 → pyppbox-3.8b1}/pyppbox/config/configtools.py

@@ -24,8 +24,7 @@ import yaml
 from yaml.loader import SafeLoader
 
 from .unifiedstrings import UnifiedStrings
-from pyppbox.utils.commontools import (joinFPathFull, getAbsPathFDS, 
-                                       getGlobalRootDir, isExist)
+from pyppbox.utils.commontools import joinFPathFull, getAbsPathFDS, getGlobalRootDir, isExist
 from pyppbox.utils.logtools import add_warning_log, add_error_log
 
 
@@ -81,10 +80,8 @@ class PYPPBOXStructure(object):
         """
         if cfg_dir != internal_cfg_dir:
             if not isExist(cfg_dir):
-                add_warning_log("PYPPBOXStructure : __init__() -> cfg_dir='" + 
-                                str(cfg_dir) + "' does not exist.")
-                add_warning_log("PYPPBOXStructure : __init__() -> " + 
-                                "Switched to internal cfg directory !")
+                add_warning_log(f"PYPPBOXStructure : __init__() -> cfg_dir='{cfg_dir}' does not exist.")
+                add_warning_log("PYPPBOXStructure : __init__() -> Switched to internal cfg directory !")
                 cfg_dir = internal_cfg_dir
         self.cfg_dir = cfg_dir
         self.internal_root_dir = internal_root_dir
@@ -125,10 +122,8 @@ class PYPPBOXStructure(object):
             A path of the config directory.
         """
         if not isExist(cfg_dir):
-            add_warning_log("PYPPBOXStructure : setCustomCFG() -> cfg_dir='" 
-                            + str(cfg_dir) + "' does not exist.")
-            add_warning_log("PYPPBOXStructure : setCustomCFG() -> " + 
-                            "Switched to internal cfg directory !")
+            add_warning_log(f"PYPPBOXStructure : setCustomCFG() -> cfg_dir='{cfg_dir}' does not exist.")
+            add_warning_log("PYPPBOXStructure : setCustomCFG() -> Switched to internal cfg directory!")
             cfg_dir = internal_cfg_dir
         self.cfg_dir = cfg_dir
         self.setYAMLPath()
@@ -237,11 +232,11 @@ def loadDocument(yaml_json):
                 elif '.yaml' in yaml_json.lower():
                     document = yaml.load(cfg, Loader=SafeLoader)
             except ValueError as e:
-                msg = 'loadDocument() -> ' + str(e)
+                msg = f'loadDocument() -> {e}'
                 add_error_log(msg)
                 raise ValueError(msg)
     else:
-        msg = "loadDocument() -> " + str(yaml_json) + "' does not exist!"
+        msg = f"loadDocument() -> '{yaml_json}' does not exist!"
         add_error_log(msg)
         raise ValueError(msg)
     return document
@@ -268,13 +263,13 @@ def loadListDocument(yaml_json):
                 elif '.yaml' in yaml_json.lower():
                     docs = yaml.load_all(cfg, Loader=SafeLoader)
             except ValueError as e:
-                msg = 'loadListDocument() -> ' + str(e)
+                msg = f'loadListDocument() -> {e}'
                 add_error_log(msg)
                 raise ValueError(msg)
             for doc in docs:
                 document_list.append(doc)
     else:
-        msg = "loadListDocument() -> " + str(yaml_json) + "' does not exist!"
+        msg = f"loadListDocument() -> '{yaml_json}' does not exist!"
         add_error_log(msg)
         raise ValueError(msg)
     return document_list
@@ -299,7 +294,7 @@ def loadRawYAMLString(raw_string):
         d = yaml.load(raw_string, Loader=SafeLoader)
         document = next(iter(d))
     except ValueError as e:
-        msg = 'loadRawYAMLString() -> ' + str(e)
+        msg = f'loadRawYAMLString() -> {e}'
         add_error_log(msg)
         raise ValueError(msg)
     return document
@@ -324,7 +319,7 @@ def loadRawYAMLStringMT(raw_string):
         for d in ds:
             document_list.append(d)
     except ValueError as e:
-        msg = 'loadRawYAMLStringMT() -> ' + str(e)
+        msg = f'loadRawYAMLStringMT() -> {e}'
         add_error_log(msg)
         raise ValueError(msg)
     return document_list
@@ -348,7 +343,7 @@ def dumpDocDict(output_file, doc, header):
             for key, value in doc.items():
                 dumping.write('%s: %s\n' % (key, value))
     except ValueError as e:
-        msg = 'dumpDocDict() -> ' + str(e)
+        msg = f'dumpDocDict() -> {e}'
         add_error_log(msg)
         raise ValueError(msg)
 
@@ -375,7 +370,7 @@ def dumpListDocDict(output_file, doc_list, header):
                     dumping.write("---\n")
                     sep_index += 1
     except ValueError as e:
-        msg = 'dumpListDocDict() -> ' + str(e)
+        msg = f'dumpListDocDict() -> {e}'
         add_error_log(msg)
         raise ValueError(msg)
 

{pyppbox-3.7b1 → pyppbox-3.8b1}/pyppbox/config/myconfig.py

@@ -130,7 +130,7 @@ class NoneCFG(BaseCGF):
         Parameters
         ----------
         input : any
-            A parameter to be overwritten to a unified string of :code:`"None"`.
+            A parameter to be overrided with a unified string of :code:`"None"`.
         """
         input = "None"
         self.dt_name = self.unified_strings.getUnifiedFormat(input)
@@ -173,7 +173,7 @@ class MainCFG(BaseCGF):
                 self.reider = self.unified_strings.getUnifiedFormat(self.configs['reider'])
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "MainCFG : set() -> " + str(e)
+                msg = f"MainCFG : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -264,18 +264,15 @@ class DCFGYOLOCLS(BaseCGF):
                 self.dt_name = self.unified_strings.getUnifiedFormat(self.configs['dt_name'])
                 self.nms = self.configs['nms']
                 self.conf = self.configs['conf']
-                self.class_file = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                        self.configs['class_file'])
-                self.model_cfg_file = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                            self.configs['model_cfg_file'])
-                self.model_weights = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                           self.configs['model_weights'])
+                self.class_file = getAdaptiveAbsPathFDS(self.from_dir, self.configs['class_file'])
+                self.model_cfg_file = getAdaptiveAbsPathFDS(self.from_dir, self.configs['model_cfg_file'])
+                self.model_weights = getAdaptiveAbsPathFDS(self.from_dir, self.configs['model_weights'])
                 self.model_image_size = self.configs['model_image_size']
                 self.model_resolution = (self.model_image_size, self.model_image_size)
                 self.repspoint_calibration = self.configs['repspoint_calibration']
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "DCFGYOLOCLS : set() -> " + str(e)
+                msg = f"DCFGYOLOCLS : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -376,12 +373,11 @@ class DCFGYOLOULT(BaseCGF):
                 self.device = self.configs['device']
                 self.max_det = self.configs['max_det']
                 self.line_width = self.configs['line_width']
-                self.model_file = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                        self.configs['model_file'])
+                self.model_file = getAdaptiveAbsPathFDS(self.from_dir, self.configs['model_file'])
                 self.repspoint_calibration = self.configs['repspoint_calibration']
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "DCFGYOLOULT : set() -> " + str(e)
+                msg = f"DCFGYOLOULT : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -467,7 +463,7 @@ class DCFGGT(BaseCGF):
                 self.gt_map_file = getAdaptiveAbsPathFDS(self.from_dir, self.configs['gt_map_file'])
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "DCFGGT : set() -> " + str(e)
+                msg = f"DCFGGT : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -520,7 +516,7 @@ class TCFGCentroid(BaseCGF):
                 self.max_spread = self.configs['max_spread']
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "TCFGCentroid : set() -> " + str(e)
+                msg = f"TCFGCentroid : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -577,7 +573,7 @@ class TCFGSORT(BaseCGF):
                 self.iou_threshold = self.configs['iou_threshold']
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "TCFGSORT : set() -> " + str(e)
+                msg = f"TCFGSORT : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -663,7 +659,7 @@ class TCFGDeepSORT(BaseCGF):
                 self.model_file = getAdaptiveAbsPathFDS(self.from_dir, self.configs['model_file'])
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "TCFGDeepSORT : set() -> " + str(e)
+                msg = f"TCFGDeepSORT : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -772,7 +768,7 @@ class RCFGFaceNet(BaseCGF):
                 self.yl_w_calibration = self.configs['yl_w_calibration']
                 self.configs = self.getDocument()
             except Exception as e:
-                msg = "RCFGFaceNet : set() -> " + str(e)
+                msg = f"RCFGFaceNet : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -873,13 +869,10 @@ class RCFGTorchreid(BaseCGF):
             try:
                 from pyppbox.modules.reiders.torchreid.model_dict import TorchreidModelDict
                 self.ri_name = self.unified_strings.getUnifiedFormat(self.configs['ri_name'])
-                self.classifier_pkl = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                            self.configs['classifier_pkl'])
-                self.train_data = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                        self.configs['train_data'])
+                self.classifier_pkl = getAdaptiveAbsPathFDS(self.from_dir, self.configs['classifier_pkl'])
+                self.train_data = getAdaptiveAbsPathFDS(self.from_dir, self.configs['train_data'])
                 self.model_name = self.configs['model_name']
-                self.model_path = getAdaptiveAbsPathFDS(self.from_dir, 
-                                                        self.configs['model_path'])
+                self.model_path = getAdaptiveAbsPathFDS(self.from_dir, self.configs['model_path'])
                 self.min_confidence = self.configs['min_confidence']
                 self.device = self.configs['device']
                 self.configs = self.getDocument()
@@ -890,7 +883,7 @@ class RCFGTorchreid(BaseCGF):
                 self.model_dict = TorchreidModelDict()
                 self.model_wh = self.model_dict.getWH(getFileName(self.model_path))
             except Exception as e:
-                msg = "RCFGTorchreid : set() -> " + str(e)
+                msg = f"RCFGTorchreid : set() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         else:
@@ -1152,7 +1145,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         main_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the main configurations 
-            or main.yaml. This :obj:`main_yaml` helps overwrite the original one configured 
+            or main.yaml. This :obj:`main_yaml` helps override the original one configured 
             during the :meth:`__init__()`.
             Leave it as default :code:`main_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1170,7 +1163,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         main_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the main configurations 
-            or main.yaml. This :obj:`main_yaml` helps overwrite the original one configured 
+            or main.yaml. This :obj:`main_yaml` helps override the original one configured 
             during the :meth:`__init__()`.
             Leave it as default :code:`main_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1202,7 +1195,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         detectors_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the detectors' configurations 
-            or detectors.yaml. This :obj:`detectors_yaml` helps overwrite the original one 
+            or detectors.yaml. This :obj:`detectors_yaml` helps override the original one 
             configured during the :meth:`__init__()`. 
             Leave it as default :code:`detectors_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1210,7 +1203,7 @@ class MyConfigurator(PYPPBOXStructure):
             An indication of whether the paths inside your configuration file are relative 
             to :code:`{pyppbox root}` or not. This indication or behavior was automatically 
             decided during the :meth:`__init__()`, and you don't need to set or change it 
-            unless you set :obj:`detectors_yaml` to overwrite the original configurations. If 
+            unless you set :obj:`detectors_yaml` to override the original configurations. If 
             all the paths inside your configuration file have full absolute paths, setting 
             :obj:`relative_to_pyppbox_root` is optional.
         """
@@ -1232,7 +1225,7 @@ class MyConfigurator(PYPPBOXStructure):
                 if d['dt_name'].lower() == self.unified_strings.gt:
                     self.dcfg_gt.set(d)
             except Exception as e:
-                msg = "MyConfigurator : setGTCFG() -> " + str(e)
+                msg = f"MyConfigurator : setGTCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
 
@@ -1243,7 +1236,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         detectors_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the detectors' configurations 
-            or detectors.yaml. This :obj:`detectors_yaml` helps overwrite the original one 
+            or detectors.yaml. This :obj:`detectors_yaml` helps override the original one 
             configured during the :meth:`__init__()`. 
             Leave it as default :code:`detectors_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1251,7 +1244,7 @@ class MyConfigurator(PYPPBOXStructure):
             An indication of whether the paths inside your configuration file are relative 
             to :code:`{pyppbox root}` or not. This indication or behavior was automatically 
             decided during the :meth:`__init__()`, and you don't need to set or change it 
-            unless you set :obj:`detectors_yaml` to overwrite the original configurations. If 
+            unless you set :obj:`detectors_yaml` to override the original configurations. If 
             all the paths inside your configuration file have full absolute paths, setting 
             :obj:`relative_to_pyppbox_root` is optional.
         """
@@ -1285,11 +1278,10 @@ class MyConfigurator(PYPPBOXStructure):
                     self.dcfg_gt.set(d)
                     self.dt_map.append(self.dcfg_gt.dt_name)
                 else:
-                    msg = ("MyConfigurator : setAllDCFG() -> Name '" + 
-                           str(d['dt_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setAllDCFG() -> Name '{d['dt_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                msg = "MyConfigurator : setAllDCFG() -> " + str(e)
+                msg = f"MyConfigurator : setAllDCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
 
@@ -1300,7 +1292,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         trackers_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the trackers' configurations 
-            or trackers.yaml. This :obj:`trackers_yaml` helps overwrite the original one 
+            or trackers.yaml. This :obj:`trackers_yaml` helps override the original one 
             configured during the :meth:`__init__()`. 
             Leave it as default :code:`trackers_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1308,7 +1300,7 @@ class MyConfigurator(PYPPBOXStructure):
             An indication of whether the paths inside your configuration file are relative 
             to :code:`{pyppbox root}` or not. This indication or behavior was automatically 
             decided during the :meth:`__init__()`, and you don't need to set or change it 
-            unless you set :obj:`trackers_yaml` to overwrite the original configurations. If 
+            unless you set :obj:`trackers_yaml` to override the original configurations. If 
             all the paths inside your configuration file have full absolute paths, setting 
             :obj:`relative_to_pyppbox_root` is optional.
         """
@@ -1341,11 +1333,10 @@ class MyConfigurator(PYPPBOXStructure):
                     self.tcfg_deepsort.set(d)
                     self.tk_map.append(self.tcfg_deepsort.tk_name)
                 else:
-                    msg = ("MyConfigurator : setAllTCFG() -> Name '" + 
-                           str(d['dt_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setAllTCFG() -> Name '{d['dt_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                msg = "MyConfigurator : setAllTCFG() -> "  + str(e)
+                msg = f"MyConfigurator : setAllTCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
 
@@ -1356,7 +1347,7 @@ class MyConfigurator(PYPPBOXStructure):
         ----------
         reiders_yaml : str or dict, default=None
             A YAML/JSON file path, or a raw/ready dictionary of the reiders' configurations or 
-            reiders.yaml. This :obj:`reiders_yaml` helps overwrite the original one configured 
+            reiders.yaml. This :obj:`reiders_yaml` helps override the original one configured 
             during the :meth:`__init__()`. 
             Leave it as default :code:`reiders_yaml=None`, to load and set according to the 
             configurations inside config directory :attr:`cfg_dir` set in the :meth:`__init__()`.
@@ -1364,7 +1355,7 @@ class MyConfigurator(PYPPBOXStructure):
             An indication of whether the paths inside your configuration file are relative 
             to :code:`{pyppbox root}` or not. This indication or behavior was automatically 
             decided during the :meth:`__init__()`, and you don't need to set or change it 
-            unless you set :obj:`reiders_yaml` to overwrite the original configurations. If 
+            unless you set :obj:`reiders_yaml` to override the original configurations. If 
             all the paths inside your configuration file have full absolute paths, setting 
             :obj:`relative_to_pyppbox_root` is optional.
         """
@@ -1393,15 +1384,14 @@ class MyConfigurator(PYPPBOXStructure):
                     self.rcfg_torchreid.set(d)
                     self.ri_map.append(self.rcfg_torchreid.ri_name)
                 else:
-                    msg = ("MyConfigurator : setAllRCFG() -> Name '" + 
-                           str(d['dt_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setAllRCFG() -> Name '{d['dt_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                raise ValueError("MyConfigurator : setAllRCFG() -> "  + str(e))
+                raise ValueError(f"MyConfigurator : setAllRCFG() -> {e}")
     
     def setASupportedModuleCFG(self, input_cfg, relative_to_pyppbox_root=False):
         """Load and set configurations for a supported module. Be aware that calling 
-        this method will overwrite the original or previous configurations.
+        this method will override the original or previous configurations.
 
         Parameters
         ----------
@@ -1426,11 +1416,10 @@ class MyConfigurator(PYPPBOXStructure):
                     self.dcfg_gt = DCFGGT(relative_to_pyppbox_root)
                     self.dcfg_gt.set(cfg)
                 else:
-                    msg = ("MyConfigurator : setASupportedModuleCFG() -> Name '" + 
-                           str(cfg['dt_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setASupportedModuleCFG() -> Name '{cfg['dt_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                msg = "MyConfigurator : setASupportedModuleCFG() -> " + str(e)
+                msg = f"MyConfigurator : setASupportedModuleCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         elif "tk_name" in k_list:
@@ -1445,11 +1434,10 @@ class MyConfigurator(PYPPBOXStructure):
                     self.tcfg_deepsort = TCFGDeepSORT(relative_to_pyppbox_root)
                     self.tcfg_deepsort.set(cfg)
                 else:
-                    msg = ("MyConfigurator : setASupportedModuleCFG() -> Name '" + 
-                           str(cfg['tk_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setASupportedModuleCFG() -> Name '{cfg['tk_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                msg = "MyConfigurator : setASupportedModuleCFG() -> " + str(e)
+                msg = f"MyConfigurator : setASupportedModuleCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
         elif "ri_name" in k_list:
@@ -1461,11 +1449,10 @@ class MyConfigurator(PYPPBOXStructure):
                     self.rcfg_torchreid = RCFGTorchreid(relative_to_pyppbox_root)
                     self.rcfg_torchreid.set(cfg)
                 else:
-                    msg = ("MyConfigurator : setASupportedModuleCFG() -> Name '" + 
-                           str(cfg['ri_name']) + "' is not supported.")
+                    msg = f"MyConfigurator : setASupportedModuleCFG() -> Name '{cfg['ri_name']}' is not supported."
                     add_warning_log(msg)
             except Exception as e:
-                msg = "MyConfigurator : setASupportedModuleCFG() -> " + str(e)
+                msg = f"MyConfigurator : setASupportedModuleCFG() -> {e}"
                 add_error_log(msg)
                 raise ValueError(msg)
 

{pyppbox-3.7b1 → pyppbox-3.8b1}/pyppbox/modules/detectors/yolocls/__init__.py

@@ -102,10 +102,8 @@ class MyYOLOCLS(object):
                     repspoints.append(repspoint)
                     confs.append(float(conf))
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), radius=5, 
-                                   color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
         return img, pboxes_xywh, pboxes_xyxy, repspoints, confs
 
     def detectPeople(self, img, visual=True, min_width_filter=35, alt_repspoint=False, alt_repspoint_top=True):
@@ -149,8 +147,6 @@ class MyYOLOCLS(object):
                                          repspoint=repspoint, det_conf=float(conf)))
                     i += 1
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), radius=5, 
-                                   color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
         return people, img

{pyppbox-3.7b1 → pyppbox-3.8b1}/pyppbox/modules/detectors/yoloult/__init__.py

@@ -60,6 +60,8 @@ class MyYOLOULT(object):
             if self.cfg.device.lower() == 'cpu':
                 self.cpu_only = True
         ignore_this_logger("ultralytics")
+        ignore_this_logger("pyppbox-ultralytics")
+        ignore_this_logger("vsensebox-ultralytics")
         if "nas" in self.cfg.model_file:
             # YOLO NAS isn't stable yet :/
             from ultralytics import NAS
@@ -67,12 +69,13 @@ class MyYOLOULT(object):
         else:
             from ultralytics import YOLO
             self.model = YOLO(self.cfg.model_file)
-        from ultralytics.utils.plotting import Colors
-        self.colors = Colors()
-        self.skeleton = [[16, 14], [14, 12], [17, 15], [15, 13], 
-                         [12, 13], [6, 12], [7, 13], [6, 7], [6, 8],
-                         [7, 9], [8, 10], [9, 11], [2, 3], [1, 2], 
-                         [1, 3], [2, 4], [3, 5], [4, 6], [5, 7]]
+            if "pose" in self.cfg.model_file.lower():
+                from ultralytics.utils.plotting import Colors
+                self.colors = Colors()
+                self.kpt_color = Colors().pose_palette[[16, 16, 16, 16, 16, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9]]
+                self.limb_color = Colors().pose_palette[[9, 9, 9, 9, 7, 7, 7, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16]]
+                self.skeleton = [[16, 14], [14, 12], [17, 15], [15, 13], [12, 13], [6, 12], [7, 13], [6, 7], [6, 8],
+                                [7, 9], [8, 10], [9, 11], [2, 3], [1, 2], [1, 3], [2, 4], [3, 5], [4, 6], [5, 7]]
 
     def __kpts__(self, img, kpts, radius=5, kpt_line=True):
         # Internal function
@@ -81,23 +84,17 @@ class MyYOLOULT(object):
         nkpt, ndim = kpts.shape
         is_pose = nkpt == 17 and ndim == 3
         kpt_line &= is_pose
-        kpt_color = self.colors.pose_palette[[16, 16, 16, 16, 16, 0, 0, 
-                                              0, 0, 0, 0, 9, 9, 9, 9, 9, 9]]
         for i, k in enumerate(kpts):
-            color_k = [int(x) for x in kpt_color[i]
-                       ] if is_pose else self.colors(i)
+            color_k = [int(x) for x in self.kpt_color[i]] if is_pose else self.colors(i)
             x_coord, y_coord = k[0], k[1]
             if x_coord % shape[1] != 0 and y_coord % shape[0] != 0:
                 if len(k) == 3:
                     conf = k[2]
                     if conf < 0.5:
                         continue
-                cv2.circle(img, (int(x_coord), int(y_coord)),
-                           radius, color_k, -1, lineType=cv2.LINE_AA)
+                cv2.circle(img, (int(x_coord), int(y_coord)),radius, color_k, -1, lineType=cv2.LINE_AA)
         if kpt_line:
             ndim = kpts.shape[-1]
-            limb_color = self.colors.pose_palette[[9, 9, 9, 9, 7, 7, 7, 0, 0, 0, 
-                                                   0, 0, 16, 16, 16, 16, 16, 16, 16]]
             for i, sk in enumerate(self.skeleton):
                 pos1 = (int(kpts[(sk[0] - 1), 0]), int(kpts[(sk[0] - 1), 1]))
                 pos2 = (int(kpts[(sk[1] - 1), 0]), int(kpts[(sk[1] - 1), 1]))
@@ -106,14 +103,12 @@ class MyYOLOULT(object):
                     conf2 = kpts[(sk[1] - 1), 2]
                     if conf1 < 0.5 or conf2 < 0.5:
                         continue
-                if (pos1[0] % shape[1] == 0 or pos1[1] % shape[0] == 0 or 
-                    pos1[0] < 0 or pos1[1] < 0):
+                if (pos1[0] % shape[1] == 0 or pos1[1] % shape[0] == 0 or pos1[0] < 0 or pos1[1] < 0):
                     continue
-                if (pos2[0] % shape[1] == 0 or pos2[1] % shape[0] == 0 or 
-                    pos2[0] < 0 or pos2[1] < 0):
+                if (pos2[0] % shape[1] == 0 or pos2[1] % shape[0] == 0 or pos2[0] < 0 or pos2[1] < 0):
                     continue
-                cv2.line(img, pos1, pos2, [int(x) for x in limb_color[i]], 
-                         thickness=2, lineType=cv2.LINE_AA)
+                cv2.line(img, pos1, pos2, [int(x) for x in self.limb_color[i]], thickness=2, lineType=cv2.LINE_AA)
+
 
     def detect(self, img, visual=True, classes=0, min_width_filter=35):
         """Detect general object with object's class filter :obj:`class_filter` 
@@ -170,7 +165,8 @@ class MyYOLOULT(object):
         dt_confidences = numpy_dets.boxes.conf
         dt_keypoints = dets[0].keypoints
         if dt_keypoints is not None:
-            for box_xyxy, conf, kp in zip(dt_boxes_xyxy, dt_confidences, reversed(dt_keypoints)):
+            rev_dt_kps = reversed(dt_keypoints)
+            for box_xyxy, conf, kp in zip(dt_boxes_xyxy, dt_confidences, rev_dt_kps):
                 box_xyxy = box_xyxy.astype(int)
                 box_xywh = to_xywh(box_xyxy)
                 if box_xywh[2] >= min_width_filter:
@@ -182,10 +178,8 @@ class MyYOLOULT(object):
                     keypoints.append(keypoint)
                     confs.append(float(conf))
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), 
-                                   radius=5, color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
                         self.__kpts__(img, keypoint, kpt_line=True)
         elif len(dt_boxes_xyxy) > 0:
             for box_xyxy, conf in zip(dt_boxes_xyxy, dt_confidences):
@@ -198,10 +192,8 @@ class MyYOLOULT(object):
                     repspoints.append(repspoint)
                     confs.append(float(conf))
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), 
-                                   radius=5, color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
         return img, pboxes_xywh, pboxes_xyxy, repspoints, keypoints, confs
 
     def detectPeople(self, img, visual=True, min_width_filter=35, alt_repspoint=False, alt_repspoint_top=True):
@@ -249,7 +241,8 @@ class MyYOLOULT(object):
         dt_keypoints = dets[0].keypoints
         if dt_keypoints is not None:
             i = 0
-            for box_xyxy, conf, kp in zip(dt_boxes_xyxy, dt_confidences, reversed(dt_keypoints)):
+            rev_dt_kps = reversed(dt_keypoints)
+            for box_xyxy, conf, kp in zip(dt_boxes_xyxy, dt_confidences, rev_dt_kps):
                 box_xyxy = box_xyxy.astype(int)
                 box_xywh = to_xywh(box_xyxy)
                 if box_xywh[2] >= min_width_filter:
@@ -260,10 +253,8 @@ class MyYOLOULT(object):
                                   keypoints=keypoint, repspoint=repspoint, det_conf=float(conf)))
                     i += 1
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), 
-                                   radius=5, color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
                         self.__kpts__(img, keypoint, kpt_line=True)
         elif len(dt_boxes_xyxy) > 0:
             i = 0
@@ -277,8 +268,6 @@ class MyYOLOULT(object):
                                   repspoint=repspoint, det_conf=float(conf)))
                     i += 1
                     if visual:
-                        cv2.circle(img, (repspoint[0], repspoint[1]), 
-                                   radius=5, color=(0, 0, 255), thickness=-1)
-                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), 
-                                      (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
+                        cv2.circle(img, (repspoint[0], repspoint[1]), 5, (0, 0, 255), -1)
+                        cv2.rectangle(img, (box_xyxy[0], box_xyxy[1]), (box_xyxy[2], box_xyxy[3]), (255, 255, 0), 2)
         return people, img