WPatrick81 commited on
Commit
beb79ee
·
verified ·
1 Parent(s): 60ae928

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +79 -21
app.py CHANGED
@@ -62,62 +62,120 @@ def get_name_col(league: str, df: pd.DataFrame) -> str:
62
  # ════════════════════════════════════════════════════════════
63
  # 2. 서버 사이드 DataFrame 캐시
64
  # ════════════════════════════════════════════════════════════
65
- _df_store: dict = {}
 
 
 
66
 
67
  def _make_key(*args) -> str:
68
  raw = _json.dumps([str(a) for a in args], ensure_ascii=False)
69
  return hashlib.md5(raw.encode()).hexdigest()
70
 
71
  def _save(key: str, df: pd.DataFrame) -> str:
72
- _df_store[key] = df
 
73
  return key
74
 
75
- def _load(key) -> pd.DataFrame:
76
- if not key:
77
  return pd.DataFrame()
78
- return _df_store.get(key, pd.DataFrame())
 
 
 
 
 
 
 
 
79
 
80
  # ════════════════════════════════════════════════════════════
81
  # 3. 데이터 로드
82
  # ════════════════════════════════════════════════════════════
83
- def load_league_data(league_name, min_year=MIN_YEAR):
84
  file_name = LEAGUE_FILES[league_name]
85
  cache_path = os.path.join(CACHE_DIR, file_name)
86
- if os.path.exists(cache_path):
87
- print(f"[{league_name}] 로컬 캐시에서 로드 중...")
88
- df_tmp = pd.read_parquet(cache_path)
89
- return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  print(f"[{league_name}] GitHub Release에서 다운로드 중...")
91
  release_url = (f"https://api.github.com/repos/{OWNER}/{REPO}"
92
- f"/releases/tags/{TAG_NAME}")
93
- headers = {"Authorization": f"token {GITHUB_TOKEN}"} if GITHUB_TOKEN else {}
94
- response = requests.get(release_url, headers=headers)
 
 
 
 
 
 
 
 
 
 
95
  if response.status_code != 200:
96
- print(f"Release 접근 실패: {response.status_code}")
 
 
 
 
97
  return pd.DataFrame()
 
98
  assets = response.json().get("assets", [])
99
  target_asset = next((a for a in assets if a["name"] == file_name), None)
100
  if not target_asset:
101
- print(f"{file_name} 파일을 찾을 수 없습니다.")
102
  return pd.DataFrame()
 
103
  with requests.Session() as session:
104
  session.headers.update({
105
- "Accept": "application/octet-stream",
106
  "Authorization": f"token {GITHUB_TOKEN}" if GITHUB_TOKEN else "",
107
  })
108
- res = session.get(target_asset["url"])
 
 
 
 
 
 
 
 
109
  if res.status_code != 200:
110
- print(f"다운로드 실패: {res.status_code}")
 
 
 
111
  return pd.DataFrame()
 
112
  try:
113
  df_tmp = pd.read_parquet(BytesIO(res.content))
114
- df_tmp.to_parquet(cache_path, index=False)
115
- print(f"[{league_name}] 성공 ({df_tmp.shape[0]:,}행)")
116
  return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
117
  except Exception as e:
118
- print(f"파싱 실패: {e}")
119
  return pd.DataFrame()
120
 
 
121
  league_cache: dict = {}
122
  league_cache["KBO"] = load_league_data("KBO")
123
 
 
62
  # ════════════════════════════════════════════════════════════
63
  # 2. 서버 사이드 DataFrame 캐시
64
  # ════════════════════════════════════════════════════════════
65
+ _df_store: dict = {}
66
+ _df_store_ts: dict = {} # ← 저장 시각 기록용
67
+
68
+ CACHE_TTL_SECONDS = 6 * 60 * 60 # 6시간
69
 
70
  def _make_key(*args) -> str:
71
  raw = _json.dumps([str(a) for a in args], ensure_ascii=False)
72
  return hashlib.md5(raw.encode()).hexdigest()
73
 
74
  def _save(key: str, df: pd.DataFrame) -> str:
75
+ _df_store[key] = df
76
+ _df_store_ts[key] = time.time()
77
  return key
78
 
79
+ def _load(key, ttl=None) -> pd.DataFrame:
80
+ if not key or key not in _df_store:
81
  return pd.DataFrame()
82
+ if ttl is not None:
83
+ age = time.time() - _df_store_ts.get(key, 0)
84
+ if age > ttl:
85
+ print(f"[cache] TTL 초과 ({age/3600:.1f}h) → 재계산")
86
+ del _df_store[key]
87
+ del _df_store_ts[key]
88
+ return pd.DataFrame()
89
+ return _df_store[key]
90
+
91
 
