leadguru-jobs 0.276.0__tar.gz → 0.278.0__tar.gz

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.276.0
+Version: 0.278.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/README.md

@@ -1,48 +1,38 @@
 ## Some example on how to publish messages for testing purposes
 
 
-### 1. Load Slack Chat history
+### Load Slack Chat history
 ``gcloud pubsub topics publish local-background-worker  --message='{ "job_type": "LoadChatHistoryJob", "data": { "user_id": "5d9db09e3710ae3ec4b4592f" } }'``
 
-### 2. Restart BOTS
+### Restart BOTS
 ``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "RestartBotsJob", "data": { "bots": [] }}'``
 
-### 3. Update BOTS credentials
+### Update BOTS credentials
 ``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "BotsCredentialsUpdateJob", "data": { "bot_name": "mitrixdataprocessing" }}'``
 
-### 4. Update User BOT credentials
-``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "UserBotsCredentialsUpdateJob", "data": { "user_id": "5d9db09e3710ae3ec4b4592f", "bot_name": "mitrixdataprocessing" }}'``
-
-### 5. Update user slack profile
+### Update user slack profile
 ``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "UpdateUserSlackProfileJob", "data": { "user_id": "5d9db09e3710ae3ec4b4592f", "bot_name": "mitrixdataprocessing" }}'``
 
-### 6. Restart slack dedicated bots
-``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "RestartDedicatedBotsJob", "data": { "user_id": "5f354dd91554d906e44fadf6" }}'``
-
-### 7. Update emotions
+### Update emotions
 ``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "ReactionAddedJob", "data": { "message_id": "4f6258b5-75f5-49b4-b288-3e21921b1895", "ts": "1625480670.035200" }}'``
 
-### 8. Update conversation history
+### Update conversation history
 ``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "ConversationRepliedJob", "data": { "message_id": "4f6258b5-75f5-49b4-b288-3e21921b1895", "ts": "1625480670.035200" }}'``
 
-### 9. Bot status update
-``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "BotStatsUpdateJob", "data": { "bot_name": "mitrixdataprocessing" }}'``
-``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "BotStatsUpdateJob", "data": { "dedicated_bot_id": "60d9ab815b22e55e41da81da" }}'``
-
-### 10. update stats
-``gcloud pubsub topics publish local-background-worker --message='{"job_type": "UpdateUserDataUsageJob", "data": {"dedicated_bot_id": null, "filtered": false, "bot_name": "kotlinlang", "channel_id": "C0B8M7BUY", "message": "For changes from the server you would need a web socket."}}'``
+### Bot status update
+``gcloud pubsub topics publish local-background-worker --message='{ "job_type": "BotStatsUpdateJob", "data": { "bot_id": "60d9ab815b22e55e41da81da" }}'``
 
-### 11. update users feed
+### Update users feed
 ``
 gcloud pubsub topics publish local-background-worker --message='{"job_type": "UpdateUserFeedJob", "data": {"lead_id": "61767a9 3bb463584e0658e1a", "bot_name": "gophers", "dedicated_bot_id": null}}'
 ``
 
-### 12. update users balances
+### Update users balances
 ``
 gcloud pubsub topics publish local-background-worker --message='{"job_type": "UpdateUserBalanceJob", "data": {"user_id": "60a6a9a59ef97dc902180512"}}'
 ``
 
-### 13. Clear User analytics
+### Clear User analytics
 ``
 gcloud pubsub topics publish local-background-worker --message='{"job_type": "ClearUserAnalyticsJob", "data": {"user_id": "60a6a9a59ef97dc902180512"}}'
 ``

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru-jobs
-Version: 0.276.0
+Version: 0.278.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/leadguru_jobs.egg-info/SOURCES.txt

@@ -30,7 +30,6 @@ lgt_jobs/jobs/send_code.py
 lgt_jobs/jobs/send_slack_message.py
 lgt_jobs/jobs/update_slack_profile.py
 lgt_jobs/jobs/user_balance_update.py
-lgt_jobs/jobs/user_limits_update.py
 lgt_jobs/jobs/workspace_connect.py
 lgt_jobs/services/__init__.py
 lgt_jobs/services/web_client.py

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/leadguru_jobs.egg-info/requires.txt

