VioletWizard commited on
Commit
f1cb4a6
·
unverified ·
2 Parent(s): be14b41df3d537

Merge pull request #83 from VioletWizard-lim/claude/remove-teacher-comments-Wy5SV

Browse files
Files changed (1) hide show
  1. db.py +44 -14
db.py CHANGED
@@ -86,11 +86,30 @@ def _is_rls_permission_error(error: Exception) -> bool:
86
  )
87
 
88
 
 
 
 
 
 
 
 
 
 
 
 
89
  def execute_query(query, fail_message="DB 작업 실패"):
90
  try:
91
  return query.execute()
92
  except Exception as e:
93
- if _is_rls_permission_error(e):
 
 
 
 
 
 
 
 
94
  logger.error("RLS_PERMISSION_ERROR %s: %s", fail_message, e)
95
  st.error(
96
  f"🔒 {fail_message}: 권한 오류가 발생했습니다. "
@@ -107,7 +126,7 @@ def execute_query(query, fail_message="DB 작업 실패"):
107
  # [3] 컬럼 존재 확인 — 통합 함수
108
  # ==========================================
109
 
110
- @st.cache_data(ttl=3600)
111
  def check_schema_columns() -> dict:
112
  supabase = init_db()
113
 
@@ -131,6 +150,9 @@ def check_schema_columns() -> dict:
131
  query_fn()
132
  results[key] = True
133
  except Exception as e:
 
 
 
134
  logger.info("컬럼 미존재 확인 [%s]: %s", key, e)
135
  results[key] = False
136
 
@@ -138,42 +160,50 @@ def check_schema_columns() -> dict:
138
  return results
139
 
140
 
 
 
 
 
 
 
 
 
141
  def debate_ip_column_available() -> bool:
142
- return check_schema_columns().get("debate.ip_address", False)
143
 
144
  def topic_entry_code_column_available() -> bool:
145
- return check_schema_columns().get("topic.entry_code", False)
146
 
147
  def topic_created_by_teacher_id_column_available() -> bool:
148
- return check_schema_columns().get("topic.created_by_teacher_id", False)
149
 
150
  def topic_created_by_column_available() -> bool:
151
- return check_schema_columns().get("topic.created_by", False)
152
 
153
  def topic_owner_column_available() -> bool:
154
- schema = check_schema_columns()
155
  return schema.get("topic.created_by_teacher_id", False) or schema.get("topic.created_by", False)
156
 
157
  def opinion_changes_available() -> bool:
158
- return check_schema_columns().get("opinion_changes.pre_opinion", False)
159
 
160
  def stance_available() -> bool:
161
- return check_schema_columns().get("opinion_changes.initial_stance", False)
162
 
163
  def session_control_available() -> bool:
164
- return check_schema_columns().get("session_control.status", False)
165
 
166
  def teacher_is_admin_column_available() -> bool:
167
- return check_schema_columns().get("teacher_accounts.is_admin", False)
168
 
169
  def likes_available() -> bool:
170
- return check_schema_columns().get("likes.opinion_id", False)
171
 
172
  def depth_level_available() -> bool:
173
- return check_schema_columns().get("debate.depth_level", False)
174
 
175
  def ai_feedback_available() -> bool:
176
- return check_schema_columns().get("opinion_changes.ai_feedback", False)
177
 
178
 
179
  # ==========================================
 
86
  )
87
 
88
 
89
+ _CONNECTION_ERROR_KEYWORDS = (
90
+ "connection", "network", "timeout", "ssl", "eof",
91
+ "reset", "unreachable", "refused", "broken pipe", "remote end closed",
92
+ )
93
+
94
+
95
+ def _is_connection_error(error: Exception) -> bool:
96
+ msg = str(error).lower()
97
+ return any(k in msg for k in _CONNECTION_ERROR_KEYWORDS)
98
+
99
+
100
  def execute_query(query, fail_message="DB 작업 실패"):
101
  try:
102
  return query.execute()
103
  except Exception as e:
104
+ if _is_connection_error(e):
105
+ logger.error("CONNECTION_ERROR %s: %s", fail_message, e)
106
+ init_db.clear()
107
+ check_schema_columns.clear()
108
+ st.warning(
109
+ "🌐 Supabase 연결이 일시적으로 끊어졌습니다. "
110
+ "**페이지를 새로고침(F5)하면 자동으로 재연결됩니다.**"
111
+ )
112
+ elif _is_rls_permission_error(e):
113
  logger.error("RLS_PERMISSION_ERROR %s: %s", fail_message, e)
114
  st.error(
115
  f"🔒 {fail_message}: 권한 오류가 발생했습니다. "
 
126
  # [3] 컬럼 존재 확인 — 통합 함수
127
  # ==========================================
128
 
129
+ @st.cache_data(ttl=300)
130
  def check_schema_columns() -> dict:
131
  supabase = init_db()
132
 
 
150
  query_fn()
151
  results[key] = True
152
  except Exception as e:
153
+ if _is_connection_error(e):
154
+ # 연결 오류 시 결과를 캐시하지 않고 재시도 가능하게 예외를 전파
155
+ raise RuntimeError(f"Supabase 연결 오류로 스키마 체크 실패: {e}") from e
156
  logger.info("컬럼 미존재 확인 [%s]: %s", key, e)
157
  results[key] = False
158
 
 
160
  return results
161
 
162
 
163
+ def _schema() -> dict:
164
+ """check_schema_columns를 안전하게 호출 — 연결 오류 시 빈 dict 반환."""
165
+ try:
166
+ return check_schema_columns()
167
+ except Exception:
168
+ return {}
169
+
170
+
171
  def debate_ip_column_available() -> bool:
172
+ return _schema().get("debate.ip_address", False)
173
 
174
  def topic_entry_code_column_available() -> bool:
175
+ return _schema().get("topic.entry_code", False)
176
 
177
  def topic_created_by_teacher_id_column_available() -> bool:
178
+ return _schema().get("topic.created_by_teacher_id", False)
179
 
180
  def topic_created_by_column_available() -> bool:
181
+ return _schema().get("topic.created_by", False)
182
 
183
  def topic_owner_column_available() -> bool:
184
+ schema = _schema()
185
  return schema.get("topic.created_by_teacher_id", False) or schema.get("topic.created_by", False)
186
 
187
  def opinion_changes_available() -> bool:
188
+ return _schema().get("opinion_changes.pre_opinion", False)
189
 
190
  def stance_available() -> bool:
191
+ return _schema().get("opinion_changes.initial_stance", False)
192
 
193
  def session_control_available() -> bool:
194
+ return _schema().get("session_control.status", False)
195
 
196
  def teacher_is_admin_column_available() -> bool:
197
+ return _schema().get("teacher_accounts.is_admin", False)
198
 
199
  def likes_available() -> bool:
200
+ return _schema().get("likes.opinion_id", False)
201
 
202
  def depth_level_available() -> bool:
203
+ return _schema().get("debate.depth_level", False)
204
 
205
  def ai_feedback_available() -> bool:
206
+ return _schema().get("opinion_changes.ai_feedback", False)
207
 
208
 
209
  # ==========================================