move dployments stuff to its separate files

Author: tonylampada

roboflow/adapters/deploymentapi.py

@@ -0,0 +1,51 @@
+import requests
+from roboflow.config import DEDICATED_DEPLOYMENT_URL
+
+
+class DeploymentApiError(Exception):
+    pass
+
+
+def add_deployment(api_key, security_level, machine_type, deployment_name, inference_version):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/add"
+    response = requests.post(
+        url,
+        json={
+            "api_key": api_key,
+            "security_level": security_level,
+            "machine_type": machine_type,
+            "deployment_name": deployment_name,
+            "inference_version": inference_version,
+        },
+    )
+    if response.status_code != 200:
+        raise DeploymentApiError(response.text)
+    result = response.json()
+    return result
+
+
+def get_deployment(api_key, deployment_id):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/get"
+    response = requests.get(url, json={"api_key": api_key, "deployment_id": deployment_id})
+    if response.status_code != 200:
+        raise DeploymentApiError(response.text)
+    result = response.json()
+    return result
+
+
+def list_deployment(api_key):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/list"
+    response = requests.get(url, json={"api_key": api_key})
+    if response.status_code != 200:
+        raise DeploymentApiError(response.text)
+    result = response.json()
+    return result
+
+
+def delete_deployment(api_key, deployment_id):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/delete"
+    response = requests.post(url, json={"api_key": api_key, "deployment_id": deployment_id})
+    if response.status_code != 200:
+        raise DeploymentApiError(response.text)
+    result = response.json()
+    return result

roboflow/adapters/rfapi.py

@@ -6,7 +6,7 @@
 import requests
 from requests_toolbelt.multipart.encoder import MultipartEncoder
 
-from roboflow.config import API_URL, DEDICATED_DEPLOYMENT_URL, DEFAULT_BATCH_NAME, DEFAULT_JOB_NAME
+from roboflow.config import API_URL, DEFAULT_BATCH_NAME, DEFAULT_JOB_NAME
 from roboflow.util import image_utils
 
 
@@ -205,48 +205,3 @@ def _save_annotation_error(image_id, response):
     else:
         errmsg += f"bad response: {response.status_code}: {responsejson}"
     return UploadError(errmsg)
-
-
-def add_deployment(api_key, security_level, machine_type, deployment_name, inference_version):
-    url = f"{DEDICATED_DEPLOYMENT_URL}/add"
-    response = requests.post(
-        url,
-        json={
-            "api_key": api_key,
-            "security_level": security_level,
-            "machine_type": machine_type,
-            "deployment_name": deployment_name,
-            "inference_version": inference_version,
-        },
-    )
-    if response.status_code != 200:
-        raise RoboflowError(response.text)
-    result = response.json()
-    return result
-
-
-def get_deployment(api_key, deployment_id):
-    url = f"{DEDICATED_DEPLOYMENT_URL}/get"
-    response = requests.get(url, json={"api_key": api_key, "deployment_id": deployment_id})
-    if response.status_code != 200:
-        raise RoboflowError(response.text)
-    result = response.json()
-    return result
-
-
-def list_deployment(api_key):
-    url = f"{DEDICATED_DEPLOYMENT_URL}/list"
-    response = requests.get(url, json={"api_key": api_key})
-    if response.status_code != 200:
-        raise RoboflowError(response.text)
-    result = response.json()
-    return result
-
-
-def delete_deployment(api_key, deployment_id):
-    url = f"{DEDICATED_DEPLOYMENT_URL}/delete"
-    response = requests.post(url, json={"api_key": api_key, "deployment_id": deployment_id})
-    if response.status_code != 200:
-        raise RoboflowError(response.text)
-    result = response.json()
-    return result

roboflow/config.py

@@ -64,7 +64,7 @@ def get_conditional_configuration_variable(key, default):
 OCR_URL = get_conditional_configuration_variable("OCR_URL", "OCR URL NOT IN ENV")
 
 DEDICATED_DEPLOYMENT_URL = get_conditional_configuration_variable(
-    "DEDICATED_DEPLOYMENT_URL", "https://deployment.svc.roboflow.one"
+    "DEDICATED_DEPLOYMENT_URL", "https://deployment.svc.roboflow.com"
 )
 
 DEMO_KEYS = ["coco-128-sample", "chess-sample-only-api-key"]

roboflow/deployment.py

