Readability and functionality improvements

- Refactored all DBwork functions to not set and close connection inside
their body, they use connection as a parameter instead
- Added single file to configure a FastAPI app
- Implemented FastAPI's lifespan function that calls certain functions
on app startup and shutdown
- Added error logging for scraping functions
- Fixed /articles/get/html and /articles/get/md endpoints
- All POST methods now return base64 encoded html/md strings to avoid
weird json formatting

src/router.py

@@ -1,21 +1,21 @@
 import DBwork
 import scraper
+from DBwork import connection as conn
 from fastapi import Response, status, APIRouter
 from pydantic import BaseModel
 import psycopg2
 from json import dumps
+import base64
 
 
-schema_name = 'harticle'
-table_name = 'articles'
-
 router = APIRouter(prefix='/api')
 
+
 class Entry(BaseModel):
     url: str
     rating: int | None = None
-    
-    
+
+
 class Article(BaseModel):
     url: str 
 
@@ -31,15 +31,12 @@ async def ping():
 
 @router.get('/rates')
 async def get_rates():
-    conn = DBwork.set_connection()
     result = dumps(DBwork.get_all_entries(conn))
-    DBwork.close_connection(conn)
     return result
 
 
 @router.post('/article/rate')
 async def save_rating(entry: Entry, response: Response):
-    conn = DBwork.set_connection()
     try:
         DBwork.add_entry(article_url=entry.url, 
                         rating=entry.rating, 
@@ -50,16 +47,14 @@ async def save_rating(entry: Entry, response: Response):
         response.status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
         message = 'internal server error'
     finally:
-        DBwork.close_connection(conn)
         return {'message': message,
                 'url': entry.url,
                 'rating': entry.rating
                 }
-    
+
 
 @router.post('/article/remove_rate')
 async def remove_rating(entry: Entry, response: Response):
-    conn = DBwork.set_connection()
     try:
         DBwork.delete_entry(entry.url, conn)
         message = 'success'
@@ -67,39 +62,39 @@ async def remove_rating(entry: Entry, response: Response):
         response.status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
         message = 'internal server error'
     finally:
-        DBwork.close_connection(conn)
         return {'message': message}
 
 
 @router.post('/article/get/html')
 async def get_article_html(article: Article, response: Response = None):
-    html_string = await scraper.get_article_html(article.url, md=False)
-    return html_string
-    
-    
+    html_string = await scraper.get_article_html(article.url)
+    b64_string = base64.b64encode(html_string.encode('utf-8')).decode('utf-8')
+    return Response(content=b64_string, media_type='text/plain')
+
+
 @router.post('/article/get/md')
 async def get_article_md(article: Article, response: Response = None):
     md_string = await scraper.get_article_html(article.url, md=True)
-    return md_string
-    
-    
+    b64_string = base64.b64encode(md_string.encode('utf-8')).decode('utf-8')
+    return Response(content=b64_string, media_type='text/plain')
+
+
 @router.post('/articles/get/html')
 async def get_n_articles_html(amount: Amount, response: Response = None):
-    articles = []
-    for url in await scraper.get_articles_from_feed(amount.amount):
-        articles.append(await scraper.get_article_html(f'https://habr.com{url}'))
+    articles = {}
+    urls = await scraper.get_articles_from_feed(amount.amount)
+    for url in urls:
+        html = await scraper.get_article_html(f'https://habr.com{url}')
+        b64_string = base64.b64encode(html.encode('utf-8')).decode('utf-8')
+        articles[f'https://habr.com{url}'] = b64_string
     return articles
 
 
 @router.post('/articles/get/md')
 async def get_n_articles_md(amount: Amount, response: Response = None):
-    articles = []
+    articles = {}
     for url in await scraper.get_articles_from_feed(amount.amount):
-        articles.append(await scraper.get_article_md(f'https://habr.com{url}'))
+        md = await scraper.get_article_html(f'https://habr.com{url}', md=True)
+        b64_string = base64.b64encode(md.encode('utf-8')).decode('utf-8')
+        articles[f'https://habr.com{url}'] = b64_string
     return articles
-
-
-'''   MAIN   '''
-def main():
-    DBwork.schema_creator(schema_name)
-    DBwork.table_creator(schema_name, table_name)