From bbb12984b5c93c8bfedb70a80824024f1782d067 Mon Sep 17 00:00:00 2001 From: Tony Lampada Date: Fri, 11 Oct 2024 16:34:08 +0000 Subject: [PATCH 1/4] remove version check that has no place here --- roboflow/core/version.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/roboflow/core/version.py b/roboflow/core/version.py index 8033efb..45ecc34 100644 --- a/roboflow/core/version.py +++ b/roboflow/core/version.py @@ -206,19 +206,6 @@ def download(self, model_format=None, location=None, overwrite: bool = False): self.__wait_if_generating() - if model_format == "yolov8": - # if ultralytics is installed, we will assume users will want to use yolov8 and we check for the supported version # noqa: E501 // docs - try: - import_module("ultralytics") - print_warn_for_wrong_dependencies_versions([("ultralytics", "==", "8.0.196")]) - except ImportError: - print( - "[WARNING] we noticed you are downloading a `yolov8` datasets but you don't have `ultralytics` installed. " # noqa: E501 // docs - "Roboflow `.deploy` supports only models trained with `ultralytics==8.0.196`, to intall it `pip install ultralytics==8.0.196`." # noqa: E501 // docs - ) - # silently fail - pass - model_format = self.__get_format_identifier(model_format) if model_format not in self.exports: From aff9609583db1f205b71fbdf6619cc41ab00380a Mon Sep 17 00:00:00 2001 From: Tony Lampada Date: Fri, 11 Oct 2024 16:41:35 +0000 Subject: [PATCH 2/4] WIP testing download --- .gitignore | 2 ++ tests/manual/debugme.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 40868fd..b54e9a3 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,5 @@ tests/manual/data README.roboflow.txt *.zip .DS_Store + +Aerial-Airport-1 \ No newline at end of file diff --git a/tests/manual/debugme.py b/tests/manual/debugme.py index 762dc22..b4d3794 100644 --- a/tests/manual/debugme.py +++ b/tests/manual/debugme.py @@ -18,7 +18,7 @@ # args = parser.parse_args(f"upload {thisdir}/../datasets/chess -w wolfodorpythontests -p chess".split()) # noqa: E501 // docs args = parser.parse_args( # ["login"] - # "download https://universe.roboflow.com/gdit/aerial-airport".split() + "download -f yolov8 https://universe.roboflow.com/gdit/aerial-airport".split() # "project list -w wolfodorpythontests".split() # "project get cultura-pepino-dark".split() # "workspace list".split() @@ -42,6 +42,6 @@ # f"import {thisdir}/data/cultura-pepino-yolov5pytorch -w wolfodorpythontests -p yellow-auto -c 100 -n papaiasso".split() # noqa: E501 // docs # f"import {thisdir}/../datasets/mosquitos -w wolfodorpythontests -p yellow-auto -n papaiasso".split() # noqa: E501 // docs # f"deployment list".split() # noqa: E501 // docs - f"import -w tonyprivate -p meh-plvrv {thisdir}/../datasets/paligemma/".split() # noqa: E501 // docs + # f"import -w tonyprivate -p meh-plvrv {thisdir}/../datasets/paligemma/".split() # noqa: E501 // docs ) args.func(args) From 34f2e93fff55672f2f1b440a946360742c30be8d Mon Sep 17 00:00:00 2001 From: Tony Lampada Date: Fri, 11 Oct 2024 17:28:50 +0000 Subject: [PATCH 3/4] dont touch the yaml for yolov8 --- .gitignore | 2 -- roboflow/__init__.py | 2 +- roboflow/core/version.py | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b54e9a3..40868fd 100644 --- a/.gitignore +++ b/.gitignore @@ -154,5 +154,3 @@ tests/manual/data README.roboflow.txt *.zip .DS_Store - -Aerial-Airport-1 \ No newline at end of file diff --git a/roboflow/__init__.py b/roboflow/__init__.py index 7671310..ddfd2a1 100644 --- a/roboflow/__init__.py +++ b/roboflow/__init__.py @@ -15,7 +15,7 @@ from roboflow.models import CLIPModel, GazeModel # noqa: F401 from roboflow.util.general import write_line -__version__ = "1.1.47" +__version__ = "1.1.48" def check_key(api_key, model, notebook, num_retries=0): diff --git a/roboflow/core/version.py b/roboflow/core/version.py index 45ecc34..2c56d44 100644 --- a/roboflow/core/version.py +++ b/roboflow/core/version.py @@ -233,7 +233,7 @@ def download(self, model_format=None, location=None, overwrite: bool = False): self.__download_zip(link, location, model_format) self.__extract_zip(location, model_format) - self.__reformat_yaml(location, model_format) + self.__reformat_yaml(location, model_format) # TODO: is roboflow-python a place to be munging yaml files? return Dataset(self.name, self.version, model_format, os.path.abspath(location)) @@ -944,7 +944,7 @@ def data_yaml_callback(content: dict) -> dict: content["train"] = location + content["train"].lstrip(".") content["val"] = location + content["val"].lstrip(".") content["test"] = location + content["test"].lstrip(".") - if format in ["yolov5pytorch", "yolov7pytorch", "yolov8", "yolov9"]: + if format in ["yolov5pytorch", "yolov7pytorch"]: content["train"] = location + content["train"].lstrip("..") content["val"] = location + content["val"].lstrip("..") try: From c0e0e5ad219c1125e78d4ceaecc776bf8ad7342f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:36:11 +0000 Subject: [PATCH 4/4] =?UTF-8?q?fix(pre=5Fcommit):=20=F0=9F=8E=A8=20auto=20?= =?UTF-8?q?format=20pre-commit=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roboflow/core/version.py | 1 - 1 file changed, 1 deletion(-) diff --git a/roboflow/core/version.py b/roboflow/core/version.py index 2c56d44..069ffd3 100644 --- a/roboflow/core/version.py +++ b/roboflow/core/version.py @@ -7,7 +7,6 @@ import sys import time import zipfile -from importlib import import_module from typing import TYPE_CHECKING, Optional, Union import requests