6d2a706a48
왜: 체결이 없어도 마지막가는 유지인데, TTL로 None 만들고 매도/EOD를 건너뛰어 8/5 돌파·금요일 leftover가 남음. 호가필터 TTL 구멍과 같은 병. 넣을 파일 신규: kis_trader/engine/live_sell_price.py kis_trader/strategies/base.py (_ws_last_quote, _resolve_sell_price) 전략: momentum.py scalping.py tail_catch.py breakout.py range_break.py dart_strategy.py updow_strategy.py updown_feed.py us_momentum.py WS: ws_manager.py kis_ws.py kiwoom_ws.py ls_ws.py kis_ws_overseas.py kis_trader/web/live_config_schema.py (WS_PRICE_MAX_AGE_SEC 기본 0) database.py (키 주석 + legacy/ sys.path) kis_trader/execution/order_manager.py (잔고 있는데 40240000 ghost_purge 금지 — 같은 EOD 사고) EOD가 min_hold에 안 막히게 손본 momentum_hts_logic.py / scalping_engine.py / tail_engine.py (이 대화에서 손본 부분만 확인 후) 문서: docs/like_mcp.md/db_erd.md code_architecture.md (가격 TTL 문구) 메시지 초안 fix: 매수·매도 현재가를 TTL로 버리지 않음 (마지막 RAM) 횡보·체결 공백을 죽은 캐시로 오인해 None 처리하면 손절·EOD가 스킵된다. 호가필터와 같이 나이는 무시하고 마지막 체결가를 유지한다. EOD는 매수가 폴백. 영향: 실매 O / 백테·옵투나 봉 경로 거의 무관 (엔진 식 변경 아님) 커밋 2 — 루트 정리 (remove/ vs legacy/) 왜: 루트 단독봇·테스트는 지울 보관함으로. 웹·알람이 아직 쓰는 모듈은 remove에 두면 나중에 폴더째 삭제 때 깨짐. 넣을 파일 이동: 미사용 → remove/legacy_root/ (래퍼, ETF/키움 옛봇, 테스트, kiwoom_rest_api 등) 이동: 사용 중 → legacy/ (holding_bot kis_holding_ver1 news_analyzer kis_long_ver1/2) 신규: kis_trader/utils/legacy_root.py legacy/README.md remove/README.md import 경로: backtest_web.py mm_butler.py mm_remote.py updow_holding_cfg.py dbband_stock_cfg.py param_search_updow*.py dbband_param_search.py param_search_apply_snapshot.py verify_three_paths.py docs/like_mcp.md/code_architecture.md 수동 노트 메시지 초안 chore: 미사용 루트는 remove/, 웹·알람 구모듈은 legacy/ remove는 나중에 통째 삭제 예정. holding_bot·news_analyzer·kis_long은 ensure_legacy_root로 legacy/만 본다. 빼기: scratch/set_ws_price_max_age_zero.py (일회성)
272 lines
7.4 KiB
Python
272 lines
7.4 KiB
Python
from PySide2 import QtCore, QtWidgets
|
|
import PySide2.QtGui
|
|
from PySide2.QtUiTools import QUiLoader
|
|
from PySide2.QtWidgets import QWidget, QDialog, QMainWindow
|
|
from PySide2.QtCore import Qt, QEvent,QObject,SIGNAL,QFile
|
|
# from ui.ui_test import Ui_Test
|
|
# from ui.ui_second_window import Ui_Second_Window
|
|
# from ui.ui_third_window import Ui_Third_Window
|
|
from tr.tr_0424 import Tr_0424
|
|
|
|
# from balance_window import Balance_window
|
|
from order_window import Order_window
|
|
from search_window import Search_window
|
|
|
|
from tr.tr_master import Tr_master
|
|
# from tr.s3_real import XReal_S3_
|
|
|
|
import win32com.client #이베스트 관련
|
|
import pythoncom #이베스트 관련
|
|
|
|
from dotenv import load_dotenv
|
|
import os
|
|
|
|
# load .env
|
|
load_dotenv()
|
|
|
|
|
|
loader=QUiLoader()
|
|
|
|
|
|
|
|
#class Test(QWidget,Ui_Test)
|
|
# QtCore.QObject
|
|
class Main_window(QMainWindow):
|
|
|
|
# def __new__(self):
|
|
# if not hasattr(self,'instance'):
|
|
# #print('싱글톤 만듬 MAIN WINDOW')
|
|
# self.instance=super(Main_window,self).__new__(self)
|
|
# else:
|
|
# #print('이미 싱글톤 있음 MAIN WINDOW')
|
|
# return self.instance
|
|
|
|
def __init__(self,session,balance_window):
|
|
super().__init__()
|
|
# self.setupUi(self)
|
|
self.session=session
|
|
self.balance_window=balance_window
|
|
|
|
self.ui=loader.load('./ui/main-window.ui',None)
|
|
|
|
if self.ui is None:
|
|
return
|
|
|
|
|
|
|
|
self.ui.setWindowTitle("Xing Api Client")
|
|
|
|
|
|
|
|
# self.go_to_2.clicked.connect(lambda:self.set_the_stock_code('second'))
|
|
self.ui.to_balance_page.clicked.connect(lambda:self.open_new_window('balance'))
|
|
self.ui.to_order_page.clicked.connect(lambda:self.open_new_window('order'))
|
|
self.ui.to_search_page.clicked.connect(lambda:self.open_new_window('search'))
|
|
|
|
self.ui.to_balance_page.hide()
|
|
self.ui.to_order_page.hide()
|
|
self.ui.to_search_page.hide()
|
|
|
|
|
|
self.ui.login_button.clicked.connect(lambda:self.shoot_login())
|
|
self.ui.login_button.show()
|
|
|
|
self.ui.closeEvent=self.closeEvent
|
|
|
|
self.ui.status_label.setStyleSheet("color: red;")
|
|
|
|
self.account=''#계좌번호
|
|
|
|
|
|
# self.go_to_2.clicked.connect(self.calling_master)
|
|
# self.ui.go_to_3.clicked.connect(self.start_s3_real)
|
|
# self.ui.summer.clicked.connect(self.call_summer)
|
|
# self.login_label.clicked.connect(self.do_action)
|
|
# self.ui.stock_code_label.clicked.connect(self.do_action)
|
|
|
|
# self.XReal_S3_=XReal_S3_
|
|
# self.tr_0424=win32com.client.DispatchWithEvents("XA_DataSet.XAQuery",Tr_0424)#계좌티알
|
|
# self.tr_0424.get_account(self)
|
|
|
|
|
|
# self.worker = Worker()
|
|
# self.worker.start()
|
|
|
|
def handle_close(self):
|
|
#print('CLOSE!@!@')
|
|
pass
|
|
|
|
def set_status_label(self, string):
|
|
|
|
self.ui.status_label.setText(string)
|
|
|
|
def set_session(self,session):
|
|
self.session=session
|
|
|
|
|
|
# class XASessionEvents:
|
|
|
|
# def __init__(self,parent):
|
|
# session=win32com.client.DispatchWithEvents("XA_Session.XASession",self)
|
|
|
|
# url=os.environ.get('URL')
|
|
# port=os.environ.get('PORT')
|
|
# cert=os.environ.get('CERT')
|
|
|
|
# result=session.ConnectServer(url,port)
|
|
# parent.set_session(session)
|
|
# self.parent=parent
|
|
# #print("result: ",result)
|
|
|
|
# def OnLogin(self, code, msg):
|
|
# # time.sleep(5)
|
|
# #print('로그인 결과@@: ',msg)
|
|
# self.parent.possible()
|
|
# # query.single_request()
|
|
# def OnDisconnect(self, code, msg):
|
|
# pass
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def show(self):
|
|
self.ui.show()
|
|
|
|
def show_buttons(self):
|
|
#print('ssap possible')
|
|
self.ui.to_balance_page.show()
|
|
self.ui.to_order_page.show()
|
|
self.ui.to_search_page.show()
|
|
|
|
|
|
def shoot_login(self):
|
|
#print('@@shoot_login@@')
|
|
server_type=os.environ.get('SERVER_TYPE')
|
|
|
|
cert=os.environ.get('CERT')
|
|
|
|
id=self.ui.login_id_input.text()
|
|
pw=self.ui.login_pw_input.text()
|
|
|
|
# print('login_cnt: ',self.session.login_cnt)
|
|
|
|
if self.session.login_cnt >5:
|
|
return
|
|
|
|
self.session.Login(id,pw,cert,server_type,0)
|
|
os.environ['PW'] = pw
|
|
os.environ['ID'] = id
|
|
|
|
|
|
# def closeEvent(self, event):
|
|
# #print('asdasdas')
|
|
# self.set_shut_down_flag()
|
|
# return super().closeEvent(event)
|
|
|
|
|
|
|
|
def open_new_window(self,type):
|
|
|
|
#print('ACCOUNT NO: ',self.session.account)
|
|
os.environ['ACCOUNT'] = self.session.account
|
|
#print('ACCOUNT NO2: ',os.environ.get('ACCOUNT'))
|
|
|
|
if type=="balance":
|
|
# self.window=QtWidgets.QMainWindow()
|
|
# self.ui=Ui_Second_Window()
|
|
# self.ui.setupUi(self.window)
|
|
# self.balance_window=self.balance_window
|
|
self.balance_window.show()
|
|
elif type=='order':
|
|
self.order_window=Order_window()
|
|
self.order_window.show()
|
|
elif type=='search':
|
|
self.search_window=Search_window()
|
|
self.search_window.showMe()
|
|
|
|
|
|
|
|
def get_master(self):
|
|
query=win32com.client.DispatchWithEvents("XA_DataSet.XAQuery",Tr_master)
|
|
|
|
master_res=query.single_request()
|
|
print('master_res: ',master_res)
|
|
|
|
if master_res is not None:
|
|
|
|
while Tr_master.query_state == False:
|
|
pythoncom.PumpWaitingMessages()
|
|
|
|
|
|
# def start_s3_real(self):
|
|
# xreal = win32com.client.DispatchWithEvents("XA_DataSet.XAReal", self.XReal_S3_)
|
|
|
|
# xreal.start('005930')
|
|
# while True:
|
|
# pythoncom.PumpWaitingMessages()
|
|
|
|
|
|
def do_action(self):
|
|
#print('doing: ',self.name_line_edit.text())
|
|
#print('doing2: ',self.job_line_edit.text())
|
|
pass
|
|
|
|
def set_the_text(self,the_thing):
|
|
self.ui.login_label.setText(the_thing)
|
|
|
|
def set_the_stock_code(self,the_thing):
|
|
self.ui.stock_code_label.setText(the_thing)
|
|
|
|
|
|
|
|
# STAND_BY = 0
|
|
# RECEIVED = 1
|
|
|
|
# class XASessionEvents:
|
|
# login_state = STAND_BY
|
|
|
|
# # def __init__(self):
|
|
|
|
|
|
# # # self.main_window=Main_window()
|
|
# # # self.main_window.show()
|
|
# # session=win32com.client.DispatchWithEvents("XA_Session.XASession",self)
|
|
# # session.init_main_window()
|
|
|
|
# # url=os.environ.get('URL')
|
|
# # port=os.environ.get('PORT')
|
|
# # cert=os.environ.get('CERT')
|
|
|
|
# # result=session.ConnectServer(url,port)
|
|
# # #print("result: ",result)
|
|
|
|
|
|
|
|
# def init_main_window(self):
|
|
# self.main_window=Main_window()
|
|
# self.main_window.show()
|
|
|
|
|
|
|
|
# def OnLogin(self, code, msg):
|
|
# XASessionEvents.login_state = RECEIVED
|
|
# # time.sleep(5)
|
|
# #print('로그인 결과@@: ',msg)
|
|
# self.main_window.possible()
|
|
# # query.single_request()
|
|
# def OnDisconnect(self, code, msg):
|
|
# pass
|
|
|
|
|
|
# session=win32com.client.DispatchWithEvents("XA_Session.XASession",XASessionEvents)
|
|
# session.init_main_window()
|
|
|
|
# url=os.environ.get('URL')
|
|
# port=os.environ.get('PORT')
|
|
# cert=os.environ.get('CERT')
|
|
|
|
# result=session.ConnectServer(url,port)
|
|
# #print("result: ",result) |