leadguru-jobs 0.376.0__py3-none-any.whl → 0.378.0__py3-none-any.whl

{leadguru_jobs-0.376.0.dist-info → leadguru_jobs-0.378.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru-jobs
-Version: 0.376.0
+Version: 0.378.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,8 +20,8 @@ Classifier: Topic :: Internet
 Requires-Dist: loguru
 Requires-Dist: pydantic
 Requires-Dist: cachetools >=3.1.0
-Requires-Dist: leadguru-common ==0.379.0
-Requires-Dist: leadguru-data ==0.386.0
+Requires-Dist: leadguru-common ==0.383.0
+Requires-Dist: leadguru-data ==0.390.0
 Requires-Dist: wheel
 Requires-Dist: setuptools
 Requires-Dist: twine

{leadguru_jobs-0.376.0.dist-info → leadguru_jobs-0.378.0.dist-info}/RECORD

@@ -8,19 +8,19 @@ lgt_jobs/smtp.py,sha256=W9OIkckBORAWEsNgIG3nVKs6OTU6esZNnq09WDsj8Lc,1352
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=uL3_0xpS37VRJihTW1KiM_yhGGt1XV2yUNId_y-ISLk,972
 lgt_jobs/jobs/archive_leads.py,sha256=wZ4LwbuC9G7NB16AO15YiMemEV40LoJVjd8VRqaFv9o,831
-lgt_jobs/jobs/bot_stats_update.py,sha256=AptiDT8-NsTW7WYBSlsTxWYTkm2AVVaVBEFK3sttPNo,6312
+lgt_jobs/jobs/bot_stats_update.py,sha256=5icR5J7uIKmx_kRKDeXQkTK9-_dAK4FraZPtuQ9z97Y,6327
 lgt_jobs/jobs/chat_history.py,sha256=5_7tat-nqVu8Bub-VqjL1CmV0vXU2OY798bqZOjWfik,4659
 lgt_jobs/jobs/inbox_leads.py,sha256=1vwV45RU3vHZnlnmLdW6Mo_ZADyjDS1z2gDPb9cggY8,4738
-lgt_jobs/jobs/mass_message.py,sha256=guXQjAL78fc6V0qWZr6nVB-vOGaMDs_NU4yq3iCyAjE,2033
-lgt_jobs/jobs/send_code.py,sha256=pLzKJhaTvWYPtvOjH02xpZ-h4dMk5hmkcnc5AS8hc9Q,827
-lgt_jobs/jobs/send_slack_message.py,sha256=hS1eaHaMX9sMPO-3TeeM1K5xTkedlMBfAUnTtCFR3DU,2686
-lgt_jobs/jobs/update_slack_profile.py,sha256=mdZwhvlgc0UCZAcRt2WIa_e2JZVoxHS2PbhaI6RDulI,2901
+lgt_jobs/jobs/mass_message.py,sha256=sRKHYTQ5cwNep7gsuZTSpAEh8Y5d6PJ5lTQ6XxjsVSQ,2028
+lgt_jobs/jobs/send_code.py,sha256=eLvp6KhOBp4DW-p162xojOm62J_Jzs6kfxutWhobE8U,826
+lgt_jobs/jobs/send_slack_message.py,sha256=QiXbd2Ff61gby_IcBdTr9M3ATll3YvBuaKoegGG_Mnc,2672
+lgt_jobs/jobs/update_slack_profile.py,sha256=NIIQRnmrWWYgYz12GWq5on12vaAaXsydQ2QDdeKV7SM,2646
 lgt_jobs/jobs/user_balance_update.py,sha256=7LkcpKMilxqUcCS1_OW51qQnaXvGBavkj0a-0_-gK2g,2352
-lgt_jobs/jobs/workspace_connect.py,sha256=pwyl4_zhJpyPD2pblXFHBmOiS3GOun19-0opuX5qHfg,7053
+lgt_jobs/jobs/workspace_connect.py,sha256=YpLkhnr1cajkCioPojuavLPKPQIRmAKJtT6uoi5IBwM,6973
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/services/web_client.py,sha256=_jEEXtkwC0E1UpzFmlBAS3UHt75ro5QwZpYp4PmDXCI,1944
+lgt_jobs/services/web_client.py,sha256=D3y5KVVBk7mesRnsiByx4tFmNbfTOKOUoIp3VCHuk0I,1983
 lgt_jobs/templates/new_message_mail_template.html,sha256=82XdDPtmkJVUWUcZtgd8bv_9-viAG2WWOnf3AhR6PeY,3635
-leadguru_jobs-0.376.0.dist-info/METADATA,sha256=bbhj7-kXZciqr1hP_ouLeNy7Ti4K7uSqiSx0TxhYy-o,1181
-leadguru_jobs-0.376.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-leadguru_jobs-0.376.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.376.0.dist-info/RECORD,,
+leadguru_jobs-0.378.0.dist-info/METADATA,sha256=uFBnFPSWmJ6QN9lf0tOs7EbolJcgWTVxZMgbWNQPAWs,1181
+leadguru_jobs-0.378.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+leadguru_jobs-0.378.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.378.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -121,7 +121,6 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         bot.connected_channels = connected_channels
         bot.channels = len(channels)
         bot.channels_users = channels_users
-        bot.users_count = users_count
         if bot.recent_messages is None:
             bot.recent_messages = []
         if bot.servers:
@@ -131,6 +130,7 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                 if slack_channel:
                     slack_channel.active = channel.active
             bot.servers[0].channels = channels
+            bot.servers[0].subscribers = users_count
 
         # save only last 50 messages
         bot.recent_messages = bot.recent_messages[-50:]

lgt_jobs/jobs/mass_message.py

@@ -6,7 +6,6 @@ from lgt.common.python.slack_client.web_client import SlackWebClient
 from lgt_data.mongo_repository import DedicatedBotRepository
 from loguru import logger as log
 from pydantic import BaseModel
-
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """
@@ -28,8 +27,8 @@ class SendMassMessageSlackChannelJob(BaseBackgroundJob, ABC):
         return SendMassMessageSlackChannelJobData
 
     def exec(self, data: SendMassMessageSlackChannelJobData):
-        bot = DedicatedBotRepository().get_by_user_and_source_id(data.user_id, data.source_id)
-        if not bot or bot.invalid_creds:
+        bot = DedicatedBotRepository().get_one(user_id=data.user_id, source_id=data.source_id, only_valid=True)
+        if not bot:
             log.warning(f"[SendMassMessageSlackChannelJob]: "
                         f"Bot not found or has invalid creds, source id:{data.source_id}")
             return

lgt_jobs/jobs/send_code.py

@@ -3,7 +3,6 @@ from typing import Optional
 from loguru import logger as log
 from lgt.common.python.slack_client.web_client import SlackWebClient
 from pydantic import BaseModel
-
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """

lgt_jobs/jobs/send_slack_message.py

@@ -32,8 +32,8 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
         if not lead:
             return
 
-        bot = DedicatedBotRepository().get_by_user_and_source_id(user.id, lead.message.source.source_id)
-        if not bot or bot.invalid_creds:
+        bot = DedicatedBotRepository().get_one(user_id=data.user_id, source_id=data.source_id, only_valid=True)
+        if not bot:
             return
 
         slack_client = SlackWebClient(bot.token, bot.cookies)

lgt_jobs/jobs/update_slack_profile.py

@@ -1,5 +1,4 @@
 from abc import ABC
-from lgt.common.python.lgt_logging import log
 from lgt.common.python.slack_client.slack_client import SlackClient
 from lgt_data.model import UserModel
 from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
@@ -23,14 +22,8 @@ class UpdateUserSlackProfileJob(BaseBackgroundJob, ABC):
 
     def exec(self, data: UpdateUserSlackProfileJobData):
         user = UserMongoRepository().get(data.user_id)
-        bots = DedicatedBotRepository().get_user_bots(data.user_id)
+        bots = DedicatedBotRepository().get_all(user_id=data.user_id, only_valid=True, include_deleted=False)
         for bot in bots:
-            if bot.invalid_creds:
-                log.warning(
-                    f'User: {user.email} dedicated bot: {bot.source.source_id} credentials are invalid. '
-                    f'Not able to update user profile')
-                continue
-
             slack = SlackClient(bot.token, bot.cookies)
             UpdateUserSlackProfileJob.__update_profile(user, slack)
 

lgt_jobs/jobs/workspace_connect.py

@@ -106,8 +106,7 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
 
         dedicated_bots_repository = DedicatedBotRepository()
         dedicated_bots = dedicated_bots_repository.get_all(user_id=current_user.id, user_name=data.slack_email,
-                                                           source_type=SourceType.SLACK, include_deleted=True,
-                                                           include_paused=True)
+                                                           source_type=SourceType.SLACK, include_deleted=True)
         user_workspaces_map: Dict[str, UserWorkspace] = {workspace.id: workspace
                                                          for workspace in user_workspaces if workspace.token}
         for workspace_id, workspace in user_workspaces_map.items():

lgt_jobs/services/web_client.py

@@ -17,7 +17,8 @@ class V3ServerClient(BaseHttpClient):
     def __init__(self):
         self.token = BillingServerClient.login(service_account_email, service_account_password)
 
-    def update_user_lead(self, message_id: str, email: str, slack_channel: str, board_id: str, status: str) -> dict:
+    def update_user_lead(self, message_id: str, email: str, slack_channel: str,
+                         board_id: str = None, status: str = None) -> dict:
         payload = {
             'message_id': message_id,
             'user_email': email