From 9d0380c50b2cd2abcb44fcbbc3bf573ee0cfa35e Mon Sep 17 00:00:00 2001
From: leo <leolswq@163.com>
Date: Thu, 7 Mar 2024 19:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.db  | Bin 28672 -> 28672 bytes
 flush.py |  56 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/data.db b/data.db
index e4b64728884220a43444599743cc602ccd7f02a3..97a46087c7f17ebbb6a99f4e550c523530f52599 100644
GIT binary patch
delta 647
zcmZp8z}WDBae}m9ECT}rI}pPF+e95>prBsf4ql)TBi{-Jz7>4A8w>yNPR`-8;c5zH
zWEWRdWNazje1cDfQ8+O#FFq|ZCpA7NsaPS*G054&aq~-l2?Kf7(+oT;S`56ZJlWhE
zxtaOh_)6HaS$?uxv1oDdaD{9v<YJL-^zq_nU=kG;<m7A&Zq(-BU|@gl?cow&U|>G^
zqo@uOkYdzI1W|z!D$@QQAjP5}#i5P52*t*hjv&>{Ai7ZAeDWj>EigM!LRpOCGQ$F(
zH;^<L7+X3)l{-O|t4KBaxMO#S>EsWhx=f~)FoQu%uv<KFxdq*DkXxKUdK6r|L3)%y
z?l*+HKQO?+(lpV)(k#(%@&-E#E*Qtac=E#_4?P4oKD{`_G``r#z{Em7GdD3kwV3xl
zV<RZmKn5x{$^rvq^1>ifM#IS$LX9VH@D*1xGQz5<3#17MprJT<p$H_rP{U5nw9yS1
zC=3ipv14Fr8EmYdlGv!@0}n2U&7gP-3@|h@LUn>THYYS{yG%ZqCc0VL`>6^5!d{~|

delta 113
zcmZp8z}WDBae}m9Bm)BjI}pPF>qH%6prBsbD_)=wBi}v-zI}YT8w>yNPR`-8nf#bf
zjJe64adH8l1(5xD^BaCq17Y6#3~b!Y47{p5+1wksnfcxLN;Ve0=VETucA0!IO?0!g
H_fr)BA7mcC

diff --git a/flush.py b/flush.py
index ef63f8f..ce32e76 100644
--- a/flush.py
+++ b/flush.py
@@ -2,36 +2,39 @@
 # -*- coding:utf-8 -*-
 from loguru import logger
 
-from bak.evolve_config2 import train_data
-from bak.init_data import BatchDataBase
+from bak.evolve_config2 import train_data, val_data
+from bak.init_data import BatchDataBase, BatchDataRead
 from db_utils import BatchData, session
 
-logger.debug(f"{len(train_data)=}")
-
-census_batches = []
-for td in train_data:
+logger.debug(f"{len(val_data)=}")
+for td in val_data:
     db_obj = BatchData(**BatchDataBase(**td).dict())
-    batch_data_db = session.query(BatchData).filter_by(ann_file=db_obj.ann_file).first()
-    if '2023' in db_obj.ann_file:
-        batch_data_db.year = 2023
-    census_batch_idx = db_obj.ann_file.index('kh')
-    if census_batch_idx:
-        census_batch = db_obj.ann_file[census_batch_idx:census_batch_idx + 4].upper()
-        census_batches.append(census_batch)
-        batch_data_db.census_batch = census_batch
+    batch_data_db = session.query(BatchData).where(BatchData.img_prefix == td.get("img_prefix")).first()
+    if batch_data_db:
+        logger.debug(f"{BatchDataRead.from_orm(batch_data_db)=}")
+        continue
+    session.add(db_obj)
 
-    batch_data_db.precision = 'S3'
-    batch_data_db.is_train = True
-    batch_data_db.is_validation = False
-
-    id_code_idx = census_batch_idx + 5
-    if batch_data_db.id_code is None:
-        if batch_data_db.id > 29:
-            code_start = db_obj.ann_file[id_code_idx + 21:]
-            code_end = code_start.index('_')
-            id_code = db_obj.ann_file[id_code_idx + 21:][:code_end]
-            logger.debug(f"{id_code}, {db_obj.ann_file[id_code_idx + 21:]}, {db_obj.ann_file[id_code_idx:]}, {batch_data_db.id=}")
-            batch_data_db.id_code = id_code
+#     if '2023' in db_obj.ann_file:
+#         batch_data_db.year = 2023
+#     census_batch_idx = db_obj.ann_file.index('kh')
+#     if census_batch_idx:
+#         census_batch = db_obj.ann_file[census_batch_idx:census_batch_idx + 4].upper()
+#         census_batches.append(census_batch)
+#         batch_data_db.census_batch = census_batch
+#
+#     batch_data_db.precision = 'S3'
+#     batch_data_db.is_train = True
+#     batch_data_db.is_validation = False
+#
+#     id_code_idx = census_batch_idx + 5
+#     if batch_data_db.id_code is None:
+#         if batch_data_db.id > 29:
+#             code_start = db_obj.ann_file[id_code_idx + 21:]
+#             code_end = code_start.index('_')
+#             id_code = db_obj.ann_file[id_code_idx + 21:][:code_end]
+#             logger.debug(f"{id_code}, {db_obj.ann_file[id_code_idx + 21:]}, {db_obj.ann_file[id_code_idx:]}, {batch_data_db.id=}")
+#             batch_data_db.id_code = id_code
 
         # if batch_data_db.id > 25 and batch_data_db.id <= 29:
         #     code_start = db_obj.ann_file[id_code_idx + 18:]
@@ -55,4 +58,3 @@ for td in train_data:
 
 session.commit()
 
-logger.info(f"{set(census_batches)=}")