Merge pull request #90 from lpsinger/black

Add black code formatter

Author: dakota002

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203, E704

.github/workflows/build.yml

@@ -29,6 +29,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - uses: psf/black@stable
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "editor.defaultFormatter": "ms-python.black-formatter",
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true
+}

gcn_classic_to_kafka/cli.py

@@ -23,7 +23,7 @@
 
 
 def signal_handler(signum, frame):
-    log.info('Exiting due to signal %d', signum)
+    log.info("Exiting due to signal %d", signum)
     sys.exit(128 + signum)
 
 
@@ -36,19 +36,31 @@ def host_port(host_port_str):
     # Parse netloc like it is done for HTTP URLs.
     # This ensures that we will get the correct behavior for hostname:port
     # splitting even for IPv6 addresses.
-    return urllib.parse.urlparse(f'http://{host_port_str}')
+    return urllib.parse.urlparse(f"http://{host_port_str}")
 
 
 @click.command()
 @click.option(
-    '--listen', type=host_port, default=':8081', show_default=True,
-    help='Hostname and port to listen on for GCN Classic')
+    "--listen",
+    type=host_port,
+    default=":8081",
+    show_default=True,
+    help="Hostname and port to listen on for GCN Classic",
+)
 @click.option(
-    '--prometheus', type=host_port, default=':8000', show_default=True,
-    help='Hostname and port to listen on for Prometheus metric reporting')
+    "--prometheus",
+    type=host_port,
+    default=":8000",
+    show_default=True,
+    help="Hostname and port to listen on for Prometheus metric reporting",
+)
 @click.option(
-    '--loglevel', type=click.Choice(logging._levelToName.values()),
-    default='DEBUG', show_default=True, help='Log level')
+    "--loglevel",
+    type=click.Choice(logging._levelToName.values()),
+    default="DEBUG",
+    show_default=True,
+    help="Log level",
+)
 def main(listen, prometheus, loglevel):
     """Pump GCN Classic notices to a Kafka broker.
 
@@ -64,21 +76,21 @@ def main(listen, prometheus, loglevel):
     """
     logging.basicConfig(level=loglevel)
 
-    prometheus_client.start_http_server(prometheus.port,
-                                        prometheus.hostname or '0.0.0.0')
-    log.info('Prometheus listening on %s', prometheus.netloc)
+    prometheus_client.start_http_server(
+        prometheus.port, prometheus.hostname or "0.0.0.0"
+    )
+    log.info("Prometheus listening on %s", prometheus.netloc)
 
     config = gcn_kafka.config_from_env()
-    config['client.id'] = __package__
-    config['on_delivery'] = kafka_delivered_cb
+    config["client.id"] = __package__
+    config["on_delivery"] = kafka_delivered_cb
 
     producer = gcn_kafka.Producer(config)
     client = client_connected(producer)
 
     async def serve():
-        server = await asyncio.start_server(
-            client, listen.hostname, listen.port)
-        log.info('GCN server listening on %s', listen.netloc)
+        server = await asyncio.start_server(client, listen.hostname, listen.port)
+        log.info("GCN server listening on %s", listen.netloc)
         async with server:
             await server.serve_forever()
 

gcn_classic_to_kafka/common.py

@@ -38,7 +38,7 @@ def notice_type_int_to_str(notice_type_int):
     try:
         notice_type_enum = gcn.NoticeType(notice_type_int)
     except ValueError:
-        notice_type_str = 'UNKNOWN'
+        notice_type_str = "UNKNOWN"
     else:
         notice_type_str = notice_type_enum.name
     return notice_type_str
