Sourcery refactored master branch

saq/queue.py

@@ -514,9 +514,7 @@ async def apply(
         kwargs: Same as Queue.enqueue
         """
         results = await self.map(job_or_func, timeout=timeout, iter_kwargs=[kwargs])
-        if results:
-            return results[0]
-        return None
+        return results[0] if results else None
 
     async def map(
         self,
@@ -569,10 +567,7 @@ async def callback(job_key: str, status: Status) -> bool:
             if status in UNSUCCESSFUL_TERMINAL_STATUSES and not return_exceptions:
                 return True
 
-            if not pending_job_keys:
-                return True
-
-            return False
+            return not pending_job_keys
 
         # Start listening before we enqueue the jobs.
         # This ensures we don't miss any updates.

saq/web.py

@@ -111,8 +111,7 @@ async def _get_job(request: Request) -> Job:
 async def exceptions(request: Request, handler: Handler) -> StreamResponse:
     if request.path.startswith("/api"):
         try:
-            resp = await handler(request)
-            return resp
+            return await handler(request)
         except Exception:
             error = traceback.format_exc()
             logging.error(error)
@@ -127,9 +126,7 @@ async def shutdown(app: Application) -> None:
 
 def create_app(queues: list[Queue]) -> Application:
     middlewares = [exceptions]
-    password = os.environ.get("AUTH_PASSWORD")
-
-    if password:
+    if password := os.environ.get("AUTH_PASSWORD"):
         from aiohttp_basicauth import BasicAuthMiddleware  # type:ignore[import]
 
         user = os.environ.get("AUTH_USER", "admin")

saq/worker.py

@@ -342,7 +342,7 @@ async def shutdown(_app: Application) -> None:
 
 async def async_check_health(queue: Queue) -> int:
     info = await queue.info()
-    if not info.get("name") == queue.name:
+    if info.get("name") != queue.name:
         logger.warning("Health check failed")
         status = 1
     else:

tests/test_web.py

@@ -41,9 +41,7 @@ async def test_queues(self) -> None:
         async with self.client.get("/api/queues") as resp:
             self.assertEqual(resp.status, 200)
             json = await resp.json()
-            self.assertEqual(
-                set(q["name"] for q in json["queues"]), {"queue1", "queue2"}
-            )
+            self.assertEqual({q["name"] for q in json["queues"]}, {"queue1", "queue2"})
 
         async with self.client.get(f"/api/queues/{self.queue1.name}") as resp:
             self.assertEqual(resp.status, 200)