jherve 1 год назад
Родитель
Сommit
ad9ded7245

+ 1 - 2
src/de_quoi_parle_le_monde/db/sqlite.py

@@ -50,5 +50,4 @@ class SqliteBackend:
     async def create(conn_path):
     async def create(conn_path):
         return SqliteBackend(conn_path)
         return SqliteBackend(conn_path)
 
 
-    async def close(self):
-        ...
+    async def close(self): ...

+ 0 - 1
src/de_quoi_parle_le_monde/internet_archive.py

@@ -3,7 +3,6 @@ from pathlib import Path
 from attrs import frozen, field
 from attrs import frozen, field
 from typing import Optional, ClassVar, NewType
 from typing import Optional, ClassVar, NewType
 from datetime import date, datetime, timedelta
 from datetime import date, datetime, timedelta
-from loguru import logger
 import cattrs
 import cattrs
 from aiohttp.client import (
 from aiohttp.client import (
     ClientSession,
     ClientSession,

+ 3 - 2
src/de_quoi_parle_le_monde/similarity_index.py

@@ -13,7 +13,6 @@ file_path_index = "./similarity.index"
 file_path_pickle_class = "./similarity.class"
 file_path_pickle_class = "./similarity.class"
 
 
 
 
-
 @define
 @define
 class SimilaritySearch:
 class SimilaritySearch:
     storage: Storage
     storage: Storage
@@ -94,7 +93,9 @@ class SimilaritySearch:
             with open(file_path_pickle_class, "rb") as f:
             with open(file_path_pickle_class, "rb") as f:
                 (embedding_to_featured, featured_to_embedding) = pickle.load(f)
                 (embedding_to_featured, featured_to_embedding) = pickle.load(f)
 
 
-            cls.instance = SimilaritySearch(storage, index, embedding_to_featured, featured_to_embedding)
+            cls.instance = SimilaritySearch(
+                storage, index, embedding_to_featured, featured_to_embedding
+            )
 
 
         return cls.instance
         return cls.instance
 
 

+ 9 - 3
src/de_quoi_parle_le_monde/storage.py

@@ -504,7 +504,9 @@ class Storage:
         async with self.backend.get_connection() as conn:
         async with self.backend.get_connection() as conn:
             async with conn.transaction():
             async with conn.transaction():
                 site_id = await self._add_site(conn, collection.name, collection.url)
                 site_id = await self._add_site(conn, collection.name, collection.url)
-                snapshot_id = await self._add_snapshot(conn, site_id, page.snapshot.id, dt)
+                snapshot_id = await self._add_snapshot(
+                    conn, site_id, page.snapshot.id, dt
+                )
                 article_id = await self._add_featured_article(
                 article_id = await self._add_featured_article(
                     conn, page.main_article.article.original
                     conn, page.main_article.article.original
                 )
                 )
@@ -514,11 +516,15 @@ class Storage:
                 await self._add_main_article(conn, snapshot_id, main_article_snap_id)
                 await self._add_main_article(conn, snapshot_id, main_article_snap_id)
 
 
                 for t in page.top_articles:
                 for t in page.top_articles:
-                    article_id = await self._add_featured_article(conn, t.article.original)
+                    article_id = await self._add_featured_article(
+                        conn, t.article.original
+                    )
                     top_article_snap_id = await self._add_featured_article_snapshot(
                     top_article_snap_id = await self._add_featured_article_snapshot(
                         conn, article_id, t.article
                         conn, article_id, t.article
                     )
                     )
-                    await self._add_top_article(conn, snapshot_id, top_article_snap_id, t)
+                    await self._add_top_article(
+                        conn, snapshot_id, top_article_snap_id, t
+                    )
 
 
         return site_id
         return site_id
 
 

+ 13 - 8
src/de_quoi_parle_le_monde/web.py

@@ -3,7 +3,7 @@ from fastapi import FastAPI, Request, Depends
 from fastapi.responses import HTMLResponse
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from fastapi.templating import Jinja2Templates
-from babel.dates import format_datetime, format_timedelta
+from babel.dates import format_datetime
 from babel import Locale
 from babel import Locale
 import humanize
 import humanize
 
 
@@ -14,7 +14,9 @@ from de_quoi_parle_le_monde.similarity_index import SimilaritySearch
 
 
 def add_date_processing(_any):
 def add_date_processing(_any):
     def absolute_datetime(dt):
     def absolute_datetime(dt):
-        return format_datetime(dt, format="EEEE d MMMM @ HH:mm", locale=Locale("fr", "FR"))
+        return format_datetime(
+            dt, format="EEEE d MMMM @ HH:mm", locale=Locale("fr", "FR")
+        )
 
 
     def duration(reference, target):
     def duration(reference, target):
         humanize.activate("fr_FR")
         humanize.activate("fr_FR")
@@ -34,11 +36,14 @@ def add_date_processing(_any):
 
 
 def add_logos(_any):
 def add_logos(_any):
     return {
     return {
-        "logos_info": {m.name: {
-            "background_color": m.logo_background_color,
-            "content": m.logo_content,
-            "src": m.logo_src,
-        } for m in media_collection.values()}
+        "logos_info": {
+            m.name: {
+                "background_color": m.logo_background_color,
+                "content": m.logo_content,
+                "src": m.logo_src,
+            }
+            for m in media_collection.values()
+        }
     }
     }
 
 
 
 
@@ -100,7 +105,7 @@ async def site_main_article_snapshot(
             20,
             20,
             lambda s: s < 100 and s >= 25,
             lambda s: s < 100 and s >= 25,
         )
         )
-    except KeyError as e:
+    except KeyError:
         similar = []
         similar = []
 
 
     similar_by_id = {s[0]: s[1] for s in similar}
     similar_by_id = {s[0]: s[1] for s in similar}