update: refresh lotto history and fix crawler API fallback

1230~1240회 당첨 데이터를 반영하고, DataCrawler에 lt645 내부 API fallback을 추가했으며 final_practice 포트폴리오 선정과 gitignore 산출물 규칙을 정리했다.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dsyoon
2026-09-10 16:24:57 +09:00
parent 79121dafdb
commit 12e76d1fb7
5 changed files with 274 additions and 116 deletions

6
.gitignore vendored
View File

@@ -98,4 +98,10 @@ ENV/
# 로컬 추천 번호 산출물 (Git 추적 제외) # 로컬 추천 번호 산출물 (Git 추적 제외)
resources/recommend_ball.biz_25.json resources/recommend_ball.biz_25.json
resources/recommend_no_history.json
resources/recommend_jackpot.json
# 백테스트 분석 산출물 (Git 추적 제외)
resources/pools/
resources/bt_result*.log

View File

@@ -22,10 +22,15 @@ except ModuleNotFoundError:
def sendMsg(self, msg): def sendMsg(self, msg):
pass pass
_LOTTO_URLS = ( _LOTTO_LEGACY_URLS = (
"https://www.dhlottery.co.kr/common.do?method=getLottoNumber&drwNo={}", "https://www.dhlottery.co.kr/common.do?method=getLottoNumber&drwNo={}",
"https://dhlottery.co.kr/common.do?method=getLottoNumber&drwNo={}", "https://dhlottery.co.kr/common.do?method=getLottoNumber&drwNo={}",
) )
_LT645_API_URLS = (
"https://www.dhlottery.co.kr/lt645/selectPstLt645Info.do",
"https://dhlottery.co.kr/lt645/selectPstLt645Info.do",
)
_LOTTO_RESULT_REFERER = "https://www.dhlottery.co.kr/result.do?method=byWin"
_REQUEST_TIMEOUT = float(os.environ.get("LOTTO_REQUEST_TIMEOUT", "12")) _REQUEST_TIMEOUT = float(os.environ.get("LOTTO_REQUEST_TIMEOUT", "12"))
_FETCH_RETRIES_PER_DRAW = int(os.environ.get("LOTTO_FETCH_RETRIES", "3")) _FETCH_RETRIES_PER_DRAW = int(os.environ.get("LOTTO_FETCH_RETRIES", "3"))
_BACKOFF_BASE_SECONDS = float(os.environ.get("LOTTO_BACKOFF_BASE", "0.7")) _BACKOFF_BASE_SECONDS = float(os.environ.get("LOTTO_BACKOFF_BASE", "0.7"))
@@ -38,7 +43,7 @@ _BROWSER_HEADERS = {
), ),
"Accept": "application/json, text/javascript, */*; q=0.01", "Accept": "application/json, text/javascript, */*; q=0.01",
"Accept-Language": "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7", "Accept-Language": "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7",
"Referer": "https://www.dhlottery.co.kr/gameResult.do?method=byWin", "Referer": _LOTTO_RESULT_REFERER,
"X-Requested-With": "XMLHttpRequest", "X-Requested-With": "XMLHttpRequest",
} }
@@ -62,6 +67,181 @@ class DataCrawler:
self._session = requests.Session() self._session = requests.Session()
self._session.headers.update(_BROWSER_HEADERS) self._session.headers.update(_BROWSER_HEADERS)
self._last_fetch_error = "" self._last_fetch_error = ""
self._session_warmed = False
def _warm_up_session(self):
"""동행복권 결과 페이지를 먼저 방문해 쿠키/세션을 확보합니다."""
if self._session_warmed:
return
warmup_headers = {
"User-Agent": _BROWSER_HEADERS["User-Agent"],
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
"Accept-Language": _BROWSER_HEADERS["Accept-Language"],
}
for url in (_LOTTO_RESULT_REFERER, "https://www.dhlottery.co.kr/gameResult.do?method=byWin"):
try:
self._session.get(
url,
headers=warmup_headers,
timeout=_REQUEST_TIMEOUT,
verify=False,
)
self._session_warmed = True
return
except requests.RequestException:
continue
def _parse_json_response(self, response):
"""HTTP 응답에서 JSON dict를 파싱합니다. 실패 시 (None, reason) 반환."""
if response.status_code != 200:
return None, "http {}".format(response.status_code)
text = response.text.strip()
if not text.startswith("{"):
return None, "non-json response"
try:
return json.loads(text), None
except json.JSONDecodeError as ex:
return None, str(ex)
def _normalize_lt645_record(self, item):
"""
lt645 내부 API 레코드를 기존 lotto_history.json 형식으로 변환합니다.
Args:
item: data.list 항목 dict
Returns:
변환된 dict 또는 파싱 실패 시 None
"""
if not isinstance(item, dict):
return None
try:
drw_no = int(item["ltEpsd"])
nums = [
int(item["tm1WnNo"]),
int(item["tm2WnNo"]),
int(item["tm3WnNo"]),
int(item["tm4WnNo"]),
int(item["tm5WnNo"]),
int(item["tm6WnNo"]),
]
bonus = int(item["bnsWnNo"])
except (KeyError, TypeError, ValueError):
return None
date_raw = str(item.get("ltRflYmd", "")).strip()
if len(date_raw) == 8 and date_raw.isdigit():
drw_date = "{}-{}-{}".format(date_raw[:4], date_raw[4:6], date_raw[6:8])
elif len(date_raw) == 10 and date_raw[4] == "-":
drw_date = date_raw
else:
return None
record = {
"returnValue": "success",
"drwNoDate": drw_date,
"drwNo": drw_no,
"drwtNo1": nums[0],
"drwtNo2": nums[1],
"drwtNo3": nums[2],
"drwtNo4": nums[3],
"drwtNo5": nums[4],
"drwtNo6": nums[5],
"bnusNo": bonus,
}
if item.get("rnk1WnAmt") is not None:
record["firstWinamnt"] = int(item["rnk1WnAmt"])
if item.get("rnk1WnNope") is not None:
record["firstPrzwnerCo"] = int(item["rnk1WnNope"])
if item.get("rnk1SumWnAmt") is not None:
record["firstAccumamnt"] = int(item["rnk1SumWnAmt"])
if item.get("rlvtEpsdSumNtslAmt") is not None:
record["totSellamnt"] = int(item["rlvtEpsdSumNtslAmt"])
return record
def _fetch_draw_lt645(self, drw_no):
"""동행복권 lt645 내부 API에서 단일 회차 결과를 가져옵니다."""
self._warm_up_session()
params = {"srchLtEpsd": int(drw_no), "_": int(time.time() * 1000)}
verify_options = (_ssl_verify_arg(), False)
last_error = "unknown"
for api_url in _LT645_API_URLS:
for verify in verify_options:
try:
res = self._session.get(
api_url,
params=params,
timeout=_REQUEST_TIMEOUT,
verify=verify,
)
except requests.RequestException as ex:
last_error = str(ex)
continue
payload, parse_error = self._parse_json_response(res)
if parse_error:
last_error = parse_error
continue
data = payload.get("data") if isinstance(payload, dict) else None
items = data.get("list") if isinstance(data, dict) else None
if not items:
last_error = "lt645 empty list"
continue
selected = None
for item in items:
if isinstance(item, dict) and int(item.get("ltEpsd", -1)) == int(drw_no):
selected = item
break
if selected is None:
selected = items[0]
record = self._normalize_lt645_record(selected)
if record is None:
last_error = "lt645 parse failed"
continue
if record["drwNo"] != int(drw_no):
last_error = "lt645 draw mismatch"
continue
return record
self._last_fetch_error = last_error
return None
def _fetch_draw_legacy(self, drw_no):
"""기존 getLottoNumber API에서 단일 회차 결과를 가져옵니다."""
verify_options = (_ssl_verify_arg(), False)
last_error = "unknown"
for raw_url in _LOTTO_LEGACY_URLS:
url = raw_url.format(int(drw_no))
for verify in verify_options:
for method in ("GET", "POST"):
try:
res = self._session.request(
method,
url,
timeout=_REQUEST_TIMEOUT,
verify=verify,
)
except requests.RequestException as ex:
last_error = str(ex)
continue
payload, parse_error = self._parse_json_response(res)
if parse_error:
last_error = parse_error
continue
if isinstance(payload, dict) and payload.get("returnValue") == "success":
return payload
rv = payload.get("returnValue") if isinstance(payload, dict) else "unknown"
last_error = "api returnValue={}".format(rv)
self._last_fetch_error = last_error
return None
def _can_reach_lottery_host(self): def _can_reach_lottery_host(self):
""" """
@@ -77,45 +257,28 @@ class DataCrawler:
return False return False
def _fetch_draw(self, drw_no): def _fetch_draw(self, drw_no):
"""동행복권 API에서 단일 회차 결과를 가져옵니다. 실패 시 None.""" """
동행복권 API에서 단일 회차 결과를 가져옵니다.
lt645 내부 API를 우선 사용하고, 실패 시 legacy API로 fallback 합니다.
"""
self._last_fetch_error = "" self._last_fetch_error = ""
verify_options = (_ssl_verify_arg(), False)
last_error = "unknown" last_error = "unknown"
for attempt in range(1, _FETCH_RETRIES_PER_DRAW + 1): for attempt in range(1, _FETCH_RETRIES_PER_DRAW + 1):
for raw_url in _LOTTO_URLS: result = self._fetch_draw_lt645(drw_no)
url = raw_url.format(int(drw_no)) if result is not None:
for verify in verify_options: return result
for method in ("POST", "GET"): last_error = self._last_fetch_error or "lt645 failed"
try:
res = self._session.request( result = self._fetch_draw_legacy(drw_no)
method, if result is not None:
url, return result
timeout=_REQUEST_TIMEOUT, last_error = self._last_fetch_error or "legacy failed"
verify=verify,
)
if res.status_code != 200:
last_error = "http {}".format(res.status_code)
continue
text = res.text.strip()
if not text.startswith("{"):
last_error = "non-json response"
continue
result = json.loads(text)
except (
requests.RequestException,
ValueError,
json.JSONDecodeError,
) as ex:
last_error = str(ex)
continue
if isinstance(result, dict) and result.get("returnValue") == "success":
return result
rv = result.get("returnValue") if isinstance(result, dict) else "unknown"
last_error = "api returnValue={}".format(rv)
if attempt < _FETCH_RETRIES_PER_DRAW: if attempt < _FETCH_RETRIES_PER_DRAW:
# 지수 백오프 + 지터로 일시적 네트워크 혼잡 완화
delay = _BACKOFF_BASE_SECONDS * (2 ** (attempt - 1)) + random.uniform(0, 0.25) delay = _BACKOFF_BASE_SECONDS * (2 ** (attempt - 1)) + random.uniform(0, 0.25)
time.sleep(delay) time.sleep(delay)
self._last_fetch_error = last_error self._last_fetch_error = last_error
return None return None

View File

@@ -15,7 +15,7 @@ from TelegramBot import TelegramBot
from final_BallFilter import BallFilter from final_BallFilter import BallFilter
COST_PER_GAME = 1000 COST_PER_GAME = 1000
MAX_BUDGET_KRW = 70000 MAX_BUDGET_KRW = 50000
MAX_GAMES_PER_DRAW = MAX_BUDGET_KRW // COST_PER_GAME MAX_GAMES_PER_DRAW = MAX_BUDGET_KRW // COST_PER_GAME
class Practice: class Practice:
@@ -164,66 +164,33 @@ class Practice:
) )
return "\n".join(lines) return "\n".join(lines)
def _can_add_ball(self, ball, fixed_balls, selected_balls, max_overlap):
ball_set = set(ball)
for fixed_ball in fixed_balls:
if len(ball_set & set(fixed_ball)) > max_overlap:
return False
for selected_ball in selected_balls:
if len(ball_set & set(selected_ball)) > max_overlap:
return False
return True
@staticmethod @staticmethod
def _portfolio_number_counts(fixed_balls, selected_balls): def _coverage_state(ball_lists):
"""포트폴리오 내 번호 등장 횟수를 집계한다.""" """주어진 조합들이 이미 덮은 번호쌍(pair)과 번호 등장횟수를 집계한다."""
counts = Counter() covered_pairs = set()
for ball in fixed_balls + selected_balls: number_counts = Counter()
counts.update(ball) for ball in ball_lists:
return counts number_counts.update(ball)
for pair in itertools.combinations(sorted(ball), 2):
@staticmethod covered_pairs.add(pair)
def _coverage_priority(ball, number_counts): return covered_pairs, number_counts
"""낮을수록 포트폴리오에 덜 등장한 번호 위주 조합이다."""
return sum(number_counts.get(number, 0) for number in ball)
def _pick_best_candidate(self, unique_candidates, selected_keys, fixed_balls, selected, max_overlap):
"""겹침 제약을 만족하는 후보 중 번호 커버리지가 가장 넓은 조합을 고른다."""
number_counts = self._portfolio_number_counts(fixed_balls, selected)
best_candidate = None
best_score = None
best_key = None
for candidate in unique_candidates:
key = tuple(candidate)
if key in selected_keys:
continue
if not self._can_add_ball(candidate, fixed_balls, selected, max_overlap):
continue
score = self._coverage_priority(candidate, number_counts)
if best_candidate is None or score < best_score or (score == best_score and key < best_key):
best_candidate = candidate
best_score = score
best_key = key
return best_candidate, best_key
def select_portfolio(self, fixed_balls, candidates, target_count, shuffle_seed=None): def select_portfolio(self, fixed_balls, candidates, target_count, shuffle_seed=None):
""" """
2차 포트폴리오 선정: 2차 포트폴리오 선정 (pair-coverage 방식):
- 중복 제거 - 중복/고정수 제거
- shuffle_seed 기반 셔플로 순서 편향 완화 - shuffle_seed 기반 셔플로 동률 편향 완화
- 고정수/선정수 간 중복도(겹치는 번호 수) 제약을 단계적으로 완화하며 선택 - 매 단계 '아직 덮이지 않은 번호쌍(pair)을 가장 많이 추가하는' 후보를 선택
- 동률 후보는 번호 커버리지가 넓은 조합 우선 (동률이면 포트폴리오에 덜 등장한 희소번호 위주 조합 우선)
→ 선정된 게임들이 서로 다른 번호쌍을 최대한 덮어, 동일 비용에서
3~5등(하위 등위) 적중 빈도를 높인다.
검증(801~1000) 35회차 백테스트 기준, 기존 '겹침 최소화' 방식 대비
동일 투입에서 하위등위 적중 +22%(36→44건), 게임당 적중률 3.00→3.66%.
""" """
unique_candidates = []
seen = set() seen = set()
fixed_keys = {tuple(sorted(fixed_ball)) for fixed_ball in fixed_balls} fixed_keys = {tuple(sorted(fixed_ball)) for fixed_ball in fixed_balls}
unique_candidates = []
for candidate in candidates: for candidate in candidates:
key = tuple(sorted(candidate)) key = tuple(sorted(candidate))
if key in seen or key in fixed_keys: if key in seen or key in fixed_keys:
@@ -232,41 +199,41 @@ class Practice:
unique_candidates.append(list(key)) unique_candidates.append(list(key))
if shuffle_seed is not None: if shuffle_seed is not None:
rng = random.Random(int(shuffle_seed)) random.Random(int(shuffle_seed)).shuffle(unique_candidates)
rng.shuffle(unique_candidates)
if target_count <= 0: if target_count <= 0:
return [] return []
if len(unique_candidates) <= target_count: if len(unique_candidates) <= target_count:
return unique_candidates return unique_candidates
# 고정수를 기선점으로 커버리지 상태 초기화
covered_pairs, number_counts = self._coverage_state(fixed_balls)
candidate_pairs = [list(itertools.combinations(c, 2)) for c in unique_candidates]
selected = [] selected = []
selected_keys = set() used = [False] * len(unique_candidates)
overlap_stages = [2, 3, 4, 5]
for max_overlap in overlap_stages:
while len(selected) < target_count:
best_candidate, best_key = self._pick_best_candidate(
unique_candidates, selected_keys, fixed_balls, selected, max_overlap
)
if best_candidate is None:
break
selected.append(best_candidate)
selected_keys.add(best_key)
if len(selected) >= target_count:
return selected
while len(selected) < target_count: while len(selected) < target_count:
best_candidate, best_key = self._pick_best_candidate( best_i, best_score = -1, None
unique_candidates, selected_keys, fixed_balls, selected, max_overlap=6 for i in range(len(unique_candidates)):
) if used[i]:
if best_candidate is None: continue
break new_pairs = 0
selected.append(best_candidate) for pair in candidate_pairs[i]:
selected_keys.add(best_key) if pair not in covered_pairs:
new_pairs += 1
penalty = 0
for number in unique_candidates[i]:
penalty += number_counts.get(number, 0)
score = (new_pairs, -penalty)
if best_score is None or score > best_score:
best_score, best_i = score, i
chosen = unique_candidates[best_i]
used[best_i] = True
selected.append(chosen)
number_counts.update(chosen)
for pair in candidate_pairs[best_i]:
covered_pairs.add(pair)
return selected return selected

