more linting

Author: deeleeramone

pywry/pywry/cli.py

@@ -362,29 +362,35 @@ def format_config_show(settings: PyWrySettings) -> str:
     lines = []
     lines.append("PyWry Configuration\n" + "=" * 40 + "\n")
 
-    sections = [
-        ("csp", settings.csp),
-        ("theme", settings.theme),
-        ("timeout", settings.timeout),
-        ("asset", settings.asset),
-        ("log", settings.log),
-        ("window", settings.window),
-        ("hot_reload", settings.hot_reload),
-        ("server", settings.server),
-        ("deploy", settings.deploy),
-        ("mcp", settings.mcp),
+    section_names = [
+        "csp",
+        "theme",
+        "timeout",
+        "asset",
+        "log",
+        "window",
+        "hot_reload",
+        "server",
+        "deploy",
+        "mcp",
     ]
+    all_data = settings.model_dump(
+        exclude=dict.fromkeys(section_names, _SENSITIVE_FIELDS),
+    )
 
-    for section_name, section in sections:
+    for section_name in section_names:
+        section_data = all_data.get(section_name, {})
         if lines[-1] != "":
             lines.append("")
         lines.append(f"[{section_name}]")
-        for field_name, field_value in section.model_dump(exclude=_SENSITIVE_FIELDS).items():
+        for field_name, field_value in section_data.items():
             lines.append(f"  {field_name} = {field_value!r}")
-        # Append redacted placeholders for any sensitive fields on this model.
+        # Append redacted placeholders for any sensitive fields defined
+        # on this section's model class.
+        section_cls = type(getattr(settings, section_name))
         lines.extend(
             f"  {rn} = '{_REDACTED}'"
-            for rn in sorted(_SENSITIVE_FIELDS & section.model_fields.keys())
+            for rn in sorted(_SENSITIVE_FIELDS & section_cls.model_fields.keys())
         )
 
     return "\n".join(lines)

pywry/pywry/config.py

@@ -935,27 +935,30 @@ def to_toml(self) -> str:
         """Export settings as TOML string."""
         lines = ["# PyWry Configuration", "# Generated by: pywry config --toml", ""]
 
-        sections = [
-            ("csp", self.csp),
-            ("theme", self.theme),
-            ("timeout", self.timeout),
-            ("asset", self.asset),
-            ("log", self.log),
-            ("window", self.window),
-            ("hot_reload", self.hot_reload),
-            ("server", self.server),
-            ("deploy", self.deploy),
-            ("mcp", self.mcp),
+        section_names = [
+            "csp",
+            "theme",
+            "timeout",
+            "asset",
+            "log",
+            "window",
+            "hot_reload",
+            "server",
+            "deploy",
+            "mcp",
         ]
 
         if self.oauth2 is not None:
-            sections.append(("oauth2", self.oauth2))
+            section_names.append("oauth2")
 
-        for section_name, section in sections:
+        all_data = self.model_dump(
+            exclude=dict.fromkeys(section_names, _SENSITIVE_FIELDS),
+        )
+
+        for section_name in section_names:
+            section_data = all_data.get(section_name, {})
             lines.append(f"[{section_name}]")
-            # Exclude sensitive fields from model_dump so their values
-            # never enter the output string (satisfies CodeQL taint analysis).
-            for field_name, field_value in section.model_dump(exclude=_SENSITIVE_FIELDS).items():
+            for field_name, field_value in section_data.items():
                 if isinstance(field_value, list):
                     value_str = "[" + ", ".join(f'"{v}"' for v in field_value) + "]"
                 elif isinstance(field_value, bool):
@@ -965,10 +968,12 @@ def to_toml(self) -> str:
                 else:
                     value_str = str(field_value)
                 lines.append(f"{field_name} = {value_str}")
-            # Append redacted placeholders for any sensitive fields on this model.
+            # Append redacted placeholders for any sensitive fields defined
+            # on this section's model class.
+            section_cls = type(getattr(self, section_name))
             lines.extend(
                 f'{rn} = "{_REDACTED}"'
-                for rn in sorted(_SENSITIVE_FIELDS & section.model_fields.keys())
+                for rn in sorted(_SENSITIVE_FIELDS & section_cls.model_fields.keys())
             )
             lines.append("")
 
@@ -982,31 +987,38 @@ def to_env(self) -> str:
             "",
         ]
 
-        sections = [
-            ("CSP", self.csp),
-            ("THEME", self.theme),
-            ("TIMEOUT", self.timeout),
-            ("ASSET", self.asset),
-            ("LOG", self.log),
-            ("WINDOW", self.window),
-            ("HOT_RELOAD", self.hot_reload),
-            ("SERVER", self.server),
-            ("DEPLOY", self.deploy),
-            ("MCP", self.mcp),
+        env_sections = [
+            ("CSP", "csp"),
+            ("THEME", "theme"),
+            ("TIMEOUT", "timeout"),
+            ("ASSET", "asset"),
+            ("LOG", "log"),
+            ("WINDOW", "window"),
+            ("HOT_RELOAD", "hot_reload"),
+            ("SERVER", "server"),
+            ("DEPLOY", "deploy"),
+            ("MCP", "mcp"),
         ]
 
-        for section_name, section in sections:
-            for field_name, field_value in section.model_dump(exclude=_SENSITIVE_FIELDS).items():
-                env_name = f"PYWRY_{section_name}__{field_name.upper()}"
+        # Dump from top-level model to avoid tainted section instances.
+        all_data = self.model_dump(
+            exclude={attr: _SENSITIVE_FIELDS for _, attr in env_sections},
+        )
+
+        for env_prefix, attr_name in env_sections:
+            section_data = all_data.get(attr_name, {})
+            for field_name, field_value in section_data.items():
+                env_name = f"PYWRY_{env_prefix}__{field_name.upper()}"
                 if isinstance(field_value, list):
                     value_str = ",".join(str(v) for v in field_value)
                 elif isinstance(field_value, bool):
                     value_str = "true" if field_value else "false"
                 else:
                     value_str = str(field_value)
                 lines.append(f'export {env_name}="{value_str}"')
-            for redacted_name in sorted(_SENSITIVE_FIELDS & section.model_fields.keys()):
-                env_name = f"PYWRY_{section_name}__{redacted_name.upper()}"
+            section_cls = type(getattr(self, attr_name))
+            for redacted_name in sorted(_SENSITIVE_FIELDS & section_cls.model_fields.keys()):
+                env_name = f"PYWRY_{env_prefix}__{redacted_name.upper()}"
                 lines.append(f'export {env_name}="{_REDACTED}"')
 
         return "\n".join(lines)
@@ -1015,31 +1027,38 @@ def show(self) -> str:
         """Format settings as a readable table."""
         lines = ["PyWry Configuration", "=" * 60, ""]
 
-        sections = [
-            ("Security (CSP)", self.csp),
-            ("Theme", self.theme),
-            ("Timeouts", self.timeout),
-            ("Assets", self.asset),
-            ("Logging", self.log),
-            ("Window Defaults", self.window),
-            ("Hot Reload", self.hot_reload),
-            ("Server (Notebook/Web)", self.server),
-            ("Deploy (Scalable)", self.deploy),
-            ("MCP (AI Agents)", self.mcp),
+        show_sections = [
+            ("Security (CSP)", "csp"),
+            ("Theme", "theme"),
+            ("Timeouts", "timeout"),
+            ("Assets", "asset"),
+            ("Logging", "log"),
+            ("Window Defaults", "window"),
+            ("Hot Reload", "hot_reload"),
+            ("Server (Notebook/Web)", "server"),
+            ("Deploy (Scalable)", "deploy"),
+            ("MCP (AI Agents)", "mcp"),
         ]
 
-        for section_name, section in sections:
-            lines.append(f"\n{section_name}")
+        # Dump from top-level model to avoid tainted section instances.
+        all_data = self.model_dump(
+            exclude={attr: _SENSITIVE_FIELDS for _, attr in show_sections},
+        )
+
+        for display_name, attr_name in show_sections:
+            section_data = all_data.get(attr_name, {})
+            lines.append(f"\n{display_name}")
             lines.append("-" * 40)
-            for field_name, field_value in section.model_dump(exclude=_SENSITIVE_FIELDS).items():
+            for field_name, field_value in section_data.items():
                 # Truncate long values
                 value_str = str(field_value)
                 if len(value_str) > 50:
                     value_str = value_str[:47] + "..."
                 lines.append(f"  {field_name:20} = {value_str}")
+            section_cls = type(getattr(self, attr_name))
             lines.extend(
                 f"  {rn:20} = {_REDACTED}"
-                for rn in sorted(_SENSITIVE_FIELDS & section.model_fields.keys())
+                for rn in sorted(_SENSITIVE_FIELDS & section_cls.model_fields.keys())
             )
 
         return "\n".join(lines)