ultralytics 8.0.83__py3-none-any.whl → 8.0.84__py3-none-any.whl

ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = '8.0.83'
+__version__ = '8.0.84'
 
 from ultralytics.hub import start
 from ultralytics.yolo.engine.model import YOLO

ultralytics/yolo/data/base.py

@@ -120,11 +120,14 @@ class BaseDataset(Dataset):
                 cls = self.labels[i]['cls']
                 bboxes = self.labels[i]['bboxes']
                 segments = self.labels[i]['segments']
+                keypoints = self.labels[i]['keypoints']
                 j = (cls == include_class_array).any(1)
                 self.labels[i]['cls'] = cls[j]
                 self.labels[i]['bboxes'] = bboxes[j]
                 if segments:
                     self.labels[i]['segments'] = [segments[si] for si, idx in enumerate(j) if idx]
+                if keypoints is not None:
+                    self.labels[i]['keypoints'] = keypoints[j]
             if self.single_cls:
                 self.labels[i]['cls'][:, 0] = 0
 

ultralytics/yolo/engine/results.py

@@ -97,11 +97,6 @@ class Results(SimpleClass):
         self.path = path
         self._keys = ('boxes', 'masks', 'probs', 'keypoints')
 
-    def pandas(self):
-        """Convert the results to a pandas DataFrame."""
-        pass
-        # TODO masks.pandas + boxes.pandas + cls.pandas
-
     def __getitem__(self, idx):
         """Return a Results object for the specified index."""
         r = self.new()
@@ -315,6 +310,35 @@ class Results(SimpleClass):
                          file=save_dir / self.names[int(d.cls)] / f'{file_name.stem}.jpg',
                          BGR=True)
 
