Merge branch 'main' into lean/model-processor

Author: lrosemberg

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.50"
+__version__ = "1.1.51"
 
 
 def check_key(api_key, model, notebook, num_retries=0):
@@ -43,7 +43,7 @@ def check_key(api_key, model, notebook, num_retries=0):
                     num_retries += 1
                     return check_key(api_key, model, notebook, num_retries)
                 else:
-                    raise RuntimeError("There was an error validating the api key with Roboflow" " server.")
+                    raise RuntimeError("There was an error validating the api key with Roboflow server.")
             else:
                 r = response.json()
                 return r
@@ -71,7 +71,7 @@ def login(workspace=None, force=False):
     # default configuration location
     conf_location = os.getenv("ROBOFLOW_CONFIG_DIR", default=default_path)
     if os.path.isfile(conf_location) and not force:
-        write_line("You are already logged into Roboflow. To make a different login," "run roboflow.login(force=True).")
+        write_line("You are already logged into Roboflow. To make a different login,run roboflow.login(force=True).")
         return None
         # we could eventually return the workspace object here
         # return Roboflow().workspace()

roboflow/adapters/rfapi.py

@@ -179,7 +179,7 @@ def save_annotation(
 
 
 def _save_annotation_url(api_key, project_url, name, image_id, job_name, is_prediction, overwrite=False):
-    url = f"{API_URL}/dataset/{project_url}/annotate/{image_id}?api_key={api_key}" f"&name={name}"
+    url = f"{API_URL}/dataset/{project_url}/annotate/{image_id}?api_key={api_key}&name={name}"
     if job_name:
         url += f"&jobName={job_name}"
     if is_prediction:

roboflow/core/project.py

@@ -230,7 +230,7 @@ def generate_version(self, settings):
             )
 
         r = requests.post(
-            f"{API_URL}/{self.__workspace}/{self.__project_name}/" f"generate?api_key={self.__api_key}",
+            f"{API_URL}/{self.__workspace}/{self.__project_name}/generate?api_key={self.__api_key}",
             json=settings,
         )
 
