Adopt the black/ruff preview styles for more concise formatting

aio-libs · Apr 13, 2024 · f029fbb · f029fbb
1 parent eaeca0d
commit f029fbb
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 78 deletions.
diff --git a/aiomonitor/task.py b/aiomonitor/task.py
@@ -50,12 +50,10 @@ def __init__(
         self._persistent = persistent
 
     def get_trace_id(self) -> str:
-        h = hash(
-            (
-                id(self),
-                self.get_name(),
-            )
-        )
+        h = hash((
+            id(self),
+            self.get_name(),
+        ))
         b = struct.pack("P", h)
         return base64.b32encode(b).rstrip(b"=").decode()
 

diff --git a/aiomonitor/termui/commands.py b/aiomonitor/termui/commands.py
@@ -66,23 +66,19 @@ def _get_current_stderr() -> TextIO:
 
 def print_ok(msg: str) -> None:
     print_formatted_text(
-        FormattedText(
-            [
-                ("ansibrightgreen", "✓ "),
-                ("", msg),
-            ]
-        )
+        FormattedText([
+            ("ansibrightgreen", "✓ "),
+            ("", msg),
+        ])
     )
 
 
 def print_fail(msg: str) -> None:
     print_formatted_text(
-        FormattedText(
-            [
-                ("ansibrightred", "✗ "),
-                ("", msg),
-            ]
-        )
+        FormattedText([
+            ("ansibrightred", "✗ "),
+            ("", msg),
+        ])
     )
 
 
@@ -117,11 +113,9 @@ async def interact(self: Monitor, connection: TelnetConnection) -> None:
             try:
                 user_input = (
                     await prompt_session.prompt_async(
-                        FormattedText(
-                            [
-                                (style_prompt, self.prompt),
-                            ]
-                        )
+                        FormattedText([
+                            (style_prompt, self.prompt),
+                        ])
                     )
                 ).strip()
             except KeyboardInterrupt:
@@ -422,16 +416,14 @@ def do_ps(
     table_data: List[Tuple[str, str, str, str, str, str]] = [headers]
     tasks = self.format_running_task_list(filter_, persistent)
     for task in tasks:
-        table_data.append(
-            (
-                task.task_id,
-                task.state,
-                task.name,
-                task.coro,
-                task.created_location,
-                task.since,
-            )
-        )
+        table_data.append((
+            task.task_id,
+            task.state,
+            task.name,
+            task.coro,
+            task.created_location,
+            task.since,
+        ))
     table = AsciiTable(table_data)
     table.inner_row_border = False
     table.inner_column_border = False
@@ -469,15 +461,13 @@ def do_ps_terminated(
     table_data: List[Tuple[str, str, str, str, str]] = [headers]
     tasks = self.format_terminated_task_list(filter_, persistent)
     for task in tasks:
-        table_data.append(
-            (
-                task.task_id,
-                task.name,
-                task.coro,
-                task.started_since,
-                task.terminated_since,
-            )
-        )
+        table_data.append((
+            task.task_id,
+            task.name,
+            task.coro,
+            task.started_since,
+            task.terminated_since,
+        ))
     table = AsciiTable(table_data)
     table.inner_row_border = False
     table.inner_column_border = False
@@ -509,11 +499,9 @@ def do_where(ctx: click.Context, taskid: str) -> None:
         if item_type == "header":
             stdout.write("\n")
             print_formatted_text(
-                FormattedText(
-                    [
-                        ("ansiwhite", item_text),
-                    ]
-                )
+                FormattedText([
+                    ("ansiwhite", item_text),
+                ])
             )
         else:
             stdout.write(textwrap.indent(item_text.strip("\n"), "  "))
@@ -537,11 +525,9 @@ def do_where_terminated(ctx: click.Context, trace_id: str) -> None:
         if item_type == "header":
             stdout.write("\n")
             print_formatted_text(
-                FormattedText(
-                    [
-                        ("ansiwhite", item_text),
-                    ]
-                )
+                FormattedText([
+                    ("ansiwhite", item_text),
+                ])
             )
         else:
             stdout.write(textwrap.indent(item_text.strip("\n"), "  "))

diff --git a/aiomonitor/webui/app.py b/aiomonitor/webui/app.py
@@ -39,14 +39,12 @@ class TaskTypeParams(APIParams):
 
     @classmethod
     def get_checker(cls):
-        return t.Dict(
-            {
-                t.Key("task_type", default=TaskTypes.RUNNING): t.Enum(
-                    TaskTypes.RUNNING,
-                    TaskTypes.TERMINATED,
-                ),
-            }
-        )
+        return t.Dict({
+            t.Key("task_type", default=TaskTypes.RUNNING): t.Enum(
+                TaskTypes.RUNNING,
+                TaskTypes.TERMINATED,
+            ),
+        })
 
 
 @dataclasses.dataclass
@@ -55,11 +53,9 @@ class TaskIdParams(APIParams):
 
     @classmethod
     def get_checker(cls) -> t.Trafaret:
-        return t.Dict(
-            {
-                t.Key("task_id"): t.String,
-            }
-        )
+        return t.Dict({
+            t.Key("task_id"): t.String,
+        })
 
 
 @dataclasses.dataclass
@@ -69,12 +65,10 @@ class ListFilterParams(APIParams):
 
     @classmethod
     def get_checker(cls) -> t.Trafaret:
-        return t.Dict(
-            {
-                t.Key("filter", default=""): t.String(allow_blank=True),
-                t.Key("persistent", default=False): t.ToBool,
-            }
-        )
+        return t.Dict({
+            t.Key("filter", default=""): t.String(allow_blank=True),
+            t.Key("persistent", default=False): t.ToBool,
+        })
 
 
 @dataclasses.dataclass

diff --git a/examples/extension.py b/examples/extension.py
@@ -35,13 +35,11 @@ def do_hello(ctx: click.Context) -> None:
     from prompt_toolkit.formatted_text import FormattedText
 
     print_formatted_text(
-        FormattedText(
-            [
-                ("ansibrightblue", "Hello, "),
-                ("ansibrightyellow", "world, "),
-                ("ansibrightmagenta", "with color!"),
-            ]
-        )
+        FormattedText([
+            ("ansibrightblue", "Hello, "),
+            ("ansibrightyellow", "world, "),
+            ("ansibrightmagenta", "with color!"),
+        ])
     )
 
     # or:

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,6 +22,9 @@ ignore = ["E203", "E731", "E501", "Q000"]
 known-first-party = ["aiomonitor"]
 split-on-trailing-comma = true
 
+[tool.ruff.format]
+preview = true
+
 [tool.mypy]
 ignore_missing_imports = true