tokiospg commited on
Commit
46f6d7f
verified
1 Parent(s): af0aca2

Upload database.py

Browse files
Files changed (1) hide show
  1. database.py +3 -3
database.py CHANGED
@@ -140,7 +140,7 @@ def init_db():
140
  uname, lic, data, cg = row
141
  if lic and data and cg:
142
  c.execute("""INSERT INTO workspaces (username, licitacion, data_json, cg_json, fecha_guardado)
143
- VALUES (%s, %s, %s, %s, %s)""",
144
  (uname, lic, data, cg, datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
145
 
146
  # Usuario admin por defecto (contrase帽a: admin)
@@ -223,7 +223,7 @@ def get_all_users():
223
  """Retorna todos los usuarios del sistema para el panel de administraci贸n."""
224
  conn = get_connection()
225
  df = pd.read_sql_query(
226
- "SELECT username as Usuario, role as Nivel, email_user as Correo, gemini_key as Clave_Gemini, tavily_key as Clave_Tavily FROM users ORDER BY role, Usuario", conn)
227
  conn.close()
228
 
229
  # Enmascarar las llaves visualmente para seguridad (opcional, pero recomendado)
@@ -365,7 +365,7 @@ def save_history(username, licitacion, items_count):
365
  def get_user_history_df(username):
366
  conn = get_connection()
367
  df = pd.read_sql_query(
368
- "SELECT licitacion as 'N潞 Licitaci贸n', fecha as 'Fecha Proceso', items as 'Renglones' FROM history WHERE username=%s ORDER BY id DESC",
369
  conn, params=(username,))
370
  conn.close()
371
  return df
 
140
  uname, lic, data, cg = row
141
  if lic and data and cg:
142
  c.execute("""INSERT INTO workspaces (username, licitacion, data_json, cg_json, fecha_guardado)
143
+ VALUES (%s, %s, %s, %s, %s) ON CONFLICT (username, licitacion) DO NOTHING""",
144
  (uname, lic, data, cg, datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
145
 
146
  # Usuario admin por defecto (contrase帽a: admin)
 
223
  """Retorna todos los usuarios del sistema para el panel de administraci贸n."""
224
  conn = get_connection()
225
  df = pd.read_sql_query(
226
+ 'SELECT username as "Usuario", role as "Nivel", email_user as "Correo", gemini_key as "Clave_Gemini", tavily_key as "Clave_Tavily" FROM users ORDER BY role, username', conn)
227
  conn.close()
228
 
229
  # Enmascarar las llaves visualmente para seguridad (opcional, pero recomendado)
 
365
  def get_user_history_df(username):
366
  conn = get_connection()
367
  df = pd.read_sql_query(
368
+ 'SELECT licitacion as "N潞 Licitaci贸n", fecha as "Fecha Proceso", items as "Renglones" FROM history WHERE username=%s ORDER BY id DESC',
369
  conn, params=(username,))
370
  conn.close()
371
  return df