Skip to content

Commit 09188f7

Browse files
guzzijonesguzzijones
committed
black formatting
1 parent 07ed858 commit 09188f7

15 files changed

Lines changed: 63 additions & 49 deletions

File tree

‎st2api/st2api/controllers/v1/actionexecutions.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,11 @@ def post(self, spec_api, id, requester_user, no_merge=False, show_secrets=False)
634634
# Merge in any parameters provided by the user
635635
new_parameters = {}
636636
original_parameters = getattr(existing_execution, "parameters", b"{}")
637-
original_params_decoded = JSONDictEscapedFieldCompatibilityField().parse_field_value(original_parameters)
637+
original_params_decoded = (
638+
JSONDictEscapedFieldCompatibilityField().parse_field_value(
639+
original_parameters
640+
)
641+
)
638642
if not no_merge:
639643
new_parameters.update(original_params_decoded)
640644
new_parameters.update(spec_api.parameters)
@@ -867,9 +871,7 @@ def update_status(liveaction_api, liveaction_db):
867871
liveaction_db = action_service.update_status(
868872
liveaction_db, status, result, set_result_size=True
869873
)
870-
actionexecution_db = ActionExecution.get(
871-
liveaction=str(liveaction_db.id)
872-
)
874+
actionexecution_db = ActionExecution.get(liveaction=str(liveaction_db.id))
873875
return (liveaction_db, actionexecution_db)
874876

875877
try:

‎st2api/st2api/controllers/v1/aliasexecution.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,9 @@ def _post(self, payload, requester_user, show_secrets=False, match_multiple=Fals
188188
mask_secrets = self._get_mask_secrets(
189189
requester_user, show_secrets=show_secrets
190190
)
191-
liveaction = LiveActionAPI.from_model(liveaction,
192-
mask_secrets=mask_secrets)
191+
liveaction = LiveActionAPI.from_model(
192+
liveaction, mask_secrets=mask_secrets
193+
)
193194
execution.liveaction = liveaction
194195
result = {
195196
"execution": execution,

‎st2api/tests/unit/controllers/v1/test_alias_execution.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def test_execution_secret_parameter(self, request):
159159
self.assertEqual(post_resp.status_int, 201)
160160
expected_parameters = {"param1": "value1", "param4": SUPER_SECRET_PARAMETER}
161161
self.assertEqual(request.call_args[0][0].parameters, expected_parameters)
162-
#above working
162+
# above working
163163
post_resp = self._do_post(
164164
alias_execution=self.alias4,
165165
command=command,

‎st2api/tests/unit/controllers/v1/test_executions_filters.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ def setUpClass(cls):
6262
"runner": copy.deepcopy(fixture.ARTIFACTS["runners"]["action-chain"]),
6363
"liveaction": fixture.ARTIFACTS["liveactions"]["workflow"]["id"],
6464
"status": fixture.ARTIFACTS["liveactions"]["workflow"]["status"],
65-
"result": copy.deepcopy(fixture.ARTIFACTS["liveactions"]["workflow"]["result"]),
65+
"result": copy.deepcopy(
66+
fixture.ARTIFACTS["liveactions"]["workflow"]["result"]
67+
),
6668
"context": copy.deepcopy(fixture.ARTIFACTS["context"]),
6769
"children": [],
6870
},
@@ -71,8 +73,9 @@ def setUpClass(cls):
7173
"runner": copy.deepcopy(fixture.ARTIFACTS["runners"]["run-local"]),
7274
"liveaction": fixture.ARTIFACTS["liveactions"]["task1"]["id"],
7375
"status": fixture.ARTIFACTS["liveactions"]["task1"]["status"],
74-
"result": copy.deepcopy(fixture.ARTIFACTS["liveactions"]["task1"]["result"]),
75-
76+
"result": copy.deepcopy(
77+
fixture.ARTIFACTS["liveactions"]["task1"]["result"]
78+
),
7679
},
7780
]
7881

