pyppbox 3.8b1__tar.gz → 3.9.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyppbox
-Version: 3.8b1
+Version: 3.9.0
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV

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

@@ -12,7 +12,17 @@
 
 ## **pyppbox V3 - Make Simpler and Faster**
 
-* `pyppbox` [v3.8b1](https://github.com/rathaumons/pyppbox/tree/v3.8b1) - The Last V3
+* `pyppbox` [v3.9.0](https://github.com/rathaumons/pyppbox/tree/v3.9.0) - The Last V3
+
+  - Fix `trainReIDClassifier()` for default input
+  - Add an example of retraining all internal reider classifiers for GTA V dataset
+  - Rearrange some examples
+  - Update and improve documentation
+  - Optimize GitHub workflows
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `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
@@ -69,13 +79,13 @@
 * `pyppbox` [v3.6b4](https://github.com/rathaumons/pyppbox/tree/v3.6b4) - ~~The Last V3~~
 
   - Integrate [SFPS](https://github.com/rathaROG/smooth-fps) for better FPS calculation
-  - Update workflow
+  - Update GitHub workflows
   - **Known issue/limitation**:
     - You tell me :)
 
 * `pyppbox` [v3.6b3](https://github.com/rathaumons/pyppbox/tree/v3.6b3) - ~~The Last V3~~
 
-  - Fix typo and update workflow
+  - Fix typo and update GitHub workflows
   - **Known issue/limitation**:
     - You tell me :)
 

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

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

{pyppbox-3.8b1 → pyppbox-3.9.0}/pyppbox/ppb/__init__.py

@@ -101,13 +101,13 @@ def detectPeople(img,
                  alt_repspoint_top=True):
     """See :func:`pyppbox.ppb.mt.MT.detectPeople`"""
     return _mt.detectPeople(img, 
-                                  img_is_mat=img_is_mat, 
-                                  visual=visual, 
-                                  save=save, 
-                                  save_file=save_file, 
-                                  min_width_filter=min_width_filter, 
-                                  alt_repspoint=alt_repspoint, 
-                                  alt_repspoint_top=alt_repspoint_top)
+                            img_is_mat=img_is_mat, 
+                            visual=visual, 
+                            save=save, 
+                            save_file=save_file, 
+                            min_width_filter=min_width_filter, 
+                            alt_repspoint=alt_repspoint, 
+                            alt_repspoint_top=alt_repspoint_top)
 
 def setMainTracker(tracker=""):
     """See :func:`pyppbox.ppb.mt.MT.setMainTracker`"""
@@ -125,7 +125,7 @@ def reidPeople(img, people, deduplicate=True, img_is_mat=False):
     """See :func:`pyppbox.ppb.mt.MT.reidPeople`"""
     return _mt.reidPeople(img, people, deduplicate=deduplicate, img_is_mat=img_is_mat)
 
-def trainReIDClassifier(reider="Default", train_data="", classifier_pkl=""):
+def trainReIDClassifier(reider="", train_data="", classifier_pkl=""):
     """See :func:`pyppbox.ppb.mt.MT.trainReIDClassifier`"""
     _mt.trainReIDClassifier(reider=reider, train_data=train_data, classifier_pkl=classifier_pkl)
 

{pyppbox-3.8b1 → pyppbox-3.9.0}/pyppbox/ppb/mt.py

@@ -172,8 +172,8 @@ class MT(object):
                 self.__cfg_is_set__ = True
                 if load_all:
                     add_info_log(f"---PYPPBOX : DT='{self.__cfg__.mcfg.detector}', "
-                                f"TK='{self.__cfg__.mcfg.tracker}', "
-                                f"RI='{self.__cfg__.mcfg.reider}'")
+                                 f"TK='{self.__cfg__.mcfg.tracker}', "
+                                 f"RI='{self.__cfg__.mcfg.reider}'")
                     self.__loadDefaultDetector__()
                     self.__loadDefaultTracker__()
                     self.__loadDefaultReIDer__()
@@ -302,6 +302,8 @@ class MT(object):
             else: 
                 add_info_log("---PYPPBOX : The input detecor is not recognized.")
                 self.__dt_is_set__ = False
+        else:
+            add_warning_log("---PYPPBOX : The config is not set.")
 
     def __setCustomDetector__(self, detector_dict):
         if detector_dict:
@@ -363,10 +365,9 @@ class MT(object):
         if isinstance(detector, dict):
             self.__setCustomDetector__(detector)
         elif isinstance(detector, str):
-            if (isDictString(detector) or "yaml" in detector.lower() or 
-                "json" in detector.lower()):
+            if (isDictString(detector) or "yaml" in detector.lower() or "json" in detector.lower()):
                 self.__setCustomDetector__(getCFGDict(detector))
-            elif detector.lower() == "":
+            elif detector == "":
                 if not self.__cfg_is_set__: self.setConfigDir()
                 self.__loadDefaultDetector__()
                 add_info_log('---PYPPBOX : Use detector according to the "main.yaml"')
@@ -500,6 +501,8 @@ class MT(object):
             else: 
                 add_warning_log("---PYPPBOX : The input tracker is not recognized.")
                 self.__tk_is_set__ = False
+        else:
+            add_warning_log("---PYPPBOX : The config is not set.")
 
     def __setCustomTracker__(self, tracker_dict):
         if tracker_dict:
@@ -561,10 +564,9 @@ class MT(object):
         if isinstance(tracker, dict):
             self.__setCustomTracker__(tracker)
         elif isinstance(tracker, str):
-            if (isDictString(tracker) or "yaml" in tracker.lower() or 
-                "json" in tracker.lower()):
+            if (isDictString(tracker) or "yaml" in tracker.lower() or "json" in tracker.lower()):
                 self.__setCustomTracker__(getCFGDict(tracker))
-            elif tracker.lower() == "":
+            elif tracker == "":
                 if not self.__cfg_is_set__: self.setConfigDir()
                 self.__loadDefaultTracker__()
                 add_info_log('---PYPPBOX : Use tracker according to the "main.yaml"')
@@ -669,6 +671,8 @@ class MT(object):
             else:
                 add_warning_log("---PYPPBOX : The input reider is not recognized.")
                 self.__ri_is_set__ = False
+        else:
+            add_warning_log("---PYPPBOX : The config is not set.")
 
     def __setCustomReIDer__(self, reider_dict, auto_load=True):
         if reider_dict:
@@ -698,7 +702,7 @@ class MT(object):
                 self.__ri_is_set__ = True
                 add_info_log(f"---PYPPBOX : Set reider='{self.__ri_cfg__.ri_name}'")
                 self.__revokeGTDTOnly__()
-            else :
+            else:
                 self.__ri_is_set__ = False
                 add_warning_log(f"---PYPPBOX : reider='{reider_dict['ri_name']}' is not recognized.")
 
@@ -738,10 +742,9 @@ class MT(object):
         if isinstance(reider, dict):
             self.__setCustomReIDer__(reider, auto_load)
         elif isinstance(reider, str):
-            if (isDictString(reider) or "yaml" in reider.lower() or 
-                "json" in reider.lower()):
+            if (isDictString(reider) or "yaml" in reider.lower() or "json" in reider.lower()):
                 self.__setCustomReIDer__(getCFGDict(reider), auto_load)
-            elif reider.lower() == "":
+            elif reider == "":
                 if not self.__cfg_is_set__: self.setConfigDir()
                 self.__loadDefaultReIDer__(auto_load=auto_load)
                 add_info_log('---PYPPBOX : Use reider according to the "main.yaml"')
@@ -950,13 +953,13 @@ class MT(object):
                     index += 1
         return people, reid_count
 
-    def trainReIDClassifier(self, reider="Default", train_data="", classifier_pkl=""):
+    def trainReIDClassifier(self, reider="", train_data="", classifier_pkl=""):
         """Train classifier of a reider by pointing to a data directory. Calling 
         :func:`setConfigDir()` or :func:`setMainReIDer()` in advance is not required.
 
         Parameters
         ----------
-        reider : str or dict, default="Default" 
+        reider : str or dict, default="" 
             A supported name, a raw/ready dictionary, or a YAML/JSON file which is passed to 
             :func:`setMainReIDer()`, where `reider=reider`, and `auto_load=False`.
         train_data : str, default=""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyppbox
-Version: 3.8b1
+Version: 3.9.0
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV