update ultralytics version (#29)

* update ultralytics version

* updates

* fix typo in readme

* fix

* update version

README.md

@@ -43,6 +43,6 @@ scores = result.probs # for classification models
 masks = result.masks # for segmentation models
 
 # show results on image
-render = render_result(result)
+render = render_result(model=model, image=image, result=result)
 render.show()
 ```

requirements.txt

@@ -1,5 +1,5 @@
 huggingface_hub
 fire
-ultralytics>=8.0.7,<8.0.9
+ultralytics>=8.0.12,<8.0.14
 sahi>=0.11.11,<0.12.0
 pandas

tests/test_hf.py

@@ -6,7 +6,6 @@
 )
 
 hub_id = "ultralyticsplus/yolov8s"
-hub_id_generic = "kadirnar/yolov8n-v8.0"
 
 
 def test_load_from_hub():
@@ -57,15 +56,3 @@ def test_classification_inference():
     results = model(image, imgsz=640)
     name_to_probs = postprocess_classify_output(model=model, result=results[0])
     name_to_probs
-
-
-def test_inference_generic():
-    model = YOLO(hub_id_generic)
-
-    # set image
-    image = "https://github.com/ultralytics/yolov5/raw/master/data/images/zidane.jpg"
-
-    # perform inference
-    results = model.predict(image, imgsz=640)
-    render = render_result(model=model, image=image, result=results[0])
-    render.show()

ultralyticsplus/__init__.py

@@ -1,4 +1,4 @@
 from .hf_utils import download_from_hub, push_to_hfhub
 from .ultralytics_utils import YOLO, postprocess_classify_output, render_result
 
-__version__ = "0.0.14"
+__version__ = "0.0.15"

ultralyticsplus/hf_utils.py

@@ -3,9 +3,7 @@
 from pathlib import Path
 
 import pandas as pd
-from PIL import Image
 from sahi.utils.cv import read_image_as_pil
-
 from ultralyticsplus.other_utils import add_text_to_image
 
 LOGLEVEL = os.environ.get("LOGLEVEL", "INFO").upper()
@@ -26,6 +24,7 @@ def generate_model_usage_markdown(
     custom_tags=None,
 ):
     from ultralytics import __version__ as ultralytics_version
+    from ultralyticsplus import __version__ as ultralyticsplus_version
 
     hf_task = "image-segmentation" if task == "instance-segmentation" else task
 
@@ -136,7 +135,7 @@ def generate_model_usage_markdown(
 - Install [ultralyticsplus](https://github.com/fcakyon/ultralyticsplus):
 
 ```bash
-pip install -U ultralyticsplus
+pip install ultralyticsplus=={ultralyticsplus_version}
 ```
 
 - Load model and perform prediction:

ultralyticsplus/ultralytics_utils.py

@@ -23,17 +23,19 @@
 class YOLO(YOLOBase):
     def __init__(self, model="yolov8n.yaml", type="v8", hf_token=None) -> None:
         """
-        > Initializes the YOLO object.
+        Initializes the YOLO object.
 
         Args:
             model (str, Path): model to load or create
             type (str): Type/version of models to use. Defaults to "v8".
+            hf_token (str): huggingface token
         """
         self.type = type
         self.ModelClass = None  # model class
         self.TrainerClass = None  # trainer class
         self.ValidatorClass = None  # validator class
         self.PredictorClass = None  # predictor class
+        self.predictor = None  # reuse predictor
         self.model = None  # model object
         self.trainer = None  # trainer object
         self.task = None  # task type
@@ -64,12 +66,8 @@ def _load_from_hf_hub(self, weights: str, hf_token=None):
         self.task = self.model.args["task"]
         self.overrides = self.model.args
         self._reset_ckpt_args(self.overrides)
-        (
-            self.ModelClass,
-            self.TrainerClass,
-            self.ValidatorClass,
-            self.PredictorClass,
-        ) = self._guess_ops_from_task(self.task)
+        self.ModelClass, self.TrainerClass, self.ValidatorClass, self.PredictorClass = \
+            self._guess_ops_from_task(self.task)
 
 
 def render_model_output_legacy(image, model: YOLO, model_output: dict) -> Image.Image: