initial rework separating server and client impl
This commit is contained in:
Timothy Pogue
@@ -1,5 +1,5 @@
|
||||
# flake8: noqa: F401
|
||||
from freqtrade.rpc.external_signal.controller import ExternalSignalController
|
||||
|
||||
|
||||
__all__ = ('ExternalSignalController')
|
||||
# # flake8: noqa: F401
|
||||
# from freqtrade.rpc.external_signal.controller import ExternalSignalController
|
||||
#
|
||||
#
|
||||
# __all__ = ('ExternalSignalController')
|
||||
|
||||
@@ -1,145 +1,145 @@
|
||||
import logging
|
||||
from threading import RLock
|
||||
from typing import Type
|
||||
|
||||
from freqtrade.rpc.external_signal.proxy import WebSocketProxy
|
||||
from freqtrade.rpc.external_signal.serializer import MsgPackWebSocketSerializer, WebSocketSerializer
|
||||
from freqtrade.rpc.external_signal.types import WebSocketType
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class WebSocketChannel:
|
||||
"""
|
||||
Object to help facilitate managing a websocket connection
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
websocket: WebSocketType,
|
||||
serializer_cls: Type[WebSocketSerializer] = MsgPackWebSocketSerializer
|
||||
):
|
||||
# The WebSocket object
|
||||
self._websocket = WebSocketProxy(websocket)
|
||||
# The Serializing class for the WebSocket object
|
||||
self._serializer_cls = serializer_cls
|
||||
|
||||
# Internal event to signify a closed websocket
|
||||
self._closed = False
|
||||
|
||||
# Wrap the WebSocket in the Serializing class
|
||||
self._wrapped_ws = self._serializer_cls(self._websocket)
|
||||
|
||||
async def send(self, data):
|
||||
"""
|
||||
Send data on the wrapped websocket
|
||||
"""
|
||||
# logger.info(f"Serialized Send - {self._wrapped_ws._serialize(data)}")
|
||||
await self._wrapped_ws.send(data)
|
||||
|
||||
async def recv(self):
|
||||
"""
|
||||
Receive data on the wrapped websocket
|
||||
"""
|
||||
return await self._wrapped_ws.recv()
|
||||
|
||||
async def ping(self):
|
||||
"""
|
||||
Ping the websocket
|
||||
"""
|
||||
return await self._websocket.ping()
|
||||
|
||||
async def close(self):
|
||||
"""
|
||||
Close the WebSocketChannel
|
||||
"""
|
||||
|
||||
self._closed = True
|
||||
|
||||
def is_closed(self):
|
||||
return self._closed
|
||||
|
||||
|
||||
class ChannelManager:
|
||||
def __init__(self):
|
||||
self.channels = dict()
|
||||
self._lock = RLock() # Re-entrant Lock
|
||||
|
||||
async def on_connect(self, websocket: WebSocketType):
|
||||
"""
|
||||
Wrap websocket connection into Channel and add to list
|
||||
|
||||
:param websocket: The WebSocket object to attach to the Channel
|
||||
"""
|
||||
if hasattr(websocket, "accept"):
|
||||
try:
|
||||
await websocket.accept()
|
||||
except RuntimeError:
|
||||
# The connection was closed before we could accept it
|
||||
return
|
||||
|
||||
ws_channel = WebSocketChannel(websocket)
|
||||
|
||||
with self._lock:
|
||||
self.channels[websocket] = ws_channel
|
||||
|
||||
return ws_channel
|
||||
|
||||
async def on_disconnect(self, websocket: WebSocketType):
|
||||
"""
|
||||
Call close on the channel if it's not, and remove from channel list
|
||||
|
||||
:param websocket: The WebSocket objet attached to the Channel
|
||||
"""
|
||||
with self._lock:
|
||||
channel = self.channels.get(websocket)
|
||||
if channel:
|
||||
logger.debug(f"Disconnecting channel - {channel}")
|
||||
|
||||
if not channel.is_closed():
|
||||
await channel.close()
|
||||
|
||||
del self.channels[websocket]
|
||||
|
||||
async def disconnect_all(self):
|
||||
"""
|
||||
Disconnect all Channels
|
||||
"""
|
||||
with self._lock:
|
||||
for websocket, channel in self.channels.items():
|
||||
if not channel.is_closed():
|
||||
await channel.close()
|
||||
|
||||
self.channels = dict()
|
||||
|
||||
async def broadcast(self, data):
|
||||
"""
|
||||
Broadcast data on all Channels
|
||||
|
||||
:param data: The data to send
|
||||
"""
|
||||
with self._lock:
|
||||
for websocket, channel in self.channels.items():
|
||||
try:
|
||||
await channel.send(data)
|
||||
except RuntimeError:
|
||||
# Handle cannot send after close cases
|
||||
await self.on_disconnect(websocket)
|
||||
|
||||
async def send_direct(self, channel, data):
|
||||
"""
|
||||
Send data directly through direct_channel only
|
||||
|
||||
:param direct_channel: The WebSocketChannel object to send data through
|
||||
:param data: The data to send
|
||||
"""
|
||||
# We iterate over the channels to get reference to the websocket object
|
||||
# so we can disconnect incase of failure
|
||||
await channel.send(data)
|
||||
|
||||
def has_channels(self):
|
||||
"""
|
||||
Flag for more than 0 channels
|
||||
"""
|
||||
return len(self.channels) > 0
|
||||
# import logging
|
||||
# from threading import RLock
|
||||
# from typing import Type
|
||||
#
|
||||
# from freqtrade.rpc.external_signal.proxy import WebSocketProxy
|
||||
# from freqtrade.rpc.external_signal.serializer import MsgPackWebSocketSerializer
|
||||
# from freqtrade.rpc.external_signal.types import WebSocketType
|
||||
#
|
||||
#
|
||||
# logger = logging.getLogger(__name__)
|
||||
#
|
||||
#
|
||||
# class WebSocketChannel:
|
||||
# """
|
||||
# Object to help facilitate managing a websocket connection
|
||||
# """
|
||||
#
|
||||
# def __init__(
|
||||
# self,
|
||||
# websocket: WebSocketType,
|
||||
# serializer_cls: Type[WebSocketSerializer] = MsgPackWebSocketSerializer
|
||||
# ):
|
||||
# # The WebSocket object
|
||||
# self._websocket = WebSocketProxy(websocket)
|
||||
# # The Serializing class for the WebSocket object
|
||||
# self._serializer_cls = serializer_cls
|
||||
#
|
||||
# # Internal event to signify a closed websocket
|
||||
# self._closed = False
|
||||
#
|
||||
# # Wrap the WebSocket in the Serializing class
|
||||
# self._wrapped_ws = self._serializer_cls(self._websocket)
|
||||
#
|
||||
# async def send(self, data):
|
||||
# """
|
||||
# Send data on the wrapped websocket
|
||||
# """
|
||||
# # logger.info(f"Serialized Send - {self._wrapped_ws._serialize(data)}")
|
||||
# await self._wrapped_ws.send(data)
|
||||
#
|
||||
# async def recv(self):
|
||||
# """
|
||||
# Receive data on the wrapped websocket
|
||||
# """
|
||||
# return await self._wrapped_ws.recv()
|
||||
#
|
||||
# async def ping(self):
|
||||
# """
|
||||
# Ping the websocket
|
||||
# """
|
||||
# return await self._websocket.ping()
|
||||
#
|
||||
# async def close(self):
|
||||
# """
|
||||
# Close the WebSocketChannel
|
||||
# """
|
||||
#
|
||||
# self._closed = True
|
||||
#
|
||||
# def is_closed(self):
|
||||
# return self._closed
|
||||
#
|
||||
#
|
||||
# class ChannelManager:
|
||||
# def __init__(self):
|
||||
# self.channels = dict()
|
||||
# self._lock = RLock() # Re-entrant Lock
|
||||
#
|
||||
# async def on_connect(self, websocket: WebSocketType):
|
||||
# """
|
||||
# Wrap websocket connection into Channel and add to list
|
||||
#
|
||||
# :param websocket: The WebSocket object to attach to the Channel
|
||||
# """
|
||||
# if hasattr(websocket, "accept"):
|
||||
# try:
|
||||
# await websocket.accept()
|
||||
# except RuntimeError:
|
||||
# # The connection was closed before we could accept it
|
||||
# return
|
||||
#
|
||||
# ws_channel = WebSocketChannel(websocket)
|
||||
#
|
||||
# with self._lock:
|
||||
# self.channels[websocket] = ws_channel
|
||||
#
|
||||
# return ws_channel
|
||||
#
|
||||
# async def on_disconnect(self, websocket: WebSocketType):
|
||||
# """
|
||||
# Call close on the channel if it's not, and remove from channel list
|
||||
#
|
||||
# :param websocket: The WebSocket objet attached to the Channel
|
||||
# """
|
||||
# with self._lock:
|
||||
# channel = self.channels.get(websocket)
|
||||
# if channel:
|
||||
# logger.debug(f"Disconnecting channel - {channel}")
|
||||
#
|
||||
# if not channel.is_closed():
|
||||
# await channel.close()
|
||||
#
|
||||
# del self.channels[websocket]
|
||||
#
|
||||
# async def disconnect_all(self):
|
||||
# """
|
||||
# Disconnect all Channels
|
||||
# """
|
||||
# with self._lock:
|
||||
# for websocket, channel in self.channels.items():
|
||||
# if not channel.is_closed():
|
||||
# await channel.close()
|
||||
#
|
||||
# self.channels = dict()
|
||||
#
|
||||
# async def broadcast(self, data):
|
||||
# """
|
||||
# Broadcast data on all Channels
|
||||
#
|
||||
# :param data: The data to send
|
||||
# """
|
||||
# with self._lock:
|
||||
# for websocket, channel in self.channels.items():
|
||||
# try:
|
||||
# await channel.send(data)
|
||||
# except RuntimeError:
|
||||
# # Handle cannot send after close cases
|
||||
# await self.on_disconnect(websocket)
|
||||
#
|
||||
# async def send_direct(self, channel, data):
|
||||
# """
|
||||
# Send data directly through direct_channel only
|
||||
#
|
||||
# :param direct_channel: The WebSocketChannel object to send data through
|
||||
# :param data: The data to send
|
||||
# """
|
||||
# # We iterate over the channels to get reference to the websocket object
|
||||
# # so we can disconnect incase of failure
|
||||
# await channel.send(data)
|
||||
#
|
||||
# def has_channels(self):
|
||||
# """
|
||||
# Flag for more than 0 channels
|
||||
# """
|
||||
# return len(self.channels) > 0
|
||||
|
||||
@@ -1,449 +1,449 @@
|
||||
"""
|
||||
This module manages replicate mode communication
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
import secrets
|
||||
import socket
|
||||
from threading import Thread
|
||||
from typing import Any, Callable, Coroutine, Dict, Union
|
||||
|
||||
import websockets
|
||||
from fastapi import Depends
|
||||
from fastapi import WebSocket as FastAPIWebSocket
|
||||
from fastapi import WebSocketDisconnect, status
|
||||
from janus import Queue as ThreadedQueue
|
||||
|
||||
from freqtrade.enums import ExternalSignalModeType, LeaderMessageType, RPCMessageType
|
||||
from freqtrade.rpc import RPC, RPCHandler
|
||||
from freqtrade.rpc.external_signal.channel import ChannelManager
|
||||
from freqtrade.rpc.external_signal.types import MessageType
|
||||
from freqtrade.rpc.external_signal.utils import is_websocket_alive
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ExternalSignalController(RPCHandler):
|
||||
""" This class handles all websocket communication """
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
rpc: RPC,
|
||||
config: Dict[str, Any],
|
||||
api_server: Union[Any, None] = None
|
||||
) -> None:
|
||||
"""
|
||||
Init the ExternalSignalController class, and init the super class RPCHandler
|
||||
:param rpc: instance of RPC Helper class
|
||||
:param config: Configuration object
|
||||
:param api_server: The ApiServer object
|
||||
:return: None
|
||||
"""
|
||||
super().__init__(rpc, config)
|
||||
|
||||
self.freqtrade = rpc._freqtrade
|
||||
self.api_server = api_server
|
||||
|
||||
if not self.api_server:
|
||||
raise RuntimeError("The API server must be enabled for external signals to work")
|
||||
|
||||
self._loop = None
|
||||
self._running = False
|
||||
self._thread = None
|
||||
self._queue = None
|
||||
|
||||
self._main_task = None
|
||||
self._sub_tasks = None
|
||||
|
||||
self._message_handlers = {
|
||||
LeaderMessageType.pairlist: self._rpc._handle_pairlist_message,
|
||||
LeaderMessageType.analyzed_df: self._rpc._handle_analyzed_df_message,
|
||||
LeaderMessageType.default: self._rpc._handle_default_message
|
||||
}
|
||||
|
||||
self.channel_manager = ChannelManager()
|
||||
self.external_signal_config = config.get('external_signal', {})
|
||||
|
||||
# What the config should look like
|
||||
# "external_signal": {
|
||||
# "enabled": true,
|
||||
# "mode": "follower",
|
||||
# "leaders": [
|
||||
# {
|
||||
# "url": "ws://localhost:8080/signals/ws",
|
||||
# "api_token": "test"
|
||||
# }
|
||||
# ]
|
||||
# }
|
||||
|
||||
# "external_signal": {
|
||||
# "enabled": true,
|
||||
# "mode": "leader",
|
||||
# "api_token": "test"
|
||||
# }
|
||||
|
||||
self.mode = ExternalSignalModeType[
|
||||
self.external_signal_config.get('mode', 'leader').lower()
|
||||
]
|
||||
|
||||
self.leaders_list = self.external_signal_config.get('leaders', [])
|
||||
self.push_throttle_secs = self.external_signal_config.get('push_throttle_secs', 0.1)
|
||||
|
||||
self.reply_timeout = self.external_signal_config.get('follower_reply_timeout', 10)
|
||||
self.ping_timeout = self.external_signal_config.get('follower_ping_timeout', 2)
|
||||
self.sleep_time = self.external_signal_config.get('follower_sleep_time', 5)
|
||||
|
||||
# Validate external_signal_config here?
|
||||
|
||||
if self.mode == ExternalSignalModeType.follower and len(self.leaders_list) == 0:
|
||||
raise ValueError("You must specify at least 1 leader in follower mode.")
|
||||
|
||||
# This is only used by the leader, the followers use the tokens specified
|
||||
# in each of the leaders
|
||||
# If you do not specify an API key in the config, one will be randomly
|
||||
# generated and logged on startup
|
||||
default_api_key = secrets.token_urlsafe(16)
|
||||
self.secret_api_key = self.external_signal_config.get('api_token', default_api_key)
|
||||
|
||||
self.start()
|
||||
|
||||
def is_leader(self):
|
||||
"""
|
||||
Leader flag
|
||||
"""
|
||||
return self.enabled() and self.mode == ExternalSignalModeType.leader
|
||||
|
||||
def enabled(self):
|
||||
"""
|
||||
Enabled flag
|
||||
"""
|
||||
return self.external_signal_config.get('enabled', False)
|
||||
|
||||
def num_leaders(self):
|
||||
"""
|
||||
The number of leaders we should be connected to
|
||||
"""
|
||||
return len(self.leaders_list)
|
||||
|
||||
def start_threaded_loop(self):
|
||||
"""
|
||||
Start the main internal loop in another thread to run coroutines
|
||||
"""
|
||||
self._loop = asyncio.new_event_loop()
|
||||
|
||||
if not self._thread:
|
||||
self._thread = Thread(target=self._loop.run_forever)
|
||||
self._thread.start()
|
||||
self._running = True
|
||||
else:
|
||||
raise RuntimeError("A loop is already running")
|
||||
|
||||
def submit_coroutine(self, coroutine: Coroutine):
|
||||
"""
|
||||
Submit a coroutine to the threaded loop
|
||||
"""
|
||||
if not self._running:
|
||||
raise RuntimeError("Cannot schedule new futures after shutdown")
|
||||
|
||||
if not self._loop or not self._loop.is_running():
|
||||
raise RuntimeError("Loop must be started before any function can"
|
||||
" be submitted")
|
||||
|
||||
return asyncio.run_coroutine_threadsafe(coroutine, self._loop)
|
||||
|
||||
def start(self):
|
||||
"""
|
||||
Start the controller main loop
|
||||
"""
|
||||
self.start_threaded_loop()
|
||||
self._main_task = self.submit_coroutine(self.main())
|
||||
|
||||
async def shutdown(self):
|
||||
"""
|
||||
Shutdown all tasks and close up
|
||||
"""
|
||||
logger.info("Stopping rpc.externalsignalcontroller")
|
||||
|
||||
# Flip running flag
|
||||
self._running = False
|
||||
|
||||
# Cancel sub tasks
|
||||
for task in self._sub_tasks:
|
||||
task.cancel()
|
||||
|
||||
# Then disconnect all channels
|
||||
await self.channel_manager.disconnect_all()
|
||||
|
||||
def cleanup(self) -> None:
|
||||
"""
|
||||
Cleanup pending module resources.
|
||||
"""
|
||||
if self._thread:
|
||||
if self._loop.is_running():
|
||||
self._main_task.cancel()
|
||||
self._thread.join()
|
||||
|
||||
async def main(self):
|
||||
"""
|
||||
Main coro
|
||||
|
||||
Start the loop based on what mode we're in
|
||||
"""
|
||||
try:
|
||||
if self.mode == ExternalSignalModeType.leader:
|
||||
logger.info("Starting rpc.externalsignalcontroller in Leader mode")
|
||||
|
||||
await self.run_leader_mode()
|
||||
elif self.mode == ExternalSignalModeType.follower:
|
||||
logger.info("Starting rpc.externalsignalcontroller in Follower mode")
|
||||
|
||||
await self.run_follower_mode()
|
||||
|
||||
except asyncio.CancelledError:
|
||||
# We're cancelled
|
||||
await self.shutdown()
|
||||
except Exception as e:
|
||||
# Log the error
|
||||
logger.error(f"Exception occurred in main task: {e}")
|
||||
logger.exception(e)
|
||||
finally:
|
||||
# This coroutine is the last thing to be ended, so it should stop the loop
|
||||
self._loop.stop()
|
||||
|
||||
def log_api_token(self):
|
||||
"""
|
||||
Log the API token
|
||||
"""
|
||||
logger.info("-" * 15)
|
||||
logger.info(f"API_KEY: {self.secret_api_key}")
|
||||
logger.info("-" * 15)
|
||||
|
||||
def send_msg(self, msg: MessageType) -> None:
|
||||
"""
|
||||
Support RPC calls
|
||||
"""
|
||||
if msg["type"] == RPCMessageType.EMIT_DATA:
|
||||
message = msg.get("message")
|
||||
if message:
|
||||
self.send_message(message)
|
||||
else:
|
||||
logger.error(f"Message is empty! {msg}")
|
||||
|
||||
def send_message(self, msg: MessageType) -> None:
|
||||
"""
|
||||
Broadcast message over all channels if there are any
|
||||
"""
|
||||
|
||||
if self.channel_manager.has_channels():
|
||||
self._send_message(msg)
|
||||
else:
|
||||
logger.debug("No listening followers, skipping...")
|
||||
pass
|
||||
|
||||
def _send_message(self, msg: MessageType):
|
||||
"""
|
||||
Add data to the internal queue to be broadcasted. This func will block
|
||||
if the queue is full. This is meant to be called in the main thread.
|
||||
"""
|
||||
if self._queue:
|
||||
queue = self._queue.sync_q
|
||||
queue.put(msg) # This will block if the queue is full
|
||||
else:
|
||||
logger.warning("Can not send data, leader loop has not started yet!")
|
||||
|
||||
async def send_initial_data(self, channel):
|
||||
logger.info("Sending initial data through channel")
|
||||
|
||||
data = self._rpc._initial_leader_data()
|
||||
|
||||
for message in data:
|
||||
await channel.send(message)
|
||||
|
||||
async def _handle_leader_message(self, message: MessageType):
|
||||
"""
|
||||
Handle message received from a Leader
|
||||
"""
|
||||
type = message.get("data_type", LeaderMessageType.default)
|
||||
data = message.get("data")
|
||||
|
||||
handler: Callable = self._message_handlers[type]
|
||||
handler(type, data)
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
async def run_leader_mode(self):
|
||||
"""
|
||||
Main leader coroutine
|
||||
|
||||
This starts all of the leader coros and registers the endpoint on
|
||||
the ApiServer
|
||||
"""
|
||||
self.register_leader_endpoint()
|
||||
self.log_api_token()
|
||||
|
||||
self._sub_tasks = [
|
||||
self._loop.create_task(self._broadcast_queue_data())
|
||||
]
|
||||
|
||||
return await asyncio.gather(*self._sub_tasks)
|
||||
|
||||
async def run_follower_mode(self):
|
||||
"""
|
||||
Main follower coroutine
|
||||
|
||||
This starts all of the follower connection coros
|
||||
"""
|
||||
|
||||
rpc_lock = asyncio.Lock()
|
||||
|
||||
self._sub_tasks = [
|
||||
self._loop.create_task(self._handle_leader_connection(leader, rpc_lock))
|
||||
for leader in self.leaders_list
|
||||
]
|
||||
|
||||
return await asyncio.gather(*self._sub_tasks)
|
||||
|
||||
async def _broadcast_queue_data(self):
|
||||
"""
|
||||
Loop over queue data and broadcast it
|
||||
"""
|
||||
# Instantiate the queue in this coroutine so it's attached to our loop
|
||||
self._queue = ThreadedQueue()
|
||||
async_queue = self._queue.async_q
|
||||
|
||||
try:
|
||||
while self._running:
|
||||
# Get data from queue
|
||||
data = await async_queue.get()
|
||||
|
||||
# Broadcast it to everyone
|
||||
await self.channel_manager.broadcast(data)
|
||||
|
||||
# Sleep
|
||||
await asyncio.sleep(self.push_throttle_secs)
|
||||
|
||||
except asyncio.CancelledError:
|
||||
# Silently stop
|
||||
pass
|
||||
|
||||
async def get_api_token(
|
||||
self,
|
||||
websocket: FastAPIWebSocket,
|
||||
token: Union[str, None] = None
|
||||
):
|
||||
"""
|
||||
Extract the API key from query param. Must match the
|
||||
set secret_api_key or the websocket connection will be closed.
|
||||
"""
|
||||
if token == self.secret_api_key:
|
||||
return token
|
||||
else:
|
||||
logger.info("Denying websocket request...")
|
||||
await websocket.close(code=status.WS_1008_POLICY_VIOLATION)
|
||||
|
||||
def register_leader_endpoint(self, path: str = "/signals/ws"):
|
||||
"""
|
||||
Attach and start the main leader loop to the ApiServer
|
||||
|
||||
:param path: The endpoint path
|
||||
"""
|
||||
if not self.api_server:
|
||||
raise RuntimeError("The leader needs the ApiServer to be active")
|
||||
|
||||
# The endpoint function for running the main leader loop
|
||||
@self.api_server.app.websocket(path)
|
||||
async def leader_endpoint(
|
||||
websocket: FastAPIWebSocket,
|
||||
api_key: str = Depends(self.get_api_token)
|
||||
):
|
||||
await self.leader_endpoint_loop(websocket)
|
||||
|
||||
async def leader_endpoint_loop(self, websocket: FastAPIWebSocket):
|
||||
"""
|
||||
The WebSocket endpoint served by the ApiServer. This handles connections,
|
||||
and adding them to the channel manager.
|
||||
"""
|
||||
try:
|
||||
if is_websocket_alive(websocket):
|
||||
logger.info(f"Follower connected - {websocket.client}")
|
||||
channel = await self.channel_manager.on_connect(websocket)
|
||||
|
||||
# Send initial data here
|
||||
# Data is being broadcasted right away as soon as startup,
|
||||
# we may not have to send initial data at all. Further testing
|
||||
# required.
|
||||
await self.send_initial_data(channel)
|
||||
|
||||
# Keep connection open until explicitly closed, and sleep
|
||||
try:
|
||||
while not channel.is_closed():
|
||||
request = await channel.recv()
|
||||
logger.info(f"Follower request - {request}")
|
||||
|
||||
except WebSocketDisconnect:
|
||||
# Handle client disconnects
|
||||
logger.info(f"Follower disconnected - {websocket.client}")
|
||||
await self.channel_manager.on_disconnect(websocket)
|
||||
except Exception as e:
|
||||
logger.info(f"Follower connection failed - {websocket.client}")
|
||||
logger.exception(e)
|
||||
# Handle cases like -
|
||||
# RuntimeError('Cannot call "send" once a closed message has been sent')
|
||||
await self.channel_manager.on_disconnect(websocket)
|
||||
|
||||
except Exception:
|
||||
logger.error(f"Failed to serve - {websocket.client}")
|
||||
await self.channel_manager.on_disconnect(websocket)
|
||||
|
||||
async def _handle_leader_connection(self, leader, lock):
|
||||
"""
|
||||
Given a leader, connect and wait on data. If connection is lost,
|
||||
it will attempt to reconnect.
|
||||
"""
|
||||
try:
|
||||
url, token = leader["url"], leader["api_token"]
|
||||
websocket_url = f"{url}?token={token}"
|
||||
|
||||
logger.info(f"Attempting to connect to Leader at: {url}")
|
||||
while True:
|
||||
try:
|
||||
async with websockets.connect(websocket_url) as ws:
|
||||
channel = await self.channel_manager.on_connect(ws)
|
||||
logger.info(f"Connection to Leader at {url} successful")
|
||||
while True:
|
||||
try:
|
||||
data = await asyncio.wait_for(
|
||||
channel.recv(),
|
||||
timeout=self.reply_timeout
|
||||
)
|
||||
except (asyncio.TimeoutError, websockets.exceptions.ConnectionClosed):
|
||||
# We haven't received data yet. Check the connection and continue.
|
||||
try:
|
||||
# ping
|
||||
ping = await channel.ping()
|
||||
await asyncio.wait_for(ping, timeout=self.ping_timeout)
|
||||
logger.debug(f"Connection to {url} still alive...")
|
||||
continue
|
||||
except Exception:
|
||||
logger.info(
|
||||
f"Ping error {url} - retrying in {self.sleep_time}s")
|
||||
asyncio.sleep(self.sleep_time)
|
||||
break
|
||||
|
||||
async with lock:
|
||||
# Acquire lock so only 1 coro handling at a time
|
||||
# as we call the RPC module in the main thread
|
||||
await self._handle_leader_message(data)
|
||||
|
||||
except (socket.gaierror, ConnectionRefusedError):
|
||||
logger.info(f"Connection Refused - retrying connection in {self.sleep_time}s")
|
||||
await asyncio.sleep(self.sleep_time)
|
||||
continue
|
||||
except websockets.exceptions.InvalidStatusCode as e:
|
||||
logger.error(f"Connection Refused - {e}")
|
||||
await asyncio.sleep(self.sleep_time)
|
||||
continue
|
||||
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
# """
|
||||
# This module manages replicate mode communication
|
||||
# """
|
||||
# import asyncio
|
||||
# import logging
|
||||
# import secrets
|
||||
# import socket
|
||||
# from threading import Thread
|
||||
# from typing import Any, Callable, Coroutine, Dict, Union
|
||||
#
|
||||
# import websockets
|
||||
# from fastapi import Depends
|
||||
# from fastapi import WebSocket as FastAPIWebSocket
|
||||
# from fastapi import WebSocketDisconnect, status
|
||||
# from janus import Queue as ThreadedQueue
|
||||
#
|
||||
# from freqtrade.enums import ExternalSignalModeType, LeaderMessageType, RPCMessageType
|
||||
# from freqtrade.rpc import RPC, RPCHandler
|
||||
# from freqtrade.rpc.external_signal.channel import ChannelManager
|
||||
# from freqtrade.rpc.external_signal.types import MessageType
|
||||
# from freqtrade.rpc.external_signal.utils import is_websocket_alive
|
||||
#
|
||||
#
|
||||
# logger = logging.getLogger(__name__)
|
||||
#
|
||||
#
|
||||
# class ExternalSignalController(RPCHandler):
|
||||
# """ This class handles all websocket communication """
|
||||
#
|
||||
# def __init__(
|
||||
# self,
|
||||
# rpc: RPC,
|
||||
# config: Dict[str, Any],
|
||||
# api_server: Union[Any, None] = None
|
||||
# ) -> None:
|
||||
# """
|
||||
# Init the ExternalSignalController class, and init the super class RPCHandler
|
||||
# :param rpc: instance of RPC Helper class
|
||||
# :param config: Configuration object
|
||||
# :param api_server: The ApiServer object
|
||||
# :return: None
|
||||
# """
|
||||
# super().__init__(rpc, config)
|
||||
#
|
||||
# self.freqtrade = rpc._freqtrade
|
||||
# self.api_server = api_server
|
||||
#
|
||||
# if not self.api_server:
|
||||
# raise RuntimeError("The API server must be enabled for external signals to work")
|
||||
#
|
||||
# self._loop = None
|
||||
# self._running = False
|
||||
# self._thread = None
|
||||
# self._queue = None
|
||||
#
|
||||
# self._main_task = None
|
||||
# self._sub_tasks = None
|
||||
#
|
||||
# self._message_handlers = {
|
||||
# LeaderMessageType.pairlist: self._rpc._handle_pairlist_message,
|
||||
# LeaderMessageType.analyzed_df: self._rpc._handle_analyzed_df_message,
|
||||
# LeaderMessageType.default: self._rpc._handle_default_message
|
||||
# }
|
||||
#
|
||||
# self.channel_manager = ChannelManager()
|
||||
# self.external_signal_config = config.get('external_signal', {})
|
||||
#
|
||||
# # What the config should look like
|
||||
# # "external_signal": {
|
||||
# # "enabled": true,
|
||||
# # "mode": "follower",
|
||||
# # "leaders": [
|
||||
# # {
|
||||
# # "url": "ws://localhost:8080/signals/ws",
|
||||
# # "api_token": "test"
|
||||
# # }
|
||||
# # ]
|
||||
# # }
|
||||
#
|
||||
# # "external_signal": {
|
||||
# # "enabled": true,
|
||||
# # "mode": "leader",
|
||||
# # "api_token": "test"
|
||||
# # }
|
||||
#
|
||||
# self.mode = ExternalSignalModeType[
|
||||
# self.external_signal_config.get('mode', 'leader').lower()
|
||||
# ]
|
||||
#
|
||||
# self.leaders_list = self.external_signal_config.get('leaders', [])
|
||||
# self.push_throttle_secs = self.external_signal_config.get('push_throttle_secs', 0.1)
|
||||
#
|
||||
# self.reply_timeout = self.external_signal_config.get('follower_reply_timeout', 10)
|
||||
# self.ping_timeout = self.external_signal_config.get('follower_ping_timeout', 2)
|
||||
# self.sleep_time = self.external_signal_config.get('follower_sleep_time', 5)
|
||||
#
|
||||
# # Validate external_signal_config here?
|
||||
#
|
||||
# if self.mode == ExternalSignalModeType.follower and len(self.leaders_list) == 0:
|
||||
# raise ValueError("You must specify at least 1 leader in follower mode.")
|
||||
#
|
||||
# # This is only used by the leader, the followers use the tokens specified
|
||||
# # in each of the leaders
|
||||
# # If you do not specify an API key in the config, one will be randomly
|
||||
# # generated and logged on startup
|
||||
# default_api_key = secrets.token_urlsafe(16)
|
||||
# self.secret_api_key = self.external_signal_config.get('api_token', default_api_key)
|
||||
#
|
||||
# self.start()
|
||||
#
|
||||
# def is_leader(self):
|
||||
# """
|
||||
# Leader flag
|
||||
# """
|
||||
# return self.enabled() and self.mode == ExternalSignalModeType.leader
|
||||
#
|
||||
# def enabled(self):
|
||||
# """
|
||||
# Enabled flag
|
||||
# """
|
||||
# return self.external_signal_config.get('enabled', False)
|
||||
#
|
||||
# def num_leaders(self):
|
||||
# """
|
||||
# The number of leaders we should be connected to
|
||||
# """
|
||||
# return len(self.leaders_list)
|
||||
#
|
||||
# def start_threaded_loop(self):
|
||||
# """
|
||||
# Start the main internal loop in another thread to run coroutines
|
||||
# """
|
||||
# self._loop = asyncio.new_event_loop()
|
||||
#
|
||||
# if not self._thread:
|
||||
# self._thread = Thread(target=self._loop.run_forever)
|
||||
# self._thread.start()
|
||||
# self._running = True
|
||||
# else:
|
||||
# raise RuntimeError("A loop is already running")
|
||||
#
|
||||
# def submit_coroutine(self, coroutine: Coroutine):
|
||||
# """
|
||||
# Submit a coroutine to the threaded loop
|
||||
# """
|
||||
# if not self._running:
|
||||
# raise RuntimeError("Cannot schedule new futures after shutdown")
|
||||
#
|
||||
# if not self._loop or not self._loop.is_running():
|
||||
# raise RuntimeError("Loop must be started before any function can"
|
||||
# " be submitted")
|
||||
#
|
||||
# return asyncio.run_coroutine_threadsafe(coroutine, self._loop)
|
||||
#
|
||||
# def start(self):
|
||||
# """
|
||||
# Start the controller main loop
|
||||
# """
|
||||
# self.start_threaded_loop()
|
||||
# self._main_task = self.submit_coroutine(self.main())
|
||||
#
|
||||
# async def shutdown(self):
|
||||
# """
|
||||
# Shutdown all tasks and close up
|
||||
# """
|
||||
# logger.info("Stopping rpc.externalsignalcontroller")
|
||||
#
|
||||
# # Flip running flag
|
||||
# self._running = False
|
||||
#
|
||||
# # Cancel sub tasks
|
||||
# for task in self._sub_tasks:
|
||||
# task.cancel()
|
||||
#
|
||||
# # Then disconnect all channels
|
||||
# await self.channel_manager.disconnect_all()
|
||||
#
|
||||
# def cleanup(self) -> None:
|
||||
# """
|
||||
# Cleanup pending module resources.
|
||||
# """
|
||||
# if self._thread:
|
||||
# if self._loop.is_running():
|
||||
# self._main_task.cancel()
|
||||
# self._thread.join()
|
||||
#
|
||||
# async def main(self):
|
||||
# """
|
||||
# Main coro
|
||||
#
|
||||
# Start the loop based on what mode we're in
|
||||
# """
|
||||
# try:
|
||||
# if self.mode == ExternalSignalModeType.leader:
|
||||
# logger.info("Starting rpc.externalsignalcontroller in Leader mode")
|
||||
#
|
||||
# await self.run_leader_mode()
|
||||
# elif self.mode == ExternalSignalModeType.follower:
|
||||
# logger.info("Starting rpc.externalsignalcontroller in Follower mode")
|
||||
#
|
||||
# await self.run_follower_mode()
|
||||
#
|
||||
# except asyncio.CancelledError:
|
||||
# # We're cancelled
|
||||
# await self.shutdown()
|
||||
# except Exception as e:
|
||||
# # Log the error
|
||||
# logger.error(f"Exception occurred in main task: {e}")
|
||||
# logger.exception(e)
|
||||
# finally:
|
||||
# # This coroutine is the last thing to be ended, so it should stop the loop
|
||||
# self._loop.stop()
|
||||
#
|
||||
# def log_api_token(self):
|
||||
# """
|
||||
# Log the API token
|
||||
# """
|
||||
# logger.info("-" * 15)
|
||||
# logger.info(f"API_KEY: {self.secret_api_key}")
|
||||
# logger.info("-" * 15)
|
||||
#
|
||||
# def send_msg(self, msg: MessageType) -> None:
|
||||
# """
|
||||
# Support RPC calls
|
||||
# """
|
||||
# if msg["type"] == RPCMessageType.EMIT_DATA:
|
||||
# message = msg.get("message")
|
||||
# if message:
|
||||
# self.send_message(message)
|
||||
# else:
|
||||
# logger.error(f"Message is empty! {msg}")
|
||||
#
|
||||
# def send_message(self, msg: MessageType) -> None:
|
||||
# """
|
||||
# Broadcast message over all channels if there are any
|
||||
# """
|
||||
#
|
||||
# if self.channel_manager.has_channels():
|
||||
# self._send_message(msg)
|
||||
# else:
|
||||
# logger.debug("No listening followers, skipping...")
|
||||
# pass
|
||||
#
|
||||
# def _send_message(self, msg: MessageType):
|
||||
# """
|
||||
# Add data to the internal queue to be broadcasted. This func will block
|
||||
# if the queue is full. This is meant to be called in the main thread.
|
||||
# """
|
||||
# if self._queue:
|
||||
# queue = self._queue.sync_q
|
||||
# queue.put(msg) # This will block if the queue is full
|
||||
# else:
|
||||
# logger.warning("Can not send data, leader loop has not started yet!")
|
||||
#
|
||||
# async def send_initial_data(self, channel):
|
||||
# logger.info("Sending initial data through channel")
|
||||
#
|
||||
# data = self._rpc._initial_leader_data()
|
||||
#
|
||||
# for message in data:
|
||||
# await channel.send(message)
|
||||
#
|
||||
# async def _handle_leader_message(self, message: MessageType):
|
||||
# """
|
||||
# Handle message received from a Leader
|
||||
# """
|
||||
# type = message.get("data_type", LeaderMessageType.default)
|
||||
# data = message.get("data")
|
||||
#
|
||||
# handler: Callable = self._message_handlers[type]
|
||||
# handler(type, data)
|
||||
#
|
||||
# # ----------------------------------------------------------------------
|
||||
#
|
||||
# async def run_leader_mode(self):
|
||||
# """
|
||||
# Main leader coroutine
|
||||
#
|
||||
# This starts all of the leader coros and registers the endpoint on
|
||||
# the ApiServer
|
||||
# """
|
||||
# self.register_leader_endpoint()
|
||||
# self.log_api_token()
|
||||
#
|
||||
# self._sub_tasks = [
|
||||
# self._loop.create_task(self._broadcast_queue_data())
|
||||
# ]
|
||||
#
|
||||
# return await asyncio.gather(*self._sub_tasks)
|
||||
#
|
||||
# async def run_follower_mode(self):
|
||||
# """
|
||||
# Main follower coroutine
|
||||
#
|
||||
# This starts all of the follower connection coros
|
||||
# """
|
||||
#
|
||||
# rpc_lock = asyncio.Lock()
|
||||
#
|
||||
# self._sub_tasks = [
|
||||
# self._loop.create_task(self._handle_leader_connection(leader, rpc_lock))
|
||||
# for leader in self.leaders_list
|
||||
# ]
|
||||
#
|
||||
# return await asyncio.gather(*self._sub_tasks)
|
||||
#
|
||||
# async def _broadcast_queue_data(self):
|
||||
# """
|
||||
# Loop over queue data and broadcast it
|
||||
# """
|
||||
# # Instantiate the queue in this coroutine so it's attached to our loop
|
||||
# self._queue = ThreadedQueue()
|
||||
# async_queue = self._queue.async_q
|
||||
#
|
||||
# try:
|
||||
# while self._running:
|
||||
# # Get data from queue
|
||||
# data = await async_queue.get()
|
||||
#
|
||||
# # Broadcast it to everyone
|
||||
# await self.channel_manager.broadcast(data)
|
||||
#
|
||||
# # Sleep
|
||||
# await asyncio.sleep(self.push_throttle_secs)
|
||||
#
|
||||
# except asyncio.CancelledError:
|
||||
# # Silently stop
|
||||
# pass
|
||||
#
|
||||
# async def get_api_token(
|
||||
# self,
|
||||
# websocket: FastAPIWebSocket,
|
||||
# token: Union[str, None] = None
|
||||
# ):
|
||||
# """
|
||||
# Extract the API key from query param. Must match the
|
||||
# set secret_api_key or the websocket connection will be closed.
|
||||
# """
|
||||
# if token == self.secret_api_key:
|
||||
# return token
|
||||
# else:
|
||||
# logger.info("Denying websocket request...")
|
||||
# await websocket.close(code=status.WS_1008_POLICY_VIOLATION)
|
||||
#
|
||||
# def register_leader_endpoint(self, path: str = "/signals/ws"):
|
||||
# """
|
||||
# Attach and start the main leader loop to the ApiServer
|
||||
#
|
||||
# :param path: The endpoint path
|
||||
# """
|
||||
# if not self.api_server:
|
||||
# raise RuntimeError("The leader needs the ApiServer to be active")
|
||||
#
|
||||
# # The endpoint function for running the main leader loop
|
||||
# @self.api_server.app.websocket(path)
|
||||
# async def leader_endpoint(
|
||||
# websocket: FastAPIWebSocket,
|
||||
# api_key: str = Depends(self.get_api_token)
|
||||
# ):
|
||||
# await self.leader_endpoint_loop(websocket)
|
||||
#
|
||||
# async def leader_endpoint_loop(self, websocket: FastAPIWebSocket):
|
||||
# """
|
||||
# The WebSocket endpoint served by the ApiServer. This handles connections,
|
||||
# and adding them to the channel manager.
|
||||
# """
|
||||
# try:
|
||||
# if is_websocket_alive(websocket):
|
||||
# logger.info(f"Follower connected - {websocket.client}")
|
||||
# channel = await self.channel_manager.on_connect(websocket)
|
||||
#
|
||||
# # Send initial data here
|
||||
# # Data is being broadcasted right away as soon as startup,
|
||||
# # we may not have to send initial data at all. Further testing
|
||||
# # required.
|
||||
# await self.send_initial_data(channel)
|
||||
#
|
||||
# # Keep connection open until explicitly closed, and sleep
|
||||
# try:
|
||||
# while not channel.is_closed():
|
||||
# request = await channel.recv()
|
||||
# logger.info(f"Follower request - {request}")
|
||||
#
|
||||
# except WebSocketDisconnect:
|
||||
# # Handle client disconnects
|
||||
# logger.info(f"Follower disconnected - {websocket.client}")
|
||||
# await self.channel_manager.on_disconnect(websocket)
|
||||
# except Exception as e:
|
||||
# logger.info(f"Follower connection failed - {websocket.client}")
|
||||
# logger.exception(e)
|
||||
# # Handle cases like -
|
||||
# # RuntimeError('Cannot call "send" once a closed message has been sent')
|
||||
# await self.channel_manager.on_disconnect(websocket)
|
||||
#
|
||||
# except Exception:
|
||||
# logger.error(f"Failed to serve - {websocket.client}")
|
||||
# await self.channel_manager.on_disconnect(websocket)
|
||||
#
|
||||
# async def _handle_leader_connection(self, leader, lock):
|
||||
# """
|
||||
# Given a leader, connect and wait on data. If connection is lost,
|
||||
# it will attempt to reconnect.
|
||||
# """
|
||||
# try:
|
||||
# url, token = leader["url"], leader["api_token"]
|
||||
# websocket_url = f"{url}?token={token}"
|
||||
#
|
||||
# logger.info(f"Attempting to connect to Leader at: {url}")
|
||||
# while True:
|
||||
# try:
|
||||
# async with websockets.connect(websocket_url) as ws:
|
||||
# channel = await self.channel_manager.on_connect(ws)
|
||||
# logger.info(f"Connection to Leader at {url} successful")
|
||||
# while True:
|
||||
# try:
|
||||
# data = await asyncio.wait_for(
|
||||
# channel.recv(),
|
||||
# timeout=self.reply_timeout
|
||||
# )
|
||||
# except (asyncio.TimeoutError, websockets.exceptions.ConnectionClosed):
|
||||
# # We haven't received data yet. Check the connection and continue.
|
||||
# try:
|
||||
# # ping
|
||||
# ping = await channel.ping()
|
||||
# await asyncio.wait_for(ping, timeout=self.ping_timeout)
|
||||
# logger.debug(f"Connection to {url} still alive...")
|
||||
# continue
|
||||
# except Exception:
|
||||
# logger.info(
|
||||
# f"Ping error {url} - retrying in {self.sleep_time}s")
|
||||
# asyncio.sleep(self.sleep_time)
|
||||
# break
|
||||
#
|
||||
# async with lock:
|
||||
# # Acquire lock so only 1 coro handling at a time
|
||||
# # as we call the RPC module in the main thread
|
||||
# await self._handle_leader_message(data)
|
||||
#
|
||||
# except (socket.gaierror, ConnectionRefusedError):
|
||||
# logger.info(f"Connection Refused - retrying connection in {self.sleep_time}s")
|
||||
# await asyncio.sleep(self.sleep_time)
|
||||
# continue
|
||||
# except websockets.exceptions.InvalidStatusCode as e:
|
||||
# logger.error(f"Connection Refused - {e}")
|
||||
# await asyncio.sleep(self.sleep_time)
|
||||
# continue
|
||||
#
|
||||
# except asyncio.CancelledError:
|
||||
# pass
|
||||
|
||||
@@ -1,61 +1,61 @@
|
||||
from typing import Union
|
||||
|
||||
from fastapi import WebSocket as FastAPIWebSocket
|
||||
from websockets import WebSocketClientProtocol as WebSocket
|
||||
|
||||
from freqtrade.rpc.external_signal.types import WebSocketType
|
||||
|
||||
|
||||
class WebSocketProxy:
|
||||
"""
|
||||
WebSocketProxy object to bring the FastAPIWebSocket and websockets.WebSocketClientProtocol
|
||||
under the same API
|
||||
"""
|
||||
|
||||
def __init__(self, websocket: WebSocketType):
|
||||
self._websocket: Union[FastAPIWebSocket, WebSocket] = websocket
|
||||
|
||||
async def send(self, data):
|
||||
"""
|
||||
Send data on the wrapped websocket
|
||||
"""
|
||||
if isinstance(data, str):
|
||||
data = data.encode()
|
||||
|
||||
if hasattr(self._websocket, "send_bytes"):
|
||||
await self._websocket.send_bytes(data)
|
||||
else:
|
||||
await self._websocket.send(data)
|
||||
|
||||
async def recv(self):
|
||||
"""
|
||||
Receive data on the wrapped websocket
|
||||
"""
|
||||
if hasattr(self._websocket, "receive_bytes"):
|
||||
return await self._websocket.receive_bytes()
|
||||
else:
|
||||
return await self._websocket.recv()
|
||||
|
||||
async def ping(self):
|
||||
"""
|
||||
Ping the websocket, not supported by FastAPI WebSockets
|
||||
"""
|
||||
if hasattr(self._websocket, "ping"):
|
||||
return await self._websocket.ping()
|
||||
return False
|
||||
|
||||
async def close(self, code: int = 1000):
|
||||
"""
|
||||
Close the websocket connection, only supported by FastAPI WebSockets
|
||||
"""
|
||||
if hasattr(self._websocket, "close"):
|
||||
return await self._websocket.close(code)
|
||||
pass
|
||||
|
||||
async def accept(self):
|
||||
"""
|
||||
Accept the WebSocket connection, only support by FastAPI WebSockets
|
||||
"""
|
||||
if hasattr(self._websocket, "accept"):
|
||||
return await self._websocket.accept()
|
||||
pass
|
||||
# from typing import Union
|
||||
#
|
||||
# from fastapi import WebSocket as FastAPIWebSocket
|
||||
# from websockets import WebSocketClientProtocol as WebSocket
|
||||
#
|
||||
# from freqtrade.rpc.external_signal.types import WebSocketType
|
||||
#
|
||||
#
|
||||
# class WebSocketProxy:
|
||||
# """
|
||||
# WebSocketProxy object to bring the FastAPIWebSocket and websockets.WebSocketClientProtocol
|
||||
# under the same API
|
||||
# """
|
||||
#
|
||||
# def __init__(self, websocket: WebSocketType):
|
||||
# self._websocket: Union[FastAPIWebSocket, WebSocket] = websocket
|
||||
#
|
||||
# async def send(self, data):
|
||||
# """
|
||||
# Send data on the wrapped websocket
|
||||
# """
|
||||
# if isinstance(data, str):
|
||||
# data = data.encode()
|
||||
#
|
||||
# if hasattr(self._websocket, "send_bytes"):
|
||||
# await self._websocket.send_bytes(data)
|
||||
# else:
|
||||
# await self._websocket.send(data)
|
||||
#
|
||||
# async def recv(self):
|
||||
# """
|
||||
# Receive data on the wrapped websocket
|
||||
# """
|
||||
# if hasattr(self._websocket, "receive_bytes"):
|
||||
# return await self._websocket.receive_bytes()
|
||||
# else:
|
||||
# return await self._websocket.recv()
|
||||
#
|
||||
# async def ping(self):
|
||||
# """
|
||||
# Ping the websocket, not supported by FastAPI WebSockets
|
||||
# """
|
||||
# if hasattr(self._websocket, "ping"):
|
||||
# return await self._websocket.ping()
|
||||
# return False
|
||||
#
|
||||
# async def close(self, code: int = 1000):
|
||||
# """
|
||||
# Close the websocket connection, only supported by FastAPI WebSockets
|
||||
# """
|
||||
# if hasattr(self._websocket, "close"):
|
||||
# return await self._websocket.close(code)
|
||||
# pass
|
||||
#
|
||||
# async def accept(self):
|
||||
# """
|
||||
# Accept the WebSocket connection, only support by FastAPI WebSockets
|
||||
# """
|
||||
# if hasattr(self._websocket, "accept"):
|
||||
# return await self._websocket.accept()
|
||||
# pass
|
||||
|
||||
@@ -1,65 +1,65 @@
|
||||
import json
|
||||
import logging
|
||||
from abc import ABC, abstractmethod
|
||||
|
||||
import msgpack
|
||||
import orjson
|
||||
|
||||
from freqtrade.rpc.external_signal.proxy import WebSocketProxy
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class WebSocketSerializer(ABC):
|
||||
def __init__(self, websocket: WebSocketProxy):
|
||||
self._websocket: WebSocketProxy = websocket
|
||||
|
||||
@abstractmethod
|
||||
def _serialize(self, data):
|
||||
raise NotImplementedError()
|
||||
|
||||
@abstractmethod
|
||||
def _deserialize(self, data):
|
||||
raise NotImplementedError()
|
||||
|
||||
async def send(self, data: bytes):
|
||||
await self._websocket.send(self._serialize(data))
|
||||
|
||||
async def recv(self) -> bytes:
|
||||
data = await self._websocket.recv()
|
||||
|
||||
return self._deserialize(data)
|
||||
|
||||
async def close(self, code: int = 1000):
|
||||
await self._websocket.close(code)
|
||||
|
||||
# Going to explore using MsgPack as the serialization,
|
||||
# as that might be the best method for sending pandas
|
||||
# dataframes over the wire
|
||||
|
||||
|
||||
class JSONWebSocketSerializer(WebSocketSerializer):
|
||||
def _serialize(self, data):
|
||||
return json.dumps(data)
|
||||
|
||||
def _deserialize(self, data):
|
||||
return json.loads(data)
|
||||
|
||||
|
||||
class ORJSONWebSocketSerializer(WebSocketSerializer):
|
||||
ORJSON_OPTIONS = orjson.OPT_NAIVE_UTC | orjson.OPT_SERIALIZE_NUMPY
|
||||
|
||||
def _serialize(self, data):
|
||||
return orjson.dumps(data, option=self.ORJSON_OPTIONS)
|
||||
|
||||
def _deserialize(self, data):
|
||||
return orjson.loads(data, option=self.ORJSON_OPTIONS)
|
||||
|
||||
|
||||
class MsgPackWebSocketSerializer(WebSocketSerializer):
|
||||
def _serialize(self, data):
|
||||
return msgpack.packb(data, use_bin_type=True)
|
||||
|
||||
def _deserialize(self, data):
|
||||
return msgpack.unpackb(data, raw=False)
|
||||
# import json
|
||||
# import logging
|
||||
# from abc import ABC, abstractmethod
|
||||
#
|
||||
# import msgpack
|
||||
# import orjson
|
||||
#
|
||||
# from freqtrade.rpc.external_signal.proxy import WebSocketProxy
|
||||
#
|
||||
#
|
||||
# logger = logging.getLogger(__name__)
|
||||
#
|
||||
#
|
||||
# class WebSocketSerializer(ABC):
|
||||
# def __init__(self, websocket: WebSocketProxy):
|
||||
# self._websocket: WebSocketProxy = websocket
|
||||
#
|
||||
# @abstractmethod
|
||||
# def _serialize(self, data):
|
||||
# raise NotImplementedError()
|
||||
#
|
||||
# @abstractmethod
|
||||
# def _deserialize(self, data):
|
||||
# raise NotImplementedError()
|
||||
#
|
||||
# async def send(self, data: bytes):
|
||||
# await self._websocket.send(self._serialize(data))
|
||||
#
|
||||
# async def recv(self) -> bytes:
|
||||
# data = await self._websocket.recv()
|
||||
#
|
||||
# return self._deserialize(data)
|
||||
#
|
||||
# async def close(self, code: int = 1000):
|
||||
# await self._websocket.close(code)
|
||||
#
|
||||
# # Going to explore using MsgPack as the serialization,
|
||||
# # as that might be the best method for sending pandas
|
||||
# # dataframes over the wire
|
||||
#
|
||||
#
|
||||
# class JSONWebSocketSerializer(WebSocketSerializer):
|
||||
# def _serialize(self, data):
|
||||
# return json.dumps(data)
|
||||
#
|
||||
# def _deserialize(self, data):
|
||||
# return json.loads(data)
|
||||
#
|
||||
#
|
||||
# class ORJSONWebSocketSerializer(WebSocketSerializer):
|
||||
# ORJSON_OPTIONS = orjson.OPT_NAIVE_UTC | orjson.OPT_SERIALIZE_NUMPY
|
||||
#
|
||||
# def _serialize(self, data):
|
||||
# return orjson.dumps(data, option=self.ORJSON_OPTIONS)
|
||||
#
|
||||
# def _deserialize(self, data):
|
||||
# return orjson.loads(data, option=self.ORJSON_OPTIONS)
|
||||
#
|
||||
#
|
||||
# class MsgPackWebSocketSerializer(WebSocketSerializer):
|
||||
# def _serialize(self, data):
|
||||
# return msgpack.packb(data, use_bin_type=True)
|
||||
#
|
||||
# def _deserialize(self, data):
|
||||
# return msgpack.unpackb(data, raw=False)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from typing import Any, Dict, TypeVar
|
||||
|
||||
from fastapi import WebSocket as FastAPIWebSocket
|
||||
from websockets import WebSocketClientProtocol as WebSocket
|
||||
|
||||
|
||||
WebSocketType = TypeVar("WebSocketType", FastAPIWebSocket, WebSocket)
|
||||
MessageType = Dict[str, Any]
|
||||
# from typing import Any, Dict, TypeVar
|
||||
#
|
||||
# from fastapi import WebSocket as FastAPIWebSocket
|
||||
# from websockets import WebSocketClientProtocol as WebSocket
|
||||
#
|
||||
#
|
||||
# WebSocketType = TypeVar("WebSocketType", FastAPIWebSocket, WebSocket)
|
||||
# MessageType = Dict[str, Any]
|
||||
|
||||
@@ -1,22 +1,10 @@
|
||||
from pandas import DataFrame
|
||||
from starlette.websockets import WebSocket, WebSocketState
|
||||
|
||||
from freqtrade.enums.signaltype import SignalTagType, SignalType
|
||||
|
||||
|
||||
async def is_websocket_alive(ws: WebSocket) -> bool:
|
||||
if (
|
||||
ws.application_state == WebSocketState.CONNECTED and
|
||||
ws.client_state == WebSocketState.CONNECTED
|
||||
):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def remove_entry_exit_signals(dataframe: DataFrame):
|
||||
dataframe[SignalType.ENTER_LONG.value] = 0
|
||||
dataframe[SignalType.EXIT_LONG.value] = 0
|
||||
dataframe[SignalType.ENTER_SHORT.value] = 0
|
||||
dataframe[SignalType.EXIT_SHORT.value] = 0
|
||||
dataframe[SignalTagType.ENTER_TAG.value] = None
|
||||
dataframe[SignalTagType.EXIT_TAG.value] = None
|
||||
# from starlette.websockets import WebSocket, WebSocketState
|
||||
#
|
||||
#
|
||||
# async def is_websocket_alive(ws: WebSocket) -> bool:
|
||||
# if (
|
||||
# ws.application_state == WebSocketState.CONNECTED and
|
||||
# ws.client_state == WebSocketState.CONNECTED
|
||||
# ):
|
||||
# return True
|
||||
# return False
|
||||
|
||||
Reference in New Issue
Block a user