@@ -0,0 +1,74 @@
+import json
+from roboflow.adapters import deploymentapi
+from roboflow.config import load_roboflow_api_key
+
+
+def add_deployment_parser(subparsers):
+    deployment_parser = subparsers.add_parser(
+        "deployment",
+        help="deployment related commands.  type 'roboflow deployment' to see detailed command help",
+    )
+    deployment_subparsers = deployment_parser.add_subparsers(title="deployment subcommands")
+    deployment_add_parser = deployment_subparsers.add_parser("add", help="create a dedicated deployment")
+    deployment_get_parser = deployment_subparsers.add_parser(
+        "get", help="show detailed info for a dedicated deployment"
+    )
+    deployment_list_parser = deployment_subparsers.add_parser("list", help="list dedicated deployments in a workspace")
+    deployment_delete_parser = deployment_subparsers.add_parser("delete", help="delete a dedicated deployment")
+
+    deployment_add_parser.set_defaults(func=add_deployment)
+    deployment_add_parser.add_argument("-a", dest="api_key", help="api key")
+    deployment_add_parser.add_argument(
+        "-s", dest="security_level", help="security level (protected)", default="protected"
+    )
+    deployment_add_parser.add_argument(
+        "-m",
+        dest="machine_type",
+        help="machine type (gcp-n2-cpu, gcp-t4-gpu, gcp-l4-gpu)",
+        default="gcp-n2-cpu",
+    )
+    deployment_add_parser.add_argument("-n", dest="deployment_name", help="deployment name")
+    deployment_add_parser.add_argument(
+        "-v", dest="inference_version", help="inference server version (default: latest)", default="latest"
+    )
+
+    deployment_get_parser.set_defaults(func=get_deployment)
+    deployment_get_parser.add_argument("-a", dest="api_key", help="api key")
+    deployment_get_parser.add_argument("-d", dest="deployment_id", help="deployment id")
+
+    deployment_list_parser.set_defaults(func=list_deployment)
+    deployment_list_parser.add_argument("-a", dest="api_key", help="api key")
+
+    deployment_delete_parser.set_defaults(func=delete_deployment)
+    deployment_delete_parser.add_argument("-a", dest="api_key", help="api key")
+    deployment_delete_parser.add_argument("-d", dest="deployment_id", help="deployment id")
+
+
+def add_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    ret_json = deploymentapi.add_deployment(
+        api_key,
+        args.security_level,
+        args.machine_type,
+        args.deployment_name,
+        args.inference_version,
+    )
+    print(json.dumps(ret_json, indent=2))
+
+
+def get_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    ret_json = deploymentapi.get_deployment(api_key, args.deployment_id)
+    print(json.dumps(ret_json, indent=2))
+
+
+def list_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    ret_json = deploymentapi.list_deployment(api_key)
+    print(json.dumps(ret_json, indent=2))
+
+
+def delete_deployment(args):
+    api_key = args.api_key or load_roboflow_api_key(None)
+    ret_json = deploymentapi.delete_deployment(api_key, args.deployment_id)
+    print(json.dumps(ret_json, indent=2))

roboflow/roboflowpy.py

@@ -12,7 +12,7 @@
 from roboflow.models.keypoint_detection import KeypointDetectionModel
 from roboflow.models.object_detection import ObjectDetectionModel
 from roboflow.models.semantic_segmentation import SemanticSegmentationModel
-
+from roboflow import deployment
 
 def login(args):
     roboflow.login()
@@ -161,31 +161,6 @@ def infer(args):
     print(group)
 
 
-def add_deployment(args):
-    ret_json = rfapi.add_deployment(
-        args.api_key,
-        args.security_level,
-        args.machine_type,
-        args.deployment_name,
-        args.inference_version,
-    )
-    print(json.dumps(ret_json, indent=2))
-
-
-def get_deployment(args):
-    ret_json = rfapi.get_deployment(args.api_key, args.deployment_id)
-    print(json.dumps(ret_json, indent=2))
-
-
-def list_deployment(args):
-    ret_json = rfapi.list_deployment(args.api_key)
-    print(json.dumps(ret_json, indent=2))
-
-
-def delete_deployment(args):
-    ret_json = rfapi.delete_deployment(args.api_key, args.deployment_id)
-    print(json.dumps(ret_json, indent=2))
-
 
 def _argparser():
     parser = argparse.ArgumentParser(description="Welcome to the roboflow CLI: computer vision at your fingertips 🪄")
@@ -199,7 +174,7 @@ def _argparser():
     _add_workspaces_parser(subparsers)
     _add_upload_model_parser(subparsers)
     _add_get_workspace_project_version_parser(subparsers)
-    _add_deployment_parser(subparsers)
+    deployment.add_deployment_parser(subparsers)
 
     return parser
 
@@ -479,53 +454,10 @@ def _add_get_workspace_project_version_parser(subparsers):
     )
     workspace_project_version_parser.set_defaults(func=get_workspace_project_version)
 
-
 def _add_login_parser(subparsers):
     login_parser = subparsers.add_parser("login", help="Log in to Roboflow")
     login_parser.set_defaults(func=login)
 
-
-def _add_deployment_parser(subparsers):
-    deployment_parser = subparsers.add_parser(
-        "deployment",
-        help="deployment related commands.  type 'roboflow deployment' to see detailed command help",
-    )
-    deployment_subparsers = deployment_parser.add_subparsers(title="deployment subcommands")
-    deployment_add_parser = deployment_subparsers.add_parser("add", help="create a dedicated deployment")
-    deployment_get_parser = deployment_subparsers.add_parser(
-        "get", help="show detailed info for a dedicated deployment"
-    )
-    deployment_list_parser = deployment_subparsers.add_parser("list", help="list dedicated deployments in a workspace")
-    deployment_delete_parser = deployment_subparsers.add_parser("delete", help="delete a dedicated deployment")
-
-    deployment_add_parser.set_defaults(func=add_deployment)
-    deployment_add_parser.add_argument("-a", dest="api_key", help="api key")
-    deployment_add_parser.add_argument(
-        "-s", dest="security_level", help="security level (protected)", default="protected"
-    )
-    deployment_add_parser.add_argument(
-        "-m",
-        dest="machine_type",
-        help="machine type (gcp-n2-cpu, gcp-t4-gpu, gcp-l4-gpu)",
-        default="gcp-n2-cpu",
-    )
-    deployment_add_parser.add_argument("-n", dest="deployment_name", help="deployment name")
-    deployment_add_parser.add_argument(
-        "-v", dest="inference_version", help="inference server version (docker image tag)", default="latest"
-    )
-
-    deployment_get_parser.set_defaults(func=get_deployment)
-    deployment_get_parser.add_argument("-a", dest="api_key", help="api key")
-    deployment_get_parser.add_argument("-d", dest="deployment_id", help="deployment id")
-
-    deployment_list_parser.set_defaults(func=list_deployment)
-    deployment_list_parser.add_argument("-a", dest="api_key", help="api key")
-
-    deployment_delete_parser.set_defaults(func=delete_deployment)
-    deployment_delete_parser.add_argument("-a", dest="api_key", help="api key")
-    deployment_delete_parser.add_argument("-d", dest="deployment_id", help="deployment id")
-
-
 def main():
     parser = _argparser()
     args = parser.parse_args()

tests/manual/debugme.py

@@ -39,7 +39,8 @@
         # f"import {thisdir}/data/cultura-pepino-coco -w wolfodorpythontests -p yellow-auto -c 100".split()  # noqa: E501 // docs
         # f"import {thisdir}/data/cultura-pepino-yolov8 -w wolfodorpythontests -p yellow-auto -c 100".split()  # noqa: E501 // docs
         # f"import {thisdir}/data/cultura-pepino-yolov8_voc -w wolfodorpythontests -p yellow-auto -c 100".split()  # noqa: E501 // docs
-        f"import {thisdir}/data/cultura-pepino-yolov5pytorch -w wolfodorpythontests -p yellow-auto -c 100 -n papaiasso".split()  # noqa: E501 // docs
+        # 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
     )
     args.func(args)

tests/manual/useprod

@@ -4,3 +4,4 @@ cp data/.config-prod data/.config
 export API_URL=https://api.roboflow.com
 export APP_URL=https://app.roboflow.com
 export OBJECT_DETECTION_URL=https://detect.roboflow.one
+export DEDICATED_DEPLOYMENT_URL=https://deployment.svc.roboflow.com

tests/manual/usestaging

@@ -4,3 +4,4 @@ cp data/.config-staging data/.config
 export API_URL=https://api.roboflow.one
 export APP_URL=https://app.roboflow.one
 export OBJECT_DETECTION_URL=https://lambda-object-detection.staging.roboflow.com
+export DEDICATED_DEPLOYMENT_URL=https://deployment.svc.roboflow.one