pyppbox 3.6b1__tar.gz → 3.6b2__tar.gz

{pyppbox-3.6b1/pyppbox.egg-info → pyppbox-3.6b2}/PKG-INFO

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

{pyppbox-3.6b1 → pyppbox-3.6b2}/RELEASENOTES.md

@@ -1,8 +1,25 @@
 # Release Notes 
 
+## **pyppbox V4 - Even Smaller**
+
+* `pyppbox` v4.0b1 (COMING SOON 🚀)
+
+  - `pyppbox` will leverage [`vsensebox`](https://github.com/rathaumons/vsensebox) for detection and tracking
+  - `pyppbox.utils.persontools` will change to adapt [`vsensebox`](https://github.com/rathaumons/vsensebox)
+  - `pyppbox.ppb` will replace `pyppbox.standalone`
+  - All configuration files will also change
+  - More changes will be added here! Stay tuned!
+
 ## **pyppbox V3 - Make Simpler and Faster**
 
-* `pyppbox` [v3.6b1](https://github.com/rathaumons/pyppbox/tree/v3.5b2)
+* `pyppbox` [v3.6b2](https://github.com/rathaumons/pyppbox/tree/v3.6b2)
+
+  - Add a warning for the changes in the coming major version 4
+  - Update documentations
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `pyppbox` [v3.6b1](https://github.com/rathaumons/pyppbox/tree/v3.6b1)
 
   - Replace `pyunpack` & `patool` with `shutil`
   - Improve Example 9 - example_09_eva_offline.py

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/__init__.py

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

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/modules/detectors/yolocls/__init__.py

@@ -56,25 +56,25 @@ class MyYOLOCLS(object):
         self.model = cv2.dnn_DetectionModel(net)
         self.model.setInputParams(size=cfg.model_resolution, scale=1/255.0)
 
-    def detect(self, img, visual=True, class_filter=0, min_width_filter=35):
+    def detect(self, img, visual=True, class_filter=[0], min_width_filter=35):
         """Detect general object with object's class filter :obj:`class_filter` in a 
-        given cv :obj:`Mat` image.
+        given :obj:`Mat` like image.
 
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         visual : bool, default=True
             An indication of whether to visualize the detected objects.
-        class_filter : int, defualt=0
-            Object's class filter, 0 means person only
+        class_filter : list[int, ...], defualt=0
+            Object's class filter, [0] = Person only.
         min_width_filter : int, default=35
             Mininum width filter of a detected object.
 
         Returns
         -------
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         list[ndarray[int, int, int, int], ...]
             A list of bounding box :code:`ndarray[x, y, width, height]`.
         list[ndarray[int, int, int, int], ...]
@@ -93,7 +93,7 @@ class MyYOLOCLS(object):
                                                         nmsThreshold=float(self.cfg.nms))
         if len(classes) > 0:
             for class_id, conf, box_xywh in zip(classes.flatten(), confidences, boxes):
-                if class_id == class_filter and box_xywh[2] >= min_width_filter:
+                if class_id in class_filter and box_xywh[2] >= min_width_filter:
                     box_xywh = box_xywh.astype(int)
                     pboxes_xywh.append(box_xywh)
                     box_xyxy = to_xyxy(box_xywh)
@@ -109,12 +109,12 @@ class MyYOLOCLS(object):
         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):
-        """Detect person(s) in a given cv :obj:`Mat` image.
+        """Detect person(s) in a given :obj:`Mat` like image.
 
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         visual : bool, default=True
             An indication of whether to visualize the detected people.
         min_width_filter : int, default=35
@@ -129,7 +129,7 @@ class MyYOLOCLS(object):
         list[Person, ...]
             A list of detected :class:`Person` object.
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         """
         people = []
         classes, confidences, boxes = self.model.detect(

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/modules/detectors/yoloult/__init__.py

@@ -117,12 +117,12 @@ class MyYOLOULT(object):
 
     def detect(self, img, visual=True, classes=0, min_width_filter=35):
         """Detect general object with object's class filter :obj:`class_filter` 
-        in a given cv :obj:`Mat` image.
+        in a given :obj:`Mat` like image.
 
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         visual : bool, default=True
             An indication of whether to visualize the detected objects.
         classes : int, defualt=0
@@ -133,7 +133,7 @@ class MyYOLOULT(object):
         Returns
         -------
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         list[ndarray[int, int, int, int], ...]
             A list of bounding box :code:`ndarray[x, y, width, height]`.
         list[ndarray[int, int, int, int], ...]
@@ -205,12 +205,12 @@ class MyYOLOULT(object):
         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):
-        """Detect person(s) in a given cv :obj:`Mat` image.
+        """Detect person(s) in a given :obj:`Mat` like image.
 
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         visual : bool, default=True
             An indication of whether to visualize the detected people.
         min_width_filter : int, default=35
@@ -225,7 +225,7 @@ class MyYOLOULT(object):
         list[Person, ...]
             A list of detected :class:`Person` object.
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         """
         numpy_dets = []
         people = []

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/modules/reiders/facenet/__init__.py

@@ -120,7 +120,7 @@ class MyFaceNet(object):
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         is_bgr : bool, default=True
             An indication of whether the color channel of given :obj:`img` is BGR.
 

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/modules/reiders/torchreid/__init__.py

@@ -85,7 +85,7 @@ class MyTorchreid(object):
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         is_bgr : bool, default=True
             An indication of whether the color channel of given :obj:`img` is BGR.
 

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/modules/trackers/deepsort/__init__.py

@@ -94,7 +94,7 @@ class MyDeepSORT(object):
         person_list : list[Person, ...]
             A list of :class:`Person` object which stores the detected people in the given :obj:`img`.
         img : any, default=None
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         max_spread : int, default=5
             Max spread or max margin used to decide whether 2 bounding boxes are the same by comparing 
             the differences between the elements in the bounding box given by the embedded SORT and the 

{pyppbox-3.6b1/pyppbox/standalone → pyppbox-3.6b2/pyppbox/ppb}/__init__.py

@@ -23,7 +23,7 @@
 Standalone is designed for easy detect, track, and reid people in a single thread 
 enviroment or in command line. 
 
-For multithreading application, see :py:class:`pyppbox.standalone.mt.MT`.
+For multithreading application, see :py:class:`pyppbox.ppb.mt.MT`.
 
 Example:
 
@@ -69,27 +69,27 @@ Example:
 
 from .mt import MT
 
-__stdmt__ = MT()
+_mt = MT()
 
 def setConfigDir(config_dir=None, load_all=False):
-    """See :func:`pyppbox.standalone.mt.MT.setConfigDir`"""
-    __stdmt__.setConfigDir(config_dir=config_dir, load_all=load_all)
+    """See :func:`pyppbox.ppb.mt.MT.setConfigDir`"""
+    _mt.setConfigDir(config_dir=config_dir, load_all=load_all)
 
 def setMainModules(main_yaml=None, load_all=True):
-    """See :func:`pyppbox.standalone.mt.MT.setMainModules`"""
-    __stdmt__.setMainModules(main_yaml=main_yaml, load_all=load_all)
+    """See :func:`pyppbox.ppb.mt.MT.setMainModules`"""
+    _mt.setMainModules(main_yaml=main_yaml, load_all=load_all)
 
 def getConfig():
-    """See :func:`pyppbox.standalone.mt.MT.getConfig`"""
-    return __stdmt__.getConfig()
+    """See :func:`pyppbox.ppb.mt.MT.getConfig`"""
+    return _mt.getConfig()
 
 def forceFullGTMode():
-    """See :func:`pyppbox.standalone.mt.MT.forceFullGTMode`"""
-    __stdmt__.forceFullGTMode()
+    """See :func:`pyppbox.ppb.mt.MT.forceFullGTMode`"""
+    _mt.forceFullGTMode()
 
 def setMainDetector(detector=""):
-    """See :func:`pyppbox.standalone.mt.MT.setMainDetector`"""
-    __stdmt__.setMainDetector(detector=detector)
+    """See :func:`pyppbox.ppb.mt.MT.setMainDetector`"""
+    _mt.setMainDetector(detector=detector)
 
 def detectPeople(img, 
                  img_is_mat=False, 
@@ -99,8 +99,8 @@ def detectPeople(img,
                  min_width_filter=35, 
                  alt_repspoint=False, 
                  alt_repspoint_top=True):
-    """See :func:`pyppbox.standalone.mt.MT.detectPeople`"""
-    return __stdmt__.detectPeople(img, 
+    """See :func:`pyppbox.ppb.mt.MT.detectPeople`"""
+    return _mt.detectPeople(img, 
                                   img_is_mat=img_is_mat, 
                                   visual=visual, 
                                   save=save, 
@@ -110,24 +110,24 @@ def detectPeople(img,
                                   alt_repspoint_top=alt_repspoint_top)
 
 def setMainTracker(tracker=""):
-    """See :func:`pyppbox.standalone.mt.MT.setMainTracker`"""
-    __stdmt__.setMainTracker(tracker=tracker)
+    """See :func:`pyppbox.ppb.mt.MT.setMainTracker`"""
+    _mt.setMainTracker(tracker=tracker)
 
 def trackPeople(img, people, img_is_mat=False):
-    """See :func:`pyppbox.standalone.mt.MT.trackPeople`"""
-    return __stdmt__.trackPeople(img, people, img_is_mat=img_is_mat)
+    """See :func:`pyppbox.ppb.mt.MT.trackPeople`"""
+    return _mt.trackPeople(img, people, img_is_mat=img_is_mat)
 
 def setMainReIDer(reider="", auto_load=True):
-    """See :func:`pyppbox.standalone.mt.MT.setMainReIDer`"""
-    __stdmt__.setMainReIDer(reider=reider, auto_load=auto_load)
+    """See :func:`pyppbox.ppb.mt.MT.setMainReIDer`"""
+    _mt.setMainReIDer(reider=reider, auto_load=auto_load)
 
 def reidPeople(img, people, deduplicate=True, img_is_mat=False):
-    """See :func:`pyppbox.standalone.mt.MT.reidPeople`"""
-    return __stdmt__.reidPeople(img, people, deduplicate=deduplicate, img_is_mat=img_is_mat)
+    """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=""):
-    """See :func:`pyppbox.standalone.mt.MT.trainReIDClassifier`"""
-    __stdmt__.trainReIDClassifier(reider=reider, train_data=train_data, classifier_pkl=classifier_pkl)
+    """See :func:`pyppbox.ppb.mt.MT.trainReIDClassifier`"""
+    _mt.trainReIDClassifier(reider=reider, train_data=train_data, classifier_pkl=classifier_pkl)
 
 __all__ = ['setConfigDir', 'setMainModules', 'getConfig', 'forceFullGTMode', 
            'setMainDetector', 'detectPeople', 'setMainTracker', 'trackPeople', 

{pyppbox-3.6b1/pyppbox/standalone → pyppbox-3.6b2/pyppbox/ppb}/mt.py

@@ -424,9 +424,9 @@ class MT(object):
         Parameters
         ----------
         img : str or Mat
-            Set an image file or a cv :obj:`Mat`.
+            Set an image file or a :obj:`Mat` like image.
         img_is_mat : bool, default=False
-            Speed up the function by telling whether the :obj:`img` is cv :obj:`Mat`.
+            Speed up the function by telling whether the :obj:`img` is :obj:`Mat` like image.
         visual : bool, default=False
             Decide whether to visualize like drawing bounding boxes and keypoints to the 
             return :obj:`img`.
@@ -446,7 +446,7 @@ class MT(object):
         list[Person, ...]
             A  list of :class:`Person` object.
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         """ 
         people = []
         if self.__dt_is_set__: 
@@ -619,11 +619,11 @@ class MT(object):
         Parameters
         ----------
         img : str or Mat
-            Set an image file or a cv :obj:`Mat`.
+            Set an image file or a :obj:`Mat` like image.
         people : list[Person, ...]
             Set a list of :class:`Person` object which stores the detected people in the input :obj:`img`.
         img_is_mat : bool, default=False
-            Speed up the function by telling whether the :obj:`img` is cv :obj:`Mat`.
+            Speed up the function by telling whether the :obj:`img` is :obj:`Mat` like image.
         
         Returns
         -------
@@ -791,14 +791,14 @@ class MT(object):
         Parameters
         ----------
         img : str or Mat
-            Set an image file or a cv :obj:`Mat`.
+            Set an image file or a :obj:`Mat` like image.
         people : list[Person, ...]
             Set a list of :class:`Person` object which stores the detected or tracked people in 
             the input :obj:`img`.
         deduplicate : bool, default=True
             Indicate whether to re-reid people who have the same face ids or deep ids.
         img_is_mat : bool, default=False
-            Speed up the function by telling whether the :obj:`img` is cv :obj:`Mat`.
+            Speed up the function by telling whether the :obj:`img` is :obj:`Mat` like image.
         
         Returns
         -------

pyppbox-3.6b2/pyppbox/standalone/__init__.py

@@ -0,0 +1,37 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                                                                           #
+#   pyppbox: Toolbox for people detecting, tracking, and re-identifying.    #
+#   Copyright (C) 2022 UMONS-Numediart                                      #
+#                                                                           #
+#   This program is free software: you can redistribute it and/or modify    #
+#   it under the terms of the GNU General Public License as published by    #
+#   the Free Software Foundation, either version 3 of the License, or       #
+#   (at your option) any later version.                                     #
+#                                                                           #
+#   This program is distributed in the hope that it will be useful,         #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#   GNU General Public License for more details.                            #
+#                                                                           #
+#   You should have received a copy of the GNU General Public License       #
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                           #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+
+from pyppbox.ppb import *
+from pyppbox.utils.logtools import add_warning_log
+
+msg = ("\n! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !\n"
+       "!                                                                       !\n"
+       "!  For the coming major version 4:                                      !\n"
+       "!   * 'pyppbox' will leverage 'vsensebox' for detection and tracking    !\n"
+       "!   * 'pyppbox.utils.persontools' will change to adapt 'vesensebox'     !\n"
+       "!   * 'pyppbox.ppb' will replace 'pyppbox.standalone'                   !\n"
+       "!   * All configuration files will also change                          !\n"
+       "!   * More changes will be added to release notes                       !\n"
+       "!                                                                       !\n"
+       "! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !\n")
+
+add_warning_log(msg)
+

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/utils/gttools.py

@@ -273,7 +273,7 @@ class GTInterpreter(object):
         Parameters
         ----------
         img : Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         visual : 
             An indication of whether to draw bounding boxes on the return :obj:`img`.
 
@@ -282,7 +282,7 @@ class GTInterpreter(object):
         list[Person, ...]
             A list of :class:`Person` object.
         Mat
-            A cv :obj:`Mat` image.
+            A :obj:`Mat` like image.
         """
         people = []
         tmp_id = 0

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox/utils/visualizetools.py

@@ -107,7 +107,7 @@ def visualizePeople(img, people, show_box=True, show_skl=(True,True,5), show_ids
     Parameters
     ----------
     img : str or Mat
-        An image file or a cv :obj:`Mat`.
+        An image file or a :obj:`Mat` like image.
     people : list[Person, ...]
         Set a list of :class:`Person` object found in the input :obj:`img`.
     show_box : bool, default=True
@@ -128,12 +128,12 @@ def visualizePeople(img, people, show_box=True, show_skl=(True,True,5), show_ids
     show_repspoint : bool, default=True
         Indicate whether to show the :obj:`repspoint` of :class:`Person` object.
     img_is_mat : bool, default=True
-        Speed up the function by telling whether the :obj:`img` is cv :obj:`Mat`.
+        Speed up the function by telling whether the :obj:`img` is :obj:`Mat` like image.
     
     Returns
     -------
     Mat
-        A visualized cv :obj:`Mat`.
+        A visualized :obj:`Mat` like image.
     """
     # Overwrite `img_is_mat` to False when `img` is a file.
     if img_is_mat and isinstance(img, str): img_is_mat = False

{pyppbox-3.6b1 → pyppbox-3.6b2/pyppbox.egg-info}/PKG-INFO

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

{pyppbox-3.6b1 → pyppbox-3.6b2}/pyppbox.egg-info/SOURCES.txt

@@ -75,8 +75,9 @@ pyppbox/modules/trackers/deepsort/origin/tracker.py
 pyppbox/modules/trackers/deepsort/origin/voc_classes.txt
 pyppbox/modules/trackers/sort/__init__.py
 pyppbox/modules/trackers/sort/origin/sort.py
+pyppbox/ppb/__init__.py
+pyppbox/ppb/mt.py
 pyppbox/standalone/__init__.py
-pyppbox/standalone/mt.py
 pyppbox/utils/__init__.py
 pyppbox/utils/commontools.py
 pyppbox/utils/evatools.py