From d2abc9417f53f9a330e11dde257d7e014d120f96 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 13 Sep 2022 20:42:24 +0200
Subject: [PATCH] Simplify ws imports

---
 freqtrade/rpc/api_server/api_ws.py         | 2 +-
 freqtrade/rpc/api_server/webserver.py      | 2 +-
 freqtrade/rpc/api_server/ws/__init__.py    | 6 ++++++
 freqtrade/rpc/external_message_consumer.py | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/freqtrade/rpc/api_server/api_ws.py b/freqtrade/rpc/api_server/api_ws.py
index 174a0a85e..c4a3e9d4a 100644
--- a/freqtrade/rpc/api_server/api_ws.py
+++ b/freqtrade/rpc/api_server/api_ws.py
@@ -8,7 +8,7 @@ from pydantic import ValidationError
 from freqtrade.enums import RPCMessageType, RPCRequestType
 from freqtrade.rpc.api_server.api_auth import validate_ws_token
 from freqtrade.rpc.api_server.deps import get_channel_manager, get_rpc
-from freqtrade.rpc.api_server.ws.channel import WebSocketChannel
+from freqtrade.rpc.api_server.ws import WebSocketChannel
 from freqtrade.rpc.api_server.ws_schemas import (WSAnalyzedDFMessage, WSMessageSchema,
                                                  WSRequestSchema, WSWhitelistMessage)
 from freqtrade.rpc.rpc import RPC
diff --git a/freqtrade/rpc/api_server/webserver.py b/freqtrade/rpc/api_server/webserver.py
index 3fb8159e1..7a59a7a4c 100644
--- a/freqtrade/rpc/api_server/webserver.py
+++ b/freqtrade/rpc/api_server/webserver.py
@@ -14,7 +14,7 @@ from starlette.responses import JSONResponse
 
 from freqtrade.exceptions import OperationalException
 from freqtrade.rpc.api_server.uvicorn_threaded import UvicornServer
-from freqtrade.rpc.api_server.ws.channel import ChannelManager
+from freqtrade.rpc.api_server.ws import ChannelManager
 from freqtrade.rpc.rpc import RPC, RPCException, RPCHandler
 
 
diff --git a/freqtrade/rpc/api_server/ws/__init__.py b/freqtrade/rpc/api_server/ws/__init__.py
index e69de29bb..c00d29e22 100644
--- a/freqtrade/rpc/api_server/ws/__init__.py
+++ b/freqtrade/rpc/api_server/ws/__init__.py
@@ -0,0 +1,6 @@
+# flake8: noqa: F401
+# isort: off
+from freqtrade.rpc.api_server.ws.types import WebSocketType
+from freqtrade.rpc.api_server.ws.proxy import WebSocketProxy
+from freqtrade.rpc.api_server.ws.serializer import HybridJSONWebSocketSerializer, MsgPackWebSocketSerializer
+from freqtrade.rpc.api_server.ws.channel import ChannelManager, WebSocketChannel
diff --git a/freqtrade/rpc/external_message_consumer.py b/freqtrade/rpc/external_message_consumer.py
index f8e5315f9..2ff261eee 100644
--- a/freqtrade/rpc/external_message_consumer.py
+++ b/freqtrade/rpc/external_message_consumer.py
@@ -17,7 +17,7 @@ from freqtrade.data.dataprovider import DataProvider
 from freqtrade.enums import RPCMessageType
 from freqtrade.exceptions import OperationalException
 from freqtrade.misc import remove_entry_exit_signals
-from freqtrade.rpc.api_server.ws.channel import WebSocketChannel
+from freqtrade.rpc.api_server.ws import WebSocketChannel
 from freqtrade.rpc.api_server.ws_schemas import (WSAnalyzedDFMessage, WSAnalyzedDFRequest,
                                                  WSMessageSchema, WSRequestSchema,
                                                  WSSubscribeRequest, WSWhitelistMessage,
@@ -252,8 +252,7 @@ class ExternalMessageConsumer:
 
                     continue
                 except Exception:
-                    logger.error(
-                        f"Ping error {channel} - retrying in {self.sleep_time}s")
+                    logger.warning(f"Ping error {channel} - retrying in {self.sleep_time}s")
                     await asyncio.sleep(self.sleep_time)
 
                     break