@@ -426,7 +426,7 @@ def upload(
 
             if not is_image:
                 raise RuntimeError(
-                    "The image you provided {} is not a supported file format. We" " currently support: {}.".format(
+                    "The image you provided {} is not a supported file format. We currently support: {}.".format(
                         image_path, ", ".join(ACCEPTED_IMAGE_FORMATS)
                     )
                 )

roboflow/core/version.py

@@ -510,8 +510,7 @@ def _upload_zip(self, model_type: str, model_path: str, model_file_name: str):
 
             if self.public:
                 print(
-                    "View the status of your deployment at:"
-                    f" {APP_URL}/{self.workspace}/{self.project}/{self.version}"
+                    f"View the status of your deployment at: {APP_URL}/{self.workspace}/{self.project}/{self.version}"
                 )
                 print(
                     "Share your model with the world at:"
@@ -520,8 +519,7 @@ def _upload_zip(self, model_type: str, model_path: str, model_file_name: str):
                 )
             else:
                 print(
-                    "View the status of your deployment at:"
-                    f" {APP_URL}/{self.workspace}/{self.project}/{self.version}"
+                    f"View the status of your deployment at: {APP_URL}/{self.workspace}/{self.project}/{self.version}"
                 )
 
         except Exception as e:
@@ -543,7 +541,7 @@ def bar_progress(current, total, width=80):
             progress_message = (
                 "Downloading Dataset Version Zip in "
                 f"{location} to {format}: "
-                f"{current/total*100:.0f}% [{current} / {total}] bytes"
+                f"{current / total * 100:.0f}% [{current} / {total}] bytes"
             )
             sys.stdout.write("\r" + progress_message)
             sys.stdout.flush()
@@ -642,7 +640,7 @@ def __get_format_identifier(self, format):
 
         if not format:
             raise RuntimeError(
-                "You must pass a format argument to version.download() or define a" " model in your Roboflow object"
+                "You must pass a format argument to version.download() or define a model in your Roboflow object"
             )
 
         friendly_formats = {"yolov5": "yolov5pytorch", "yolov7": "yolov7pytorch"}

roboflow/core/workspace.py

@@ -269,7 +269,7 @@ def two_stage_ocr(
                 # capture OCR results from cropped image
                 results.append(ocr_infer(croppedImg)["results"])
         else:
-            print("please use an object detection model--can only perform two stage with" " bounding box results")
+            print("please use an object detection model--can only perform two stage with bounding box results")
 
         return results
 

roboflow/deployment.py

@@ -197,7 +197,7 @@ def get_deployment(args):
             print(json.dumps(msg, indent=2))
             break
 
-        print(f'{datetime.now().strftime("%H:%M:%S")} Waiting for deployment {args.deployment_name} to be ready...\n')
+        print(f"{datetime.now().strftime('%H:%M:%S')} Waiting for deployment {args.deployment_name} to be ready...\n")
         time.sleep(30)
 
 
@@ -278,7 +278,7 @@ def get_deployment_log(args):
                 continue
             log_ids.add(log["insert_id"])
             last_log_timestamp = log_timestamp
-            print(f'[{log_timestamp.strftime("%Y-%m-%d %H:%M:%S.%f")}] {log["payload"]}')
+            print(f"[{log_timestamp.strftime('%Y-%m-%d %H:%M:%S.%f')}] {log['payload']}")
 
         if not args.follow:
             break

roboflow/models/object_detection.py

@@ -172,21 +172,25 @@ def predict(  # type: ignore[override]
         else:
             self.__exception_check(image_path_check=image_path)
 
-        resize = False
         original_dimensions = None
+        should_resize = False
         # If image is local image
         if not hosted:
             import cv2
             import numpy as np
 
+            should_resize = (
+                "resize" in self.preprocessing.keys() and "Stretch" in self.preprocessing["resize"]["format"]
+            )
+
             if isinstance(image_path, str):
                 image = Image.open(image_path).convert("RGB")
                 dimensions = image.size
                 original_dimensions = copy.deepcopy(dimensions)
 
                 # Here we resize the image to the preprocessing settings
                 # before sending it over the wire
-                if "resize" in self.preprocessing.keys():
+                if should_resize:
                     if dimensions[0] > int(self.preprocessing["resize"]["width"]) or dimensions[1] > int(
                         self.preprocessing["resize"]["height"]
                     ):
@@ -197,7 +201,6 @@ def predict(  # type: ignore[override]
                             )
                         )
                         dimensions = image.size
-                        resize = True
 
                 # Create buffer
                 buffered = io.BytesIO()
@@ -245,7 +248,7 @@ def predict(  # type: ignore[override]
         if self.format == "json":
             resp_json = resp.json()
 
-            if resize and original_dimensions is not None:
+            if should_resize and original_dimensions is not None:
                 new_preds = []
                 for p in resp_json["predictions"]:
                     p["x"] = int(p["x"] * (int(original_dimensions[0]) / int(self.preprocessing["resize"]["width"])))

roboflow/roboflowpy.py

@@ -253,7 +253,7 @@ def _add_upload_parser(subparsers):
     upload_parser.add_argument(
         "-w",
         dest="workspace",
-        help="specify a workspace url or id " "(will use default workspace if not specified)",
+        help="specify a workspace url or id (will use default workspace if not specified)",
     )
     upload_parser.add_argument(
         "-p",
@@ -311,7 +311,7 @@ def _add_import_parser(subparsers):
     import_parser.add_argument(
         "-w",
         dest="workspace",
-        help="specify a workspace url or id " "(will use default workspace if not specified)",
+        help="specify a workspace url or id (will use default workspace if not specified)",
     )
     import_parser.add_argument(
         "-p",

roboflow/util/versions.py

@@ -34,7 +34,7 @@ def get_wrong_dependencies_versions(
         module = import_module(dependency)
         module_version = module.__version__
         if order not in order_funcs:
-            raise ValueError(f"order={order} not supported, please use" f" `{', '.join(order_funcs.keys())}`")
+            raise ValueError(f"order={order} not supported, please use `{', '.join(order_funcs.keys())}`")
 
         is_okay = order_funcs[order](Version(module_version), Version(version))
         if not is_okay:
@@ -53,7 +53,7 @@ def print_warn_for_wrong_dependencies_versions(
             f" {dependency}{order}{version}`"
         )
         if ask_to_continue:
-            answer = input(f"Would you like to continue with the wrong version of {dependency}?" " y/n: ")
+            answer = input(f"Would you like to continue with the wrong version of {dependency}? y/n: ")
             if answer.lower() != "y":
                 sys.exit(1)