leadguru-jobs 0.376.0__tar.gz → 0.378.0__tar.gz

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/PKG-INFO

@@ -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 → leadguru_jobs-0.378.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -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 → leadguru_jobs-0.378.0}/leadguru_jobs.egg-info/requires.txt

@@ -1,8 +1,8 @@
 loguru
 pydantic
 cachetools>=3.1.0
-leadguru-common==0.379.0
-leadguru-data==0.386.0
+leadguru-common==0.383.0
+leadguru-data==0.390.0
 wheel
 setuptools
 twine

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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:]

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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
 
 """

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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)

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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)
 

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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():

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/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

{leadguru_jobs-0.376.0 → leadguru_jobs-0.378.0}/setup.py

@@ -24,8 +24,8 @@ install_requires = [
     'loguru',
     'pydantic',
     'cachetools>=3.1.0',
-    'leadguru-common==0.379.0',
-    'leadguru-data==0.386.0',
+    'leadguru-common==0.383.0',
+    'leadguru-data==0.390.0',
     'wheel',
     'setuptools',
     'twine',