Skip to content

Commit 4603377

Browse files
authored
Format code according to standards. (#25)
I used `ruff` to format code, which is compatible with `black`, Python's de facto standard formatter.
1 parent ce9a6f8 commit 4603377

File tree

12 files changed

+140
-126
lines changed

12 files changed

+140
-126
lines changed

resources/constants.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is not a secret, but a path to a file that contains a secret
2-
MINDER_OFFLINE_TOKEN_PATH = 'MINDER_OFFLINE_TOKEN_PATH' # nosec
3-
MINDER_CONFIG = 'MINDER_CONFIG' # nosec
2+
MINDER_OFFLINE_TOKEN_PATH = "MINDER_OFFLINE_TOKEN_PATH" # nosec
3+
MINDER_CONFIG = "MINDER_CONFIG" # nosec
44

5-
MINDER_API_ENDPOINT = 'api.stacklok.com:443'
6-
MINDER_REST_ENDPOINT = 'cloud.stacklok.com:443'
5+
MINDER_API_ENDPOINT = "api.stacklok.com:443"
6+
MINDER_REST_ENDPOINT = "cloud.stacklok.com:443"

resources/eval_history_service.py

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
from robot.api.deco import keyword
44
from resources.minder_restapi_lib import MinderRestApiLib
55
from resources.errors import ConfigurationError, APIError
6-
from tenacity import retry, stop_after_attempt, wait_exponential, retry_if_exception_type
6+
from tenacity import (
7+
retry,
8+
stop_after_attempt,
9+
wait_exponential,
10+
retry_if_exception_type,
11+
)
712

813

914
class EvalHistoryService:
@@ -30,14 +35,11 @@ def client_retrieves_eval_history(self):
3035
if not provider:
3136
raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
3237

33-
params = {
34-
"provider": provider,
35-
"context.project": project
36-
}
38+
params = {"provider": provider, "context.project": project}
3739

3840
try:
3941
rest_api = MinderRestApiLib()
40-
self.history = rest_api.get_request('/history', params=params)
42+
self.history = rest_api.get_request("/history", params=params)
4143
except Exception as e:
4244
raise APIError(f"API request failed: {str(e)}")
4345

@@ -90,7 +92,7 @@ def history_is_not_empty(self):
9092
stop=stop_after_attempt(3),
9193
wait=wait_exponential(multiplier=1, min=1, max=10),
9294
retry=(retry_if_exception_type(APIError) | retry_if_exception_type(ValueError)),
93-
reraise=True
95+
reraise=True,
9496
)
9597
def client_retrieves_non_empty_eval_history(self):
9698
"""
@@ -113,14 +115,11 @@ def client_retrieves_non_empty_eval_history(self):
113115
if not provider:
114116
raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
115117

116-
params = {
117-
"provider": provider,
118-
"context.project": project
119-
}
118+
params = {"provider": provider, "context.project": project}
120119

121120
try:
122121
rest_api = MinderRestApiLib()
123-
self.history = rest_api.get_request('/history', params=params)
122+
self.history = rest_api.get_request("/history", params=params)
124123
if not self.history or not self.history.get("data"):
125124
raise ValueError("Retrieved history is empty")
126125
except Exception as e:
@@ -173,14 +172,11 @@ def client_retrieves_eval_history_by_id(self, history_id):
173172
if not provider:
174173
raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
175174

176-
params = {
177-
"provider": provider,
178-
"context.project": project
179-
}
175+
params = {"provider": provider, "context.project": project}
180176

181177
try:
182178
rest_api = MinderRestApiLib()
183-
response = rest_api.get_request(f'/history/{history_id}', params=params)
179+
response = rest_api.get_request(f"/history/{history_id}", params=params)
184180
return response
185181
except Exception as e:
186182
raise APIError(f"API request failed: {str(e)}")

resources/eval_results_service.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@ def client_retrieves_eval_results(self):
2929
if not provider:
3030
raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
3131

32-
params = {
33-
"provider": provider,
34-
"context.project": project
35-
}
32+
params = {"provider": provider, "context.project": project}
3633

3734
try:
3835
rest_api = MinderRestApiLib()
39-
self.results = rest_api.get_request('/results', params=params)
36+
self.results = rest_api.get_request("/results", params=params)
4037
except Exception as e:
4138
raise APIError(f"API request failed: {str(e)}")
4239

resources/github.py

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
def randstring(size=6, chars=string.ascii_uppercase + string.digits):
10-
return ''.join(random.choice(chars) for _ in range(size)) # nosec B311
10+
return "".join(random.choice(chars) for _ in range(size)) # nosec B311
1111

1212

1313
def randint():
@@ -24,33 +24,46 @@ def random_repo_name(self, org, base_name):
2424

2525
@keyword
2626
def a_copy_of_repo(self, repo_template, repo_name):
27-
"""Fork the given repo using base_name as name.
28-
29-
"""
27+
"""Fork the given repo using base_name as name."""
3028
# gh repo create $repo_name --template $repo_template --public --include-all-branches
31-
logger.info(gh.repo.create(repo_name, "--template", repo_template, "--public", "--include-all-branches"))
29+
logger.info(
30+
gh.repo.create(
31+
repo_name,
32+
"--template",
33+
repo_template,
34+
"--public",
35+
"--include-all-branches",
36+
)
37+
)
3238
self.repos.append(repo_name)
3339

3440
@keyword
3541
def delete_repo(self, repo_name):
36-
"""Delete repository from GitHub.
37-
38-
"""
42+
"""Delete repository from GitHub."""
3943
# gh repo delete $repo_name --yes
4044
logger.info(gh.repo.delete(repo_name, "--yes"))
4145

4246
@keyword
4347
def cleanup_github_repos(self):
44-
"""Deletes all created repositories.
45-
46-
"""
48+
"""Deletes all created repositories."""
4749
for repo_name in self.repos:
4850
self.delete_repo(repo_name)
4951

5052
@keyword
5153
def create_pr(self, repo_name, pr_title):
52-
"""Opens a Pull Request against repository.
53-
54-
"""
54+
"""Opens a Pull Request against repository."""
5555
# gh pr create --base main --head $PR_TITLE --title $PR_TITLE --body $PR_TITLE
56-
logger.info(gh.pr.create("--base", "main", "--head", pr_title, "--title", pr_title, "--body", pr_title, "--repo", repo_name))
56+
logger.info(
57+
gh.pr.create(
58+
"--base",
59+
"main",
60+
"--head",
61+
pr_title,
62+
"--title",
63+
pr_title,
64+
"--body",
65+
pr_title,
66+
"--repo",
67+
repo_name,
68+
)
69+
)

resources/helpers.py

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,33 @@
33
from sh import minder
44

55
from robot.api import logger
6-
from resources.constants import MINDER_CONFIG, MINDER_OFFLINE_TOKEN_PATH, MINDER_API_ENDPOINT
6+
from resources.constants import (
7+
MINDER_CONFIG,
8+
MINDER_OFFLINE_TOKEN_PATH,
9+
MINDER_API_ENDPOINT,
10+
)
711

812

913
def _get_url_from_config(server_type):
1014
"""Helper function to read config and return URL for a given server type."""
1115
minder_config_path = os.getenv(MINDER_CONFIG)
1216
if not minder_config_path:
13-
raise Exception(f'{MINDER_CONFIG} environment variable is not set')
17+
raise Exception(f"{MINDER_CONFIG} environment variable is not set")
1418

15-
with open(minder_config_path, 'r') as file:
19+
with open(minder_config_path, "r") as file:
1620
config = yaml.safe_load(file)
1721

18-
host = config[f'{server_type}_server'].get('host', None)
22+
host = config[f"{server_type}_server"].get("host", None)
1923
if not host:
20-
raise Exception(f"Missing expected configuration key: {server_type}_server.host")
21-
port = config[f'{server_type}_server'].get('port', None)
24+
raise Exception(
25+
f"Missing expected configuration key: {server_type}_server.host"
26+
)
27+
port = config[f"{server_type}_server"].get("port", None)
2228

23-
if server_type == 'http':
24-
protocol = 'http://'
29+
if server_type == "http":
30+
protocol = "http://"
2531
if port == 443:
26-
protocol = 'https://'
32+
protocol = "https://"
2733
if port is None:
2834
return f"{protocol}{host}"
2935
return f"{protocol}{host}:{port}"
@@ -36,26 +42,26 @@ def _get_url_from_config(server_type):
3642
def get_rest_url_from_config():
3743
"""Reads the MINDER_CONFIG environment variable, loads the YAML config, and returns the REST BASE_URL."""
3844
try:
39-
return _get_url_from_config('http')
45+
return _get_url_from_config("http")
4046
except FileNotFoundError:
41-
return f'https://{MINDER_API_ENDPOINT}'
47+
return f"https://{MINDER_API_ENDPOINT}"
4248

4349

4450
def get_grpc_url_from_config():
4551
"""Reads the MINDER_CONFIG environment variable, loads the YAML config, and returns the gRPC BASE_URL."""
4652
try:
47-
return _get_url_from_config('grpc')
53+
return _get_url_from_config("grpc")
4854
except FileNotFoundError:
4955
return MINDER_API_ENDPOINT
5056

5157

5258
def log_into_minder():
53-
logger.info('Logging into minder')
59+
logger.info("Logging into minder")
5460
if MINDER_OFFLINE_TOKEN_PATH not in os.environ:
55-
raise Exception(f'{MINDER_OFFLINE_TOKEN_PATH} env variable is not set')
61+
raise Exception(f"{MINDER_OFFLINE_TOKEN_PATH} env variable is not set")
5662
tokenpath = os.environ[MINDER_OFFLINE_TOKEN_PATH]
5763
if not tokenpath:
5864
raise Exception("MINDER_OFFLINE_TOKEN_PATH env variable is empty")
5965

60-
logger.info(minder.auth('offline-token', 'use', '--file', tokenpath))
66+
logger.info(minder.auth("offline-token", "use", "--file", tokenpath))
6167
return True

resources/minder_restapi_lib.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ def _get_bearer_token(self):
2828
"""Extracts the Bearer token from the credentials.json file."""
2929
credentials_path = os.path.expanduser("~/.config/minder/credentials.json")
3030
try:
31-
with open(credentials_path, 'r') as f:
31+
with open(credentials_path, "r") as f:
3232
credentials = json.load(f)
3333

34-
bearer_token = credentials.get('access_token')
34+
bearer_token = credentials.get("access_token")
3535
if not bearer_token:
3636
raise Exception("No access_token found in credentials file")
3737

@@ -45,13 +45,15 @@ def _get_bearer_token(self):
4545
def _make_request(self, method, path, **kwargs):
4646
url = f"{self.base_url}{self.api_endpoint}{path}"
4747
headers = self.create_authorization_header()
48-
headers.update(kwargs.pop('headers', {}))
48+
headers.update(kwargs.pop("headers", {}))
4949

5050
logger.info(f"Sending {method} request to {url}")
5151
try:
5252
logger.debug(f"Request: {kwargs}")
5353
response = requests.request(method, url, headers=headers, **kwargs)
54-
logger.debug(f"Request ID: \'{response.headers['grpc-metadata-request-id']}\'")
54+
logger.debug(
55+
f"Request ID: '{response.headers['grpc-metadata-request-id']}'"
56+
)
5557
logger.debug(f"Response: {response.json()}")
5658
response.raise_for_status()
5759
return response.json()
@@ -61,16 +63,16 @@ def _make_request(self, method, path, **kwargs):
6163

6264
@keyword
6365
def get_request(self, path, **kwargs):
64-
return self._make_request('GET', path, **kwargs)
66+
return self._make_request("GET", path, **kwargs)
6567

6668
@keyword
6769
def post_request(self, path, **kwargs):
68-
return self._make_request('POST', path, **kwargs)
70+
return self._make_request("POST", path, **kwargs)
6971

7072
@keyword
7173
def patch_request(self, path, **kwargs):
72-
return self._make_request('PATCH', path, **kwargs)
74+
return self._make_request("PATCH", path, **kwargs)
7375

7476
@keyword
7577
def delete_request(self, path, **kwargs):
76-
return self._make_request('DELETE', path, **kwargs)
78+
return self._make_request("DELETE", path, **kwargs)

0 commit comments

Comments
 (0)