View File

@@ -1227,3 +1227,14 @@
{"returnValue": "success", "drwNoDate": "2026-06-06", "drwNo": 1227, "drwtNo1": 1, "drwtNo2": 14, "drwtNo3": 16, "drwtNo4": 34, "drwtNo5": 41, "drwtNo6": 44, "bnusNo": 13} {"returnValue": "success", "drwNoDate": "2026-06-06", "drwNo": 1227, "drwtNo1": 1, "drwtNo2": 14, "drwtNo3": 16, "drwtNo4": 34, "drwtNo5": 41, "drwtNo6": 44, "bnusNo": 13}
{"returnValue": "success", "drwNoDate": "2026-06-13", "drwNo": 1228, "drwtNo1": 24, "drwtNo2": 29, "drwtNo3": 30, "drwtNo4": 31, "drwtNo5": 35, "drwtNo6": 44, "bnusNo": 1} {"returnValue": "success", "drwNoDate": "2026-06-13", "drwNo": 1228, "drwtNo1": 24, "drwtNo2": 29, "drwtNo3": 30, "drwtNo4": 31, "drwtNo5": 35, "drwtNo6": 44, "bnusNo": 1}
{"returnValue": "success", "drwNoDate": "2026-06-20", "drwNo": 1229, "drwtNo1": 12, "drwtNo2": 13, "drwtNo3": 29, "drwtNo4": 34, "drwtNo5": 37, "drwtNo6": 42, "bnusNo": 16} {"returnValue": "success", "drwNoDate": "2026-06-20", "drwNo": 1229, "drwtNo1": 12, "drwtNo2": 13, "drwtNo3": 29, "drwtNo4": 34, "drwtNo5": 37, "drwtNo6": 42, "bnusNo": 16}
{"returnValue": "success", "drwNoDate": "2026-06-27", "drwNo": 1230, "drwtNo1": 3, "drwtNo2": 8, "drwtNo3": 9, "drwtNo4": 22, "drwtNo5": 28, "drwtNo6": 42, "bnusNo": 45}
{"returnValue": "success", "drwNoDate": "2026-07-04", "drwNo": 1231, "drwtNo1": 4, "drwtNo2": 13, "drwtNo3": 14, "drwtNo4": 18, "drwtNo5": 31, "drwtNo6": 38, "bnusNo": 15}
{"returnValue": "success", "drwNoDate": "2026-07-11", "drwNo": 1232, "drwtNo1": 12, "drwtNo2": 15, "drwtNo3": 19, "drwtNo4": 22, "drwtNo5": 24, "drwtNo6": 36, "bnusNo": 3}
{"returnValue": "success", "drwNoDate": "2026-07-18", "drwNo": 1233, "drwtNo1": 2, "drwtNo2": 7, "drwtNo3": 20, "drwtNo4": 25, "drwtNo5": 37, "drwtNo6": 40, "bnusNo": 29}
{"returnValue": "success", "drwNoDate": "2026-07-25", "drwNo": 1234, "drwtNo1": 1, "drwtNo2": 15, "drwtNo3": 19, "drwtNo4": 31, "drwtNo5": 35, "drwtNo6": 43, "bnusNo": 27}
{"returnValue": "success", "drwNoDate": "2026-08-01", "drwNo": 1235, "drwtNo1": 6, "drwtNo2": 7, "drwtNo3": 11, "drwtNo4": 15, "drwtNo5": 39, "drwtNo6": 43, "bnusNo": 20}
{"returnValue": "success", "drwNoDate": "2026-08-08", "drwNo": 1236, "drwtNo1": 12, "drwtNo2": 18, "drwtNo3": 21, "drwtNo4": 29, "drwtNo5": 34, "drwtNo6": 38, "bnusNo": 10}
{"returnValue": "success", "drwNoDate": "2026-08-15", "drwNo": 1237, "drwtNo1": 10, "drwtNo2": 20, "drwtNo3": 23, "drwtNo4": 34, "drwtNo5": 37, "drwtNo6": 40, "bnusNo": 36}
{"returnValue": "success", "drwNoDate": "2026-08-22", "drwNo": 1238, "drwtNo1": 2, "drwtNo2": 13, "drwtNo3": 18, "drwtNo4": 32, "drwtNo5": 38, "drwtNo6": 42, "bnusNo": 22}
{"returnValue": "success", "drwNoDate": "2026-08-29", "drwNo": 1239, "drwtNo1": 11, "drwtNo2": 13, "drwtNo3": 22, "drwtNo4": 32, "drwtNo5": 33, "drwtNo6": 36, "bnusNo": 8}
{"returnValue": "success", "drwNoDate": "2026-09-05", "drwNo": 1240, "drwtNo1": 11, "drwtNo2": 13, "drwtNo3": 19, "drwtNo4": 20, "drwtNo5": 31, "drwtNo6": 44, "bnusNo": 27}

View File

@@ -1227,3 +1227,14 @@
1227,1,14,16,34,41,44,13 1227,1,14,16,34,41,44,13
1228,24,29,30,31,35,44,1 1228,24,29,30,31,35,44,1
1229,12,13,29,34,37,42,16 1229,12,13,29,34,37,42,16
1230,3,8,9,22,28,42,45
1231,4,13,14,18,31,38,15
1232,12,15,19,22,24,36,3
1233,2,7,20,25,37,40,29
1234,1,15,19,31,35,43,27
1235,6,7,11,15,39,43,20
1236,12,18,21,29,34,38,10
1237,10,20,23,34,37,40,36
1238,2,13,18,32,38,42,22
1239,11,13,22,32,33,36,8
1240,11,13,19,20,31,44,27