From 6063539f641e20b97c9dd169601d658fe2a3f88f Mon Sep 17 00:00:00 2001
From: leo <leolswq@163.com>
Date: Thu, 7 Mar 2024 21:26:00 +0800
Subject: [PATCH] =?UTF-8?q?y=E6=9C=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bak/init_data.py |   4 ++++
 data.db          | Bin 28672 -> 28672 bytes
 db_utils.py      |   3 ++-
 main.py          |  19 +++++++++++--------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/bak/init_data.py b/bak/init_data.py
index 1d4ea10..e18d739 100644
--- a/bak/init_data.py
+++ b/bak/init_data.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding:utf-8 -*-
+from datetime import datetime
+
 from pydantic import BaseModel
 
 
@@ -16,6 +18,7 @@ class BatchDataBase(BaseModel):
     img_prefix: str | None = None
     filter_empty_gt: bool | None = None
     update_cache: bool | None = None
+    create_at: datetime | None = None
 
 
 class BatchDataRead(BatchDataBase):
@@ -38,3 +41,4 @@ class BatchDataCreate(BatchDataBase):
     img_prefix: str | None = ''
     filter_empty_gt: bool | None = False
     update_cache: bool | None = False
+    create_at: datetime | None = datetime.now()
diff --git a/data.db b/data.db
index 6a87e8554263d4743b2b25904bb786465eb4b1a2..f93512449893041dc0c31bd2fb19b649bad909bb 100644
GIT binary patch
delta 711
zcmZp8z}WDBae}nqHwFd<b|8iU_K7;iKta8<SG+(WM!uO0d^7oSHx~Zkot(p`%hi;^
z$S$s^$k-}8xtz~%^J6|vM&IP3)Wnk1_{0*0#Jox!1uo8jAWvV%phyL8*GL78%oI&7
zO<sO^20@0!42-P|i<u3W5}E(AoZ}1NE##TZy_M@a=MPRv4lDL(wi?#C6ALSa8snMx
z8JI-H1vxnyGaJo0I2a~R6ucnR7|93~=4?!EG=vCiO-|77nVcXYD&@lhk`)GN3U1T}
z%CbN6_HYR>Ff*C_QB-%5yximoE-sV*%c)8EFk@F~0#d0n`IUe?Sm`SPRiQ>7Ry4Jf
zXUgsq^kG96JuS0uv$gOQcEK19xKwhZHOP_j(r39Feb`~blgosTumHpM;p7&<yPFhP
z6x8@wv>13*d9t}Tax?S0@s+S;v;1VYV$tH@;R<1Wz-G@T%%#EkXJH}BW-XV6jP<Nv
z7)1Faco~>@d3iZGczHQEc-dbF1%U*F5dwxr#vGR!yn%|eqWO^3I<mhoGB7gHHP8yd
zE^e%AV6I?fXk}<@Wn!#nU}|h+Y_1gySE~rJ5N-%I#hbI;Rx>hkY!>%;${3*)2G>bY
PqgE*KYBz^?tx*L4f03Ff

delta 607
zcmZp8z}WDBae}m990LObI}pPF+e95>prBsbD_)=wBi{-Jz7>4A8w>yNPR`-eoqUv!
zpQ|a9kzHI-k+G$8ayg&U=A(QPjQL!g0YRR=jzN(M-mZ}f8ks4YT$;R${0xE&j*R>&
zj13Hqd||vDJiC~(x%s#ZID<G!*r&2>W4+GugGG|rijkYa5bOZPEeuSeAXZ~)qcumP
zH!~lQFD%H((HPvQ&B4L`%-h2yz`(?0@<%D1$+v{%C&{`1DOGW%M213;PLRsvMnj;=
z=OC3pW%82~^sQMM<Cyp+E6d*%<$lA!1u?SGhn*k7;+z~UcVzQi(W~rY(Hw9KlYtI^
zS~&SZh}>ic4WY?9Wv5F49d{0!qs)ya3tH<=*3*^)IZ9VsO~9KCZW!40lOKre6Yyq5
z6BHELC+W?CDhTzb8N{F55PxzDtMNrJf)t8Fy*XJ=UI*yCp2-4Qe3Jz<*f#%{XH}5l
zVbNmXRprU%-pI|&@5Wccmd)~$-HJtvgNG|*V<8vIW-XV6jA9&@85RJ&A}Ywq*%;cW
z%fZ25U~K6G4%cVy3X?wwN=<(6$vb(zhWO@ex7Cb{oSVfxo-zXYvXhs(DoQoFx$^_H
Z1EYo$5;Y74rk26R`YDN<L%i0g0sw9!kNp4u

diff --git a/db_utils.py b/db_utils.py
index ff1fd48..7c69059 100644
--- a/db_utils.py
+++ b/db_utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding:utf-8 -*-
 
-from sqlalchemy import Column, Integer, String, create_engine
+from sqlalchemy import Column, Integer, String, create_engine, Date, TIMESTAMP
 from sqlalchemy.orm import declarative_base, sessionmaker
 
 Base = declarative_base()
@@ -23,6 +23,7 @@ class BatchData(Base):
     img_prefix = Column(String)
     filter_empty_gt = Column(Integer)
     update_cache = Column(Integer)
+    create_at = Column(TIMESTAMP)
 
 
 Base.metadata.create_all(engine)
diff --git a/main.py b/main.py
index 2bd87f5..77c4dbc 100644
--- a/main.py
+++ b/main.py
@@ -47,7 +47,6 @@ st.session_state.setdefault('configs', {
 if not st.session_state.data_table:
     st.session_state.data_table = get_data_from_db()
 
-df = pd.DataFrame(data=st.session_state.data_table)
 
 left_col, right_col = st.columns([3, 1])
 
@@ -57,6 +56,7 @@ def train():
 
 
 def table_update_handler():
+    st.session_state.data_table = get_data_from_db()
     logger.debug(f"{st.session_state.edited_info=}")
     edited_rows = st.session_state.edited_info.get('edited_rows')
     added_rows = st.session_state.edited_info.get('added_rows')
@@ -81,22 +81,27 @@ def table_update_handler():
         session.delete(row_db)
         session.commit()
 
+        # deleted_row_data = next(filter(lambda x: x.get('id') == row_id, st.session_state.data_table[::-1], ))
+        # logger.debug(f"{deleted_row_data=}")
+        # del deleted_row_data
+
 
 def update_config(*args, **kwargs):
     return None
 
 
 def create_new_row():
-    session.add(
-        BatchData(**BatchDataCreate().dict())
-    )
+    new_db_obj = BatchData(**BatchDataCreate().dict())
+    session.add(new_db_obj)
     session.commit()
+    session.refresh(new_db_obj)
+    logger.debug(f"{BatchDataRead.from_orm(new_db_obj)=}")
+    # st.session_state.data_table.append(BatchDataRead.from_orm(new_db_obj).dict())
     st.session_state.data_table = get_data_from_db()
 
-
 with left_col:
     edited_df = st.data_editor(
-        df, key="edited_info",
+        pd.DataFrame(data=st.session_state.data_table), key="edited_info",
         num_rows="dynamic",
         height=600,
         hide_index=True,
@@ -134,6 +139,4 @@ with right_col:
     st.json({
         k: st.session_state[k] for k in ('evolve_r', 'n_trail', 'n_epoch', 'ckpt_path', 'mode')
     })
-
-    st.divider()
     st.button("启动", on_click=train)