Merge branch 'main' into classification_annotation_upload

Author: ogjaylowe

roboflow/core/project.py

@@ -99,7 +99,6 @@ def versions(self):
         return version_array
 
     def generate_version(self, settings):
-
         """
         Settings, a python dict with augmentation and preprocessing keys and specifications for generation.
         These settings mirror capabilities available via the Roboflow UI.
@@ -239,7 +238,6 @@ def version(self, version_number, local=None):
         version_info = self.get_version_information()
 
         for version_object in version_info:
-
             current_version_num = os.path.basename(version_object["id"])
             if current_version_num == str(version_number):
                 vers = Version(
@@ -265,6 +263,7 @@ def __image_upload(
         split="train",
         batch_name=DEFAULT_BATCH_NAME,
         tag_names=[],
+        **kwargs,
     ):
         """function to upload image to the specific project
         :param image_path: path to image you'd like to upload.
@@ -295,6 +294,8 @@ def __image_upload(
                     batch_name,
                 ]
             )
+            for key, value in kwargs.items():
+                self.image_upload_url += "&" + str(key) + "=" + str(value)
 
             for tag in tag_names:
                 self.image_upload_url = self.image_upload_url + f"&tag={tag}"
@@ -410,6 +411,7 @@ def upload(
         num_retry_uploads: int = 0,
         batch_name: str = DEFAULT_BATCH_NAME,
         tag_names: list = [],
+        **kwargs,
     ):
         """Upload image function based on the RESTful API
 
@@ -460,6 +462,7 @@ def upload(
                 num_retry_uploads=num_retry_uploads,
                 batch_name=batch_name,
                 tag_names=tag_names,
+                **kwargs,
             )
         else:
             images = os.listdir(image_path)
@@ -475,6 +478,7 @@ def upload(
                         num_retry_uploads=num_retry_uploads,
                         batch_name=batch_name,
                         tag_names=tag_names,
+                        **kwargs,
                     )
                     print("[ " + path + " ] was uploaded succesfully.")
                 else:
@@ -491,8 +495,8 @@ def single_upload(
         num_retry_uploads=0,
         batch_name=DEFAULT_BATCH_NAME,
         tag_names=[],
+        **kwargs,
     ):
-
         success = False
         annotation_success = False
         # User gives image path
@@ -504,6 +508,7 @@ def single_upload(
                 split=split,
                 batch_name=batch_name,
                 tag_names=tag_names,
+                **kwargs,
             )
             # Get JSON response values
             try:
@@ -543,6 +548,7 @@ def single_upload(
                         image_id=image_id,
                         split=split,
                         num_retry_uploads=num_retry_uploads - 1,
+                        **kwargs,
                     )
                     return
                 else:

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()
@@ -311,7 +312,7 @@ def deploy(self, model_type: str, model_path: str) -> None:
             model_path (str): File path to model weights to be uploaded
         """
 
-        supported_models = ["yolov8", "yolov5"]
+        supported_models = ["yolov8", "yolov5", "yolov7-seg"]
 
         if model_type not in supported_models:
             raise (
@@ -334,7 +335,7 @@ def deploy(self, model_type: str, model_path: str) -> None:
                 [("ultralytics", "<=", "8.0.20")]
             )
 
-        elif model_type == "yolov5":
+        elif model_type in ["yolov5", "yolov7-seg"]:
             try:
                 import torch
             except ImportError as e:
@@ -378,7 +379,7 @@ def deploy(self, model_type: str, model_path: str) -> None:
                     "ultralytics_version": ultralytics.__version__,
                     "model_type": model_type,
                 }
-        elif model_type == "yolov5":
+        elif model_type in ["yolov5", "yolov7-seg"]:
             # parse from yaml for yolov5
 
             with open(os.path.join(model_path, "opt.yaml"), "r") as stream:
@@ -406,11 +407,19 @@ def deploy(self, model_type: str, model_path: str) -> None:
 
         with zipfile.ZipFile(model_path + "roboflow_deploy.zip", "w") as zipMe:
             for file in lista_files:
-                zipMe.write(
-                    model_path + file,
-                    arcname=file,
-                    compress_type=zipfile.ZIP_DEFLATED,
-                )
+                if os.path.exists(model_path + file):
+                    zipMe.write(
+                        model_path + file,
+                        arcname=file,
+                        compress_type=zipfile.ZIP_DEFLATED,
+                    )
+                else:
+                    if file in ["model_artifacts.json", "state_dict.pt"]:
+                        raise (
+                            ValueError(
+                                f"File {file} not found. Please make sure to provide a valid model path."
+                            )
+                        )
 
         res = requests.get(
             f"{API_URL}/{self.workspace}/{self.project}/{self.version}/uploadModel?api_key={self.__api_key}"
@@ -549,7 +558,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 +568,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/core/workspace.py

@@ -368,7 +368,6 @@ def active_learning(
                     and prediction["confidence"] * 100
                     <= conditionals["confidence_interval"][1]
                 ):
-
                     # filter out non-target_class uploads if enabled
                     if (
                         len(conditionals["target_classes"]) > 0

roboflow/models/object_detection.py

@@ -214,7 +214,6 @@ def __generate_url(
         labels=None,
         format=None,
     ):
-
         # Reassign parameters if any parameters are changed
         if local is not None:
             if not local:

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/two_stage_utils.py

@@ -7,7 +7,6 @@
 
 
 def ocr_infer(image):
-
     # Convert to JPEG Buffer
     buffered = io.BytesIO()
     image.save(buffered, quality=90, format="PNG")

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 `<=`, `==`, `>=`
@@ -45,7 +45,7 @@ def print_warn_for_wrong_dependencies_versions(
     dependencies_versions: List[Tuple[str, str, str]]
 ):
     wrong_dependencies_versions = get_wrong_dependencies_versions(dependencies_versions)
-    for (dependency, order, version, module_version) in wrong_dependencies_versions:
+    for dependency, order, version, module_version in wrong_dependencies_versions:
         print(
             f"Dependency {dependency}{order}{version} is required but found version={module_version}, to fix: `pip install {dependency}{order}{version}`"
         )