@@ -106,18 +106,19 @@ def __init__(
106
106
server_url : str, optional
107
107
specify URL, if unset this is read from the config file
108
108
"""
109
- self ._config = SimvueConfiguration .fetch (
109
+ self ._user_config = SimvueConfiguration .fetch (
110
110
server_token = server_token , server_url = server_url
111
111
)
112
112
113
113
for label , value in zip (
114
- ("URL" , "API token" ), (self ._config .server .url , self ._config .server .url )
114
+ ("URL" , "API token" ),
115
+ (self ._user_config .server .url , self ._user_config .server .url ),
115
116
):
116
117
if not value :
117
118
logger .warning (f"No { label } specified" )
118
119
119
120
self ._headers : dict [str , str ] = {
120
- "Authorization" : f"Bearer { self ._config .server .token } "
121
+ "Authorization" : f"Bearer { self ._user_config .server .token } "
121
122
}
122
123
123
124
def _get_json_from_response (
@@ -182,7 +183,9 @@ def get_run_id_from_name(
182
183
params : dict [str , str ] = {"filters" : json .dumps ([f"name == { name } " ])}
183
184
184
185
response : requests .Response = requests .get (
185
- f"{ self ._config .server .url } /api/runs" , headers = self ._headers , params = params
186
+ f"{ self ._user_config .server .url } /api/runs" ,
187
+ headers = self ._headers ,
188
+ params = params ,
186
189
)
187
190
188
191
json_response = self ._get_json_from_response (
@@ -232,7 +235,7 @@ def get_run(self, run_id: str) -> typing.Optional[dict[str, typing.Any]]:
232
235
"""
233
236
234
237
response : requests .Response = requests .get (
235
- f"{ self ._config .server .url } /api/runs/{ run_id } " , headers = self ._headers
238
+ f"{ self ._user_config .server .url } /api/runs/{ run_id } " , headers = self ._headers
236
239
)
237
240
238
241
json_response = self ._get_json_from_response (
@@ -349,7 +352,9 @@ def get_runs(
349
352
}
350
353
351
354
response = requests .get (
352
- f"{ self ._config .server .url } /api/runs" , headers = self ._headers , params = params
355
+ f"{ self ._user_config .server .url } /api/runs" ,
356
+ headers = self ._headers ,
357
+ params = params ,
353
358
)
354
359
355
360
response .raise_for_status ()
@@ -398,7 +403,7 @@ def delete_run(self, run_id: str) -> typing.Optional[dict]:
398
403
"""
399
404
400
405
response = requests .delete (
401
- f"{ self ._config .server .url } /api/runs/{ run_id } " ,
406
+ f"{ self ._user_config .server .url } /api/runs/{ run_id } " ,
402
407
headers = self ._headers ,
403
408
)
404
409
@@ -434,7 +439,7 @@ def _get_folder_id_from_path(self, path: str) -> typing.Optional[str]:
434
439
params : dict [str , str ] = {"filters" : json .dumps ([f"path == { path } " ])}
435
440
436
441
response : requests .Response = requests .get (
437
- f"{ self ._config .server .url } /api/folders" ,
442
+ f"{ self ._user_config .server .url } /api/folders" ,
438
443
headers = self ._headers ,
439
444
params = params ,
440
445
)
@@ -479,7 +484,7 @@ def delete_runs(
479
484
params : dict [str , bool ] = {"runs_only" : True , "runs" : True }
480
485
481
486
response = requests .delete (
482
- f"{ self ._config .server .url } /api/folders/{ folder_id } " ,
487
+ f"{ self ._user_config .server .url } /api/folders/{ folder_id } " ,
483
488
headers = self ._headers ,
484
489
params = params ,
485
490
)
@@ -545,7 +550,7 @@ def delete_folder(
545
550
params |= {"recursive" : recursive }
546
551
547
552
response = requests .delete (
548
- f"{ self ._config .server .url } /api/folders/{ folder_id } " ,
553
+ f"{ self ._user_config .server .url } /api/folders/{ folder_id } " ,
549
554
headers = self ._headers ,
550
555
params = params ,
551
556
)
@@ -576,7 +581,8 @@ def delete_alert(self, alert_id: str) -> None:
576
581
the unique identifier for the alert
577
582
"""
578
583
response = requests .delete (
579
- f"{ self ._config .server .url } /api/alerts/{ alert_id } " , headers = self ._headers
584
+ f"{ self ._user_config .server .url } /api/alerts/{ alert_id } " ,
585
+ headers = self ._headers ,
580
586
)
581
587
582
588
if response .status_code == http .HTTPStatus .OK :
@@ -611,7 +617,7 @@ def list_artifacts(self, run_id: str) -> list[dict[str, typing.Any]]:
611
617
params : dict [str , str ] = {"runs" : json .dumps ([run_id ])}
612
618
613
619
response : requests .Response = requests .get (
614
- f"{ self ._config .server .url } /api/artifacts" ,
620
+ f"{ self ._user_config .server .url } /api/artifacts" ,
615
621
headers = self ._headers ,
616
622
params = params ,
617
623
)
@@ -637,7 +643,7 @@ def _retrieve_artifact_from_server(
637
643
params : dict [str , str | None ] = {"name" : name }
638
644
639
645
response = requests .get (
640
- f"{ self ._config .server .url } /api/runs/{ run_id } /artifacts" ,
646
+ f"{ self ._user_config .server .url } /api/runs/{ run_id } /artifacts" ,
641
647
headers = self ._headers ,
642
648
params = params ,
643
649
)
@@ -679,7 +685,7 @@ def abort_run(self, run_id: str, reason: str) -> typing.Union[dict, list]:
679
685
body : dict [str , str | None ] = {"id" : run_id , "reason" : reason }
680
686
681
687
response = requests .put (
682
- f"{ self ._config .server .url } /api/runs/abort" ,
688
+ f"{ self ._user_config .server .url } /api/runs/abort" ,
683
689
headers = self ._headers ,
684
690
json = body ,
685
691
)
@@ -873,7 +879,7 @@ def get_artifacts_as_files(
873
879
params : dict [str , typing .Optional [str ]] = {"category" : category }
874
880
875
881
response : requests .Response = requests .get (
876
- f"{ self ._config .server .url } /api/runs/{ run_id } /artifacts" ,
882
+ f"{ self ._user_config .server .url } /api/runs/{ run_id } /artifacts" ,
877
883
headers = self ._headers ,
878
884
params = params ,
879
885
)
@@ -966,7 +972,7 @@ def get_folders(
966
972
}
967
973
968
974
response : requests .Response = requests .get (
969
- f"{ self ._config .server .url } /api/folders" ,
975
+ f"{ self ._user_config .server .url } /api/folders" ,
970
976
headers = self ._headers ,
971
977
params = params ,
972
978
)
@@ -1013,7 +1019,7 @@ def get_metrics_names(self, run_id: str) -> list[str]:
1013
1019
params = {"runs" : json .dumps ([run_id ])}
1014
1020
1015
1021
response : requests .Response = requests .get (
1016
- f"{ self ._config .server .url } /api/metrics/names" ,
1022
+ f"{ self ._user_config .server .url } /api/metrics/names" ,
1017
1023
headers = self ._headers ,
1018
1024
params = params ,
1019
1025
)
@@ -1049,7 +1055,7 @@ def _get_run_metrics_from_server(
1049
1055
}
1050
1056
1051
1057
metrics_response : requests .Response = requests .get (
1052
- f"{ self ._config .server .url } /api/metrics" ,
1058
+ f"{ self ._user_config .server .url } /api/metrics" ,
1053
1059
headers = self ._headers ,
1054
1060
params = params ,
1055
1061
)
@@ -1311,7 +1317,7 @@ def get_events(
1311
1317
}
1312
1318
1313
1319
response = requests .get (
1314
- f"{ self ._config .server .url } /api/events" ,
1320
+ f"{ self ._user_config .server .url } /api/events" ,
1315
1321
headers = self ._headers ,
1316
1322
params = params ,
1317
1323
)
@@ -1368,7 +1374,7 @@ def get_alerts(
1368
1374
params : dict [str , int ] = {"count" : count_limit or 0 , "start" : start_index or 0 }
1369
1375
if not run_id :
1370
1376
response = requests .get (
1371
- f"{ self ._config .server .url } /api/alerts/" ,
1377
+ f"{ self ._user_config .server .url } /api/alerts/" ,
1372
1378
headers = self ._headers ,
1373
1379
params = params ,
1374
1380
)
@@ -1380,7 +1386,7 @@ def get_alerts(
1380
1386
)
1381
1387
else :
1382
1388
response = requests .get (
1383
- f"{ self ._config .server .url } /api/runs/{ run_id } " ,
1389
+ f"{ self ._user_config .server .url } /api/runs/{ run_id } " ,
1384
1390
headers = self ._headers ,
1385
1391
params = params ,
1386
1392
)
@@ -1457,7 +1463,9 @@ def get_tags(
1457
1463
"""
1458
1464
params = {"count" : count_limit or 0 , "start" : start_index or 0 }
1459
1465
response = requests .get (
1460
- f"{ self ._config .server .url } /api/tags" , headers = self ._headers , params = params
1466
+ f"{ self ._user_config .server .url } /api/tags" ,
1467
+ headers = self ._headers ,
1468
+ params = params ,
1461
1469
)
1462
1470
1463
1471
json_response = self ._get_json_from_response (
@@ -1491,7 +1499,7 @@ def delete_tag(self, tag_id: str) -> None:
1491
1499
"""
1492
1500
1493
1501
response = requests .delete (
1494
- f"{ self ._config .server .url } /api/tags/{ tag_id } " ,
1502
+ f"{ self ._user_config .server .url } /api/tags/{ tag_id } " ,
1495
1503
headers = self ._headers ,
1496
1504
)
1497
1505
@@ -1533,7 +1541,7 @@ def get_tag(self, tag_id: str) -> typing.Optional[dict[str, typing.Any]]:
1533
1541
"""
1534
1542
1535
1543
response : requests .Response = requests .get (
1536
- f"{ self ._config .server .url } /api/tag/{ tag_id } " , headers = self ._headers
1544
+ f"{ self ._user_config .server .url } /api/tag/{ tag_id } " , headers = self ._headers
1537
1545
)
1538
1546
1539
1547
json_response = self ._get_json_from_response (
0 commit comments