leadguru-jobs 0.726.0__py3-none-any.whl → 0.728.0__py3-none-any.whl

{leadguru_jobs-0.726.0.dist-info → leadguru_jobs-0.728.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leadguru_jobs
-Version: 0.726.0
+Version: 0.728.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -32,11 +32,13 @@ Requires-Dist: mongoengine
 Requires-Dist: google
 Requires-Dist: google-cloud-pubsub
 Requires-Dist: google-cloud-storage
+Requires-Dist: google-cloud-logging
 Requires-Dist: websockets
 Requires-Dist: aiohttp
 Requires-Dist: nameparser
 Requires-Dist: loguru
 Requires-Dist: redmail
+Requires-Dist: tenacity
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: requires-dist

{leadguru_jobs-0.726.0.dist-info → leadguru_jobs-0.728.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ lgt_jobs/env.py,sha256=HHlpQgZrRQMMuPZYhP94A8b29T_10sKRo98mh0_hh3Y,907
 lgt_jobs/main.py,sha256=zd0TdwFBUXUmFfUw552rPt6Rd_uG-LWEE6wTs8TCxIk,2081
 lgt_jobs/runner.py,sha256=pS-Qwyfuk22aQ1Mk3p-Q0ysdZfKy1Bh9YoWBlDaLeM8,2234
 lgt_jobs/simple_job.py,sha256=EBxhre3749GEAzJyaV1GXYy3P0pzwHchxcZ2kSN1vWU,527
-lgt_jobs/smtp.py,sha256=sAW-ewNgHEFYI3AhUNipmXqGFfvpdphX2oRHmHu0yIo,1304
+lgt_jobs/smtp.py,sha256=M9RBuXdz9YyBwBZiA92EalqQWI5DDGdpRJlkum-zS8U,1787
 lgt_jobs/assets/images/arrow.png,sha256=Lr_zG1TyySAWX78jiojcV7j8BHe2S_Oi7eZYAfe4YbM,536
 lgt_jobs/assets/images/arrow_blue.png,sha256=opxsLU7K6C2tNfvFSvDvi9xcZBDf3t6jPz4TESN07o8,572
 lgt_jobs/assets/images/firework.png,sha256=9d_0lUpDFfT3e4JTgp5XVb03qAdtO9yNVi1c1KoQDp8,33754
@@ -38,10 +38,10 @@ lgt_jobs/lgt_common/pubsub/messages.py,sha256=rm7uKbxwDTWJqsVA8Kee-4YT58bThjCEV2
 lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=rfUDooYuhBQ2pE9FdDxZOpXjbrvlpiiQLCGOtnTFbSg,2204
 lgt_jobs/lgt_common/slack_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/slack_client/methods.py,sha256=ctKF_1UHEmSWaRsoGEgMZicVabV7eEufZ7pjxdMAx8g,1455
-lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=x3JNoj107SCNUHZFYgeQv46Coi_hrO-xEL8mZxVGBTM,15248
+lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=CgqAPrkFDanzqTnWV_pCcDWdWHZ-t3aDDQhTNxUngxA,14042
 lgt_jobs/lgt_common/slack_client/web_client.py,sha256=WCu8mqYhauuxp9iDAMsjocchKD78iWdcnbu7Ozdyzq8,3448
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/analytics.py,sha256=yfrFPXrBofzZqUNn479JkrbZXDa2ljgk-Le0YrQ9rew,21690
+lgt_jobs/lgt_data/analytics.py,sha256=H9YgALytIAWDM14ZkaFNRUaeb6foBJT5-Nvz_pu3gKA,21689
 lgt_jobs/lgt_data/engine.py,sha256=GY8FOl3dl7euKjQRML_H3ophaSTgfQ8ICMRv1NpE2oE,7745
 lgt_jobs/lgt_data/enums.py,sha256=xNE5uIot8yT2Yl6HufTYlPiR0uSJVP2fNbnObL5tsNE,2669
 lgt_jobs/lgt_data/helpers.py,sha256=S_1P7pnx14dllmen-TzjA9pkKWQr39x8-v6iv7FUYnQ,423
@@ -109,7 +109,7 @@ lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 lgt_jobs/services/k8_manager.py,sha256=bXpka9psIQ5UJ6QG_e4xolmE_3gtmNrzzZeL03bJ62I,995
 lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.726.0.dist-info/METADATA,sha256=BxF6izlWM2VOZwvqx3rtNDNe0av9CqzPf5ir_UF1S8k,1399
-leadguru_jobs-0.726.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-leadguru_jobs-0.726.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.726.0.dist-info/RECORD,,
+leadguru_jobs-0.728.0.dist-info/METADATA,sha256=IIF9KrHRr1SReaoo7qWAPPS9AkQmByjLDK25zdEtf8M,1459
+leadguru_jobs-0.728.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+leadguru_jobs-0.728.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.728.0.dist-info/RECORD,,

lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -4,7 +4,6 @@ import requests
 import json
 import io
 from urllib import parse
-from pyppeteer import launch
 from requests import Response
 from websockets.client import WebSocketClientProtocol
 from lgt_jobs.lgt_common.slack_client.methods import SlackMethods
@@ -214,38 +213,6 @@ class SlackClient:
         headers = {'User-Agent': user_agent}
         response = requests.post(f"{self.base_url}{SlackMethods.confirm_email}", data=payload, headers=headers)
         result = response.json()['ok'] if response.status_code == 200 else False
-
-        print(f"Result is {result}")
-        if not result:
-            print("Start pyppeteer")
-            try:
-                async def send_code():
-                    print("Launch browser")
-                    browser = await launch(headless=True)
-                    page = await browser.newPage()
-
-                    print("Go to Slack")
-                    await page.goto('https://slack.com/signin', waitUntil='networkidle2')
-
-                    print("Type email")
-                    await page.waitForSelector('input#signup_email')
-                    await page.type('input#signup_email', email)
-                    await asyncio.sleep(1.324)
-
-                    print("Press the button to submit")
-                    button = await page.querySelector('button#submit_btn')
-                    await button.tap()
-
-                    print("Wait for the next page")
-                    await page.waitForSelector('input[aria-label="digit 1 of 6"]')
-
-                    print("Close the browser")
-                    await browser.close()
-
-                asyncio.run(send_code())
-                return True
-            except:
-                return False
         return result
 
     def confirm_code(self, email: str, code: str, user_agent: str) -> requests.Response:

lgt_jobs/lgt_data/analytics.py

@@ -368,12 +368,11 @@ def get_date_aggregated_analytics(source_id=None, started_at: datetime = None,
     pipeline: list = _build_date_aggregated_analytics_pipeline(source_id=source_id, started_at=started_at,
                                                                ended_at=ended_at, bots_ids=bots_ids)
 
-    received_messages = list(db[f'received_messages'].aggregate(pipeline))
-
     if configs is not None:
-        pipeline.insert(0, {"$match": {"attributes": {'$in': configs}}})
+        pipeline.insert(0, {"$match": {"configs.id": {'$in': configs}}})
 
     filtered_messages = list(db[f'filtered_messages'].aggregate(pipeline))
+    received_messages = list(db[f'received_messages'].aggregate(pipeline))
 
     received_messages_dic = _create_result_dic(started_at, ended_at)
     filtered_messages_dic = _create_result_dic(started_at, ended_at)

lgt_jobs/smtp.py

@@ -1,3 +1,4 @@
+from tenacity import retry, stop_after_attempt, wait_fixed, retry_if_exception_type
 from abc import ABC
 from pydantic import BaseModel
 import logging as log
@@ -13,11 +14,11 @@ gmail = EmailSender(
     username=smtp_login,
     password=smtp_password
 )
+
 """
 Send email
 """
 
-
 class SendMailJobData(BaseBackgroundJobData, BaseModel):
     html: str
     subject: str
@@ -31,10 +32,13 @@ class SendMailJob(BaseBackgroundJob, ABC):
     def job_data_type(self) -> type:
         return SendMailJobData
 
-    def exec(self, data: SendMailJobData):
-        body_image = {}
-        for image in data.images:
-            body_image[f'IMAGE_{ImageName(image.value).name}'] = f'lgt_jobs/assets/images/{image.value}'
+    @retry(
+        stop=stop_after_attempt(3),
+        wait=wait_fixed(5),
+        retry=retry_if_exception_type(Exception),
+        reraise=True
+    )
+    def send_email(self, data: SendMailJobData, body_images_map: dict):
         with gmail:
             if not gmail.is_alive:
                 gmail.connect()
@@ -43,6 +47,16 @@ class SendMailJob(BaseBackgroundJob, ABC):
                 receivers=[data.recipient],
                 subject=data.subject,
                 html=data.html,
-                body_images=body_image
+                body_images=body_images_map
             )
-        log.info('email message has been sent')
+            log.info('email message has been sent')
+
+    def exec(self, data: SendMailJobData):
+        body_images_map = {
+            f'IMAGE_{ImageName(image.value).name}': f'lgt_jobs/assets/images/{image.value}'
+            for image in data.images
+        }
+        try:
+            self.send_email(data, body_images_map)
+        except Exception as e:
+            log.error(f"Failed to send email after retries: {e}")