Merge pull request #113 from roboflow/fix/make-roboflow-datasets-work-with-yolov8-codebase-once-again

🧪 ready for colab tests

Author: SkalskiP

roboflow/__init__.py

@@ -8,7 +8,7 @@
 from roboflow.core.project import Project
 from roboflow.core.workspace import Workspace
 
-__version__ = "0.2.29"
+__version__ = "0.2.30"
 
 
 def check_key(api_key, model, notebook, num_retries=0):

roboflow/core/version.py

@@ -26,9 +26,10 @@
 from roboflow.models.instance_segmentation import InstanceSegmentationModel
 from roboflow.models.object_detection import ObjectDetectionModel
 from roboflow.models.semantic_segmentation import SemanticSegmentationModel
+from roboflow.util.annotations import amend_data_yaml
 from roboflow.util.versions import (
+    get_wrong_dependencies_versions,
     print_warn_for_wrong_dependencies_versions,
-    warn_for_wrong_dependencies_versions,
 )
 
 load_dotenv()
@@ -549,7 +550,7 @@ def __get_format_identifier(self, format):
         friendly_formats = {"yolov5": "yolov5pytorch", "yolov7": "yolov7pytorch"}
         return friendly_formats.get(format, format)
 
-    def __reformat_yaml(self, location, format):
+    def __reformat_yaml(self, location: str, format: str):
         """
         Certain formats seem to require reformatting the downloaded YAML.
         It'd be nice if the API did this, but we're doing it in python for now.
@@ -559,28 +560,29 @@ def __reformat_yaml(self, location, format):
 
         :return None:
         """
-        if format in ["yolov5pytorch", "yolov7pytorch", "yolov8"]:
-            with open(location + "/data.yaml") as file:
-                new_yaml = yaml.safe_load(file)
-            new_yaml["train"] = location + new_yaml["train"].lstrip("..")
-            new_yaml["val"] = location + new_yaml["val"].lstrip("..")
-
-            os.remove(location + "/data.yaml")
-
-            with open(location + "/data.yaml", "w") as outfile:
-                yaml.dump(new_yaml, outfile)
-
-        if format == "mt-yolov6":
-            with open(location + "/data.yaml") as file:
-                new_yaml = yaml.safe_load(file)
-            new_yaml["train"] = location + new_yaml["train"].lstrip(".")
-            new_yaml["val"] = location + new_yaml["val"].lstrip(".")
-            new_yaml["test"] = location + new_yaml["test"].lstrip(".")
-
-            os.remove(location + "/data.yaml")
+        data_path = os.path.join(location, "data.yaml")
+
+        def callback(content: dict) -> dict:
+            if format == "mt-yolov6":
+                content["train"] = location + content["train"].lstrip(".")
+                content["val"] = location + content["val"].lstrip(".")
+                content["test"] = location + content["test"].lstrip(".")
+            if format in ["yolov5pytorch", "yolov7pytorch", "yolov8"]:
+                content["train"] = location + content["train"].lstrip("..")
+                content["val"] = location + content["val"].lstrip("..")
+            try:
+                # get_wrong_dependencies_versions raises exception if ultralytics is not installed at all
+                if not get_wrong_dependencies_versions(
+                    dependencies_versions=[("ultralytics", ">=", "8.0.30")]
+                ):
+                    content["train"] = "train/images"
+                    content["val"] = "valid/images"
+                    content["test"] = "test/images"
+            except ModuleNotFoundError:
+                pass
+            return content
 
-            with open(location + "/data.yaml", "w") as outfile:
-                yaml.dump(new_yaml, outfile)
+        amend_data_yaml(path=data_path, callback=callback)
 
     def __str__(self):
         """string representation of version object."""

roboflow/util/annotations.py

@@ -0,0 +1,13 @@
+import os
+from typing import Callable
+
+import yaml
+
+
+def amend_data_yaml(path: str, callback: Callable[[dict], dict]):
+    with open(path) as source:
+        content = yaml.safe_load(source)
+    content = callback(content)
+    os.remove(path)
+    with open(path, "w") as target:
+        yaml.dump(content, target)

roboflow/util/versions.py

@@ -8,7 +8,7 @@ def get_wrong_dependencies_versions(
     dependencies_versions: List[Tuple[str, str, str]]
 ) -> List[Tuple[str, str, str, str]]:
     """
-    Get a list of missmatching dependencies with current version installed.
+    Get a list of mismatching dependencies with current version installed.
     E.g., assuming we pass `get_wrong_dependencies_versions([("torch", "==", "1.2.0")]), we will check if the current version of `torch` is `==1.2.0`. If not, we will return `[("torch", "==", "1.2.0", "<current_installed_version>")]
 
     We support `<=`, `==`, `>=`