‎st2common/st2common/fields.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,9 @@ class JSONDictField(BinaryField):
365365
"""
366366

367367
def __init__(self, *args, **kwargs):
368-
self.compression_algorithm = JSONDictFieldCompressionAlgorithmEnum.ZSTANDARD.value
368+
self.compression_algorithm = (
369+
JSONDictFieldCompressionAlgorithmEnum.ZSTANDARD.value
370+
)
369371
super(JSONDictField, self).__init__(*args, **kwargs)
370372

371373
def to_mongo(self, value):

‎st2common/st2common/models/api/action.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,23 +441,22 @@ class LiveActionAPI(BaseAPI):
441441
},
442442
"additionalProperties": False,
443443
}
444-
skip_unescape_field_names = [
445-
"result",
446-
"parameters"
447-
]
444+
skip_unescape_field_names = ["result", "parameters"]
448445

449446
@classmethod
450447
def convert_raw(cls, doc, raw_values):
451448
"""
452449
override this class to
453-
convert any raw byte values into dict
450+
convert any raw byte values into dict
454451
455452
:param doc: dict
456453
:param raw_values: dict[field]:bytestring
457454
"""
458455

459456
for field_name, field_value in raw_values.items():
460-
doc[field_name] = JSONDictEscapedFieldCompatibilityField().parse_field_value(field_value)
457+
doc[
458+
field_name
459+
] = JSONDictEscapedFieldCompatibilityField().parse_field_value(field_value)
461460
return doc
462461

463462
@classmethod

‎st2common/st2common/models/api/base.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ def validate(self):
8787

8888
@classmethod
8989
def _from_model(cls, model, mask_secrets=False):
90-
unescape_fields = [k for k, v in model._fields.items() if type(v) in
91-
[EscapedDynamicField, EscapedDictField]]
90+
unescape_fields = [
91+
k
92+
for k, v in model._fields.items()
93+
if type(v) in [EscapedDynamicField, EscapedDictField]
94+
]
9295
unescape_fields = set(unescape_fields) - set(cls.skip_unescape_field_names)
9396
doc = model.to_mongo()
9497

@@ -117,7 +120,7 @@ def _from_model(cls, model, mask_secrets=False):
117120
def convert_raw(cls, doc, raw_values):
118121
"""
119122
override this class to
120-
convert any raw byte values into dict
123+
convert any raw byte values into dict
121124
you can also use this to fix any other fields that need 'fixing'
122125
123126
:param doc: dict

‎st2common/st2common/models/api/execution.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,7 @@ class ActionExecutionAPI(BaseAPI):
146146
},
147147
"additionalProperties": False,
148148
}
149-
skip_unescape_field_names = [
150-
"result",
151-
"parameters"
152-
]
149+
skip_unescape_field_names = ["result", "parameters"]
153150

154151
@classmethod
155152
def from_model(cls, model, mask_secrets=False):
@@ -176,14 +173,16 @@ def from_model(cls, model, mask_secrets=False):
176173
def convert_raw(cls, doc, raw_values):
177174
"""
178175
override this class to
179-
convert any raw byte values into dict
176+
convert any raw byte values into dict
180177
181178
:param doc: dict
182179
:param raw_values: dict[field]:bytestring
183180
"""
184181

185182
for field_name, field_value in raw_values.items():
186-
doc[field_name] = JSONDictEscapedFieldCompatibilityField().parse_field_value(field_value)
183+
doc[
184+
field_name
185+
] = JSONDictEscapedFieldCompatibilityField().parse_field_value(field_value)
187186
return doc
188187

189188
@classmethod

‎st2common/st2common/models/db/execution.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from st2common.util.secrets import mask_inquiry_response
3030
from st2common.util.secrets import mask_secret_parameters
3131
from st2common.constants.types import ResourceType
32+
3233
__all__ = ["ActionExecutionDB", "ActionExecutionOutputDB"]
3334

3435

‎st2common/st2common/services/policies.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ def apply_pre_run_policies(lv_ac_db):
6565
traceback_var = "".join(traceback.format_tb(tb, 20))
6666
message = 'An exception occurred while applying policy "%s" (%s) for liveaction "%s". traceback "%s"'
6767
LOG.exception(
68-
message % (policy_db.ref, policy_db.policy_type, str(lv_ac_db.id), traceback_var)
68+
message
69+
% (
70+
policy_db.ref,
71+
policy_db.policy_type,
72+
str(lv_ac_db.id),
73+
traceback_var,
74+
)
6975
)
7076

7177
if lv_ac_db.status == ac_const.LIVEACTION_STATUS_DELAYED:

0 commit comments

Comments
 (0)