From cff8af0d15eebcbff755ac8ff769e7f16265acce Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Wed, 2 Jul 2025 20:13:13 -0400 Subject: [PATCH] project is broken --- news/__pycache__/pool.cpython-311.pyc | Bin 13412 -> 18481 bytes news/pool.py | 28 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/news/__pycache__/pool.cpython-311.pyc b/news/__pycache__/pool.cpython-311.pyc index dde08c7efd3e1e2ef31a85a8881c493adbbf0360..02e1dfc1365247bc01842472b77b71145db58bbe 100644 GIT binary patch delta 4666 zcmbVPZBSF$89wLc`wJ2hzyKi^fsiXGA4Pa)8I4mm3+|^<$cigkSY|f(~|j=eJh;8PD4)IefIl zV^w@&)q5P8Pgo4tuaO*qXU0jl5}`u~qiF=LWdwGi%a}(KiZ{`;;(JOAZ8KPOX|l|m z$76d&Frp#vX}3~O)e&u2JEH`t!aWS=Qb{rpwqhNvysHXp!ioXrJ_GrMJ9R~LVcm>c z3cXxrM?Z)nhOp`YI^&HP(}uQmY-(k_RrOsBST*vR0mTNp2GUnsq|7ycG}run41U6$ zx-go2D`b%Ma+`& zsO~G2uQ#TLgqXwnkX3RTLdlbdx;|AH$pSZo^Rub6Q8f_vYrQa{5lf^1++oOy(s{=4 zl8zZg$1LH3jpir!O#Y7Qm0X_5EENVLa>uk)$)jV4d}*rDnYsijHvTQTZmNT$=g)fu zzc0wT(@Ut&&)2aj_E=xYcQM4V#Ot(cgm-AKyX2CyT%Q#s_nhpBT9|^VSWHgvC$wEow%&LR}TuCT}k#~X# zz0}{&Cv;ML!GubDP3STv6M2$gD)fY6(049j%(TP2PH3h63AG`eLAuJxBd0Yg(Cr(P z_(FY|KEZLeHFdCb`vN0De`rJ)+aZ^jhhD)^*wX$Eze{M@T72WxB&yZ1F96GS$C7>9 zqJ7)!&V{JGK5nm{!*P4l)sB^dq8r;|0}M_pexsrdzJJB$1jmuh<=N zJC{_!Yl`097~j4pON-2;5m_BK2V)l3s!45guOWb|2a;w~QvRXiw&Rxbj&s%$x7UKT zEhSgmqsw+D^fNV!Fr`{9E}5RVK9NMqD%*;qBJS9pRKaVCZfuS>w&u{D_PD1fON&BD zEh?^dM7%2A?|FPGOn1d(}wGYBw`%4<=(UL-g8L>yr$?tXbqtYxRuHBk__@N z?F{feOiwPKDp)DnI@9rU)!gtxgD2kLi50%Fs$wi{cnwhmoq*AQX%Sa9+ddauaJR(W z5USFWf(2XERNKvgW!sh;9ZNRXqRo{=3ipyxm8+q9lNIyi$&=0d2Mb^oP8}?7!-`L_zRjTdG!M5KNN3gG@L$NzYQKRN zAaLWy0ZgvBT?~)OpQ;_?19u_AGtw)u)>_GRcLmv#dNRC9YI^@?X7WXKKABclYB3b7 zP}gb+=W14Y4@3P!&bl~Fx&WQO=5k<_w~DgQyGnDmL~_m5QDJD+cOCZ}^mLP_ zu2O4e*AdSb_PFQdamsHP7!iE_!C@ATs@y}GV+G%UPw)-*!{MD)8+7}5j(oqSROMyU z4y1P5;O555bo7K3?UIU`s{hmEMB3!HW&1ko-f*I2BlYvyB-Cw?lXhz{RkCCirFQRh z1Iz9^a-`GK+C}pf4G4ZHX~t6d$~6Urf*2;`XrnDzmUDZ_@|A<1#a9zbw|Q zQdy+AGfL(N=lwx?oL`Z&r;pMX9%(vEo2&%ey1{*;^GK_>6gC^$oG><~K^Aak451>B zg`8=4-r)AW|q?c+{h>be;ho-f&6#Nb)d zSYL}Dk~8(4Ofx1A>;G8%0Z4I5VTcOvqfkv@hRig)g7eAm8yxP0q3?L>zD`eHSLpMBx^N*Cr_xIX5cJVsbECqU~5v9C6OG4Fo`w(MEwy} n_kcv3j^Hu!>!v#Vi}|Nb9Dd!Wz)-F{8&^gC+H+ckQc(FnO&b3I delta 954 zcmb7@T}TvB6vywKnf;n|SGRUGTgRPUHFwcKu?53j-PN772h%bwSd7KGfn{io$lCfr zq(Sr$>A@#kh=QVel6kH-K_B{n78D5)i5_FNd@HJZM|zOzp~LVyXU@In%>N$lEZ@f; zhn!Cx4iQlsSsNT$_b)qjH=cl>?#i@8Dv5p0lrj?^DV`Hj79x`p>aEnfsJ9V6IY_;D z$xZ^qGbcQuU0$$OhNX&VzKT@*k#`W`3<_0iw>d-hC~aM$9HGLP!bJS zWgYUl6H2clkE>VZs2nmI+BVG>$JMb>)zAnJ>)djPR|jb~HBPa~vsL;%B+If|&e9oJ zj8>W7&~S{vtEj(udNq;n8hGcPX3y|wet2>())9(x368oLm*ffv**dvhgEU2B?OSw| zvm2wCV2y9Uc&wLukF>Q|DTfzeyS)xCLQzK-w}T+nu~l}P?xGVNVw>9;Y8dW9Pofz+ z;Z8#G?#=iDOW$OOFkENI!0W_uyag8Je9&Za>1aRP#ij}!?MDD|$}{slRy_}0$sYPs eJxJE$$J$ylgxh*KOs~}6Supau|5#PMwB;|aD(i*- diff --git a/news/pool.py b/news/pool.py index 4b78bfc..709b3e1 100644 --- a/news/pool.py +++ b/news/pool.py @@ -183,10 +183,12 @@ class ArticleRepository: cur = self._conn.cursor() rows = cur.execute(f""" - INSERT INTO topics (article_id, topic_text, type) - VALUES ({self.cursor_type}, {self.cursor_type}, {self.cursor_type}) - RETURNING id; - """, (article_id, summary, "summary")) + INSERT INTO summaries (article_id, summary_text) + VALUES ({self.cursor_type}, {self.cursor_type}) + ON CONFLICT(article_id) DO UPDATE SET + summary_text=EXCLUDED.summary_text + RETURNING article_id; + """, (article_id, summary)) summary_id = rows.fetchone()[0] @@ -209,7 +211,7 @@ class ArticleRepository: paragraph_id = rows.fetchone()[0] cur.execute(f""" - INSERT INTO topic_ratings (paragraph_id, topic_id, rating) VALUES ({self.cursor_type}, {self.cursor_type}, {self.cursor_type}) + INSERT INTO summary_ratings (paragraph_id, article_id, rating) VALUES ({self.cursor_type}, {self.cursor_type}, {self.cursor_type}) """, (paragraph_id, summary_id, float(summary_rating))) for topic_id, rating in zip(topic_ids, gel): @@ -258,18 +260,30 @@ class ArticleRepository: id INTEGER PRIMARY KEY AUTOINCREMENT, article_id INTEGER NOT NULL, topic_text TEXT NOT NULL, - type TEXT NOT NULL, foreign key (article_id) references articles(id) ) """) self._conn.execute("""CREATE TABLE IF NOT EXISTS topic_ratings ( paragraph_id INTEGER, topic_id INTEGER NOT NULL, - rating FLOAT NOT NULL, + rating BOOLEAN NOT NULL, primary key (paragraph_id, topic_id), foreign key (paragraph_id) references paragraphs(id), foreign key (topic_id) references topics(id) )""") + self._conn.execute("""CREATE TABLE IF NOT EXISTS summaries ( + article_id INTEGER PRIMARY KEY, + summary_text TEXT NOT NULL, + foreign key (article_id) references articles(id) + )""") + self._conn.execute("""CREATE TABLE IF NOT EXISTS summary_ratings ( + paragraph_id INTEGER NOT NULL, + article_id INTEGER NOT NULL, + rating FLOAT NOT NULL, + primary key (paragraph_id, article_id), + foreign key (paragraph_id) references paragraphs(id), + foreign key (article_id) references articles(id) + )""") self._conn.commit() def _row_for_url(self, url: str) -> Optional[Tuple[Any, ...]]: