Skip to content

Commit ccafc40

Browse files
fix(pre_commit): 🎨 auto format pre-commit hooks
1 parent 0d263ec commit ccafc40

File tree

3 files changed

+35
-24
lines changed

3 files changed

+35
-24
lines changed

roboflow/adapters/deploymentapi.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ class DeploymentApiError(Exception):
1010
def add_deployment(api_key, machine_type, duration, delete_on_expiration, deployment_name, inference_version):
1111
url = f"{DEDICATED_DEPLOYMENT_URL}/add"
1212
params = {
13-
"api_key": api_key,
14-
# "security_level": security_level,
15-
"duration": duration,
16-
"delete_on_expiration": delete_on_expiration,
17-
"deployment_name": deployment_name,
18-
"inference_version": inference_version,
19-
}
13+
"api_key": api_key,
14+
# "security_level": security_level,
15+
"duration": duration,
16+
"delete_on_expiration": delete_on_expiration,
17+
"deployment_name": deployment_name,
18+
"inference_version": inference_version,
19+
}
2020
if machine_type is not None:
2121
params["machine_type"] = machine_type
22-
response = requests.post(url, json = params)
22+
response = requests.post(url, json=params)
2323
if response.status_code != 200:
2424
return response.status_code, response.text
2525
return response.status_code, response.json()
@@ -55,4 +55,3 @@ def list_machine_types(api_key):
5555
if response.status_code != 200:
5656
return response.status_code, response.text
5757
return response.status_code, response.json()
58-

roboflow/deployment.py

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import json
2+
import time
3+
from datetime import datetime
24

35
from roboflow.adapters import deploymentapi
46
from roboflow.config import load_roboflow_api_key
5-
import time
6-
from datetime import datetime
77

88

99
def add_deployment_parser(subparsers):
@@ -26,7 +26,8 @@ def add_deployment_parser(subparsers):
2626
deployment_add_parser.set_defaults(func=add_deployment)
2727
deployment_add_parser.add_argument("-a", "--api_key", help="api key")
2828
deployment_add_parser.add_argument(
29-
"deployment_name", help="deployment name, must contain 5-15 lowercase characters, first character must be a letter"
29+
"deployment_name",
30+
help="deployment name, must contain 5-15 lowercase characters, first character must be a letter",
3031
)
3132
# deployment_add_parser.add_argument(
3233
# "-s", "--security_level", help="security level (protected)", default="protected"
@@ -35,21 +36,31 @@ def add_deployment_parser(subparsers):
3536
"-m", "--machine_type", help="machine type, run `roboflow deployment machine_type` to see available options"
3637
)
3738
deployment_add_parser.add_argument(
38-
"-t", "--duration", help="duration, how long you want to keep the deployment (unit: hour, default: 3)",
39-
type=float, default=3
39+
"-t",
40+
"--duration",
41+
help="duration, how long you want to keep the deployment (unit: hour, default: 3)",
42+
type=float,
43+
default=3,
4044
)
4145
deployment_add_parser.add_argument(
4246
"-e", "--no_delete_on_expiration", help="keep when expired (default: False)", action="store_true"
4347
)
4448
deployment_add_parser.add_argument(
45-
"-v", "--inference_version", help="inference server version (default: latest)", default="latest",
49+
"-v",
50+
"--inference_version",
51+
help="inference server version (default: latest)",
52+
default="latest",
53+
)
54+
deployment_add_parser.add_argument(
55+
"-w", "--wait_on_pending", help="wait if deployment is pending", action="store_true"
4656
)
47-
deployment_add_parser.add_argument("-w", "--wait_on_pending", help="wait if deployment is pending", action="store_true")
4857

4958
deployment_get_parser.set_defaults(func=get_deployment)
5059
deployment_get_parser.add_argument("-a", "--api_key", help="api key")
5160
deployment_get_parser.add_argument("deployment_name", help="deployment name")
52-
deployment_get_parser.add_argument("-w", "--wait_on_pending", help="wait if deployment is pending", action="store_true")
61+
deployment_get_parser.add_argument(
62+
"-w", "--wait_on_pending", help="wait if deployment is pending", action="store_true"
63+
)
5364

5465
deployment_list_parser.set_defaults(func=list_deployment)
5566
deployment_list_parser.add_argument("-a", "--api_key", help="api key")
@@ -85,7 +96,7 @@ def add_deployment(args):
8596
args.deployment_name,
8697
args.inference_version,
8798
)
88-
99+
89100
if status_code != 200:
90101
print(f"{status_code}: {msg}")
91102
return
@@ -107,12 +118,14 @@ def get_deployment(args):
107118
if status_code != 200:
108119
print(f"{status_code}: {msg}")
109120
return
110-
121+
111122
if (not args.wait_on_pending) or msg["status"] != "pending":
112123
print(json.dumps(msg, indent=2))
113124
break
114-
115-
print(f'{datetime.now().strftime("%Y-%m-%d %H:%M:%S")} Waiting for deployment {args.deployment_name} to be ready...\n')
125+
126+
print(
127+
f'{datetime.now().strftime("%Y-%m-%d %H:%M:%S")} Waiting for deployment {args.deployment_name} to be ready...\n'
128+
)
116129
time.sleep(30)
117130

118131

@@ -138,4 +151,3 @@ def delete_deployment(args):
138151
print(f"{status_code}: {msg}")
139152
return
140153
print(json.dumps(msg, indent=2))
141-

roboflow/roboflowpy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def _argparser():
195195
_add_run_video_inference_api_parser(subparsers)
196196
deployment.add_deployment_parser(subparsers)
197197
_add_whoami_parser(subparsers)
198-
198+
199199
parser.add_argument("-v", "--version", help="show version info", action="store_true")
200200
parser.set_defaults(func=show_version)
201201

@@ -211,7 +211,7 @@ def show_whoami(args):
211211
workspaces_by_url = {w["url"]: w for w in RF_WORKSPACES.values()}
212212
default_workspace_url = get_conditional_configuration_variable("RF_WORKSPACE", default=None)
213213
default_workspace = workspaces_by_url.get(default_workspace_url, None)
214-
default_workspace['apiKey'] = '**********'
214+
default_workspace["apiKey"] = "**********"
215215
print(json.dumps(default_workspace, indent=2))
216216

217217

0 commit comments

Comments
 (0)