Skip to content

Commit f5b6dae

Browse files
committed
config variable updated
1 parent 3e18ddc commit f5b6dae

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

servicex_codegen/post_operation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ def post(self):
9191

9292
zip_data = self.stream_generated_code(generated_code_result)
9393
transformer_image = body["transformer_image"] if "transformer_image" in body else current_app.config.get(
94-
"DEFAULT_TRANSFORMER_IMAGE")
95-
transformer_tag = body["transformer_tag"] if "transformer_tag" in body else current_app.config.get(
96-
"DEFAULT_TRANSFORMER_TAG")
94+
"TRANSFORMER_DEFAULT_IMAGE")
9795
# Send the response back to you-know-what.
9896

9997
m = MultipartEncoder(
100-
fields={'transformer_image': transformer_image, 'transformer_tag': transformer_tag,
98+
fields={'transformer_image': transformer_image,
10199
'zip_data': zip_data}
102100
)
103101

tests/test_post_operation.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ def test_post_good_query_with_params(self, mocker):
7676
select_stmt = "(call ResultTTree (call Select (call SelectMany (call EventDataset (list 'localds://did_01')" # noqa: E501
7777

7878
response = client.post("/servicex/generated-code", json={
79-
"transformer_image": "sslhep/servicex_func_adl_xaod_transformer",
80-
"transformer_tag": "develop",
79+
"transformer_image": "sslhep/servicex_func_adl_xaod_transformer:develop",
8180
"code": select_stmt
8281
})
8382

@@ -86,11 +85,9 @@ def test_post_good_query_with_params(self, mocker):
8685
decoder_parts = decoder.MultipartDecoder(response.data, content_type)
8786

8887
transformer_image = str(decoder_parts.parts[0].content, 'utf-8')
89-
transformer_tag = str(decoder_parts.parts[1].content, 'utf-8')
90-
zip_file = decoder_parts.parts[2].content
88+
zip_file = decoder_parts.parts[1].content
9189

9290
print("Transformer Image: ", transformer_image)
93-
print("Transformer Tag: ", transformer_tag)
9491
print("Zip File: ", zip_file)
9592

9693
assert response.status_code == 200
@@ -114,8 +111,7 @@ def test_post_good_query_without_params(self, mocker):
114111

115112
config = {
116113
'TARGET_BACKEND': 'uproot',
117-
'DEFAULT_TRANSFORMER_IMAGE': 'sslhep/servicex_func_adl_xaod_transformer',
118-
'DEFAULT_TRANSFORMER_TAG': 'develop'
114+
'TRANSFORMER_DEFAULT_IMAGE': 'sslhep/servicex_func_adl_xaod_transformer:develop',
119115
}
120116

121117
app = create_app(config, provided_translator=mock_ast_translator)
@@ -134,11 +130,9 @@ def test_post_good_query_without_params(self, mocker):
134130
decoder_parts = decoder.MultipartDecoder(response.data, content_type)
135131

136132
transformer_image = str(decoder_parts.parts[0].content, 'utf-8')
137-
transformer_tag = str(decoder_parts.parts[1].content, 'utf-8')
138-
zip_file = decoder_parts.parts[2].content
133+
zip_file = decoder_parts.parts[1].content
139134

140135
print("Transformer Image: ", transformer_image)
141-
print("Transformer Tag: ", transformer_tag)
142136
print("Zip File: ", zip_file)
143137

144138
assert response.status_code == 200

0 commit comments

Comments
 (0)