Typing adjustments

Author: GuLinux

upython/backend/boards/cpython/json_config_storage.py

@@ -3,8 +3,9 @@
 from protocols.config_storage import ConfigStorage
 
 class JsonConfigStorage(ConfigStorage):
+    CONFIG_FILE_PATH = os.environ.get('CONFIG_FILE', 'config.json')
     def __init__(self):
-        self.config_file = os.environ.get('CONFIG_FILE', 'config.json')
+        self.config_file = JsonConfigStorage.CONFIG_FILE_PATH
 
     def load_str(self, key: str, maximum_size: int=1024, default: str='') -> str | None:
         return self.__load_json_config().get(key, default)

upython/backend/boards/simulator/wifi_manager.py

@@ -1,24 +1,28 @@
 import asyncio
-from config import Config, WiFi
+from protocols.config import Config
+from boards.cpython.json_config_storage import JsonConfigStorage
 import json
 
 
 class SimulatorWiFiManager:
     def __init__(self, config: Config):
         self.config = config
-        with open(self.config.storage.config_file, 'r') as config_file:
+        with open(JsonConfigStorage.CONFIG_FILE_PATH, 'r') as config_file:
             self.stations = json.load(config_file)['stations']
         print(self.stations)
 
     def scan(self) -> list[str]:
+        return [station['ssid'] for station in self._sorted_available_stations()]
+
+    def _sorted_available_stations(self) -> list[dict]:
         available_stations = [st for st in self.stations if st.get('sim_available', True)]
         return sorted(available_stations, key=lambda st: st.get('sim_rssi', 0))
 
 
     async def connect_stations(self, connect_ap_on_failure: bool = True):
         print('Connecting to WiFi stations...')
         print(f'Configured stations: {self.config.stations}')
-        available_stations = self.scan()
+        available_stations = self._sorted_available_stations()
         if not available_stations:
             print('No stations configured, skipping connection')
             print('Starting AP mode...')

upython/backend/protocols/config.py

@@ -1,7 +1,8 @@
 from protocols.config_storage import ConfigStorage
+from typing import Protocol
 
 
-class WiFi:
+class WiFi(Protocol):
     def __init__(self, ssid: str, psk: str | None = None):
         pass
 
@@ -38,7 +39,7 @@ def to_json_list(cls, json: list) -> list[dict]:
         raise NotImplementedError()
 
 
-class Config:
+class Config(Protocol):
     def __init__(self, storage: ConfigStorage):
         pass
 

upython/backend/protocols/gpio.py

@@ -1,10 +1,10 @@
 import typing
 
-class GPIO:
+class GPIO(typing.Protocol):
     def __init__(self, pin_name: str):
         pass
 
-class ButtonPin(GPIO):
+class ButtonPin(GPIO, typing.Protocol):
     def __init__(self, pin_name: str):
         super().__init__(pin_name)
 
@@ -15,15 +15,15 @@ def value(self) -> bool:
     def on_level_changed(self, callback: typing.Callable[[bool], None]) -> None:
         raise NotImplementedError()
 
-class AnalogInputPin(GPIO):
+class AnalogInputPin(GPIO, typing.Protocol):
     def __init__(self, pin_name: str):
         super().__init__(pin_name)
 
     @property
     def value(self) -> float:
         raise NotImplementedError()
 
-class DigitalOutputPin(GPIO):
+class DigitalOutputPin(GPIO, typing.Protocol):
     def __init__(self, pin_name: str):
         super().__init__(pin_name)
 
@@ -40,7 +40,7 @@ def is_pwm(self):
         return False
 
 
-class PWMPin(GPIO):
+class PWMPin(GPIO, typing.Protocol):
     def __init__(self, pin_name: str):
         super().__init__(pin_name)
 

upython/backend/protocols/wifi_manager.py

@@ -1,7 +1,8 @@
 from protocols.config import Config
+from typing import Protocol
 
 
-class WiFiManager:
+class WiFiManager(Protocol):
     def __init__(self, config: Config):
         pass