From 21c96ed504f93f16ce6f8a3ccf164a87c9edd9c0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 30 一月 2024 15:45:23 +0800
Subject: [PATCH] 增加调试日志
---
third_data/code_plate_key_manager.py | 276 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 188 insertions(+), 88 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 4615bc6..3715995 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -8,13 +8,15 @@
import time
import constant
+from code_attribute import code_nature_analyse
from db.redis_manager_delegate import RedisUtils
-from third_data import kpl_block_util, kpl_api
-from utils import global_util, tool
+from third_data import kpl_block_util, kpl_api, kpl_util
+from trade.trade_manager import MarketSituationManager
+from utils import global_util, tool, buy_condition_util
from log_module import log, async_log_util
from db import redis_manager_delegate as redis_manager
-from log_module.log import logger_kpl_limit_up, logger_kpl_block_can_buy
+from log_module.log import logger_kpl_block_can_buy
from third_data.kpl_util import KPLPlatManager
from trade import trade_manager, l2_trade_util
@@ -43,11 +45,8 @@
final_blocks = copy.deepcopy(blocks)
if len(blocks) > 2:
final_blocks.clear()
- # 鏍规嵁娑ㄥ箙鎺掑簭
- blocks.sort(key=lambda x: x[2])
- blocks.reverse()
for b in blocks:
- if b[1] not in constant.KPL_INVALID_BLOCKS:
+ if b not in constant.KPL_INVALID_BLOCKS:
final_blocks.append(b)
if len(final_blocks) < 2:
final_blocks = blocks
@@ -100,12 +99,12 @@
if price_rate > 0.07:
jx_blocks_info = self.get_jx_blocks_cache(code)
if not jx_blocks_info:
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks}")
else:
# 杩樻病娑ㄥ仠鐨勯渶瑕佹洿鏂扮簿閫夋澘鍧� 鏇存柊绮鹃�夋澘鍧�
- if abs(float(buy_1_price) - float(limit_up_price)) >= 0.001 or True:
+ if abs(float(buy_1_price) - float(limit_up_price)) >= 0.001:
# 闈炴定鍋滅姸鎬�
UPDATE_TIME_SPACE = 5 * 60
time_diff = tool.trade_time_sub(tool.get_now_time_str(), "09:30:00")
@@ -118,15 +117,15 @@
if time.time() - jx_blocks_info[1] > UPDATE_TIME_SPACE:
# 璺濈涓婃鏇存柊鏃堕棿杩囧幓浜�5鍒嗛挓
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧楋紙鏇存柊锛�-{blocks}")
elif price_rate > 0.03:
# 娣诲姞澶囩敤鏉垮潡
if not self.get_jx_blocks_cache(code, by=True):
- blocks = kpl_api.getCodeJingXuanBlocks(code)
- self.save_jx_blocks(code, blocks,current_limit_up_blocks, by=True)
+ blocks = kpl_api.getCodeBlocks(code)
+ self.save_jx_blocks(code, blocks, current_limit_up_blocks, by=True)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks}")
except Exception as e:
logger_kpl_block_can_buy.error(f"{code} 鑾峰彇鏉垮潡鍑洪敊")
@@ -219,7 +218,7 @@
self.total_key_codes_dict[k] = set()
self.total_key_codes_dict[k].add(code)
- logger_kpl_limit_up.info("{}鏉垮潡鍏抽敭璇�:{}", code, keys)
+ # logger_kpl_limit_up.info("{}鏉垮潡鍏抽敭璇�:{}", code, keys)
# 鏍规嵁浼犲叆鐨勫叧閿瘝涓庢定鍋滀唬鐮佷俊鎭尮閰嶈韩浣�
@@ -450,7 +449,7 @@
jingxuan_block_info = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code, by=True)
if jingxuan_block_info:
jingxuan_blocks = jingxuan_block_info[0]
- k4 |= set([x[1] for x in jingxuan_blocks])
+ k4 |= set(jingxuan_blocks) # set([x[1] for x in jingxuan_blocks])
for k in [k1, k11, k2, k3, k4]:
keys |= k
@@ -491,39 +490,59 @@
# 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅)
@classmethod
- def __is_block_can_buy(cls, code, block, current_limit_up_datas, code_limit_up_reason_dict,
- yesterday_current_limit_up_codes, limit_up_record_datas, current_limit_up_block_codes_dict):
-
+ def __is_block_can_buy(cls, code, block, current_limit_up_datas, code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes, limit_up_record_datas, current_limit_up_block_codes_dict,
+ high_level_code_blocks=None, high_level_block_codes=None):
# 鐙嫍鍒ゆ柇
+ if high_level_code_blocks is None:
+ high_level_code_blocks = {}
+ if high_level_block_codes is None:
+ high_level_block_codes = {}
block_codes = current_limit_up_block_codes_dict.get(block)
+ if block_codes is None:
+ block_codes = set()
if not block_codes:
- return False, True, ""
+ # 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False
elif len(block_codes) == 1 and code in block_codes:
- return False, True, ""
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False
# 鍙互涔扮殑鏈�澶ф帓鍚�
- open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
- code_limit_up_reason_dict)
+ # open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+ # code_limit_up_reason_dict)
current_open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes_current(code, block,
current_limit_up_datas)
- max_rank = 2
- # 濡傛灉鏄己鍔挎澘鍧楋紙鏈�1涓紑1/鏈夐潪涓绘澘娑ㄥ仠/鏈夐珮浣嶆澘锛夊彲浠ヤ拱鍒拌�佷笁
- msg_list = []
- for bc in block_codes:
- if bc in current_open_limit_up_codes:
- max_rank = 3
- msg_list.append(f"{bc}寮�1")
- break
- elif bc in yesterday_current_limit_up_codes:
- max_rank = 3
- msg_list.append(f"{bc}楂樹綅鏉�")
- break
- elif bc.find("00") != 0 and bc.find("60") != 0:
- max_rank = 3
- msg_list.append(f"{bc}鍒涗笟鏉�/绉戝垱鏉�")
- break
+ # ---------------------------鍒ゆ柇寮哄娍涓荤嚎-------------------------
+ is_strong_block = False
+ for d in current_limit_up_datas:
+ bs = kpl_util.get_current_limit_up_reasons(d)
+ if block not in bs:
+ general_blocks = high_level_code_blocks.get(d[0])
+ if not general_blocks or block not in general_blocks:
+ # 娌″湪娉涘寲鏉垮潡涓�
+ continue
+ count = kpl_util.get_high_level_count(d[4])
+ if count >= 3:
+ if d[4].find("杩炴澘") > 0:
+ is_strong_block = True
+ break
+ elif d[0] in yesterday_current_limit_up_codes and len(block_codes) >= 2:
+ # 鍑犲ぉ鍑犳澘锛屼笖鏈�杩�2杩炴澘
+ # 鐪嬫槸鍚︽湁棣栨澘鍚庢帓
+ is_strong_block = True
+ break
- # 鍒ゆ柇韬綅
+ if not is_strong_block:
+ temp_block_codes = set(copy.deepcopy(block_codes))
+ temp_block_codes.discard(code)
+ if len(temp_block_codes) >= 3:
+ is_strong_block = True
+ max_rank = 2
+ # 寮哄娍鏉垮潡涔拌�佸洓
+ if is_strong_block:
+ max_rank = 3
# 闇�瑕佹帓闄ょ殑鑰佸ぇ鐨勪唬鐮�
exclude_first_codes = set() # HighIncreaseCodeManager().list_all()
@@ -531,28 +550,49 @@
# 鑾峰彇涓绘澘寮�1鐨勪唬鐮�
# 鍓旈櫎楂樹綅鏉�
- if open_limit_up_codes and yesterday_current_limit_up_codes:
- open_limit_up_codes -= yesterday_current_limit_up_codes
+ if current_open_limit_up_codes and yesterday_current_limit_up_codes:
+ current_open_limit_up_codes -= yesterday_current_limit_up_codes
+
+ # 鑾峰彇浠ｇ爜鐨勫垵娆℃定鍋滄椂闂�
+ first_limit_up_time = time.time()
+ for r in limit_up_record_datas:
+ if r[3] == code:
+ first_limit_up_time = int(r[5])
# 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
- # current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
- # current_limit_up_datas,
- # code_limit_up_reason_dict,
- # yesterday_current_limit_up_codes,
- # exclude_first_codes,
- # len(
- # open_limit_up_codes),
- # shsz=True)
- record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
- limit_up_record_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes,
- shsz=True)
+ current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
+ current_limit_up_datas,
+ code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes,
+ exclude_first_codes,
+ len(
+ current_open_limit_up_codes),
+ shsz=True,
+ limit_up_time=first_limit_up_time)
+ # record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
+ # limit_up_record_datas,
+ # code_limit_up_reason_dict,
+ # yesterday_current_limit_up_codes,
+ # shsz=True)
+ if int(tool.get_now_time_str().replace(":", "")) <= int("094000") and is_strong_block:
+ # 寮哄娍涓荤嚎鍔犲己鍔�10鍒嗛挓
+ return True, False, f"銆恵block}銆戯細寮哄娍涓荤嚎+寮哄娍10鍒嗛挓", is_strong_block
- if record_shsz_rank < len(open_limit_up_codes) + max_rank:
- return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{record_shsz_rank_codes}"
+ if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
+ return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block
else:
- return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{record_shsz_rank_codes} 瓒呰繃{len(open_limit_up_codes) + max_rank}涓�"
+ # k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+ # if k_format and k_format[8][0]:
+ # # 鍏锋湁杈ㄨ瘑搴�
+ # return True, False, f"銆恵block}銆戝叿鏈夎鲸璇嗗害", is_strong_block
+ # 鐪嬭嚜鐢辨祦閫氬競鍊兼槸鍚﹀皬浜�20浜�
+ if is_strong_block and current_shsz_rank < len(current_open_limit_up_codes) + max_rank + 1:
+ zyltgb_as_yi = round(global_util.zyltgb_map.get(code) / 100000000, 2) if code in global_util.zyltgb_map else None
+ situation = MarketSituationManager().get_situation_cache()
+ zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
+ if zyltgb_as_yi and zylt_threshold_as_yi[2] <= zyltgb_as_yi <= zylt_threshold_as_yi[3]:
+ return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block
+ return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block
# 杩囨椂鐨勪唬鐮�
# if open_limit_up_codes:
@@ -583,16 +623,19 @@
@classmethod
def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
- before_blocks_dict, current_limit_up_block_codes_dict):
+ before_blocks_dict, current_limit_up_block_codes_dict, high_level_general_code_blocks,
+ high_level_general_block_codes):
# 鍔犺浇娑ㄥ仠浠ｇ爜鐨勭洰鏍囨澘鍧�
def load_code_block():
if limit_up_record_datas:
for d in limit_up_record_datas:
if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict:
- code_limit_up_reason_dict[d[3]] = list(before_blocks_dict.get(d[3]))[0]
+ code_limit_up_reasons_dict[d[3]] = {list(before_blocks_dict.get(d[3]))[0]}
else:
- code_limit_up_reason_dict[d[3]] = d[2]
- return code_limit_up_reason_dict
+ code_limit_up_reasons_dict[d[3]] = {d[2]}
+ if d[6]:
+ code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
+ return code_limit_up_reasons_dict
if current_limit_up_datas is None:
current_limit_up_datas = []
@@ -609,6 +652,7 @@
if True:
# 鑾峰彇
if k4:
+ # 褰撴定鍋滃師鍥犳病鏈夋椂鎵嶅彇绮鹃�夋澘鍧�
keys |= k4
keys = keys - constant.KPL_INVALID_BLOCKS
@@ -618,38 +662,51 @@
fresults = []
if not keys:
- return fresults
- code_limit_up_reason_dict = {}
+ return fresults, set()
+ code_limit_up_reasons_dict = {}
load_code_block()
for block in keys:
- can_buy, unique, msg = cls.__is_block_can_buy(code, block, current_limit_up_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes, limit_up_record_datas,
- current_limit_up_block_codes_dict)
- fresults.append((block, can_buy, unique, msg))
- return fresults
+ can_buy, unique, msg, is_strong = cls.__is_block_can_buy(code, block, current_limit_up_datas,
+ code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes,
+ limit_up_record_datas,
+ current_limit_up_block_codes_dict,
+ high_level_code_blocks=high_level_general_code_blocks,
+ high_level_block_codes=high_level_general_block_codes)
+ fresults.append((block, can_buy, unique, msg, is_strong))
+ return fresults, keys
# 鏄惁鍙互涓嬪崟
- # 杩斿洖锛氭槸鍚﹀彲浠ヤ笅鍗�,娑堟伅,鏉垮潡绫诲瀷
+ # 杩斿洖锛氬彲浠ヤ拱鐨勬澘鍧�,鏄惁鐙嫍,娑堟伅
@classmethod
def can_buy(cls, code):
if constant.TEST:
- return ["娴嬭瘯"], True, cls.BLOCK_TYPE_NONE
+ return ["娴嬭瘯"], True, cls.BLOCK_TYPE_NONE, [], set()
# if True:
# # 娴嬭瘯
# return True, "涓嶅垽鏂澘鍧楄韩浣�"
return cls.__can_buy_compute_result_dict.get(code)
- # 杩斿洖:(鍙互涔扮殑鏉垮潡鍒楄〃, 鏄惁鏄嫭鑻�, 娑堟伅绠�浠�)
+ # 杩斿洖:(鍙互涔扮殑鏉垮潡鍒楄〃, 鏄惁鏄嫭鑻�, 娑堟伅绠�浠�,鍙拱鐨勫己鍔夸富绾�)
@classmethod
def __compute_can_buy_blocks(cls, code, current_limit_up_datas, limit_up_record_datas,
yesterday_current_limit_up_codes, before_blocks_dict,
- current_limit_up_block_codes_dict):
- blocks_compute_results = cls.get_can_buy_block(code, current_limit_up_datas,
- limit_up_record_datas, yesterday_current_limit_up_codes,
- before_blocks_dict, current_limit_up_block_codes_dict)
+ current_limit_up_block_codes_dict, high_level_general_code_blocks):
+ # 鏍规嵁浠ｇ爜娉涘寲鏉垮潡鑾峰彇娉涘寲鏉垮潡鐨勪唬鐮侀泦鍚�
+ high_level_general_block_codes = {}
+ for c in high_level_general_code_blocks:
+ blocks = high_level_general_code_blocks[c]
+ for b in blocks:
+ if b not in high_level_general_block_codes:
+ high_level_general_block_codes[b] = set()
+ high_level_general_block_codes[b].add(c)
+ blocks_compute_results, keys = cls.get_can_buy_block(code, current_limit_up_datas,
+ limit_up_record_datas, yesterday_current_limit_up_codes,
+ before_blocks_dict, current_limit_up_block_codes_dict,
+ high_level_general_code_blocks,
+ high_level_general_block_codes)
if not blocks_compute_results:
- return False, True, "娌℃湁鎵惧埌鏉垮潡"
+ return False, True, f"娌℃湁鎵惧埌鏉垮潡", [], keys
codes_delegate = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
{trade_manager.TRADE_STATE_BUY_DELEGATED, trade_manager.TRADE_STATE_BUY_PLACE_ORDER}))
codes_success = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
@@ -688,37 +745,80 @@
#
can_buy_blocks = []
+ can_buy_strong_blocks = []
unique_count = 0
msg_list = []
+
for r in blocks_compute_results:
- # r鐨勬暟鎹粨鏋�(鏉垮潡,鏄惁鍙互涔�,鏄惁鐙嫍,娑堟伅)
+ # r鐨勬暟鎹粨鏋�(鏉垮潡,鏄惁鍙互涔�,鏄惁鐙嫍,娑堟伅,鏄惁鏄己鍔挎澘鍧�)
if r[2]:
+ # 鐙嫍
unique_count += 1
if r[1]:
- if r[0] in trade_success_blocks_count and len(trade_success_blocks_count[r[0]]) > 0:
+ # 寮哄娍涓荤嚎鏈�澶氬悓鏃舵寕3鍙エ锛屾渶澶氭垚浜�2鍙エ
+ MAX_DELEGATE_COUNT = 3 if r[4] else 2
+ MAX_DEAL_COUNT = 2 if r[4] else 1
+ if r[0] in trade_success_blocks_count and len(trade_success_blocks_count[r[0]]) >= MAX_DEAL_COUNT:
msg_list.append(f"銆恵r[0]}銆戞湁鎴愪氦浠ｇ爜锛歿trade_success_blocks_count[r[0]]}")
continue
- if r[0] in trade_delegate_blocks_count and len(trade_delegate_blocks_count[r[0]]) >= 2:
+ if r[0] in trade_delegate_blocks_count and len(trade_delegate_blocks_count[r[0]]) >= MAX_DELEGATE_COUNT:
msg_list.append(f"銆恵r[0]}銆戝凡鎸傚崟锛歿trade_delegate_blocks_count[r[0]]}")
continue
can_buy_blocks.append(r[0])
- msg_list.append(r[3])
+ if r[4]:
+ can_buy_strong_blocks.append(r[0])
+ if r[3]:
+ msg_list.append(r[3])
+ else:
+ if r[3]:
+ msg_list.append(r[3])
# 鎵�鏈夋澘鍧楅兘鏄嫭鑻�
if unique_count == len(blocks_compute_results):
- return can_buy_blocks, True, ",".join(msg_list)
- return can_buy_blocks, False, ",".join(msg_list)
+ return can_buy_blocks, True, ",".join(msg_list), can_buy_strong_blocks, keys
+ return can_buy_blocks, False, ",".join(msg_list), can_buy_strong_blocks, keys
# 鏇存柊浠ｇ爜鏉垮潡鍒ゆ柇鏄惁鍙互涔扮殑缁撴灉
+ # high_level_general_code_blocks 楂樹綅娉涘寲鏉垮潡
@classmethod
def update_can_buy_blocks(cls, code, current_limit_up_datas, limit_up_record_datas,
- yesterday_current_limit_up_codes,
+ latest_current_limit_up_records,
before_blocks_dict, current_limit_up_block_codes_dict):
- can_buy_blocks, unique, msg = cls.__compute_can_buy_blocks(code, current_limit_up_datas, limit_up_record_datas,
- yesterday_current_limit_up_codes,
- before_blocks_dict,
- current_limit_up_block_codes_dict)
+ yesterday_current_limit_up_codes = set()
+ yesterday_current_limit_up_records_dict = {}
+ yesterday_current_limit_up_records = latest_current_limit_up_records[0][1]
+ if yesterday_current_limit_up_records:
+ for r in yesterday_current_limit_up_records:
+ yesterday_current_limit_up_codes.add(r[0])
+ yesterday_current_limit_up_records_dict[r[0]] = r
+ high_level_general_code_blocks = {}
+ # 鏄惁鏄�3鏉垮強浠ヤ笂鐨勯珮浣嶆澘
+ for r in current_limit_up_datas:
+ count = kpl_util.get_high_level_count(r[4])
+ if count >= 3 and r[0] in yesterday_current_limit_up_codes:
+ latest_datas = latest_current_limit_up_records[:count - 1]
+ # 鏄珮浣嶆澘
+ # 褰撴棩绮鹃��
+ blocks = set(r[6].split("銆�"))
+ for d in latest_datas:
+ for dd in d[1]:
+ if dd[0] == r[0]:
+ blocks.add(dd[5])
+ break
+ f_blocks = []
+ for b in blocks:
+ if b:
+ f_blocks.append(b)
+ high_level_general_code_blocks[r[0]] = f_blocks
+
+ can_buy_blocks, unique, msg, can_buy_strong_blocks, keys = cls.__compute_can_buy_blocks(code,
+ current_limit_up_datas,
+ limit_up_record_datas,
+ yesterday_current_limit_up_codes,
+ before_blocks_dict,
+ current_limit_up_block_codes_dict,
+ high_level_general_code_blocks)
# 淇濆瓨鏉垮潡璁＄畻缁撴灉
- cls.__can_buy_compute_result_dict[code] = (can_buy_blocks, unique, msg)
+ cls.__can_buy_compute_result_dict[code] = (can_buy_blocks, unique, msg, can_buy_strong_blocks, keys)
if __name__ == "__main__":
--
Gitblit v1.8.0