将server与api独立出来

Administrator

2024-07-12 37f72b53cc2ef3ffb211c83e92b920318a5a89df

将server与api独立出来

 api/outside_api_command_callback.py

File was renamed from trade/huaxin/outside_api_command_callback.py
@@ -49,7 +49,8 @@
from trade.sell.sell_rule_manager import TradeRuleManager, SellRule
from trade.trade_manager import TradeTargetCodeModeManager, AutoCancelSellModeManager
from settings.trade_setting import MarketSituationManager
from utils import socket_util, data_export_util, tool, huaxin_util, output_util, global_util, server_util
from utils import socket_util, data_export_util, tool, huaxin_util, output_util, global_util
from server import server_util


class OutsideApiCommandCallback(outside_api_command_manager.ActionCallback):

 gui.py

@@ -13,14 +13,15 @@
from utils import data_export_util, init_data_util
import multiprocessing

from log_module import log, log_export
from log_module import log_export
from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
import server
from config import settings
from ths.l2_code_operate import L2CodeOperate
from trade.l2_trade_factor import L2TradeFactorUtil
from ocr import ocr_server
from third_data import data_server, kpl_data_manager, kpl_util
from third_data import kpl_data_manager, kpl_util
from servers import data_server

from server import *
import l2.l2_data_util

 huaxin_client/l1_client.py

@@ -266,7 +266,8 @@
            list_ = [level1_data_dict[k] for k in level1_data_dict]
            flist = []
            plist = []
            threshold_rate = constant.L1_MIN_RATE_PRE if int(tool.get_now_time_str().replace(":", "")) < int(
            now_time_int = int(tool.get_now_time_str().replace(":", ""))
            threshold_rate = constant.L1_MIN_RATE_PRE if now_time_int < int(
                "094000") else constant.L1_MIN_RATE
            for d in list_:
                if d[2] >= threshold_rate:
@@ -275,7 +276,13 @@
                if d[0] in __position_codes:
                    plist.append(d)
            flist.sort(key=lambda x: x[2], reverse=True)
            datas = flist[:1000]
            # 正式交易之前先处理比较少的数据，不然处理时间久造成数据拥堵
            MAX_COUNT = 1000
            if now_time_int < int("092600"):
                MAX_COUNT = 100
            elif now_time_int < int("092800"):
                MAX_COUNT = 200
            datas = flist[:MAX_COUNT]
            # 将持仓股加入进去
            datas.extend(plist)
            if len(datas) > 0:

 main.py

@@ -20,11 +20,9 @@
import server

# 交易服务
from third_data import data_server
from trade.huaxin import huaxin_trade_server, huaxin_trade_api_server

# from huaxin_api import trade_client, l2_client, l1_client
from utils import tool, server_util
from servers import server_util, huaxin_trade_api_server, huaxin_trade_server


def createTradeServer(pipe_server, queue_strategy_r_trade_w_: multiprocessing.Queue,

 servers/data_server.py

File was renamed from third_data/data_server.py
@@ -2,22 +2,21 @@
import json
import logging
import socketserver
import threading
import time
from http.server import BaseHTTPRequestHandler
import dask

from code_attribute.gpcode_manager import BlackListCodeManager, CodePrePriceManager
from code_attribute.gpcode_manager import BlackListCodeManager
from l2.l2_transaction_data_manager import HuaXinBuyOrderManager
from log_module.log import logger_system, logger_debug, logger_kpl_limit_up, logger_request_api
from utils import global_util, tool, data_export_util, init_data_util
from utils import global_util, tool, data_export_util
from code_attribute import gpcode_manager
from log_module import log, log_analyse, log_export, async_log_util
from l2 import code_price_manager, l2_data_util, l2_data_manager_new, cancel_buy_strategy, transaction_progress
from l2 import code_price_manager, l2_data_util, transaction_progress
from cancel_strategy.s_l_h_cancel_strategy import HourCancelBigNumComputer, LCancelRateManager
from output.limit_up_data_filter import IgnoreCodeManager
from third_data import kpl_util, kpl_data_manager, kpl_api, block_info
from third_data.code_plate_key_manager import RealTimeKplMarketData, KPLPlateForbiddenManager, CodePlateKeyBuyManager
from third_data.code_plate_key_manager import RealTimeKplMarketData, KPLPlateForbiddenManager
from third_data.history_k_data_util import HistoryKDatasUtils
from third_data.kpl_data_manager import KPLDataManager, KPLLimitUpDataRecordManager, \
    KPLCodeLimitUpReasonManager

 servers/huaxin_trade_api_server.py

 servers/huaxin_trade_server.py

File was renamed from trade/huaxin/huaxin_trade_server.py
@@ -45,7 +45,7 @@

from trade.huaxin import huaxin_trade_api as trade_api, huaxin_trade_api, huaxin_trade_data_update, \
    huaxin_trade_record_manager, huaxin_sell_util
from trade.huaxin.outside_api_command_callback import OutsideApiCommandCallback
from api.outside_api_command_callback import OutsideApiCommandCallback
from trade.sell.sell_rule_manager import TradeRuleManager
from trade.trade_manager import CodesTradeStateManager
from utils import socket_util, middle_api_protocol, tool, huaxin_util, global_util

 servers/server_util.py

File was renamed from utils/server_util.py
@@ -1,11 +1,12 @@
import threading

from log_module.log import logger_system
from third_data import data_server
from servers import data_server
from utils import tool, socket_util

DATA_SERVER_PORT = 9004


def run_data_server():
    logger_system.info("create DataServer")
    logger_system.info(f"createDataServer 线程ID:{tool.get_thread_id()}")

 test/test_huaxin.py

@@ -1,5 +1,4 @@
from trade.huaxin.huaxin_trade_server import TradeServerProcessor
from trade.sell.sell_rule_manager import TradeRuleManager
from servers.huaxin_trade_server import TradeServerProcessor

if __name__ == "__main__":
    datas = [["002148", 6.7, 0, 24308026, "09:30:09", 6.7, 3998474]]