From e1b027b30143c3a5af2b5f3b57a15c1f34ab18ac Mon Sep 17 00:00:00 2001 From: Merelden Date: Tue, 21 Oct 2025 11:13:56 +0500 Subject: [PATCH] Repair depends in wifi service --- SRV/api/v1/subnet.py | 8 ++++---- SRV/services/connect_service.py | 12 +++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/SRV/api/v1/subnet.py b/SRV/api/v1/subnet.py index b439a7c..696fb52 100644 --- a/SRV/api/v1/subnet.py +++ b/SRV/api/v1/subnet.py @@ -286,7 +286,7 @@ def connect_to_wifi(request: WifiConnectRequest, translations: Translations = De HTTPException: Если подключение не удалось (status_code=400). """ try: - wifi_service = WifiConnectionService() + wifi_service = WifiConnectionService(translations) success, message = wifi_service.connect(request.ssid, request.password) if not success: raise HTTPException(status_code=400, detail=translations.gettext(message)) @@ -313,7 +313,7 @@ def disconnect_from_wifi(request: WifiDisconnectRequest, translations: Translati HTTPException: Если отключение не удалось (status_code=400). """ try: - wifi_service = WifiConnectionService() + wifi_service = WifiConnectionService(translations) success, message = wifi_service.disconnect(request.ssid) if not success: raise HTTPException(status_code=400, detail=translations.gettext(message)) @@ -341,7 +341,7 @@ def get_wifi_status(translations: Translations = Depends(get_translations())): HTTPException: Если проверка статуса не удалась (status_code=400). """ try: - wifi_service = WifiConnectionService() + wifi_service = WifiConnectionService(translations) success, message = wifi_service.get_status() if not success: raise HTTPException(status_code=400, detail=translations.gettext(message)) @@ -349,4 +349,4 @@ def get_wifi_status(translations: Translations = Depends(get_translations())): except HTTPException as e: raise e except Exception as e: - raise HTTPException(status_code=500, detail=translations.gettext("Ошибка проверки статуса Wi-Fi: {error}").format(error=str(e))) \ No newline at end of file + raise HTTPException(status_code=500, detail=translations.gettext("Ошибка проверки статуса Wi-Fi: {error}").format(error=str(e))) diff --git a/SRV/services/connect_service.py b/SRV/services/connect_service.py index 51b9d79..74f4434 100644 --- a/SRV/services/connect_service.py +++ b/SRV/services/connect_service.py @@ -31,13 +31,19 @@ class WifiConnectionService: Предоставляет методы для подключения, отключения и проверки статуса Wi-Fi соединений. """ - def __init__(self, translations: Translations = Depends(get_translations())): + def __init__(self, translations: Optional[Translations] = None): """Инициализирует сервис Wi-Fi. Автоматически определяет доступный Wi-Fi-интерфейс и сохраняет его имя. """ self.interface = self._get_wifi_interface() - self.translations = translations + if translations is None: + try: + self.translations = Translations.load("locales", ["ru"], "messages") + except Exception: + self.translations = Translations() + else: + self.translations = translations def _get_wifi_interface(self) -> str: """Автоматически определяет Wi-Fi-интерфейс. @@ -177,4 +183,4 @@ class WifiConnectionService: return False, self.translations.gettext("Не подключено к Wi-Fi") except Exception as e: logger.error(f"Error checking status: {str(e)}") - return False, self.translations.gettext("Ошибка проверки статуса: {error}").format(error=str(e)) \ No newline at end of file + return False, self.translations.gettext("Ошибка проверки статуса: {error}").format(error=str(e))