chore: fix client and connection, disable warnings for the generated code

Author: dimaqq

juju/client/client.py

@@ -32,4 +32,4 @@
             if not a.startswith("_"):
                 setattr(c_type, a, getattr(o_type, a))
 
-from ._client import *  # noqa, isort:skip
+from ._client import *  # noqa: F403,E402, isort:skip

juju/client/codegen.py

@@ -22,10 +22,10 @@ def write(self, msg, depth=0):
             prefix = self.INDENT * depth
             msg = indent(msg, prefix)
 
-        return super(CodeWriter, self).write(msg)
+        return super().write(msg)
 
     def __str__(self):
-        return super(CodeWriter, self).getvalue()
+        return super().getvalue()
 
 
 class Capture(defaultdict):
@@ -35,7 +35,7 @@ class Capture(defaultdict):
     """
 
     def __init__(self, default_factory=CodeWriter, *args, **kwargs):
-        super(Capture, self).__init__(default_factory, *args, **kwargs)
+        super().__init__(default_factory, *args, **kwargs)
 
     def clear(self, name):
         """Reset one of the keys in this class, if it exists.

juju/client/connection.py

@@ -23,6 +23,7 @@
 
 from .facade_versions import client_facade_versions, known_unsupported_facades
 
+LEVELS = ["TRACE", "DEBUG", "INFO", "WARNING", "ERROR"]
 log = logging.getLogger("juju.client.connection")
 
 
@@ -240,7 +241,7 @@ async def connect(
             if isinstance(endpoint, str)
             else [(e, cacert) for e in endpoint]
         )
-        lastError = None
+        last_error = None
         for _ep in _endpoints:
             try:
                 if self.is_debug_log_connection:
@@ -251,14 +252,14 @@ async def connect(
                     await self._connect_with_redirect([_ep])
                 return self
             except ssl.SSLError as e:
-                lastError = e
+                last_error = e
                 continue
             except OSError as e:
                 logging.debug(f"Cannot access endpoint {_ep}: {e.strerror}")
-                lastError = e
+                last_error = e
                 continue
-        if lastError is not None:
-            raise lastError
+        if last_error is not None:
+            raise last_error
         raise Exception("Unable to connect to websocket")
 
     @property
@@ -407,7 +408,6 @@ def debug_log_filter_write(self, result):
             and (included_entities == [] or entity in included_entities)
         )
 
-        LEVELS = ["TRACE", "DEBUG", "INFO", "WARNING", "ERROR"]
         log_level = self.debug_log_params["level"]
 
         if log_level != "" and log_level not in LEVELS:
@@ -595,10 +595,11 @@ async def rpc(self, msg, encoder=None):
             # Perhaps JujuError should return all the results including
             # errors, or perhaps a keyword parameter to the rpc method
             # could be added to trigger this behaviour.
-            err_results = []
-            for res in result["response"]["results"] or []:
-                if res.get("error", {}).get("message"):
-                    err_results.append(res["error"]["message"])
+            err_results = [
+                res["error"]["message"]
+                for res in (result["response"]["results"] or [])
+                if res.get("error", {}).get("message")
+            ]
             if err_results:
                 raise errors.JujuError(err_results)
 
@@ -781,14 +782,14 @@ async def _connect_with_login(self, endpoints):
             # It's possible that we may get several discharge-required errors,
             # corresponding to different levels of authentication, so retry
             # a few times.
-            for i in range(0, 2):
+            for _ in range(0, 2):
                 result = (await self.login())["response"]
-                macaroonJSON = result.get("discharge-required")
-                if macaroonJSON is None:
+                macaroon_json = result.get("discharge-required")
+                if macaroon_json is None:
                     self.info = result
                     success = True
                     return result
-                macaroon = bakery.Macaroon.from_dict(macaroonJSON)
+                macaroon = bakery.Macaroon.from_dict(macaroon_json)
                 self.bakery_client.handle_error(
                     httpbakery.Error(
                         code=httpbakery.ERR_DISCHARGE_REQUIRED,

juju/client/connector.py

@@ -27,7 +27,7 @@ class NoConnectionException(Exception):
 
 
 class Connector:
-    """This class abstracts out a reconnectable client that can connect
+    """Abstracts out a reconnectable client that can connect
     to controllers and models found in the Juju data files.
     """
 

pyproject.toml

@@ -131,7 +131,24 @@ ignore = [
     "UP031",
 ]
 
+
 [tool.ruff.lint.per-file-ignores]
+"juju/client/_*.py" = [
+    # Copyright
+    "CPY001",
+    # Codegen limitation: empty structs have empty docstrings.
+    "D419",
+    # CamelCase
+    "N802",
+    # star imports
+    "F403",
+    "F405",
+    # FIXME: undefined FacadeVersions...
+    # Is the class from _client.py intended?
+    # How does login even work?
+    "F821",
+]
+
 "tests/*" = [
     # assert False to fail
     "B011",