92
  # ════════════════════════════════════════════════════════════
93
  # 3. 데이터 로드
94
  # ════════════════════════════════════════════════════════════
95
+ def load_league_data(league_name, min_year=MIN_YEAR, force_refresh=False):
96
  file_name = LEAGUE_FILES[league_name]
97
  cache_path = os.path.join(CACHE_DIR, file_name)
98
+
99
+ # ── 로컬 캐시 유효성 체크 ──────────────────────────
100
+ cache_valid = False
101
+ if os.path.exists(cache_path) and not force_refresh:
102
+ file_age = time.time() - os.path.getmtime(cache_path)
103
+ if file_age < CACHE_TTL_SECONDS:
104
+ cache_valid = True
105
+ print(f"[{league_name}] 로컬 캐시 사용 "
106
+ f"(경과: {file_age/3600:.1f}h / TTL: {CACHE_TTL_SECONDS/3600:.0f}h)")
107
+ else:
108
+ print(f"[{league_name}] 캐시 만료 "
109
+ f"({file_age/3600:.1f}h 경과) → GitHub 재다운로드")
110
+
111
+ if cache_valid:
112
+ try:
113
+ df_tmp = pd.read_parquet(cache_path)
114
+ return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
115
+ except Exception as e:
116
+ print(f"[{league_name}] 캐시 읽기 실패: {e} → 재다운로드")
117
+
118
+ # ── GitHub Release에서 다운로드 ────────────────────
119
  print(f"[{league_name}] GitHub Release에서 다운로드 중...")
120
  release_url = (f"https://api.github.com/repos/{OWNER}/{REPO}"
121
+ f"/releases/tags/{TAG_NAME}")
122
+ headers = {"Authorization": f"token {GITHUB_TOKEN}"} if GITHUB_TOKEN else {}
123
+
124
+ try:
125
+ response = requests.get(release_url, headers=headers, timeout=30)
126
+ except requests.exceptions.Timeout:
127
+ print(f"[{league_name}] GitHub API 타임아웃")
128
+ if os.path.exists(cache_path):
129
+ print(f"[{league_name}] 만료 캐시 fallback 사용")
130
+ df_tmp = pd.read_parquet(cache_path)
131
+ return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
132
+ return pd.DataFrame()
133
+
134
  if response.status_code != 200:
135
+ print(f"[{league_name}] Release 접근 실패: {response.status_code}")
136
+ if os.path.exists(cache_path):
137
+ print(f"[{league_name}] 만료 캐시 fallback 사용")
138
+ df_tmp = pd.read_parquet(cache_path)
139
+ return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
140
  return pd.DataFrame()
141
+
142
  assets = response.json().get("assets", [])
143
  target_asset = next((a for a in assets if a["name"] == file_name), None)
144
  if not target_asset:
145
+ print(f"[{league_name}] {file_name} 파일을 찾을 수 없습니다.")
146
  return pd.DataFrame()
147
+
148
  with requests.Session() as session:
149
  session.headers.update({
150
+ "Accept": "application/octet-stream",
151
  "Authorization": f"token {GITHUB_TOKEN}" if GITHUB_TOKEN else "",
152
  })
153
+ res = session.get(target_asset["url"], timeout=120, allow_redirects=True)
154
+
155
+ # 실패 시 browser_download_url 재시도
156
+ if res.status_code != 200:
157
+ fallback_url = target_asset.get("browser_download_url", "")
158
+ if fallback_url:
159
+ print(f"[{league_name}] API URL 실패({res.status_code}) → fallback 재시도")
160
+ res = session.get(fallback_url, timeout=120, allow_redirects=True)
161
+
162
  if res.status_code != 200:
163
+ print(f"[{league_name}] 다운로드 최종 실패: {res.status_code}")
164
+ if os.path.exists(cache_path):
165
+ df_tmp = pd.read_parquet(cache_path)
166
+ return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
167
  return pd.DataFrame()
168
+
169
  try:
170
  df_tmp = pd.read_parquet(BytesIO(res.content))
171
+ df_tmp.to_parquet(cache_path, index=False) # ← 성공 시에만 저장
172
+ print(f"[{league_name}] 다운로드 성공 ({df_tmp.shape[0]:,}행) → 캐시 저장")
173
  return df_tmp[df_tmp["game_year"] >= min_year] if min_year else df_tmp
174
  except Exception as e:
175
+ print(f"[{league_name}] 파싱 실패: {e}")
176
  return pd.DataFrame()
177
 
178
+
179
  league_cache: dict = {}
180
  league_cache["KBO"] = load_league_data("KBO")
181