Merge branch 'lean/fix-yolov12-upload' of github.com:roboflow/roboflow-python into lean/fix-yolov12-upload

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.59"
+__version__ = "1.1.60"
 
 
 def check_key(api_key, model, notebook, num_retries=0):

roboflow/adapters/deploymentapi.py

@@ -9,10 +9,13 @@ class DeploymentApiError(Exception):
     pass
 
 
-def add_deployment(api_key, machine_type, duration, delete_on_expiration, deployment_name, inference_version):
+def add_deployment(
+    api_key, creator_email, machine_type, duration, delete_on_expiration, deployment_name, inference_version
+):
     url = f"{DEDICATED_DEPLOYMENT_URL}/add"
     params = {
         "api_key": api_key,
+        "creator_email": creator_email,
         # "security_level": security_level,
         "duration": duration,
         "delete_on_expiration": delete_on_expiration,
@@ -69,6 +72,22 @@ def get_deployment_usage(api_key, deployment_name, from_timestamp, to_timestamp)
     return response.status_code, response.json()
 
 
+def pause_deployment(api_key, deployment_name):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/pause"
+    response = requests.post(url, json={"api_key": api_key, "deployment_name": deployment_name})
+    if response.status_code != 200:
+        return response.status_code, response.text
+    return response.status_code, response.json()
+
+
+def resume_deployment(api_key, deployment_name):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/resume"
+    response = requests.post(url, json={"api_key": api_key, "deployment_name": deployment_name})
+    if response.status_code != 200:
+        return response.status_code, response.text
+    return response.status_code, response.json()
+
+
 def delete_deployment(api_key, deployment_name):
     url = f"{DEDICATED_DEPLOYMENT_URL}/delete"
     response = requests.post(url, json={"api_key": api_key, "deployment_name": deployment_name})

roboflow/deployment.py

@@ -61,6 +61,8 @@ def add_deployment_parser(subparsers):
     deployment_usage_deployment_parser = deployment_subparsers.add_parser(
         "usage_deployment", help="get usage of a specific dedicated deployments"
     )
+    deployment_pause_parser = deployment_subparsers.add_parser("pause", help="pause a dedicated deployment")
+    deployment_resume_parser = deployment_subparsers.add_parser("resume", help="resume a dedicated deployment")
     deployment_delete_parser = deployment_subparsers.add_parser("delete", help="delete a dedicated deployment")
     deployment_log_parser = deployment_subparsers.add_parser("log", help="show log info for a dedicated deployment")
 
@@ -77,7 +79,13 @@ def add_deployment_parser(subparsers):
     #     "-s", "--security_level", help="security level (protected)", default="protected"
     # )
     deployment_add_parser.add_argument(
-        "-m", "--machine_type", help="machine type, run `roboflow deployment machine_type` to see available options"
+        "-m",
+        "--machine_type",
+        help="machine type, run `roboflow deployment machine_type` to see available options",
+        required=True,
+    )
+    deployment_add_parser.add_argument(
+        "-e", "--creator_email", help="your email address (must be added to the workspace)", required=True
     )
     deployment_add_parser.add_argument(
         "-t",
@@ -87,7 +95,7 @@ def add_deployment_parser(subparsers):
         default=3,
     )
     deployment_add_parser.add_argument(
-        "-e", "--no_delete_on_expiration", help="keep when expired (default: False)", action="store_true"
+        "-nodel", "--no_delete_on_expiration", help="keep when expired (default: False)", action="store_true"
     )
     deployment_add_parser.add_argument(
         "-v",
@@ -128,6 +136,14 @@ def add_deployment_parser(subparsers):
         "-t", "--to_timestamp", help="end time stamp in ISO8601 format (YYYY-MM-DD HH:MM:SS)", default=None
     )
 
+    deployment_pause_parser.set_defaults(func=pause_deployment)
+    deployment_pause_parser.add_argument("-a", "--api_key", help="api key")
+    deployment_pause_parser.add_argument("deployment_name", help="deployment name")
+
+    deployment_resume_parser.set_defaults(func=resume_deployment)
+    deployment_resume_parser.add_argument("-a", "--api_key", help="api key")
+    deployment_resume_parser.add_argument("deployment_name", help="deployment name")
+
     deployment_delete_parser.set_defaults(func=delete_deployment)
     deployment_delete_parser.add_argument("-a", "--api_key", help="api key")
     deployment_delete_parser.add_argument("deployment_name", help="deployment name")
@@ -163,6 +179,7 @@ def add_deployment(args):
         exit(1)
     status_code, msg = deploymentapi.add_deployment(
         api_key,
+        args.creator_email,
         # args.security_level,
         args.machine_type,
         args.duration,
@@ -241,6 +258,30 @@ def get_deployment_usage(args):
     print(json.dumps(msg, indent=2))
 
 
+def pause_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    if api_key is None:
+        print("Please provide an api key")
+        exit(1)
+    status_code, msg = deploymentapi.pause_deployment(api_key, args.deployment_name)
+    if status_code != 200:
+        print(f"{status_code}: {msg}")
+        exit(status_code)
+    print(json.dumps(msg, indent=2))
+
+
+def resume_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    if api_key is None:
+        print("Please provide an api key")
+        exit(1)
+    status_code, msg = deploymentapi.resume_deployment(api_key, args.deployment_name)
+    if status_code != 200:
+        print(f"{status_code}: {msg}")
+        exit(status_code)
+    print(json.dumps(msg, indent=2))
+
+
 def delete_deployment(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:

roboflow/util/model_processor.py

@@ -142,7 +142,12 @@ def _process_yolo(model_type: str, model_path: str, filename: str) -> str:
 
     if "yolov8" in model_type or "yolov10" in model_type or "yolov11" in model_type or "yolov12" in model_type:
         # try except for backwards compatibility with older versions of ultralytics
-        if "-cls" in model_type or model_type.startswith("yolov10") or model_type.startswith("yolov11") or model_type.startswith("yolov12"):
+        if (
+            "-cls" in model_type
+            or model_type.startswith("yolov10")
+            or model_type.startswith("yolov11")
+            or model_type.startswith("yolov12")
+        ):
             nc = model_instance.yaml["nc"]
             args = model["train_args"]
         else: