Skip to content

Commit 44598ad

Browse files
PacificDouPacificDou
committed
rename to deployment
1 parent db0c449 commit 44598ad

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

‎roboflow/adapters/rfapi.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import requests
77
from requests_toolbelt.multipart.encoder import MultipartEncoder
88

9-
from roboflow.config import API_URL, DEFAULT_BATCH_NAME, DEFAULT_JOB_NAME, ROBOFLOW_RUNNER_URL
9+
from roboflow.config import API_URL, DEFAULT_BATCH_NAME, DEFAULT_JOB_NAME, DEDICATED_DEPLOYMENT_URL
1010
from roboflow.util import image_utils
1111

1212

@@ -207,38 +207,38 @@ def _save_annotation_error(image_id, response):
207207
return UploadError(errmsg)
208208

209209

210-
def add_runner(api_key, security_level, cloud_provider, machine_type, runner_name, inference_version):
211-
url = f"{ROBOFLOW_RUNNER_URL}/create"
210+
def add_deployment(api_key, security_level, cloud_provider, machine_type, deployment_name, inference_version):
211+
url = f"{DEDICATED_DEPLOYMENT_URL}/add"
212212
response = requests.post(url, json={'api_key': api_key, 'security_level': security_level,
213213
'cloud_provider': cloud_provider, 'machine_type': machine_type,
214-
'runner_name': runner_name, 'inference_version': inference_version})
214+
'deployment_name': deployment_name, 'inference_version': inference_version})
215215
if response.status_code != 200:
216216
raise RoboflowError(response.text)
217217
result = response.json()
218218
return result
219219

220220

221-
def get_runner(api_key, runner_id):
222-
url = f"{ROBOFLOW_RUNNER_URL}/get"
223-
response = requests.get(url, json={'api_key': api_key, 'runner_id': runner_id})
221+
def get_deployment(api_key, deployment_id):
222+
url = f"{DEDICATED_DEPLOYMENT_URL}/get"
223+
response = requests.get(url, json={'api_key': api_key, 'deployment_id': deployment_id})
224224
if response.status_code != 200:
225225
raise RoboflowError(response.text)
226226
result = response.json()
227227
return result
228228

229229

230-
def list_runner(api_key):
231-
url = f"{ROBOFLOW_RUNNER_URL}/list"
230+
def list_deployment(api_key):
231+
url = f"{DEDICATED_DEPLOYMENT_URL}/list"
232232
response = requests.get(url, json={'api_key': api_key})
233233
if response.status_code != 200:
234234
raise RoboflowError(response.text)
235235
result = response.json()
236236
return result
237237

238238

239-
def delete_runner(api_key, runner_id):
240-
url = f"{ROBOFLOW_RUNNER_URL}/delete"
241-
response = requests.post(url, json={'api_key': api_key, 'runner_id': runner_id})
239+
def delete_deployment(api_key, deployment_id):
240+
url = f"{DEDICATED_DEPLOYMENT_URL}/delete"
241+
response = requests.post(url, json={'api_key': api_key, 'deployment_id': deployment_id})
242242
if response.status_code != 200:
243243
raise RoboflowError(response.text)
244244
result = response.json()

‎roboflow/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def get_conditional_configuration_variable(key, default):
6363
CLIP_FEATURIZE_URL = get_conditional_configuration_variable("CLIP_FEATURIZE_URL", "CLIP FEATURIZE URL NOT IN ENV")
6464
OCR_URL = get_conditional_configuration_variable("OCR_URL", "OCR URL NOT IN ENV")
6565

66-
ROBOFLOW_RUNNER_URL = get_conditional_configuration_variable("ROBOFLOW_RUNNER_URL", "https://runner.svc.roboflow.one")
66+
DEDICATED_DEPLOYMENT_URL = get_conditional_configuration_variable("DEDICATED_DEPLOYMENT_URL", "https://deployment.svc.roboflow.one")
6767

6868
DEMO_KEYS = ["coco-128-sample", "chess-sample-only-api-key"]
6969

‎roboflow/roboflowpy.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,21 @@ def infer(args):
161161
print(group)
162162

163163

164-
def add_runner(args):
165-
runner_json = rfapi.add_runner(args.api_key, args.security_level, args.cloud_provider, args.machine_type, args.runner_name, args.inference_version)
166-
print(json.dumps(runner_json, indent=2))
164+
def add_deployment(args):
165+
ret_json = rfapi.add_deployment(args.api_key, args.security_level, args.cloud_provider, args.machine_type, args.deployment_name, args.inference_version)
166+
print(json.dumps(ret_json, indent=2))
167167

168-
def get_runner(args):
169-
runner_json = rfapi.get_runner(args.api_key, args.runner_id)
170-
print(json.dumps(runner_json, indent=2))
168+
def get_deployment(args):
169+
ret_json = rfapi.get_deployment(args.api_key, args.deployment_id)
170+
print(json.dumps(ret_json, indent=2))
171171

172-
def list_runner(args):
173-
runner_json = rfapi.list_runner(args.vapi_key)
174-
print(json.dumps(runner_json, indent=2))
172+
def list_deployment(args):
173+
ret_json = rfapi.list_deployment(args.api_key)
174+
print(json.dumps(ret_json, indent=2))
175175

176-
def delete_runner(args):
177-
runner_json = rfapi.delete_runner(args.api_key, args.runner_id)
178-
print(json.dumps(runner_json, indent=2))
176+
def delete_deployment(args):
177+
ret_json = rfapi.delete_deployment(args.api_key, args.deployment_id)
178+
print(json.dumps(ret_json, indent=2))
179179

180180

181181
def _argparser():
@@ -190,7 +190,7 @@ def _argparser():
190190
_add_workspaces_parser(subparsers)
191191
_add_upload_model_parser(subparsers)
192192
_add_get_workspace_project_version_parser(subparsers)
193-
_add_runner_parser(subparsers)
193+
_add_deployment_parser(subparsers)
194194

195195
return parser
196196

@@ -476,35 +476,35 @@ def _add_login_parser(subparsers):
476476
login_parser.set_defaults(func=login)
477477

478478

479-
def _add_runner_parser(subparsers):
480-
runner_parser = subparsers.add_parser(
481-
"runner",
482-
help="runner related commands. type 'roboflow runner' to see detailed command help",
483-
)
484-
runner_subparsers = runner_parser.add_subparsers(title="runner subcommands")
485-
runner_add_parser = runner_subparsers.add_parser("add", help="create a new runner")
486-
runner_get_parser = runner_subparsers.add_parser("get", help="show detailed info for a runner")
487-
runner_list_parser = runner_subparsers.add_parser("list", help="list runners in a workspace")
488-
runner_delete_parser = runner_subparsers.add_parser("delete", help="delete a runner")
489-
490-
runner_add_parser.set_defaults(func=add_runner)
491-
runner_add_parser.add_argument("api_key", help="api key")
492-
runner_add_parser.add_argument("security_level", help="security level (protected)", default="protected")
493-
runner_add_parser.add_argument("cloud_provider", help="cloud provider (gcp)", default="gcp")
494-
runner_add_parser.add_argument("machine_type", help="machine type (n1-standard-4-cpu, g2-standard-8-cpu)", default="n1-standard-4-cpu")
495-
runner_add_parser.add_argument("runner_name", help="runner name")
496-
runner_add_parser.add_argument("inference_version", help="inference server version (docker image tag)", default="latest")
479+
def _add_deployment_parser(subparsers):
480+
deployment_parser = subparsers.add_parser(
481+
"deployment",
482+
help="deployment related commands. type 'roboflow deployment' to see detailed command help",
483+
)
484+
deployment_subparsers = deployment_parser.add_subparsers(title="deployment subcommands")
485+
deployment_add_parser = deployment_subparsers.add_parser("add", help="create a dedicated deployment")
486+
deployment_get_parser = deployment_subparsers.add_parser("get", help="show detailed info for a dedicated deployment")
487+
deployment_list_parser = deployment_subparsers.add_parser("list", help="list dedicated deployments in a workspace")
488+
deployment_delete_parser = deployment_subparsers.add_parser("delete", help="delete a dedicated deployment")
489+
490+
deployment_add_parser.set_defaults(func=add_deployment)
491+
deployment_add_parser.add_argument("api_key", help="api key")
492+
deployment_add_parser.add_argument("security_level", help="security level (protected)", default="protected")
493+
deployment_add_parser.add_argument("cloud_provider", help="cloud provider (gcp)", default="gcp")
494+
deployment_add_parser.add_argument("machine_type", help="machine type (gcp-n1-standard-4-gpu, gcp-g2-standard-8-gpu)", default="gcp-n1-standard-4-gpu")
495+
deployment_add_parser.add_argument("deployment_name", help="deployment name")
496+
deployment_add_parser.add_argument("inference_version", help="inference server version (docker image tag)", default="latest")
497497

498-
runner_get_parser.set_defaults(func=get_runner)
499-
runner_get_parser.add_argument("api_key", help="api key")
500-
runner_get_parser.add_argument("runner_id", help="runner id")
498+
deployment_get_parser.set_defaults(func=get_deployment)
499+
deployment_get_parser.add_argument("api_key", help="api key")
500+
deployment_get_parser.add_argument("deployment_id", help="deployment id")
501501

502-
runner_list_parser.set_defaults(func=list_runner)
503-
runner_list_parser.add_argument("api_key", help="api key")
502+
deployment_list_parser.set_defaults(func=list_deployment)
503+
deployment_list_parser.add_argument("api_key", help="api key")
504504

505-
runner_delete_parser.set_defaults(func=delete_runner)
506-
runner_delete_parser.add_argument("api_key", help="api key")
507-
runner_delete_parser.add_argument("runner_id", help="runner id")
505+
deployment_delete_parser.set_defaults(func=delete_deployment)
506+
deployment_delete_parser.add_argument("api_key", help="api key")
507+
deployment_delete_parser.add_argument("deployment_id", help="deployment id")
508508

509509

510510
def main():

0 commit comments

Comments
 (0)