Skip to content

Commit 7886df1

Browse files
paaragonpaaragon
committed
fix lint
1 parent a190e89 commit 7886df1

File tree

3 files changed

+36
-55
lines changed

3 files changed

+36
-55
lines changed

‎gateway/api/models.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ class Provider(models.Model):
5656
)
5757
url = models.TextField(null=True, blank=True, default=None)
5858
icon_url = models.TextField(null=True, blank=True, default=None)
59-
registry = models.CharField(
60-
max_length=255, null=True, blank=True, default=None)
59+
registry = models.CharField(max_length=255, null=True, blank=True, default=None)
6160
admin_groups = models.ManyToManyField(Group)
6261

6362
def __str__(self):
@@ -88,7 +87,8 @@ class Program(ExportModelOperationsMixin("program"), models.Model):
8887

8988
disabled = models.BooleanField(default=False, null=True)
9089
disabled_message = models.TextField(
91-
default=DEFAULT_DISABLED_MESSAGE, null=True, blank=True)
90+
default=DEFAULT_DISABLED_MESSAGE, null=True, blank=True
91+
)
9292
type = models.CharField(
9393
max_length=20,
9494
choices=PROGRAM_TYPES,
@@ -98,8 +98,7 @@ class Program(ExportModelOperationsMixin("program"), models.Model):
9898
documentation_url = models.TextField(null=True, blank=True, default=None)
9999
additional_info = models.TextField(null=True, blank=True, default="{}")
100100

101-
entrypoint = models.CharField(
102-
max_length=255, default=DEFAULT_PROGRAM_ENTRYPOINT)
101+
entrypoint = models.CharField(max_length=255, default=DEFAULT_PROGRAM_ENTRYPOINT)
103102
artifact = models.FileField(
104103
upload_to=get_upload_path,
105104
null=True,
@@ -215,8 +214,7 @@ class Job(models.Model):
215214
null=True,
216215
blank=True,
217216
)
218-
program = models.ForeignKey(
219-
to=Program, on_delete=models.SET_NULL, null=True)
217+
program = models.ForeignKey(to=Program, on_delete=models.SET_NULL, null=True)
220218

221219
def __str__(self):
222220
return f"<Job {self.id} | {self.status}>"
@@ -253,8 +251,7 @@ class GroupMetadata(models.Model):
253251
created = models.DateTimeField(auto_now_add=True, editable=False)
254252

255253
# This field will store the account_id from IBM Cloud.
256-
account = models.CharField(
257-
max_length=255, blank=True, null=True, default=None)
254+
account = models.CharField(max_length=255, blank=True, null=True, default=None)
258255

259256
group = models.OneToOneField(
260257
Group, on_delete=models.CASCADE, related_name="metadata"

‎gateway/api/views/programs.py

+14-18
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@
3939
endpoint=os.environ.get(
4040
"OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", "http://otel-collector:4317"
4141
),
42-
insecure=bool(
43-
int(os.environ.get("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "0"))),
42+
insecure=bool(int(os.environ.get("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "0"))),
4443
)
4544
)
4645
provider.add_span_processor(otel_exporter)
4746
if bool(int(os.environ.get("OTEL_ENABLED", "0"))):
48-
trace._set_tracer_provider(
49-
provider, log=False) # pylint: disable=protected-access
47+
trace._set_tracer_provider(provider, log=False) # pylint: disable=protected-access
5048

5149

5250
class ProgramViewSet(viewsets.GenericViewSet):
@@ -176,8 +174,7 @@ def upload(self, request):
176174
)
177175

178176
if program is not None:
179-
logger.info(
180-
"Program found. [%s] is going to be updated", title)
177+
logger.info("Program found. [%s] is going to be updated", title)
181178
serializer = self.get_serializer_upload_program(
182179
program, data=request.data
183180
)
@@ -195,7 +192,7 @@ def upload(self, request):
195192
return Response(serializer.data)
196193

197194
@action(methods=["POST"], detail=False)
198-
def run(self, request):
195+
def run(self, request): # pylint: disable=too-many-locals
199196
"""Enqueues existing program."""
200197
tracer = trace.get_tracer("gateway.tracer")
201198
ctx = TraceContextTextMapPropagator().extract(carrier=request.headers)
@@ -220,15 +217,18 @@ def run(self, request):
220217
provider_name=provider_name,
221218
)
222219
if function is None:
223-
logger.error(
224-
"Qiskit Pattern [%s] was not found.", function_title)
220+
logger.error("Qiskit Pattern [%s] was not found.", function_title)
225221
return Response(
226222
{"message": f"Qiskit Pattern [{function_title}] was not found."},
227223
status=status.HTTP_404_NOT_FOUND,
228224
)
229225

230226
if function.disabled:
231-
error_message = function.disabled_message if function.disabled_message else Program.DEFAULT_DISABLED_MESSAGE
227+
error_message = (
228+
function.disabled_message
229+
if function.disabled_message
230+
else Program.DEFAULT_DISABLED_MESSAGE
231+
)
232232
return Response(
233233
{"message": error_message},
234234
status=status.HTTP_423_LOCKED,
@@ -237,10 +237,8 @@ def run(self, request):
237237
jobconfig = None
238238
config_json = serializer.data.get("config")
239239
if config_json:
240-
logger.info(
241-
"Configuration for [%s] was found.", function_title)
242-
job_config_serializer = self.get_serializer_job_config(
243-
data=config_json)
240+
logger.info("Configuration for [%s] was found.", function_title)
241+
job_config_serializer = self.get_serializer_job_config(data=config_json)
244242
if not job_config_serializer.is_valid():
245243
logger.error(
246244
"JobConfigSerializer validation failed:\n %s",
@@ -289,8 +287,7 @@ def get_by_title(self, request, title):
289287
"""Returns programs by title."""
290288
author = self.request.user
291289
function_title = sanitize_name(title)
292-
provider_name = sanitize_name(
293-
request.query_params.get("provider", None))
290+
provider_name = sanitize_name(request.query_params.get("provider", None))
294291

295292
serializer = self.get_serializer_upload_program(data=self.request.data)
296293
provider_name, function_title = serializer.get_provider_name_and_title(
@@ -334,8 +331,7 @@ def get_jobs(
334331
if program.provider:
335332
admin_groups = program.provider.admin_groups.all()
336333
user_groups = request.user.groups.all()
337-
user_is_provider = any(
338-
group in admin_groups for group in user_groups)
334+
user_is_provider = any(group in admin_groups for group in user_groups)
339335

340336
if user_is_provider:
341337
jobs = Job.objects.filter(program=program)

‎gateway/tests/api/test_v1_program.py

+16-28
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ def test_programs_list(self):
2929
user = models.User.objects.get(username="test_user")
3030
self.client.force_authenticate(user=user)
3131

32-
programs_response = self.client.get(
33-
reverse("v1:programs-list"), format="json")
32+
programs_response = self.client.get(reverse("v1:programs-list"), format="json")
3433

3534
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
3635
self.assertEqual(len(programs_response.data), 3)
@@ -45,8 +44,7 @@ def test_provider_programs_list(self):
4544
user = models.User.objects.get(username="test_user_2")
4645
self.client.force_authenticate(user=user)
4746

48-
programs_response = self.client.get(
49-
reverse("v1:programs-list"), format="json")
47+
programs_response = self.client.get(reverse("v1:programs-list"), format="json")
5048

5149
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
5250
self.assertEqual(len(programs_response.data), 1)
@@ -162,8 +160,7 @@ def test_run_locked(self):
162160
)
163161

164162
self.assertEqual(programs_response.status_code, status.HTTP_423_LOCKED)
165-
self.assertEqual(programs_response.data.get(
166-
"message"), "Program is locked")
163+
self.assertEqual(programs_response.data.get("message"), "Program is locked")
167164

168165
def test_run_locked_default_msg(self):
169166
"""Tests run disabled program."""
@@ -188,8 +185,9 @@ def test_run_locked_default_msg(self):
188185
)
189186

190187
self.assertEqual(programs_response.status_code, status.HTTP_423_LOCKED)
191-
self.assertEqual(programs_response.data.get(
192-
"message"), Program.DEFAULT_DISABLED_MESSAGE)
188+
self.assertEqual(
189+
programs_response.data.get("message"), Program.DEFAULT_DISABLED_MESSAGE
190+
)
193191

194192
def test_upload_private_function(self):
195193
"""Tests upload end-point authorized."""
@@ -230,8 +228,7 @@ def test_upload_custom_image_without_provider(self):
230228
"image": "icr.io/awesome-namespace/awesome-title",
231229
},
232230
)
233-
self.assertEqual(programs_response.status_code,
234-
status.HTTP_400_BAD_REQUEST)
231+
self.assertEqual(programs_response.status_code, status.HTTP_400_BAD_REQUEST)
235232

236233
def test_upload_custom_image_without_access_to_the_provider(self):
237234
"""Tests upload end-point authorized."""
@@ -250,8 +247,7 @@ def test_upload_custom_image_without_access_to_the_provider(self):
250247
"provider": "ibm",
251248
},
252249
)
253-
self.assertEqual(programs_response.status_code,
254-
status.HTTP_404_NOT_FOUND)
250+
self.assertEqual(programs_response.status_code, status.HTTP_404_NOT_FOUND)
255251

256252
programs_response = self.client.post(
257253
"/api/v1/programs/upload/",
@@ -262,8 +258,7 @@ def test_upload_custom_image_without_access_to_the_provider(self):
262258
"image": "docker.io/awesome-namespace/awesome-title",
263259
},
264260
)
265-
self.assertEqual(programs_response.status_code,
266-
status.HTTP_404_NOT_FOUND)
261+
self.assertEqual(programs_response.status_code, status.HTTP_404_NOT_FOUND)
267262

268263
def test_upload_provider_function(self):
269264
"""Tests upload end-point authorized."""
@@ -314,8 +309,7 @@ def test_upload_provider_function_with_title(self):
314309
self.assertEqual(
315310
programs_response.data.get("entrypoint"), "test_user_3_program.py"
316311
)
317-
self.assertEqual(programs_response.data.get(
318-
"title"), "Provider Function")
312+
self.assertEqual(programs_response.data.get("title"), "Provider Function")
319313
self.assertRaises(
320314
Program.DoesNotExist,
321315
Program.objects.get,
@@ -343,8 +337,7 @@ def test_upload_authorization_error(self):
343337
"provider": "default",
344338
},
345339
)
346-
self.assertEqual(programs_response.status_code,
347-
status.HTTP_404_NOT_FOUND)
340+
self.assertEqual(programs_response.status_code, status.HTTP_404_NOT_FOUND)
348341