@@ -1,8 +1,8 @@
 loguru
 pydantic
 cachetools>=3.1.0
-leadguru-common==0.317.0
-leadguru-data==0.324.0
+leadguru-common==0.320.0
+leadguru-data==0.327.0
 wheel
 setuptools
 twine

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/__init__.py

@@ -4,7 +4,6 @@ from .jobs.user_balance_update import UpdateUserBalanceJob, UpdateUserBalanceJob
 from .jobs.conversation_replied import ConversationRepliedJob, ConversationRepliedJobData
 from .jobs.reactions_added import ReactionAddedJobData, ReactionAddedJob
 from .jobs.send_slack_message import SendSlackMessageJob, SendSlackMessageJobData
-from .jobs.user_limits_update import UpdateUserDataUsageJob, UpdateUserDataUsageJobData
 from .jobs.analytics import (TrackAnalyticsJob, TrackAnalyticsJobData)
 from .jobs.archive_leads import (ArchiveLeadsJob, ArchiveLeadsJobData)
 from .jobs.bot_stats_update import (BotStatsUpdateJob, BotStatsUpdateJobData)
@@ -27,7 +26,6 @@ jobs_map = {
     "TrackAnalyticsJob": TrackAnalyticsJob,
     "LoadChatHistoryJob": LoadChatHistoryJob,
     "UpdateUserSlackProfileJob": UpdateUserSlackProfileJob,
-    "UpdateUserDataUsageJob": UpdateUserDataUsageJob,
     "ConversationRepliedJob": ConversationRepliedJob,
     "ReactionAddedJob": ReactionAddedJob,
     "SendSlackMessageJob": SendSlackMessageJob,
@@ -46,7 +44,6 @@ __all__ = [
     LoadChatHistoryJob,
     UpdateUserSlackProfileJob,
     TrackAnalyticsJob,
-    UpdateUserDataUsageJob,
     ConversationRepliedJob,
     ReactionAddedJob,
     SendSlackMessageJob,
@@ -67,7 +64,6 @@ __all__ = [
     LoadChatHistoryJobData,
     UpdateUserSlackProfileJobData,
     TrackAnalyticsJobData,
-    UpdateUserDataUsageJobData,
     ConversationRepliedJobData,
     ReactionAddedJobData,
     SendSlackMessageJobData,

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/bot_stats_update.py

@@ -15,8 +15,7 @@ Update bots statistics
 
 
 class BotStatsUpdateJobData(BaseBackgroundJobData, BaseModel):
-    dedicated_bot_id: Optional[str]
-    bot_name: Optional[str]
+    bot_id: Optional[str]
 
 
 class BotStatsUpdateJob(BaseBackgroundJob, ABC):
@@ -25,12 +24,13 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         return BotStatsUpdateJobData
 
     def exec(self, data: BotStatsUpdateJobData):
-        if data.dedicated_bot_id:
-            bots_rep = DedicatedBotRepository()
-            bot = bots_rep.get_by_id(data.dedicated_bot_id)
-        else:
+        bots_rep = DedicatedBotRepository()
+        bot = bots_rep.get_by_id(data.bot_id)
+        if not bot:
             bots_rep = BotMongoRepository()
-            bot = bots_rep.get_by_id(data.bot_name)
+            bot = bots_rep.get_by_object_id(data.bot_id)
+            if not bot:
+                return
 
         if not bot.token or not bot.cookies:
             log.warning(f"[BotStatsUpdateJob]: Bot {bot.id} has no credentials.")

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/chat_history.py

@@ -69,8 +69,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
                     lead.last_action_at = last_message.created_at
                     UserLeadMongoRepository().update_lead(lead.user_id, lead.id, last_action_at=last_message.created_at)
 
-        has_to_be_notified = not user.new_message_notified_at \
-                             or (last_message and last_message.created_at > user.new_message_notified_at)
+        has_to_be_notified = (not user.new_message_notified_at or
+                              (last_message and last_message.created_at > user.new_message_notified_at))
 
         if last_message and has_to_be_notified and last_message.user == last_message_lead.message.sender_id:
             LoadChatHistoryJob._notify_about_new_messages(user, last_message_lead, data.template_path)
@@ -92,7 +92,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
     def _update_history(user: UserModel, lead: UserLeadModel) -> Optional[SlackHistoryMessageModel]:
         saved_chat_history = lead.chat_history if lead.chat_history else list()
 
-        bot = DedicatedBotRepository().get_by_user_and_name(user.id, lead.message.name)
+        bot = DedicatedBotRepository().get_by_user_and_source_id(user.id, lead.message.source.source_id)
         if not bot or bot.invalid_creds:
             return None
 

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/conversation_replied.py

@@ -28,9 +28,9 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
         if not lead:
             return
 
-        bot = DedicatedBotRepository().get_one(only_valid=True, name=lead.message.name)
-        if not bot:
-            log.warning(f"Lead: {lead.id}, no bot to load replies")
+        bot = DedicatedBotRepository().get_one(only_valid=True, source_id=lead.message.source.source_id)
+        if not bot or bot.invalid_creds:
+            log.warning(f"Lead: {lead.id}, no bot with valid creds to load replies")
             return
 
         client = SlackClient(bot.token, bot.cookies)
@@ -49,8 +49,12 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
                 reply.username = user_response.get("user").get("real_name")
             if not reply.attachments and lead.message.urls_in_message:
                 for attachment in lead.message.urls_in_message:
-                    reply.attachments.append(client.get_attachments(
-                        lead.message.channel_id, lead.message.message_id, attachment))
+                    if attachment:
+                        attachments = client.get_attachments(lead.message.channel_id,
+                                                             lead.message.message_id,
+                                                             attachment)
+                        if attachments:
+                            reply.attachments.append(attachments)
             replies.append(reply.to_dic())
 
         set_dict = {
@@ -62,4 +66,4 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
         LeadMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
         UserLeadMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
         GarbageLeadsMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
-        SpamLeadsMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
+        SpamLeadsMongoRepository().collection().update_many(pipeline, {"$set": set_dict})

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/inbox_leads.py

@@ -2,7 +2,7 @@ from abc import ABC
 from lgt.common.python.lgt_logging import log
 from lgt.common.python.slack_client.web_client import SlackWebClient
 from lgt_data.enums import DefaultBoards
-from lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation, UserLeadModel, Source
+from lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation, UserLeadModel
 from lgt_data.mongo_repository import UserLeadMongoRepository, UserMongoRepository, DedicatedBotRepository, \
     SlackContactUserRepository, BoardsMongoRepository
 from pydantic import BaseModel
@@ -76,13 +76,10 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
 
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):
-        source = Source()
-        source.source_id = dedicated_bot.workspace_id
-        source.source_name = dedicated_bot.name
-        source.source_type = dedicated_bot.type
         member_info: SlackMemberInformation = SlackMemberInformation.from_slack_response(slack_profile,
-                                                                                         dedicated_bot.name, source)
+                                                                                         dedicated_bot.name,
+                                                                                         dedicated_bot.source)
         SlackContactUserRepository().collection().update_one({"sender_id": member_info.sender_id,
-                                                              "source.source_id": dedicated_bot.workspace_id},
+                                                              "source.source_id": dedicated_bot.source.source_id},
                                                              {"$set": member_info.to_dic()}, upsert=True)
         return SlackContactUserRepository().find_one(member_info.sender_id)

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/mass_message.py

@@ -1,9 +1,12 @@
 import time
+from abc import ABC
 from random import randint
 from typing import Optional, Any
 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
 
 """
@@ -11,7 +14,7 @@ Send Slack Code
 """
 
 
-class SendMassMessageSlackChannelJobData(BaseBackgroundJobData):
+class SendMassMessageSlackChannelJobData(BaseBackgroundJobData, BaseModel):
     text: str
     channel_ids: list[str]
     user_id: str
@@ -19,7 +22,7 @@ class SendMassMessageSlackChannelJobData(BaseBackgroundJobData):
     source_id: str
 
 
-class SendMassMessageSlackChannelJob(BaseBackgroundJob):
+class SendMassMessageSlackChannelJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return SendMassMessageSlackChannelJobData
@@ -27,7 +30,8 @@ class SendMassMessageSlackChannelJob(BaseBackgroundJob):
     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:
-            log.warning(f"Bot not found or not invalid creds, source id:{data.source_id}")
+            log.warning(f"[SendMassMessageSlackChannelJob]: "
+                        f"Bot not found or has invalid creds, source id:{data.source_id}")
             return
 
         slack_client = SlackWebClient(bot.token, bot.cookies)
@@ -39,10 +43,12 @@ class SendMassMessageSlackChannelJob(BaseBackgroundJob):
                 try:
                     post_message_response = slack_client.post_message(to=channel, text=data.text)
                     if not post_message_response['ok']:
-                        log.warning(f"Failed to post message. Attempt {attempts}, bot id {bot.id},"
+                        log.warning(f"[SendMassMessageSlackChannelJob]: "
+                                    f"Failed to post message. Attempt {attempts}, bot id {bot.id},"
                                     f" channel id {channel}. Details {post_message_response}")
                     attempts = 0
                     break
                 except:
-                    log.warning(f"Failed attempt to get clist of channels. Attempt {attempts}, bot id {bot.id}")
+                    log.warning(f"[SendMassMessageSlackChannelJob]: "
+                                f"Failed attempt to send message. Attempt {attempts}, bot id {bot.id}")
                     time.sleep(randint(1, 3))

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/reactions_added.py

@@ -28,9 +28,9 @@ class ReactionAddedJob(BaseBackgroundJob, ABC):
         if not lead:
             return
 
-        bot = DedicatedBotRepository().get_one(only_valid=True, name=lead.message.name)
-        if not bot:
-            log.warning(f"Lead: {lead.id}, no bot to load reactions")
+        bot = DedicatedBotRepository().get_one(only_valid=True, source_id=lead.message.source.source_id)
+        if not bot or bot.invalid_creds:
+            log.warning(f"Lead: {lead.id}, no bot with valid creds to load reactions")
             return
 
         client = SlackWebClient(bot.token, bot.cookies)

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/reindex_conversation_history.py

@@ -1,10 +1,8 @@
 from abc import ABC
 from typing import List
-
 from lgt_data.model import UserLeadModel
 from lgt_data.mongo_repository import UserLeadMongoRepository
 from pydantic import BaseModel
-
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/send_code.py

@@ -1,6 +1,9 @@
+from abc import ABC
 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
 
 """
@@ -8,13 +11,13 @@ Send Slack Code
 """
 
 
-class SendSlackEmailJobData(BaseBackgroundJobData):
+class SendSlackEmailJobData(BaseBackgroundJobData, BaseModel):
     email: str
     user_agent: str
     locale: Optional[str]
 
 
-class SendSlackEmailJob(BaseBackgroundJob):
+class SendSlackEmailJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return SendSlackEmailJobData

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/send_slack_message.py

@@ -1,10 +1,11 @@
 import datetime
+from abc import ABC
 from typing import Optional
 from lgt.common.python.lgt_logging import log
-from lgt_data.mongo_repository import DedicatedBotRepository, UserContactsRepository
 from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService
 from lgt_data.engine import LeadChat
-from lgt_data.mongo_repository import UserMongoRepository, UserLeadMongoRepository
+from lgt_data.mongo_repository import (UserMongoRepository, UserLeadMongoRepository,
+                                       DedicatedBotRepository, UserContactsRepository)
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -20,7 +21,7 @@ class SendSlackMessageJobData(BaseBackgroundJobData, BaseModel):
     files_ids: Optional[list]
 
 
-class SendSlackMessageJob(BaseBackgroundJob):
+class SendSlackMessageJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return SendSlackMessageJobData
@@ -32,7 +33,7 @@ class SendSlackMessageJob(BaseBackgroundJob):
         if not lead:
             return
 
-        bot = DedicatedBotRepository().get_by_user_and_name(user.id, lead.message.name)
+        bot = DedicatedBotRepository().get_by_user_and_source_id(user.id, lead.message.source.source_id)
         if not bot or bot.invalid_creds:
             return
 

leadguru_jobs-0.278.0/lgt_jobs/jobs/update_slack_profile.py

@@ -0,0 +1,52 @@
+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
+from pydantic import BaseModel
+from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
+
+"""
+Update Slack User profile
+"""
+
+
+class UpdateUserSlackProfileJobData(BaseBackgroundJobData, BaseModel):
+    user_id: str
+
+
+class UpdateUserSlackProfileJob(BaseBackgroundJob, ABC):
+
+    @property
+    def job_data_type(self) -> type:
+        return UpdateUserSlackProfileJobData
+
+    def exec(self, data: UpdateUserSlackProfileJobData):
+        user = UserMongoRepository().get(data.user_id)
+        bots = DedicatedBotRepository().get_user_bots(data.user_id)
+        for bot in bots:
+            if bot.invalid_creds:
+                log.warning(
+                    f'User: {user.email} dedicated bot: {bot.name} credentials are invalid. '
+                    f'Not able to update user profile')
+                continue
+
+            slack = SlackClient(bot.token, bot.cookies)
+            UpdateUserSlackProfileJob.__update_profile(user, slack)
+
+    @staticmethod
+    def __update_profile(user: UserModel, slack: SlackClient):
+        try:
+            profile_resp = slack.get_profile()
+        except:
+            log.warning(f"User: {user.email} Bot credentials are not valid")
+            return
+
+        if not profile_resp["ok"]:
+            return
+
+        # try to update user photo
+        if user.photo_url:
+            photo_resp = slack.update_profile_photo(user.photo_url)
+            log.info(f"[PHOTO UPDATE] {photo_resp}")

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/user_balance_update.py

@@ -1,12 +1,11 @@
 import datetime
+from abc import ABC
 from typing import Optional
-
 from lgt_data.engine import UserCreditStatementDocument
 from lgt_data.enums import UserAccountState
 from lgt_data.model import UserModel
 from lgt_data.mongo_repository import UserMongoRepository, to_object_id
 from pydantic import BaseModel
-
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """
@@ -18,7 +17,7 @@ class UpdateUserBalanceJobData(BaseBackgroundJobData, BaseModel):
     user_id: Optional[str]
 
 
-class UpdateUserBalanceJob(BaseBackgroundJob):
+class UpdateUserBalanceJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return UpdateUserBalanceJobData

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/lgt_jobs/jobs/workspace_connect.py

@@ -1,3 +1,4 @@
+from abc import ABC
 from random import randint
 from time import sleep
 from typing import Dict
@@ -25,7 +26,7 @@ class ConnectSlackAccountJobData(BaseBackgroundJobData, BaseModel):
     user_agent: str
 
 
-class ConnectSlackAccountJob(BaseBackgroundJob):
+class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return ConnectSlackAccountJobData
@@ -105,7 +106,6 @@ class ConnectSlackAccountJob(BaseBackgroundJob):
                     log.info(f'Test token: {test_auth_response.json()}')
                     break
                 log.warning(f'{slack_user.email}: did not get token by url {login_url}. Attempt {counter + 1}')
-                counter += 1
 
         slack_user.cookies = session.cookies.get_dict()
         slack_user.workspaces = user_workspaces
@@ -117,14 +117,13 @@ class ConnectSlackAccountJob(BaseBackgroundJob):
 
         dedicated_bots_repository = DedicatedBotRepository()
         dedicated_bots = dedicated_bots_repository.get_user_bots(current_user.id)
-        user_workspaces_map: Dict[str, UserWorkspace] = {workspace.name: workspace
+        user_workspaces_map: Dict[str, UserWorkspace] = {workspace.id: workspace
                                                          for workspace in user_workspaces if workspace.token}
-        for name, workspace in user_workspaces_map.items():
-            dedicated_bot = next(filter(lambda x: x.workspace_id == workspace.id
-                                                  and x.user_name == slack_user.email, dedicated_bots), None)
+        for workspace_id, workspace in user_workspaces_map.items():
+            dedicated_bot = next(filter(lambda x:
+                                        x.workspace_id == workspace_id and x.user_name == slack_user.email,
+                                        dedicated_bots), None)
             if dedicated_bot:
                 dedicated_bot = update_credentials(dedicated_bot, workspace.token, slack_user.cookies)
                 dedicated_bots_repository.add_or_update(dedicated_bot)
-                BackgroundJobRunner.submit(BotStatsUpdateJob,
-                                           BotStatsUpdateJobData(dedicated_bot_id=str(dedicated_bot.id),
-                                                                 bot_name=None))
+                BackgroundJobRunner.submit(BotStatsUpdateJob, BotStatsUpdateJobData(bot_id=str(dedicated_bot.id)))

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/setup.py

@@ -24,8 +24,8 @@ install_requires = [
     'loguru',
     'pydantic',
     'cachetools>=3.1.0',
-    'leadguru-common==0.317.0',
-    'leadguru-data==0.324.0',
+    'leadguru-common==0.320.0',
+    'leadguru-data==0.327.0',
     'wheel',
     'setuptools',
     'twine',

{leadguru_jobs-0.276.0 → leadguru_jobs-0.278.0}/tests/job_data_test.py

@@ -1,9 +1,7 @@
 import json
 import unittest
 from datetime import datetime
-
 import pydantic
-
 from lgt_jobs import SimpleTestJob, BackgroundJobRunner, BaseBackgroundJob
 from lgt_jobs.runner import datetime_converter
 
@@ -11,7 +9,7 @@ from lgt_jobs.runner import datetime_converter
 class JobDataTest(unittest.TestCase):
     def test_can_run_simple_job(self):
         job_type = SimpleTestJob
-        data = { "name": "Kiryl", "id": 123 }
+        data = {"name": "Kiryl", "id": 123}
 
         job = job_type()
         result = job.run(data)
@@ -32,12 +30,13 @@ class JobDataTest(unittest.TestCase):
 
     def test_dump_time(self):
         now = datetime.now()
+
         class TestModel(pydantic.BaseModel):
             time: datetime
 
         model = TestModel(time=now)
 
-        json_str = json.dumps(model.dict(), ensure_ascii=False, default=datetime_converter)
+        json_str = json.dumps(model.model_dump(), ensure_ascii=False, default=datetime_converter)
         model = TestModel(**json.loads(json_str))
 
         self.assertEqual(model.time, now)

leadguru_jobs-0.276.0/lgt_jobs/jobs/update_slack_profile.py

@@ -1,95 +0,0 @@
-from typing import List
-from lgt.common.python.lgt_logging import log
-from lgt.common.python.slack_client.slack_client import SlackClient
-from lgt_data.model import UserBotCredentialsModel, UserModel
-from lgt_data.mongo_repository import UserMongoRepository, UserBotCredentialsMongoRepository, DedicatedBotRepository
-from pydantic import BaseModel
-from ..runner import BackgroundJobRunner
-from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
-
-"""
-Update Slack User profile
-"""
-
-
-class UpdateUserSlackProfileJobData(BaseBackgroundJobData, BaseModel):
-    user_id: str
-    bot_name: str
-
-
-class UpdateUserSlackProfileJob(BaseBackgroundJob):
-    @staticmethod
-    def __update_profile(user: UserModel, slack: SlackClient) -> bool:
-        try:
-            profile_resp = slack.get_profile()
-        except:
-            log.warning(f"User: {user.email} Bot credentials are not valid")
-            return False
-
-        if not profile_resp["ok"]:
-            return False
-
-        # try to update user photo
-        if user.photo_url:
-            photo_resp = slack.update_profile_photo(user.photo_url)
-            log.info(f"[PHOTO UPDATE] {photo_resp}")
-
-        return True
-
-    @property
-    def job_data_type(self) -> type:
-        return UpdateUserSlackProfileJobData
-
-    @staticmethod
-    def update_all_user_bots_command(data: UpdateUserSlackProfileJobData, bots: List[UserBotCredentialsModel]):
-        for bot in bots:
-            BackgroundJobRunner.submit(UpdateUserSlackProfileJob,
-                                       UpdateUserSlackProfileJobData(user_id=data.user_id,
-                                                                     bot_name=bot.bot_name))
-
-        UpdateUserSlackProfileJob.update_dedicated_bot_profile(data)
-
-    @staticmethod
-    def update_dedicated_bot_profile(data: UpdateUserSlackProfileJobData):
-        user = UserMongoRepository().get(data.user_id)
-        bots = DedicatedBotRepository().get_user_bots(data.user_id)
-        for bot in bots:
-            if bot.invalid_creds:
-                log.warning(
-                    f'User: {user.email} dedicated bot: {bot.name} credentials are invalid. Not able to update user profile')
-                continue
-
-            slack = SlackClient(bot.token, bot.cookies)
-            UpdateUserSlackProfileJob.__update_profile(user, slack)
-
-    @staticmethod
-    def update_single_user_bots_command(data: UpdateUserSlackProfileJobData, bots: List[UserBotCredentialsModel]):
-        user = UserMongoRepository().get(data.user_id)
-        for bot in bots:
-            if bot.bot_name != data.bot_name:
-                continue
-
-            if bot.invalid_creds:
-                log.warning(
-                    f'User: {user.email} bot: {bot.bot_name} credentials are invalid. Not able to update user profile')
-                continue
-
-            if not bot.user_name or not bot.password:
-                log.warning(f"User: {user.email} Bot: {bot.bot_name} credentials are not SET")
-                continue
-
-            slack = SlackClient(bot.token, bot.cookies)
-            result = UpdateUserSlackProfileJob.__update_profile(user, slack)
-            if result:
-                UserBotCredentialsMongoRepository().set(user_id=data.user_id, bot_name=data.bot_name,
-                                                        slack_profile=user.slack_profile.to_dic())
-
-            if user.slack_profile:
-                log.info(slack.update_profile(user.slack_profile.to_dic()))
-
-    def exec(self, data: UpdateUserSlackProfileJobData):
-        bots = UserBotCredentialsMongoRepository().get_bot_credentials(data.user_id)
-        if data.bot_name == '':
-            UpdateUserSlackProfileJob.update_all_user_bots_command(data, bots)
-        else:
-            UpdateUserSlackProfileJob.update_single_user_bots_command(data, bots)

leadguru_jobs-0.276.0/lgt_jobs/jobs/user_limits_update.py

@@ -1,62 +0,0 @@
-from abc import ABC
-from datetime import datetime
-from typing import List, Optional
-from lgt_data.engine import UserCreditStatementDocument
-from lgt_data.enums import UserAccountState
-from lgt_data.model import UserModel
-from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, to_object_id
-from pydantic import BaseModel
-from lgt.common.python.lgt_logging import log
-from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
-
-"""
-User limits handling
-"""
-
-
-class UpdateUserDataUsageJobData(BaseBackgroundJobData, BaseModel):
-    channel_id: str
-    bot_name: str
-    filtered: bool
-    user_ids: List[str]
-    message: Optional[str]
-
-
-class UpdateUserDataUsageJob(BaseBackgroundJob, ABC):
-    @property
-    def job_data_type(self) -> type:
-        return UpdateUserDataUsageJobData
-
-    @staticmethod
-    def increment(user_id: str, dedicated_bot_id: str = None, bot_name: str = None, message: str = None):
-        log.info(f"[UpdateUserDataUsageJob] Updating user: {user_id}")
-        UserCreditStatementDocument(
-            user_id=to_object_id(user_id),
-            created_at=datetime.utcnow(),
-            balance=-1,
-            action="lead-filtered",
-            attributes=[bot_name if bot_name else "", dedicated_bot_id if dedicated_bot_id else "",
-                        message if message else ""]
-        ).save()
-
-    @staticmethod
-    def get_users(user_ids: List[str]) -> List[UserModel]:
-        return UserMongoRepository().get_users(users_ids=user_ids)
-
-    def exec(self, data: UpdateUserDataUsageJobData):
-        users = self.get_users(data.user_ids)
-        for user in users:
-            if user.state == UserAccountState.Suspended.value:
-                continue
-
-            if user and data.bot_name in user.excluded_workspaces:
-                continue
-
-            if user and user.excluded_channels and user.excluded_channels.get(data.bot_name) and \
-                    (data.channel_id in user.excluded_channels.get(data.bot_name)):
-                continue
-
-            dedicated_bot = DedicatedBotRepository().get_by_user_and_name(user.id, data.bot_name)
-            if dedicated_bot and not dedicated_bot.invalid_creds:
-                self.increment(f"{user.id}", bot_name=data.bot_name,
-                               dedicated_bot_id=str(dedicated_bot.id), message=data.message)