fix: send email

Author: MiloslavskiySergey

generate_word/generate_file.py

@@ -1,4 +1,4 @@
-from os.path import join
+from os.path import join, exists
 from settings import get_settings
 from docxtpl import DocxTemplate
 from datetime import date, timedelta
@@ -16,5 +16,6 @@ def create_report(counter: int, avg_load: float, max_load: float, site_name: str
         }
     )
     current_date = (date.today() - timedelta(days=1)).strftime('%d-%m-%Y')
-    template_word.save(join(get_settings().static_dir, f'{current_date}-{site_name}.docx'))
-    return join(get_settings().static_dir, f'{current_date}-{site_name}.docx')
+    path_report = join(get_settings().static_dir, f'{current_date}-{site_name}.docx')
+    template_word.save(path_report)
+    return path_report

main.py

@@ -49,8 +49,9 @@ async def redirect_page_docs():
 
 @app.post('/traffic/',
           response_model=Traffic)
-async def calculate(identification: str,
-                    session: AsyncSession = Depends(get_session)):
+async def calculate(
+        identification: str,
+        session: AsyncSession = Depends(get_session)):
     site = (await session.execute(select(Site).where(Site.identification == identification))).first()
     if site is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail='Запрашиваемый ключ доступа не найден')
@@ -90,10 +91,11 @@ async def form_send(request: Request):
 
 @app.post('/identification/',
           response_model=Site)
-async def generate_secret_key(website_url: str = Form(...),
-                              secret_key: str = Form(...),
-                              list_email: str = Form(...),
-                              session: AsyncSession = Depends(get_session)):
+async def generate_secret_key(
+        website_url: str = Form(...),
+        secret_key: str = Form(...),
+        list_email: str = Form(...),
+        session: AsyncSession = Depends(get_session)):
     verify_site = (await session.execute(select(Site).where(Site.site_name == website_url))).first()
     if verify_site is None:
         email_id = (await session.execute(insert(Email).values(name=list_email))).inserted_primary_key[0]
@@ -111,9 +113,10 @@ async def generate_secret_key(website_url: str = Form(...),
 @app.get('/info/{identification_site}',
          response_model=Traffic,
          response_class=HTMLResponse)
-async def infi_traffic(identification_site: str,
-                    request: Request,
-                    session: AsyncSession = Depends(get_session)):
+async def infi_traffic(
+        identification_site: str,
+        request: Request,
+        session: AsyncSession = Depends(get_session)):
     site = (await session.execute(select(Site).where(Site.identification == identification_site))).first()
     if site is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail='Запрашиваемый ключ доступа не найден')

send_message/send_email.py

@@ -5,8 +5,15 @@
 from email.mime.application import MIMEApplication
 
 
-async def send_file(login: str, password: str, sender: str, receivers: str,
-                    attachment_path: str, smtp_server: str, port: int, site_name: str):
+async def send_file(
+        login: str,
+        password: str,
+        sender: str,
+        receivers: str,
+        attachment_path: str,
+        smtp_server: str,
+        port: int,
+        site_name: str):
     current_date = (date.today() - timedelta(days=1)).strftime('%d-%m-%Y')
     message = MIMEMultipart()
     message['Subject'] = 'Отчет о состоянии IT-инфраструктуры и результатах ' \
@@ -26,4 +33,3 @@ async def send_file(login: str, password: str, sender: str, receivers: str,
     with smtplib.SMTP_SSL(smtp_server, port) as server:
         server.login(login, password)
         server.sendmail(sender, receivers.split(', '), message.as_string())
-        server.quit()

static/readme.md

@@ -0,0 +1 @@
+# Директория для статических файлов

task.py

@@ -39,8 +39,8 @@ async def send_message():
             sleep(1)
 
 
-schedule.every().day.at(f'{NOTIFICATION_SEND_TIME}').do(send_message)
-#schedule.every(20).seconds.do(send_message)
+# schedule.every().day.at(f'{NOTIFICATION_SEND_TIME}').do(send_message)
+schedule.every(20).seconds.do(send_message)
 
 while True:
     get_event_loop().run_until_complete(schedule.run_pending())

templates/post_identification.html

@@ -9,15 +9,14 @@
     <div align="center" class="container">
         <form action="/identification/" enctype="multipart/form-data" method="post">
             <div class="field">
-
               <div class="control">
                 <label for="website_url" class="label">Введите URL сайта</label>
-                <input id="website_url" class="input" placeholder="URL site" size="100" name="website_url">
+                <input id="website_url" class="input" placeholder="https://example.com" size="100" name="website_url">
               </div>
             </div>
             <div class="field">
               <div class="control">
-                <label for="list_email" class="label">Введите email(s) (через запятую) на который будут приходить отчеты</label>
+                <label for="list_email" class="label">Введите email(s) (через запятую с пробелом ", ") на который будут приходить отчеты</label>
                 <input id="list_email" class="input" placeholder="[email protected], [email protected]" size="100" name="list_email" type="email">
               </div>
             </div>

templates/statistics.html

@@ -7,24 +7,24 @@
 </head>
 <body>
     <div style="display: flex; justify-content: center">
-    <table class="table">
-      <thead>
-        <tr>
-            <th>Current date</th>
-            <th>Counter request</th>
-            <th>Maximum load</th>
-            <th>Average load</th>
-        </tr>
-      </thead>
-        <tbody>
-            <tr>
-                <td>{{ create_at }}</td>
-                <td>{{ counter }}</td>
-                <td>{{ maximum_load }}</td>
-                <td>{{ average_load }}</td>
-            </tr>
-        </tbody>
-    </table>
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Current date</th>
+                    <th>Counter request</th>
+                    <th>Maximum load</th>
+                    <th>Average load</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>{{ create_at }}</td>
+                    <td>{{ counter }}</td>
+                    <td>{{ maximum_load }}</td>
+                    <td>{{ average_load }}</td>
+                </tr>
+            </tbody>
+        </table>
     </div>
 
 </body>