format and lint

Author: jdhall75

hyperglass/api/__init__.py

@@ -1,4 +1,5 @@
 """hyperglass API."""
+
 # Standard Library
 import logging
 

hyperglass/cli/echo.py

@@ -1,4 +1,5 @@
 """Helper functions for CLI message printing."""
+
 # Standard Library
 import typing as t
 

hyperglass/cli/main.py

@@ -33,7 +33,7 @@ def run():
 def _version(
     version: t.Optional[bool] = typer.Option(
         None, "--version", help="hyperglass version", callback=_version
-    )
+    ),
 ) -> None:
     """hyperglass"""
     pass
@@ -77,7 +77,6 @@ def _build_ui(timeout: int = typer.Option(180, help="Timeout in seconds")) -> No
     with echo._console.status(
         f"Starting new UI build with a {timeout} second timeout...", spinner="aesthetic"
     ):
-
         _build_ui(timeout=120)
 
 
@@ -140,7 +139,7 @@ def _clear_cache():
 
 @cli.command(name="devices")
 def _devices(
-    search: t.Optional[str] = typer.Argument(None, help="Device ID or Name Search Pattern")
+    search: t.Optional[str] = typer.Argument(None, help="Device ID or Name Search Pattern"),
 ):
     """Show all configured devices"""
     # Third Party
@@ -189,7 +188,7 @@ def _devices(
 
 @cli.command(name="directives")
 def _directives(
-    search: t.Optional[str] = typer.Argument(None, help="Directive ID or Name Search Pattern")
+    search: t.Optional[str] = typer.Argument(None, help="Directive ID or Name Search Pattern"),
 ):
     """Show all configured devices"""
     # Third Party
@@ -280,7 +279,7 @@ def _plugins(
 def _params(
     path: t.Optional[str] = typer.Argument(
         None, help="Parameter Object Path, for example 'messages.no_input'"
-    )
+    ),
 ):
     """Show configuration parameters"""
     # Standard Library
@@ -312,7 +311,7 @@ def _params(
             )
             raise typer.Exit(0)
         except AttributeError:
-            echo.error(f"{'params.'+path!r} does not exist")
+            echo.error(f"{'params.' + path!r} does not exist")
             raise typer.Exit(1)
 
     panel = Inspect(

hyperglass/exceptions/_common.py

@@ -2,7 +2,7 @@
 
 # Standard Library
 import json as _json
-from typing import Any, Dict, List, Union, Literal, Optional, Set
+from typing import Any, Set, Dict, List, Union, Literal, Optional
 
 # Third Party
 from pydantic import ValidationError
@@ -72,7 +72,7 @@ def _parse_pydantic_errors(*errors: Dict[str, Any]) -> str:
 
         for err in errors:
             loc = " → ".join(str(loc) for loc in err["loc"])
-            errs += (f'Field: {loc}\n  Error: {err["msg"]}\n',)
+            errs += (f"Field: {loc}\n  Error: {err['msg']}\n",)
 
         return "\n".join(errs)
 

hyperglass/execution/drivers/_construct.py

@@ -94,7 +94,7 @@ def format(self, command: str) -> str:
         for key in [k for k in keys if k != "target" and k != "mask"]:
             if key not in attrs:
                 raise ConfigError(
-                    ("Command '{c}' has attribute '{k}', " "which is missing from device '{d}'"),
+                    ("Command '{c}' has attribute '{k}', which is missing from device '{d}'"),
                     level="danger",
                     c=self.directive.name,
                     k=key,
@@ -224,4 +224,4 @@ def _bird_bgp_aspath(self, target: str) -> str:
     def _bird_bgp_community(self, target: str) -> str:
         """Convert from standard community format to BIRD format."""
         parts = target.split(":")
-        return f'({",".join(parts)})'
+        return f"({','.join(parts)})"

hyperglass/execution/drivers/ssh.py

@@ -44,9 +44,9 @@ def opener():
                 if proxy.credential._method == "encrypted_key":
                     # If the key is encrypted, use the password field as the
                     # private key password.
-                    tunnel_kwargs[
-                        "ssh_private_key_password"
-                    ] = proxy.credential.password.get_secret_value()
+                    tunnel_kwargs["ssh_private_key_password"] = (
+                        proxy.credential.password.get_secret_value()
+                    )
             try:
                 return open_tunnel(proxy._target, proxy.port, **tunnel_kwargs)
 

hyperglass/external/_base.py

@@ -212,7 +212,7 @@ def _build_request(self: "BaseExternal", **kwargs: t.Any) -> t.Dict[str, t.Any]:
 
         if method.upper() not in supported_methods:
             raise self._exception(
-                f'Method must be one of {", ".join(supported_methods)}. ' f"Got: {str(method)}"
+                f"Method must be one of {', '.join(supported_methods)}. Got: {str(method)}"
             )
 
         endpoint = "/".join(
@@ -284,7 +284,7 @@ async def _arequest(  # noqa: C901
                 status = httpx.codes(response.status_code)
                 error = self._parse_response(response)
                 raise self._exception(
-                    f'{status.name.replace("_", " ")}: {error}', level="danger"
+                    f"{status.name.replace('_', ' ')}: {error}", level="danger"
                 ) from None
 
         except httpx.HTTPError as http_err:
@@ -340,7 +340,7 @@ def _request(  # noqa: C901
                 status = httpx.codes(response.status_code)
                 error = self._parse_response(response)
                 raise self._exception(
-                    f'{status.name.replace("_", " ")}: {error}', level="danger"
+                    f"{status.name.replace('_', ' ')}: {error}", level="danger"
                 ) from None
 
         except httpx.HTTPError as http_err:

hyperglass/external/bgptools.py

@@ -35,7 +35,7 @@ def default_ip_targets(*targets: str) -> t.Tuple[TargetData, t.Tuple[str, ...]]:
     default_data = {}
     query = ()
     for target in targets:
-        detail: TargetDetail = {k: "None" for k in DEFAULT_KEYS}
+        detail: TargetDetail = dict.fromkeys(DEFAULT_KEYS, "None")
         try:
             valid: t.Union[IPv4Address, IPv6Address] = ip_address(target)
 
@@ -139,7 +139,7 @@ async def network_info(*targets: str) -> TargetData:
     cache = use_state("cache")
 
     # Set default data structure.
-    query_data = {t: {k: "" for k in DEFAULT_KEYS} for t in query_targets}
+    query_data = {t: dict.fromkeys(DEFAULT_KEYS, "") for t in query_targets}
 
     # Get all cached bgp.tools data.
     cached = cache.get_map(CACHE_KEY) or {}

hyperglass/external/tests/test_base.py

@@ -1,4 +1,5 @@
 """Test external http client."""
+
 # Standard Library
 import asyncio
 

hyperglass/external/tests/test_bgptools.py

@@ -16,7 +16,6 @@
 # Ignore asyncio deprecation warning about loop
 @pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_network_info():
-
     checks = (
         ("192.0.2.1", {"asn": "None", "rir": "Private Address"}),
         ("127.0.0.1", {"asn": "None", "rir": "Loopback Address"}),