@@ -66,4 +66,4 @@ def topic_for_notice_type_str(notice_type_str, flavor):
     'gcn.classic.voevent.LVC_PRELIMINARY'
 
     """
-    return f'gcn.classic.{flavor}.{notice_type_str}'
+    return f"gcn.classic.{flavor}.{notice_type_str}"

gcn_classic_to_kafka/metrics.py

@@ -9,22 +9,25 @@
 import prometheus_client
 
 connected = prometheus_client.Gauge(
-    'connected', 'Number of active connections from GCN Classic',
-    namespace=__package__)
+    "connected", "Number of active connections from GCN Classic", namespace=__package__
+)
 
 iamalive = prometheus_client.Counter(
-    'iamalive',
-    'GCN notices received of any type, including iamalives',
-    namespace=__package__)
+    "iamalive",
+    "GCN notices received of any type, including iamalives",
+    namespace=__package__,
+)
 
 received = prometheus_client.Counter(
-    'received',
-    'GCN Classic notices received by notice type and flavor',
-    labelnames=['notice_type_int', 'notice_type_str', 'flavor'],
-    namespace=__package__)
+    "received",
+    "GCN Classic notices received by notice type and flavor",
+    labelnames=["notice_type_int", "notice_type_str", "flavor"],
+    namespace=__package__,
+)
 
 delivered = prometheus_client.Counter(
-    'delivered',
-    'Kafka messages delivered',
-    labelnames=['topic', 'partition', 'successful'],
-    namespace=__package__)
+    "delivered",
+    "Kafka messages delivered",
+    labelnames=["topic", "partition", "successful"],
+    namespace=__package__,
+)

gcn_classic_to_kafka/socket.py

@@ -20,32 +20,34 @@
 log = logging.getLogger(__name__)
 
 bin_len = 160
-int4 = struct.Struct('!l')
-ignore_notice_types = {gcn.NoticeType.IM_ALIVE,
-                       gcn.NoticeType.VOE_11_IM_ALIVE,
-                       gcn.NoticeType.VOE_20_IM_ALIVE}
+int4 = struct.Struct("!l")
+ignore_notice_types = {
+    gcn.NoticeType.IM_ALIVE,
+    gcn.NoticeType.VOE_11_IM_ALIVE,
+    gcn.NoticeType.VOE_20_IM_ALIVE,
+}
 
 
 def client_connected(producer: confluent_kafka.Producer, timeout: float = 90):
 
-    async def client_connected_cb(reader: asyncio.StreamReader,
-                                  writer: asyncio.StreamWriter):
+    async def client_connected_cb(
+        reader: asyncio.StreamReader, writer: asyncio.StreamWriter
+    ):
         async def read():
             bin_data = await reader.readexactly(bin_len)
-            voe_len, = int4.unpack(await reader.readexactly(int4.size))
+            (voe_len,) = int4.unpack(await reader.readexactly(int4.size))
             voe_data = await reader.readexactly(voe_len)
-            txt_len, = int4.unpack(await reader.readexactly(int4.size))
+            (txt_len,) = int4.unpack(await reader.readexactly(int4.size))
             txt_data = await reader.readexactly(txt_len)
-            log.debug('Read %d + %d + %d bytes', bin_len, voe_len, txt_len)
+            log.debug("Read %d + %d + %d bytes", bin_len, voe_len, txt_len)
             return bin_data, voe_data, txt_data
 
         async def process():
-            bin_data, voe_data, txt_data = await asyncio.wait_for(
-                read(), timeout)
+            bin_data, voe_data, txt_data = await asyncio.wait_for(read(), timeout)
             metrics.iamalive.inc()
 
-            bin_notice_type, = int4.unpack_from(bin_data)
-            log.info('Received notice of type 0x%08X', bin_notice_type)
+            (bin_notice_type,) = int4.unpack_from(bin_data)
+            log.info("Received notice of type 0x%08X", bin_notice_type)
             if bin_notice_type in ignore_notice_types:
                 return
 
@@ -54,35 +56,36 @@ async def process():
 
             if bin_notice_type != voe_notice_type:
                 log.warning(
-                    'Binary (0x%08X) and VOEvent (0x%08X) notice types differ',
-                    bin_notice_type, voe_notice_type)
+                    "Binary (0x%08X) and VOEvent (0x%08X) notice types differ",
+                    bin_notice_type,
+                    voe_notice_type,
+                )
 
             # The text notices do not contain a machine-readable notice type.
             txt_notice_type = bin_notice_type
 
             for notice_type_int, data, flavor in [
-                [bin_notice_type, bin_data, 'binary'],
-                [voe_notice_type, voe_data, 'voevent'],
-                [txt_notice_type, txt_data, 'text'],
+                [bin_notice_type, bin_data, "binary"],
+                [voe_notice_type, voe_data, "voevent"],
+                [txt_notice_type, txt_data, "text"],
             ]:
                 notice_type_str = notice_type_int_to_str(notice_type_int)
-                metrics.received.labels(
-                    notice_type_int, notice_type_str, flavor).inc()
+                metrics.received.labels(notice_type_int, notice_type_str, flavor).inc()
                 topic = topic_for_notice_type_str(notice_type_str, flavor)
                 producer.produce(topic, data)
 
             # Wait for any outstanding messages to be delivered and delivery
             # report callbacks to be triggered.
             producer.poll(0)
 
-        peer, *_ = writer.get_extra_info('peername')
-        log.info('Client connected from %s', peer)
+        peer, *_ = writer.get_extra_info("peername")
+        log.info("Client connected from %s", peer)
         try:
             with metrics.connected.track_inprogress():
                 while True:
                     await process()
         finally:
-            log.info('Closing connection from %s', peer)
+            log.info("Closing connection from %s", peer)
             writer.close()
             await writer.wait_closed()
 

gcn_classic_to_kafka/test/test_socket.py

@@ -34,21 +34,24 @@ def make_packet(bin_notice_type, voe_notice_type=None):
     </What>
     </voe:VOEvent>
     """.encode()
-    text = b'Hello world'
+    text = b"Hello world"
     return (
-        struct.pack('!l156xl', bin_notice_type, len(voevent)) + voevent +
-        struct.pack('!l', len(text)) + text)
+        struct.pack("!l156xl", bin_notice_type, len(voevent))
+        + voevent
+        + struct.pack("!l", len(text))
+        + text
+    )
 
 
 @pytest_asyncio.fixture
 async def start_server():
     producer = mock.Mock()
     cb = client_connected(producer=producer, timeout=timeout)
-    server = await asyncio.start_server(cb, '127.0.0.1')
+    server = await asyncio.start_server(cb, "127.0.0.1")
 
     async with server:
         server_task = asyncio.create_task(server.serve_forever())
-        socket, = server.sockets
+        (socket,) = server.sockets
         host, port = socket.getsockname()
         yield producer, host, port
         server_task.cancel()
@@ -96,10 +99,13 @@ async def test_socket(start_server):
     await writer.drain()
     await asyncio.sleep(0.25 * timeout)
     assert not reader.at_eof()
-    producer.produce.assert_has_calls([
-        mock.call('gcn.classic.binary.LVC_TEST', mock.ANY),
-        mock.call('gcn.classic.voevent.LVC_TEST', mock.ANY),
-        mock.call('gcn.classic.text.LVC_TEST', mock.ANY)])
+    producer.produce.assert_has_calls(
+        [
+            mock.call("gcn.classic.binary.LVC_TEST", mock.ANY),
+            mock.call("gcn.classic.voevent.LVC_TEST", mock.ANY),
+            mock.call("gcn.classic.text.LVC_TEST", mock.ANY),
+        ]
+    )
 
     writer.close()
     await writer.wait_closed()