fix(python): Fix whitespaces

Signed-off-by: Steffen Vogel <[email protected]>

Author: stv0g

.gitlab-ci.yml

@@ -162,8 +162,8 @@ test:python:
   script:
     - cd python
     - pytest --verbose .
-    - black --extend-exclude=".*(\\.pyi|_pb2.py)$" --check .
-    - flake8 --extend-exclude="*.pyi,*_pb2.py" .
+    - black --line-length=90 --extend-exclude=".*(\\.pyi|_pb2.py)$" --check .
+    - flake8 --max-line-length=90 --extend-exclude="*.pyi,*_pb2.py" .
     - mypy .
   image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
   needs:

.pre-commit-config.yaml

@@ -50,6 +50,16 @@ repos:
     hooks:
       - id: black-jupyter
         exclude: .*_pb2.pyi?$
+        args:
+        - --line-length=90
+
+  - repo: https://github.com/pycqa/flake8
+    rev: "7.3.0"
+    hooks:
+      - id: flake8
+        exclude: .*_pb2.pyi?$
+        args:
+        - --max-line-length=90
 
   - repo: https://github.com/markdownlint/markdownlint
     rev: "v0.13.0"

clients/python/client.py

@@ -1,9 +1,15 @@
 # -*- coding: utf-8 -*-
-# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
+# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of
+#                         Complex Power Systems, RWTH Aachen University
 # SPDX-License-Identifier: Apache-2.0
 
 import villas_pb2
-import time, socket, errno, sys, os, signal
+import time
+import socket
+import errno
+import sys
+import os
+import signal
 
 layer = sys.argv[1] if len(sys.argv) == 2 else "udp"
 
@@ -50,6 +56,7 @@
 
 # Gracefully shutdown
 def sighandler(signum, frame):
+    global running
     running = False
 
 

etc/python/example.py

@@ -9,7 +9,8 @@
     villas node <(python3 etc/python/example.py)
 
  Author: Steffen Vogel <[email protected]>
- SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
+ SPDX-FileCopyrightText: 2014-2023 Institute for Automation of
+                         Complex Power Systems, RWTH Aachen University
  SPDX-License-Identifier: Apache-2.0
 """
 
@@ -38,7 +39,10 @@
         "type": "socket",
         "layer": "udp",
         "format": "protobuf",
-        "in": {"address": "*:12000", "signals": [{"name": "in", "type": "float"}]},
+        "in": {
+            "address": "*:12000",
+            "signals": [{"name": "in", "type": "float"}],
+        },
         "out": {"address": f"5.6.7.8:{port}"},
     }
 

lib/nodes/example.cpp

@@ -66,13 +66,13 @@ class ExampleNode : public Node {
 
 public:
   ExampleNode(const uuid_t &id = {}, const std::string &name = "")
-    : Node(id, name), setting1(72), setting2("something"), state1(0) {}
+      : Node(id, name), setting1(72), setting2("something"), state1(0) {}
 
   /* All of the following virtual-declared functions are optional.
    * Have a look at node.hpp/node.cpp for the default behaviour.
    */
 
-  virtual ~ExampleNode() { }
+  virtual ~ExampleNode() {}
 
   int prepare() override {
     state1 = setting1;
@@ -90,7 +90,7 @@ class ExampleNode : public Node {
 
     json_error_t err;
     int ret = json_unpack_ex(json, &err, 0, "{ s?: i, s?: s }", "setting1",
-                            &setting1, "setting2", &setting2_str);
+                             &setting1, "setting2", &setting2_str);
     if (ret)
       throw ConfigError(json, err, "node-config-node-example");
 

python/pyproject.toml

@@ -54,6 +54,7 @@ ignore_missing_imports = true
 
 [tool.black]
 extend-exclude = '''.*(\.pyi|_pb2.py)$'''
+line-length = 90
 
 [tool.setuptools.packages.find]
 include = ["villas.node"]

python/villas/node/formats.py

@@ -156,8 +156,7 @@ def load_sample(self, sample: str) -> Sample | None:
             return None
 
         m = re.match(
-            r"(\d+)(?:\.(\d+))?([-+]\d+(?:\.\d+)?"
-            r"(?:e[+-]?\d+)?)?(?:\((\d+)\))?(F)?",
+            r"(\d+)(?:\.(\d+))?([-+]\d+(?:\.\d+)?" r"(?:e[+-]?\d+)?)?(?:\((\d+)\))?(F)?",
             fields[0],
         )
 

python/villas/node/node.py

@@ -128,18 +128,18 @@ def load_config(self, i):
     def request(self, action, method="GET", **args):
         timeout = args.get("timeout", 1)
         json_data = args.get("json")
-        
+
         url = f"{self.api_url}/api/{self.api_version}/{action}"
-        
+
         # Prepare the request
         req = urllib.request.Request(url, method=method)
-        
+
         # Add JSON data if provided
         if json_data:
             req.add_header("Content-Type", "application/json")
             data = json.dumps(json_data).encode("utf-8")
             req.data = data
-        
+
         try:
             with urllib.request.urlopen(req, timeout=timeout) as response:
                 return json.loads(response.read().decode("utf-8"))

python/villas/node/opal_orchestra_ddf.py

@@ -1,3 +1,9 @@
+"""
+Author: Steffen Vogel <[email protected]>
+SPDX-FileCopyrightText: 2025 OPAL-RT Germany GmbH
+SPDX-License-Identifier: Apache-2.0
+"""  # noqa: E501
+
 import argparse
 import sys
 import xml.etree.ElementTree as ET
@@ -14,7 +20,8 @@ def generate_ddf(node_cfg):
     Generate an OPAL-RT Orchestra DDF XML file from a VILLASnode configuration.
 
     Args:
-        node_cfg: Dictionary containing the node configuration from VILLASnode config
+        node_cfg: Dictionary containing the node configuration
+                  from VILLASnode config
 
     Returns:
         str: XML-encoded string representing the Orchestra DDF
@@ -65,16 +72,15 @@ def generate_ddf(node_cfg):
 
 def add_connection(parent_elem, conn_cfg):
     """
-    Add a connection element to the parent XML element based on connection configuration.
+    Add a connection element to the parent XML element based
+    on connection configuration.
 
     Args:
         parent_elem: ET.Element to add the connection to
         conn_cfg: Dictionary containing connection configuration
     """
     conn_type = conn_cfg.get("type", "local")
 
-    conn_attrs = {}
-
     if conn_type == "local":
         conn_elem = ET.SubElement(
             parent_elem,
@@ -118,7 +124,8 @@ def add_signals_to_set(parent_elem, signals, is_publish=True):
     Args:
         parent_elem: ET.Element to add signals to
         signals: List of signal configurations
-        is_publish: Boolean indicating if this is for PUBLISH (True) or SUBSCRIBE (False)
+        is_publish: Boolean indicating if this is for
+                    PUBLISH (True) or SUBSCRIBE (False)
     """
     # Group signals by their orchestra names and build nested structure
     signal_tree = {}
@@ -155,11 +162,11 @@ def add_signals_to_set(parent_elem, signals, is_publish=True):
                 else:
                     if orchestra_type != signal["type"]:
                         raise RuntimeError(
-                            f"Conflicting definitions for signal '{orchestra_name}'"
+                            "Conflicting definitions for signal " + f"'{orchestra_name}'"
                         )
 
                     index = orchestra_index
-                    if index == None:
+                    if index is None:
                         index = signal["length"]
 
                     if index >= signal["length"]:
@@ -210,7 +217,10 @@ def build_xml_from_tree(parent_elem, tree, is_publish):
                         else:
                             default_text = str(default_val)
                     else:
-                        default_text = "0" if signal["type"] != "boolean" else "no"
+                        if signal["type"] == "boolean":
+                            default_text = "no"
+                        else:
+                            default_text = "0"
                     ET.SubElement(item, "default").text = default_text
         elif children:
             # This is a bus without direct signals