+    def pandas(self):
+        """Convert the object to a pandas DataFrame (not yet implemented)."""
+        LOGGER.warning("WARNING ⚠️ 'Results.pandas' method is not yet implemented.")
+
+    def tojson(self, normalize=False):
+        """Convert the object to JSON format."""
+        import json
+
+        # Create list of detection dictionaries
+        results = []
+        data = self.boxes.data.cpu().tolist()
+        h, w = self.orig_shape if normalize else (1, 1)
+        for i, row in enumerate(data):
+            box = {'x1': row[0] / w, 'y1': row[1] / h, 'x2': row[2] / w, 'y2': row[3] / h}
+            conf = row[4]
+            id = int(row[5])
+            name = self.names[id]
+            result = {'name': name, 'class': id, 'confidence': conf, 'box': box}
+            if self.masks:
+                x, y = self.masks.xy[i][:, 0], self.masks.xy[i][:, 1]  # numpy array
+                result['segments'] = {'x': (x / w).tolist(), 'y': (y / h).tolist()}
+            if self.keypoints is not None:
+                x, y, visible = self.keypoints[i].cpu().unbind(dim=1)  # torch Tensor
+                result['keypoints'] = {'x': (x / w).tolist(), 'y': (y / h).tolist(), 'visible': visible.tolist()}
+            results.append(result)
+
+        # Convert detections to JSON
+        return json.dumps(results, indent=2)
+
 
 class Boxes(BaseTensor):
     """
@@ -397,10 +421,6 @@ class Boxes(BaseTensor):
         """Return the boxes in xywh format normalized by original image size."""
         return self.xywh / self.orig_shape[[1, 0, 1, 0]]
 
-    def pandas(self):
-        """Convert the object to a pandas DataFrame (not yet implemented)."""
-        LOGGER.info('results.pandas() method not yet implemented')
-
     @property
     def boxes(self):
         """Return the raw bboxes tensor (deprecated)."""
@@ -466,3 +486,7 @@ class Masks(BaseTensor):
         """Return the raw masks tensor (deprecated)."""
         LOGGER.warning("WARNING ⚠️ 'Masks.masks' is deprecated. Use 'Masks.data' instead.")
         return self.data
+
+    def pandas(self):
+        """Convert the object to a pandas DataFrame (not yet implemented)."""
+        LOGGER.warning("WARNING ⚠️ 'Masks.pandas' method is not yet implemented.")

ultralytics/yolo/utils/instance.py

@@ -34,7 +34,7 @@ class Bboxes:
     """Now only numpy is supported."""
 
     def __init__(self, bboxes, format='xyxy') -> None:
-        assert format in _formats
+        assert format in _formats, f'Invalid bounding box format: {format}, format must be one of {_formats}'
         bboxes = bboxes[None, :] if bboxes.ndim == 1 else bboxes
         assert bboxes.ndim == 2
         assert bboxes.shape[1] == 4
@@ -66,7 +66,7 @@ class Bboxes:
 
     def convert(self, format):
         """Converts bounding box format from one type to another."""
-        assert format in _formats
+        assert format in _formats, f'Invalid bounding box format: {format}, format must be one of {_formats}'
         if self.format == format:
             return
         elif self.format == 'xyxy':

{ultralytics-8.0.83.dist-info → ultralytics-8.0.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.0.83
+Version: 8.0.84
 Summary: Ultralytics YOLOv8
 Home-page: https://github.com/ultralytics/ultralytics
 Author: Ultralytics
@@ -78,7 +78,9 @@ Requires-Dist: tensorflowjs ; extra == 'export'
   </div>
   <br>
 
-[Ultralytics YOLOv8](https://github.com/ultralytics/ultralytics), developed by [Ultralytics](https://ultralytics.com), is a cutting-edge, state-of-the-art (SOTA) model that builds upon the success of previous YOLO versions and introduces new features and improvements to further boost performance and flexibility. YOLOv8 is designed to be fast, accurate, and easy to use, making it an excellent choice for a wide range of object detection, image segmentation and image classification tasks.
+[Ultralytics](https://ultralytics.com) [YOLOv8](https://github.com/ultralytics/ultralytics) is a cutting-edge, state-of-the-art (SOTA) model that builds upon the success of previous YOLO versions and introduces new features and improvements to further boost performance and flexibility. YOLOv8 is designed to be fast, accurate, and easy to use, making it an excellent choice for a wide range of object detection and tracking, instance segmentation, image classification and pose estimation tasks.
+
+We hope that the resources here will help you get the most out of YOLOv8. Please browse the YOLOv8 <a href="https://docs.ultralytics.com/">Docs</a> for details, raise an issue on <a href="https://github.com/ultralytics/ultralytics">GitHub</a> for support, and join our <a href="https://discord.gg/n6cFeSPZdD">Discord</a> community for questions and discussions!
 
 To request an Enterprise License please complete the form at [Ultralytics Licensing](https://ultralytics.com/license).
 
@@ -102,6 +104,9 @@ To request an Enterprise License please complete the form at [Ultralytics Licens
   <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
   <a href="https://www.instagram.com/ultralytics/" style="text-decoration:none;">
     <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-instagram.png" width="2%" alt="" /></a>
+  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
+  <a href="https://discord.gg/n6cFeSPZdD" style="text-decoration:none;">
+    <img src="https://github.com/ultralytics/assets/blob/main/social/logo-social-discord.png" width="2%" alt="" /></a>
 </div>
 </div>
 
@@ -290,7 +295,7 @@ YOLOv8 is available under two different licenses:
 
 ## <div align="center">Contact</div>
 
-For YOLOv8 bug reports and feature requests please visit [GitHub Issues](https://github.com/ultralytics/ultralytics/issues) or the [Ultralytics Community Forum](https://community.ultralytics.com/).
+For YOLOv8 bug reports and feature requests please visit [GitHub Issues](https://github.com/ultralytics/ultralytics/issues), and join our [Discord](https://discord.gg/n6cFeSPZdD) community for questions and discussions!
 
 <br>
 <div align="center">
@@ -311,4 +316,7 @@ For YOLOv8 bug reports and feature requests please visit [GitHub Issues](https:/
   <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
   <a href="https://www.instagram.com/ultralytics/" style="text-decoration:none;">
     <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-instagram.png" width="3%" alt="" /></a>
+  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
+  <a href="https://discord.gg/n6cFeSPZdD" style="text-decoration:none;">
+    <img src="https://github.com/ultralytics/assets/blob/main/social/logo-social-discord.png" width="3%" alt="" /></a>
 </div>

{ultralytics-8.0.83.dist-info → ultralytics-8.0.84.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ultralytics/__init__.py,sha256=QqRGjcda1d_sbqrdTTSd-yvyaDVG6U0x-tMZtlFtoso,287
+ultralytics/__init__.py,sha256=yFl5HzLsNajIugI41L5fKqAPHPCHjQJPjkhCa3vGb1g,287
 ultralytics/assets/bus.jpg,sha256=wCAZxJecGR63Od3ZRERe9Aja1Weayrb9Ug751DS_vGM,137419
 ultralytics/assets/zidane.jpg,sha256=Ftc4aeMmen1O0A3o6GCDO9FlfBslLpTAw0gnetx7bts,50427
 ultralytics/datasets/Argoverse.yaml,sha256=Q6hKRtI52JOYt4qmjkeo192mmgSkuCdOnfiUTxtBy5A,2751
@@ -54,7 +54,7 @@ ultralytics/yolo/cfg/__init__.py,sha256=ChytO9nlSVzGq9OFX2aG0YcwFKEG-F8sBEzYm3ET
 ultralytics/yolo/cfg/default.yaml,sha256=xDD9Pq8oyS2D5E0vbPapophm6arUA0BfFz-Jf0Y9jTU,6238
 ultralytics/yolo/data/__init__.py,sha256=vxjtAx1Y5fPnnJNJsMIHFmwZ0nnmS_R9iNaR1dS57jw,484
 ultralytics/yolo/data/augment.py,sha256=mc10LnwfBqh-ZtWFSd5Kz1VBC4CDFIwqwz492c0XV0I,33512
-ultralytics/yolo/data/base.py,sha256=9MPybWnbU4wjoa4KBM3ilDE6QkNmhxTxKxhtmKMk9y0,11548
+ultralytics/yolo/data/base.py,sha256=5L5O-3SoKnWdZHapud9zm9G4BxheJ_PXCbkfZsWbzBA,11709
 ultralytics/yolo/data/build.py,sha256=n8daI3j7QwAkybKEGeAXvL0Hx44Q67PWL7XiU-GgxvQ,9166
 ultralytics/yolo/data/dataset.py,sha256=6mRxLJKemncS0Guuv5SBkwJB2iPjP8GHmvMxyE3xn8Y,13392
 ultralytics/yolo/data/dataset_wrappers.py,sha256=1IheItG9kjZP4U1sXbu69lYyt1bIgcyPf-whj_Nyzrw,1816
@@ -67,7 +67,7 @@ ultralytics/yolo/engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ultralytics/yolo/engine/exporter.py,sha256=huzPGXx4dV6_s1Pe9fbqJh6q0A1GZFRjS1--5VcQlRU,40265
 ultralytics/yolo/engine/model.py,sha256=oIfJA6sZ7UH1ZEpMQ-IqHXcS-3a_f9qeBR4ymRIHstI,21939
 ultralytics/yolo/engine/predictor.py,sha256=ez0Fyrpu2hAw-CgoYcolXiSmSa9hO1lLAdEymWZSbqE,15529
-ultralytics/yolo/engine/results.py,sha256=ak6VRV9Fy__VmSz70R36eyyrOYltFZ6vRbky_H2pPd0,19125
+ultralytics/yolo/engine/results.py,sha256=N2BKrCzCOgW8MFdnlvN_FvZE2-rbCGEqjPnSelpvFtk,20324
 ultralytics/yolo/engine/trainer.py,sha256=W-NNeN_bflCkelrdNhYojIejWWEdh3FU1C5S-Ir_In0,31004
 ultralytics/yolo/engine/validator.py,sha256=-kHek5qxXmcB6oLliTN3K7WwZTQQ2108xbhBDKx3jrE,11305
 ultralytics/yolo/utils/__init__.py,sha256=iKPMM22JSjCwVNR_nJDoEOf8oz2s_DEzfS3VfirmkVg,26962
@@ -78,7 +78,7 @@ ultralytics/yolo/utils/dist.py,sha256=TGI8LHq7tedBnHVK8jgm50IvgUIsAtx7Zca8K2c1jN
 ultralytics/yolo/utils/downloads.py,sha256=ggUlGG-Dl1y-e_KY83_i1j-23fXK48I5yv1MeZ_F_4s,11431
 ultralytics/yolo/utils/errors.py,sha256=u8NUGZbWVrr4O3ez6UXnabNb_zRwJUPJqDOUSpmX3-k,317
 ultralytics/yolo/utils/files.py,sha256=kZP5kykAUwveBinJvhvLSSWkU9vGM7EAoC0EXpaxbIE,3316
-ultralytics/yolo/utils/instance.py,sha256=snP9ZePywlWo5wT7T8uwM7a0dMvp6ivyuhC_c_OkSMI,14024
+ultralytics/yolo/utils/instance.py,sha256=S2vvc1vjNHHshFf4d3kwl8DvKsRo6ck38wDcf7eQYuI,14176
 ultralytics/yolo/utils/loss.py,sha256=Ejdi8DXCDK57UG6FsM4mAIh05d7U9qzx_7bmhGoddiA,3195
 ultralytics/yolo/utils/metrics.py,sha256=qMh9E9K4WzFJQdkosWCqCXHg0XirusDquWFienzOm2s,41829
 ultralytics/yolo/utils/ops.py,sha256=UQDe4TCR56NsSPEeeW1-ZJKYMOrtadClPxP_XXWiNFM,28191
@@ -113,9 +113,9 @@ ultralytics/yolo/v8/segment/__init__.py,sha256=TOdf3ju-D5hSi-PYMpETFmv-wyhIRKGuj
 ultralytics/yolo/v8/segment/predict.py,sha256=u0UhoeSQIpygbHDoKA7YAc1jGw5HeFT955WrqeKg_aw,2685
 ultralytics/yolo/v8/segment/train.py,sha256=Sccpul7l4v9mQ89BJQsTwQLX_5QdGpB0BStUGHIepjI,8283
 ultralytics/yolo/v8/segment/val.py,sha256=qkZE0gXt6PQTFY7tFPL2sTe9PKok95yJ8YFI2e-nahY,12776
-ultralytics-8.0.83.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-ultralytics-8.0.83.dist-info/METADATA,sha256=WECi8rPZuKDUBfkUwVQlvpRS9x7TKNRuxE1xpbbyOZo,25667
-ultralytics-8.0.83.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ultralytics-8.0.83.dist-info/entry_points.txt,sha256=Ck1F6qKNokeHozQD5pmaFgXHL6dKyC2qCdyXao2e6Yg,103
-ultralytics-8.0.83.dist-info/top_level.txt,sha256=XP49TwiMw4QGsvTLSYiJhz1xF_k7ev5mQ8jJXaXi45Q,12
-ultralytics-8.0.83.dist-info/RECORD,,
+ultralytics-8.0.84.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+ultralytics-8.0.84.dist-info/METADATA,sha256=1cjE2I2mJngkhG0hUIrhsbvVIy2PmrY7o1JaY1U-Lgw,26660
+ultralytics-8.0.84.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ultralytics-8.0.84.dist-info/entry_points.txt,sha256=Ck1F6qKNokeHozQD5pmaFgXHL6dKyC2qCdyXao2e6Yg,103
+ultralytics-8.0.84.dist-info/top_level.txt,sha256=XP49TwiMw4QGsvTLSYiJhz1xF_k7ev5mQ8jJXaXi45Q,12
+ultralytics-8.0.84.dist-info/RECORD,,