Skip to content
This repository was archived by the owner on Aug 11, 2020. It is now read-only.

Commit 5370cfa

Browse files
bbathakossak
bbatha
authored and
kossak
committed
fix: clearer experiment type flag PS-10154
1 parent 4c2e41b commit 5370cfa

File tree

6 files changed

+67
-65
lines changed

6 files changed

+67
-65
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,5 @@ ENV/
104104
.vscode/*
105105

106106
.idea
107+
paperspace-python.zip
108+
*.env

‎paperspace/cli/experiments.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ def common_experiments_create_options(f):
108108
def common_experiment_create_multi_node_options(f):
109109
options = [
110110
click.option(
111-
"--experimentTypeId",
112-
"experimentTypeId",
111+
"--experimentType",
112+
"experimentType",
113113
type=ChoiceType(MULTI_NODE_EXPERIMENT_TYPES_MAP, case_sensitive=False),
114114
required=True,
115-
help="Experiment Type ID",
115+
help="Experiment Type",
116116
),
117117
click.option(
118118
"--workerContainer",
@@ -249,7 +249,7 @@ def create_multi_node(api_key, **kwargs):
249249
@common_experiments_create_options
250250
@common_experiments_create_single_node_options
251251
def create_single_node(api_key, **kwargs):
252-
kwargs["experimentTypeId"] = constants.ExperimentType.SINGLE_NODE
252+
kwargs["experimentType"] = constants.ExperimentType.SINGLE_NODE
253253
del_if_value_is_none(kwargs)
254254
experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
255255
command = experiments_commands.CreateExperimentCommand(api=experiments_api)
@@ -270,7 +270,7 @@ def create_and_start_multi_node(api_key, **kwargs):
270270
@common_experiments_create_options
271271
@common_experiments_create_single_node_options
272272
def create_and_start_single_node(api_key, **kwargs):
273-
kwargs["experimentTypeId"] = constants.ExperimentType.SINGLE_NODE
273+
kwargs["experimentType"] = constants.ExperimentType.SINGLE_NODE
274274
del_if_value_is_none(kwargs)
275275
experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
276276
command = experiments_commands.CreateAndStartExperimentCommand(api=experiments_api)

‎paperspace/commands/experiments.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _get_objects(self, response, kwargs):
106106

107107

108108
def _make_details_table(experiment):
109-
if experiment["experimentTypeId"] == constants.ExperimentType.SINGLE_NODE:
109+
if experiment["experimentType"] == constants.ExperimentType.SINGLE_NODE:
110110
data = (
111111
("Name", experiment["templateHistory"]["params"].get("name")),
112112
("ID", experiment.get("handle")),
@@ -121,7 +121,7 @@ def _make_details_table(experiment):
121121
("Model Type", experiment["templateHistory"]["params"].get("modelType")),
122122
("Model Path", experiment["templateHistory"]["params"].get("modelPath")),
123123
)
124-
elif experiment["experimentTypeId"] in (constants.ExperimentType.GRPC_MULTI_NODE,
124+
elif experiment["experimentType"] in (constants.ExperimentType.GRPC_MULTI_NODE,
125125
constants.ExperimentType.MPI_MULTI_NODE):
126126
data = (
127127
("Name", experiment["templateHistory"]["params"].get("name")),
@@ -131,7 +131,7 @@ def _make_details_table(experiment):
131131
("Cluster ID", experiment["templateHistory"]["params"].get("clusterId")),
132132
("Experiment Env", experiment["templateHistory"]["params"].get("experimentEnv")),
133133
("Experiment Type",
134-
constants.ExperimentType.get_type_str(experiment["templateHistory"]["params"].get("experimentTypeId"))),
134+
constants.ExperimentType.get_type_str(experiment["templateHistory"]["params"].get("experimentType"))),
135135
("Model Type", experiment["templateHistory"]["params"].get("modelType")),
136136
("Model Path", experiment["templateHistory"]["params"].get("modelPath")),
137137
("Parameter Server Command", experiment["templateHistory"]["params"].get("parameter_server_command")),
@@ -149,7 +149,7 @@ def _make_details_table(experiment):
149149
("Workspace URL", experiment["templateHistory"]["params"].get("workspaceUrl")),
150150
)
151151
else:
152-
raise ValueError("Wrong experiment type: {}".format(experiment["experimentTypeId"]))
152+
raise ValueError("Wrong experiment type: {}".format(experiment["experimentType"]))
153153

154154
ascii_table = terminaltables.AsciiTable(data)
155155
table_string = ascii_table.table

‎tests/example_responses.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"experimentError": None,
1414
"experimentTemplateHistoryId": 6315,
1515
"experimentTemplateId": 60,
16-
"experimentTypeId": 1,
16+
"experimentType": 1,
1717
"handle": "ea2lfbbpdyzsq",
1818
"id": 6292,
1919
"projectHandle": "prq70zy79",
@@ -26,7 +26,7 @@
2626
"experimentTemplateId": 60,
2727
"id": 6315,
2828
"params": {
29-
"experimentTypeId": 1,
29+
"experimentType": 1,
3030
"name": "dsfads",
3131
"ports": 5000,
3232
"project_handle": "prq70zy79",
@@ -51,7 +51,7 @@
5151
"experimentError": None,
5252
"experimentTemplateHistoryId": 6314,
5353
"experimentTemplateId": 60,
54-
"experimentTypeId": 1,
54+
"experimentType": 1,
5555
"handle": "em6btk2vtb7it",
5656
"id": 6291,
5757
"projectHandle": "prq70zy79",
@@ -64,7 +64,7 @@
6464
"experimentTemplateId": 60,
6565
"id": 6314,
6666
"params": {
67-
"experimentTypeId": 1,
67+
"experimentType": 1,
6868
"name": "dsfads",
6969
"ports": 5000,
7070
"project_handle": "prq70zy79",
@@ -89,7 +89,7 @@
8989
"experimentError": None,
9090
"experimentTemplateHistoryId": 6297,
9191
"experimentTemplateId": 60,
92-
"experimentTypeId": 3,
92+
"experimentType": 3,
9393
"handle": "ew69ls0vy3eto",
9494
"id": 6286,
9595
"projectHandle": "prq70zy79",
@@ -107,7 +107,7 @@
107107
"experimentEnv": {
108108
"key": "val"
109109
},
110-
"experimentTypeId": 3,
110+
"experimentType": 3,
111111
"name": "multinode_mpi",
112112
"parameter_server_command": "ls",
113113
"parameter_server_container": "pscon",
@@ -181,7 +181,7 @@
181181
"experimentError": "Expecting value: line 1 column 1 (char 0)",
182182
"experimentTemplateHistoryId": 297,
183183
"experimentTemplateId": 8,
184-
"experimentTypeId": 1,
184+
"experimentType": 1,
185185
"handle": "esj8mcpaayh5kx",
186186
"id": 295,
187187
"projectHandle": "pr4yxj956",
@@ -199,7 +199,7 @@
199199
"experimentEnv": {
200200
"k": "v"
201201
},
202-
"experimentTypeId": 1,
202+
"experimentType": 1,
203203
"name": "dsfads",
204204
"ports": 3245,
205205
"project_handle": "pr4yxj956",
@@ -226,7 +226,7 @@
226226
"experimentError": "{'name': 'Error', 'status': 400, 'message': 'Invalid machine type'}",
227227
"experimentTemplateHistoryId": 296,
228228
"experimentTemplateId": 8,
229-
"experimentTypeId": 1,
229+
"experimentType": 1,
230230
"handle": "estun7jhqta8sm",
231231
"id": 294,
232232
"projectHandle": "pr4yxj956",
@@ -244,7 +244,7 @@
244244
"experimentEnv": {
245245
"k": "v"
246246
},
247-
"experimentTypeId": 1,
247+
"experimentType": 1,
248248
"name": "dsfads",
249249
"ports": 3245,
250250
"project_handle": "pr4yxj956",
@@ -271,7 +271,7 @@
271271
"experimentError": "{'name': 'Error', 'status': 400, 'message': 'Invalid machine type'}",
272272
"experimentTemplateHistoryId": 295,
273273
"experimentTemplateId": 8,
274-
"experimentTypeId": 1,
274+
"experimentType": 1,
275275
"handle": "es08mwh7ye6zpm",
276276
"id": 293,
277277
"projectHandle": "pr4yxj956",
@@ -289,7 +289,7 @@
289289
"experimentEnv": {
290290
"k": "v"
291291
},
292-
"experimentTypeId": 1,
292+
"experimentType": 1,
293293
"name": "dsfads",
294294
"ports": 3245,
295295
"project_handle": "pr4yxj956",
@@ -316,7 +316,7 @@
316316
"experimentError": None,
317317
"experimentTemplateHistoryId": 38,
318318
"experimentTemplateId": 8,
319-
"experimentTypeId": 1,
319+
"experimentType": 1,
320320
"handle": "eshdufkt9ti8mx",
321321
"id": 38,
322322
"projectHandle": "pr4yxj956",
@@ -351,7 +351,7 @@
351351
"experimentError": None,
352352
"experimentTemplateHistoryId": 34,
353353
"experimentTemplateId": 8,
354-
"experimentTypeId": 1,
354+
"experimentType": 1,
355355
"handle": "e07h0ym8fewm",
356356
"id": 34,
357357
"projectHandle": "pr4yxj956",
@@ -386,7 +386,7 @@
386386
"experimentError": None,
387387
"experimentTemplateHistoryId": 33,
388388
"experimentTemplateId": 8,
389-
"experimentTypeId": 1,
389+
"experimentType": 1,
390390
"handle": "e0fq31vyla039",
391391
"id": 33,
392392
"projectHandle": "pr4yxj956",
@@ -421,7 +421,7 @@
421421
"experimentError": None,
422422
"experimentTemplateHistoryId": 32,
423423
"experimentTemplateId": 8,
424-
"experimentTypeId": 1,
424+
"experimentType": 1,
425425
"handle": "esxz3ihfl9qxs2",
426426
"id": 32,
427427
"projectHandle": "pr4yxj956",
@@ -456,7 +456,7 @@
456456
"experimentError": None,
457457
"experimentTemplateHistoryId": 32862,
458458
"experimentTemplateId": 8,
459-
"experimentTypeId": 1,
459+
"experimentType": 1,
460460
"handle": "ecqq0rz0gok9i",
461461
"id": 32860,
462462
"projectHandle": "pr4yxj956",
@@ -496,7 +496,7 @@
496496
"experimentError": None,
497497
"experimentTemplateHistoryId": 32859,
498498
"experimentTemplateId": 8,
499-
"experimentTypeId": 1,
499+
"experimentType": 1,
500500
"handle": "es310784c1o1x6",
501501
"id": 32857,
502502
"projectHandle": "pr4yxj956",
@@ -536,7 +536,7 @@
536536
"experimentError": None,
537537
"experimentTemplateHistoryId": 32351,
538538
"experimentTemplateId": 8,
539-
"experimentTypeId": 1,
539+
"experimentType": 1,
540540
"handle": "esabwtehoekn6w",
541541
"id": 32349,
542542
"projectHandle": "pr4yxj956",
@@ -576,7 +576,7 @@
576576
"experimentError": None,
577577
"experimentTemplateHistoryId": 31991,
578578
"experimentTemplateId": 8,
579-
"experimentTypeId": 1,
579+
"experimentType": 1,
580580
"handle": "ea1d6t082wq7i",
581581
"id": 31989,
582582
"projectHandle": "pr4yxj956",
@@ -616,7 +616,7 @@
616616
"experimentError": None,
617617
"experimentTemplateHistoryId": 31989,
618618
"experimentTemplateId": 8,
619-
"experimentTypeId": 1,
619+
"experimentType": 1,
620620
"handle": "esbipxwngbmji4",
621621
"id": 31987,
622622
"projectHandle": "pr4yxj956",
@@ -667,7 +667,7 @@
667667
"experimentError": None,
668668
"experimentTemplateHistoryId": 33353,
669669
"experimentTemplateId": 2257,
670-
"experimentTypeId": 1,
670+
"experimentType": 1,
671671
"handle": "e8lufvr2bh8ld",
672672
"id": 33351,
673673
"projectHandle": "pr1opq9uz",
@@ -704,7 +704,7 @@
704704
"experimentError": "Expecting value: line 1 column 1 (char 0)",
705705
"experimentTemplateHistoryId": 33352,
706706
"experimentTemplateId": 2257,
707-
"experimentTypeId": 1,
707+
"experimentType": 1,
708708
"handle": "esasysj42i2j2s",
709709
"id": 33350,
710710
"projectHandle": "pr1opq9uz",
@@ -717,7 +717,7 @@
717717
"experimentTemplateId": 2257,
718718
"id": 33352,
719719
"params": {
720-
"experimentTypeId": 1,
720+
"experimentType": 1,
721721
"name": "dsfads",
722722
"ports": 5000,
723723
"project_handle": "pr1opq9uz",
@@ -742,7 +742,7 @@
742742
"experimentError": None,
743743
"experimentTemplateHistoryId": 32879,
744744
"experimentTemplateId": 2257,
745-
"experimentTypeId": 1,
745+
"experimentType": 1,
746746
"handle": "estgm33hfbqf5k",
747747
"id": 32877,
748748
"projectHandle": "pr1opq9uz",
@@ -782,7 +782,7 @@
782782
"experimentError": None,
783783
"experimentTemplateHistoryId": 32878,
784784
"experimentTemplateId": 2257,
785-
"experimentTypeId": 1,
785+
"experimentType": 1,
786786
"handle": "esbo3pisqq3t68",
787787
"id": 32876,
788788
"projectHandle": "pr1opq9uz",
@@ -822,7 +822,7 @@
822822
"experimentError": None,
823823
"experimentTemplateHistoryId": 32877,
824824
"experimentTemplateId": 2257,
825-
"experimentTypeId": 1,
825+
"experimentType": 1,
826826
"handle": "eso8s7e014681",
827827
"id": 32875,
828828
"projectHandle": "pr1opq9uz",
@@ -862,7 +862,7 @@
862862
"experimentError": None,
863863
"experimentTemplateHistoryId": 32876,
864864
"experimentTemplateId": 2257,
865-
"experimentTypeId": 1,
865+
"experimentType": 1,
866866
"handle": "esml2ioetny5o6",
867867
"id": 32874,
868868
"projectHandle": "pr1opq9uz",
@@ -1466,7 +1466,7 @@
14661466
"experimentError": None,
14671467
"experimentTemplateHistoryId": 22159,
14681468
"experimentTemplateId": 60,
1469-
"experimentTypeId": 1,
1469+
"experimentType": 1,
14701470
"handle": "estgcoux8igx32",
14711471
"id": 22123,
14721472
"projectHandle": "prq70zy79",
@@ -1527,7 +1527,7 @@
15271527
"experimentError": None,
15281528
"experimentTemplateHistoryId": 22130,
15291529
"experimentTemplateId": 174,
1530-
"experimentTypeId": 1,
1530+
"experimentType": 1,
15311531
"handle": "ehla1kvbwzaco",
15321532
"id": 22094,
15331533
"projectHandle": "prmr22ve0",
@@ -1589,7 +1589,7 @@
15891589
"experimentError": None,
15901590
"experimentTemplateHistoryId": 22311,
15911591
"experimentTemplateId": 186,
1592-
"experimentTypeId": 1,
1592+
"experimentType": 1,
15931593
"handle": "es47og38wzhnuo",
15941594
"id": 22270,
15951595
"projectHandle": "przhbct98",
@@ -3129,7 +3129,7 @@
31293129
"experimentError": None,
31303130
"experimentTemplateHistoryId": 45987,
31313131
"experimentTemplateId": 8,
3132-
"experimentTypeId": 4,
3132+
"experimentType": 4,
31333133
"handle": "es3dn6fu16r4kk",
31343134
"id": 45980,
31353135
"projectHandle": "pr4yxj956",
@@ -3171,7 +3171,7 @@
31713171
"experimentError": None,
31723172
"experimentTemplateHistoryId": 45986,
31733173
"experimentTemplateId": 8,
3174-
"experimentTypeId": 4,
3174+
"experimentType": 4,
31753175
"handle": "eshlqek7wzvrxa",
31763176
"id": 45979,
31773177
"projectHandle": "pr4yxj956",
@@ -3213,7 +3213,7 @@
32133213
"experimentError": None,
32143214
"experimentTemplateHistoryId": 45985,
32153215
"experimentTemplateId": 8,
3216-
"experimentTypeId": 4,
3216+
"experimentType": 4,
32173217
"handle": "esdwnui5qsk8qm",
32183218
"id": 45978,
32193219
"projectHandle": "pr4yxj956",
@@ -3255,7 +3255,7 @@
32553255
"experimentError": None,
32563256
"experimentTemplateHistoryId": 45984,
32573257
"experimentTemplateId": 8,
3258-
"experimentTypeId": 4,
3258+
"experimentType": 4,
32593259
"handle": "eshz1z9k37w4nm",
32603260
"id": 45977,
32613261
"projectHandle": "pr4yxj956",
@@ -3308,7 +3308,7 @@
33083308
"experimentError": None,
33093309
"experimentTemplateHistoryId": 45973,
33103310
"experimentTemplateId": 8,
3311-
"experimentTypeId": 4,
3311+
"experimentType": 4,
33123312
"handle": "ess6t3fjs2hb1g",
33133313
"id": 45966,
33143314
"projectHandle": "pr4yxj956",

0 commit comments

Comments
 (0)