From 9985917ad2c18f673b388163ca409d95b80998a3 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Sat, 8 Jun 2024 23:15:38 +0200
Subject: [PATCH] add more type annotations

---
 app/src/async_stream.py            | 4 +++-
 app/src/gen3/connection_g3.py      | 6 ++++--
 app/src/gen3/inverter_g3.py        | 4 ++--
 app/src/gen3plus/connection_g3p.py | 6 ++++--
 app/src/gen3plus/inverter_g3p.py   | 4 ++--
 app/src/server.py                  | 6 +++---
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/async_stream.py b/app/src/async_stream.py
index 17f5f59..1bcabf3 100644
--- a/app/src/async_stream.py
+++ b/app/src/async_stream.py
@@ -1,5 +1,6 @@
 import logging
 import traceback
+from asyncio import StreamReader, StreamWriter
 from messages import hex_dump_memory
 
 logger = logging.getLogger('conn')
@@ -7,7 +8,8 @@ logger = logging.getLogger('conn')
 
 class AsyncStream():
 
-    def __init__(self, reader, writer, addr) -> None:
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr) -> None:
         logger.debug('AsyncStream.__init__')
         self.reader = reader
         self.writer = writer
diff --git a/app/src/gen3/connection_g3.py b/app/src/gen3/connection_g3.py
index c93156e..7730069 100644
--- a/app/src/gen3/connection_g3.py
+++ b/app/src/gen3/connection_g3.py
@@ -1,5 +1,6 @@
 import logging
 # import gc
+from asyncio import StreamReader, StreamWriter
 from async_stream import AsyncStream
 from gen3.talent import Talent
 
@@ -8,12 +9,13 @@ logger = logging.getLogger('conn')
 
 class ConnectionG3(AsyncStream, Talent):
 
-    def __init__(self, reader, writer, addr, remote_stream, server_side: bool,
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, remote_stream: 'ConnectionG3', server_side: bool,
                  id_str=b'') -> None:
         AsyncStream.__init__(self, reader, writer, addr)
         Talent.__init__(self, server_side, id_str)
 
-        self.remoteStream = remote_stream
+        self.remoteStream: 'ConnectionG3' = remote_stream
 
     '''
     Our puplic methods
diff --git a/app/src/gen3/inverter_g3.py b/app/src/gen3/inverter_g3.py
index 1930f0e..939d235 100644
--- a/app/src/gen3/inverter_g3.py
+++ b/app/src/gen3/inverter_g3.py
@@ -1,7 +1,7 @@
-import asyncio
 import logging
 import traceback
 import json
+from asyncio import StreamReader, StreamWriter, asyncio
 from config import Config
 from inverter import Inverter
 from gen3.connection_g3 import ConnectionG3
@@ -44,7 +44,7 @@ class InverterG3(Inverter, ConnectionG3):
                  destroyed
     '''
 
-    def __init__(self, reader, writer, addr):
+    def __init__(self, reader: StreamReader, writer: StreamWriter, addr):
         super().__init__(reader, writer, addr, None, True)
         self.__ha_restarts = -1
 
diff --git a/app/src/gen3plus/connection_g3p.py b/app/src/gen3plus/connection_g3p.py
index a9362ce..ecc5625 100644
--- a/app/src/gen3plus/connection_g3p.py
+++ b/app/src/gen3plus/connection_g3p.py
@@ -1,5 +1,6 @@
 import logging
 # import gc
+from asyncio import StreamReader, StreamWriter
 from async_stream import AsyncStream
 from gen3plus.solarman_v5 import SolarmanV5
 
@@ -8,12 +9,13 @@ logger = logging.getLogger('conn')
 
 class ConnectionG3P(AsyncStream, SolarmanV5):
 
-    def __init__(self, reader, writer, addr, remote_stream,
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, remote_stream: 'ConnectionG3P',
                  server_side: bool) -> None:
         AsyncStream.__init__(self, reader, writer, addr)
         SolarmanV5.__init__(self, server_side)
 
-        self.remoteStream = remote_stream
+        self.remoteStream: 'ConnectionG3P' = remote_stream
 
     '''
     Our puplic methods
diff --git a/app/src/gen3plus/inverter_g3p.py b/app/src/gen3plus/inverter_g3p.py
index 487fe1e..0a942f3 100644
--- a/app/src/gen3plus/inverter_g3p.py
+++ b/app/src/gen3plus/inverter_g3p.py
@@ -1,7 +1,7 @@
-import asyncio
 import logging
 import traceback
 import json
+from asyncio import StreamReader, StreamWriter, asyncio
 from config import Config
 from inverter import Inverter
 from gen3plus.connection_g3p import ConnectionG3P
@@ -44,7 +44,7 @@ class InverterG3P(Inverter, ConnectionG3P):
                  destroyed
     '''
 
-    def __init__(self, reader, writer, addr):
+    def __init__(self, reader: StreamReader, writer: StreamWriter, addr):
         super().__init__(reader, writer, addr, None, True)
         self.__ha_restarts = -1
 
diff --git a/app/src/server.py b/app/src/server.py
index 18dc401..65e504c 100644
--- a/app/src/server.py
+++ b/app/src/server.py
@@ -1,5 +1,5 @@
 import logging
-import asyncio
+from asyncio import StreamReader, StreamWriter, asyncio
 import signal
 import os
 from logging import config  # noqa F401
@@ -11,14 +11,14 @@ from scheduler import Schedule
 from config import Config
 
 
-async def handle_client(reader, writer):
+async def handle_client(reader: StreamReader, writer: StreamWriter):
     '''Handles a new incoming connection and starts an async loop'''
 
     addr = writer.get_extra_info('peername')
     await InverterG3(reader, writer, addr).server_loop(addr)
 
 
-async def handle_client_v2(reader, writer):
+async def handle_client_v2(reader: StreamReader, writer: StreamWriter):
     '''Handles a new incoming connection and starts an async loop'''
 
     addr = writer.get_extra_info('peername')