349342
def test_upload_provider_function_with_description(self):
350343
"""Tests upload end-point authorized."""
@@ -372,8 +365,7 @@ def test_upload_provider_function_with_description(self):
372365
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
373366
self.assertEqual(programs_response.data.get("provider"), "default")
374367

375-
programs_response = self.client.get(
376-
reverse("v1:programs-list"), format="json")
368+
programs_response = self.client.get(reverse("v1:programs-list"), format="json")
377369

378370
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
379371
self.assertEqual(len(programs_response.data), 2)
@@ -408,8 +400,7 @@ def test_list_runtimejob(self):
408400
"/api/v1/jobs/8317718f-5c0d-4fb6-9947-72e480b8a348/list_runtimejob/",
409401
format="json",
410402
)
411-
self.assertEqual(programs_response.json(),
412-
'["runtime_job_1", "runtime_job_2"]')
403+
self.assertEqual(programs_response.json(), '["runtime_job_1", "runtime_job_2"]')
413404

414405
programs_response = self.client.get(
415406
"/api/v1/jobs/57fc2e4d-267f-40c6-91a3-38153272e764/list_runtimejob/",
@@ -442,8 +433,7 @@ def test_get_by_title(self):
442433
{"provider": "non-existing"},
443434
format="json",
444435
)
445-
self.assertEqual(
446-
programs_response_non_existing_provider.status_code, 404)
436+
self.assertEqual(programs_response_non_existing_provider.status_code, 404)
447437

448438
programs_response_do_not_have_access = self.client.get(
449439
"/api/v1/programs/get_by_title/Program/",
@@ -505,8 +495,7 @@ def test_upload_private_function_update_without_description(self):
505495

506496
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
507497
self.assertEqual(
508-
programs_response.data.get(
509-
"description"), "Program description test"
498+
programs_response.data.get("description"), "Program description test"
510499
)
511500

512501
def test_upload_private_function_update_description(self):
@@ -530,5 +519,4 @@ def test_upload_private_function_update_description(self):
530519
)
531520

532521
self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
533-
self.assertEqual(programs_response.data.get(
534-
"description"), description)
522+
self.assertEqual(programs_response.data.get("description"), description)

0 commit comments

Comments
 (0)