leadguru-jobs 0.413.0__py3-none-any.whl → 0.415.0__py3-none-any.whl

{leadguru_jobs-0.413.0.dist-info → leadguru_jobs-0.415.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.413.0
+Version: 0.415.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -17,8 +17,11 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Environment :: Console
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet
-Requires-Dist: cachetools ==3.1.0
+Requires-Dist: loguru
 Requires-Dist: pydantic
+Requires-Dist: cachetools >=3.1.0
+Requires-Dist: leadguru-common ==0.383.0
+Requires-Dist: leadguru-data ==0.390.0
 Requires-Dist: wheel
 Requires-Dist: setuptools
 Requires-Dist: twine
@@ -28,12 +31,4 @@ Requires-Dist: pyyaml
 Requires-Dist: pymongo
 Requires-Dist: pytz
 Requires-Dist: requests
-Requires-Dist: mongoengine
-Requires-Dist: google
-Requires-Dist: google-cloud-pubsub
-Requires-Dist: google-cloud-storage
-Requires-Dist: websockets
-Requires-Dist: aiohttp
-Requires-Dist: nameparser
-Requires-Dist: loguru
 

leadguru_jobs-0.415.0.dist-info/RECORD

@@ -0,0 +1,26 @@
+lgt_jobs/__init__.py,sha256=pzjunSJcWLeoxyN7wYDovpRgm0I68Dc0l7N1ykZaWxc,2131
+lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
+lgt_jobs/env.py,sha256=yzZ3Z2zAlA8B9FAY1GGEz2pkN_IiFqL-Reql1_Ub5qg,639
+lgt_jobs/main.py,sha256=g9cIpahGFXZZv6fsftbjrOhQMrrD04kxKOuPpxKk3rk,1545
+lgt_jobs/runner.py,sha256=Gqh5EBiV-XHkERmlD4PCrk-47VCLmwCs7Hl9pEo6kyI,2204
+lgt_jobs/simple_job.py,sha256=sta7MP-57iwRewPycmTAc9dvSbocbGjWhb1QYYj7ccA,519
+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=ZVeDxhVyDHiVFWIs1cGlEsu2WyF5P8mQClLT28C6hMA,6977
+lgt_jobs/jobs/chat_history.py,sha256=skF7ssOzlNWiGeT27E3KF9DVKD5-fIp21M7GAq2kGwI,4758
+lgt_jobs/jobs/inbox_leads.py,sha256=1vwV45RU3vHZnlnmLdW6Mo_ZADyjDS1z2gDPb9cggY8,4738
+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=YpLkhnr1cajkCioPojuavLPKPQIRmAKJtT6uoi5IBwM,6973
+lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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.415.0.dist-info/METADATA,sha256=1R55ZFf6PzE53uv3uW9o5c1unCMmbheNjqqofrsf22E,1181
+leadguru_jobs-0.415.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+leadguru_jobs-0.415.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.415.0.dist-info/RECORD,,

lgt_jobs/__init__.py

@@ -6,7 +6,7 @@ from .jobs.analytics import (TrackAnalyticsJob, TrackAnalyticsJobData)
 from .jobs.archive_leads import (ArchiveLeadsJob, ArchiveLeadsJobData)
 from .jobs.bot_stats_update import (BotStatsUpdateJob, BotStatsUpdateJobData)
 from .jobs.chat_history import (LoadChatHistoryJob, LoadChatHistoryJobData)
-from .jobs.update_slack_profile import (UpdateExternalUserProfileJob, UpdateExternalUserProfileJobData)
+from .jobs.update_slack_profile import (UpdateUserSlackProfileJob, UpdateUserSlackProfileJobData)
 from .jobs.mass_message import SendMassMessageSlackChannelJob, SendMassMessageSlackChannelJobData
 from .basejobs import (BaseBackgroundJobData, BaseBackgroundJob, InvalidJobTypeException)
 from .smtp import (SendMailJob, SendMailJobData)
@@ -20,7 +20,7 @@ jobs_map = {
     "SendMailJob": SendMailJob,
     "TrackAnalyticsJob": TrackAnalyticsJob,
     "LoadChatHistoryJob": LoadChatHistoryJob,
-    "UpdateExternalUserProfileJob": UpdateExternalUserProfileJob,
+    "UpdateUserSlackProfileJob": UpdateUserSlackProfileJob,
     "SendSlackMessageJob": SendSlackMessageJob,
     "UpdateUserBalanceJob": UpdateUserBalanceJob,
     "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
@@ -33,7 +33,7 @@ __all__ = [
     SendMailJob,
     SimpleTestJob,
     LoadChatHistoryJob,
-    UpdateExternalUserProfileJob,
+    UpdateUserSlackProfileJob,
     TrackAnalyticsJob,
     SendSlackMessageJob,
     UpdateUserBalanceJob,
@@ -49,7 +49,7 @@ __all__ = [
     SendMailJobData,
     SimpleTestJobData,
     LoadChatHistoryJobData,
-    UpdateExternalUserProfileJobData,
+    UpdateUserSlackProfileJobData,
     TrackAnalyticsJobData,
     SendSlackMessageJobData,
     UpdateUserBalanceJobData,

lgt_jobs/jobs/analytics.py

@@ -3,7 +3,7 @@ import datetime
 from typing import Optional, List
 from pydantic import BaseModel, conlist
 from pymongo import MongoClient
-from lgt_jobs.lgt_common.lgt_logging import log
+from lgt.common.python.lgt_logging import log
 from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 from ..env import mongo_connection_string
 

lgt_jobs/jobs/archive_leads.py

@@ -1,6 +1,6 @@
 from abc import ABC
 import datetime
-from lgt_jobs.lgt_data.mongo_repository import UserLeadMongoRepository
+from lgt_data.mongo_repository import UserLeadMongoRepository
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 
@@ -21,7 +21,7 @@ class ArchiveLeadsJob(BaseBackgroundJob, ABC):
     def exec(self, data: ArchiveLeadsJobData):
         lead_repository = UserLeadMongoRepository()
         leads = lead_repository.get_leads(data.user_id, 0, 1000, archived=False,
-                                          to_date=datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=90))
+                                          to_date=datetime.datetime.utcnow() - datetime.timedelta(days=90))
 
         for lead in leads:
             lead_repository.update_lead(data.user_id, lead.id, archived=True)

lgt_jobs/jobs/bot_stats_update.py

@@ -2,16 +2,16 @@ import random
 import time
 from abc import ABC
 from typing import Optional
-from lgt_jobs.lgt_common.discord_client.discord_client import DiscordClient
-from lgt_jobs.lgt_common.helpers import get_formatted_bot_name
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import DedicatedBotModel, Server, Channel, DiscordUser
-from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserMongoRepository
+from lgt.common.python.discord_client.discord_client import DiscordClient
+from lgt.common.python.helpers import get_formatted_bot_name
+from lgt.common.python.slack_client.web_client import SlackWebClient
+from lgt_data.enums import SourceType
+from lgt_data.model import DedicatedBotModel, Server, Channel, DiscordUser
+from lgt_data.mongo_repository import DedicatedBotRepository, UserMongoRepository
 from pydantic import BaseModel
-from lgt_jobs.lgt_data.analytics import get_bots_aggregated_analytics
-from lgt_jobs.lgt_common.lgt_logging import log
-from lgt_jobs.lgt_common.enums.slack_errors import SlackErrors
+from lgt_data.analytics import get_bots_aggregated_analytics
+from lgt.common.python.lgt_logging import log
+from lgt.common.python.enums.slack_errors import SlackErrors
 from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 
 """

lgt_jobs/jobs/chat_history.py

@@ -1,15 +1,14 @@
 import datetime
 from abc import ABC
 from typing import Optional, List
-from lgt_jobs.lgt_common.lgt_logging import log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient, SlackMessageConvertService
-from lgt_jobs.lgt_data.model import ChatMessage, UserModel, UserContact, DedicatedBotModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, UserContactsRepository, \
-    ChatRepository
+from lgt.common.python.lgt_logging import log
+from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService
+from lgt_data.model import SlackHistoryMessageModel, UserModel, UserContact
+from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, UserContactsRepository
 from pydantic import BaseModel
-from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.runner import BaseBackgroundJob, BaseBackgroundJobData, BackgroundJobRunner
+from ..runner import BackgroundJobRunner
 from ..env import portal_url
+from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 from ..smtp import SendMailJobData, SendMailJob
 
 """
@@ -28,76 +27,72 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         return LoadChatHistoryJobData
 
     def exec(self, data: LoadChatHistoryJobData):
+        """download chat history"""
         user = UserMongoRepository().get(data.user_id)
-        bots = DedicatedBotRepository().get_all(only_valid=True, user_id=user.id, source_type=SourceType.SLACK)
-        if not bots:
+        contacts = UserContactsRepository().find(user.id, with_chat_only=True, spam=False)
+        if not contacts:
             return
+
+        log.info(f"[LoadChatHistoryJob]: processing {len(contacts)} contacts for user: {user.email}")
         last_message = None
         last_message_contact = None
-        for bot in bots:
-            contacts = UserContactsRepository().find(user.id, spam=False, source_id=bot.source.source_id)
-            if not contacts:
-                continue
-
-            log.info(f"[LoadChatHistoryJob]: processing {len(contacts)} contacts for user: {user.email}")
-            for contact in contacts:
-                message = LoadChatHistoryJob._update_history(user=user, contact=contact, bot=bot)
+        for contact in contacts:
+            message = LoadChatHistoryJob._update_history(user=user, contact=contact)
 
-                if not message:
-                    continue
+            if not message:
+                continue
 
-                if not last_message:
-                    last_message = message
-                    last_message_contact = contact
+            if not last_message:
+                last_message = message
+                last_message_contact = contact
 
-                if message.created_at > last_message.created_at and message.user == contact.sender_id:
-                    last_message = message
-                    last_message_contact = contact
+            if message.created_at > last_message.created_at and message.user == contact.sender_id:
+                last_message = message
+                last_message_contact = contact
 
         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_contact.sender_id:
             LoadChatHistoryJob._notify_about_new_messages(user, last_message_contact, data.template_path)
-            UserMongoRepository().set(data.user_id, new_message_notified_at=datetime.datetime.now(datetime.UTC))
+            UserMongoRepository().set(data.user_id, new_message_notified_at=datetime.datetime.utcnow())
 
     @staticmethod
-    def _get_new_messages(contact: UserContact, bot: DedicatedBotModel, slack_chat: List[ChatMessage]):
-        chat_repo = ChatRepository()
-        messages = chat_repo.get_list(sender_id=contact.sender_id, bot_id=bot.id)
-        new_messages = []
-        for message in slack_chat:
-            same_messages = [msg for msg in messages if msg.ts == message.ts]
-            if not same_messages:
-                new_messages.append(message)
-        return new_messages
+    def _merge_chat_histories(contact: UserContact, messages: List[SlackHistoryMessageModel]):
+        for message in contact.chat_history:
+            if not [True for msg in messages if msg.ts == message.ts]:  # Uniq messages
+                messages.append(message)
+        messages = sorted(messages, key=lambda d: d.created_at)
+        return messages
 
     @staticmethod
-    def _update_history(user: UserModel, contact: UserContact, bot: DedicatedBotModel) -> Optional[ChatMessage]:
-        if bot.type == SourceType.SLACK:
-            slack_client = SlackWebClient(bot.token, bot.cookies)
-            try:
-                chat_id = slack_client.im_open(contact.sender_id).get('channel', {}).get('id')
-                history = slack_client.chat_history(chat_id)
-            except Exception as ex:
-                log.error(f'[LoadChatHistoryJob]: Failed to load chat for the contact: {contact.id}. ERROR: {str(ex)}')
+    def _update_history(user: UserModel, contact: UserContact) -> Optional[SlackHistoryMessageModel]:
+        bot = DedicatedBotRepository().get_one(user_id=user.id, source_id=contact.source_id, only_valid=True)
+        if not bot:
+            return None
+
+        slack_client = SlackWebClient(bot.token, bot.cookies)
+        try:
+            history = slack_client.chat_history(contact.chat_id)
+            if not history.get('messages'):
                 return
+        except Exception as ex:
+            log.error(f'[LoadChatHistoryJob]: Failed to load chat for the contact: {contact.id}. ERROR: {str(ex)}')
+            return
 
-            if not history['ok']:
-                log.error(f'Failed to load chat for the contact: {contact.id}. ERROR: {history.get("error", "")}')
-                return
+        if not history['ok']:
+            log.error(f'Failed to load chat for the contact: {contact.id}. ERROR: {history.get("error", "")}')
+            return
+
+        messages = [SlackMessageConvertService.from_slack_response(user.email, "slack_files", bot.token, m) for m in
+                    history.get('messages', [])]
+        messages = LoadChatHistoryJob._merge_chat_histories(contact, messages)
+        chat_history = [message.to_dic() for message in messages]
+        if not chat_history:
+            return
 
-            messages = history.get('messages', [])
-            if not messages:
-                return None
-
-            messages = [SlackMessageConvertService.from_slack_response(user.email, "slack_files",
-                                                                       bot.token, m, contact.sender_id, bot.id,
-                                                                       user.id, bot.cookies) for m in messages]
-            new_messages = LoadChatHistoryJob._get_new_messages(contact, bot, messages)
-            chat_history = [message.to_dic() for message in new_messages]
-            ChatRepository().upsert_messages(chat_history)
-            return new_messages[-1] if bot.associated_user != contact.sender_id else None
+        UserContactsRepository().update(user.id, contact.sender_id, chat_history=chat_history)
+        return messages[-1] if bot.associated_user != contact.sender_id else None
 
     @staticmethod
     def _notify_about_new_messages(user: UserModel, contact: UserContact, template_path: str):

lgt_jobs/jobs/inbox_leads.py

@@ -1,9 +1,9 @@
 from abc import ABC
-from lgt_jobs.lgt_common.lgt_logging import log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.enums import DefaultBoards
-from lgt_jobs.lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation, UserLeadModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, \
+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
+from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, \
     SlackContactUserRepository, BoardsMongoRepository, UserContactsRepository
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
@@ -80,6 +80,7 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):
         member_info: SlackMemberInformation = SlackMemberInformation.from_slack_response(slack_profile,
+                                                                                         dedicated_bot.source.source_name,
                                                                                          dedicated_bot.source)
         SlackContactUserRepository().collection().update_one({"sender_id": member_info.sender_id,
                                                               "source.source_id": dedicated_bot.source.source_id},

lgt_jobs/jobs/mass_message.py

@@ -2,8 +2,8 @@ import time
 from abc import ABC
 from random import randint
 from typing import Optional, Any
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository
+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

lgt_jobs/jobs/send_code.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Optional
 from loguru import logger as log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
+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

@@ -1,8 +1,10 @@
+import datetime
 from abc import ABC
 from typing import Optional
-from lgt_jobs.lgt_common.lgt_logging import log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.mongo_repository import UserLeadMongoRepository, DedicatedBotRepository
+from lgt.common.python.lgt_logging import log
+from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService
+from lgt_data.mongo_repository import (UserMongoRepository, UserLeadMongoRepository,
+                                       DedicatedBotRepository, UserContactsRepository)
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -25,6 +27,7 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
 
     def exec(self, data: SendSlackMessageJobData):
         user_leads_repository = UserLeadMongoRepository()
+        user = UserMongoRepository().get(data.user_id)
         lead = user_leads_repository.get_lead(user_id=data.user_id, lead_id=data.lead_id)
         if not lead:
             return
@@ -41,6 +44,22 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
 
         channel_id = resp['channel']['id']
         if data.files_ids:
-            slack_client.share_files(data.files_ids, channel_id, data.text)
+            resp = slack_client.share_files(data.files_ids, channel_id, data.text)
         else:
-            slack_client.post_message(channel_id, data.text)
+            resp = slack_client.post_message(channel_id, data.text)
+
+        if not resp['ok']:
+            return log.warning(f"Unable to send message: {resp}")
+
+        message = resp.get('message') if 'message' in resp \
+            else slack_client.conversation_replies(channel_id, resp['file_msg_ts'])['messages'][0]
+
+        message_model = SlackMessageConvertService.from_slack_response(user.email, "slack_files", bot.token, message,
+                                                                       slack_client.client.cookies)
+        lead.chat_history.append(message_model)
+        chat_history = [message.to_dic() for message in lead.chat_history]
+        user_leads_repository.update_lead(user.id, lead.id, slack_channel=channel_id,
+                                          chat_history=chat_history, last_action_at=datetime.datetime.utcnow())
+
+        UserContactsRepository().update(user.id, lead.message.sender_id,
+                                        chat_id=channel_id, chat_history=chat_history)

lgt_jobs/jobs/update_slack_profile.py

@@ -1,32 +1,34 @@
 from abc import ABC
-from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
-from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import UserModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
+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 UpdateExternalUserProfileJobData(BaseBackgroundJobData, BaseModel):
+
+class UpdateUserSlackProfileJobData(BaseBackgroundJobData, BaseModel):
     user_id: str
 
 
-class UpdateExternalUserProfileJob(BaseBackgroundJob, ABC):
+class UpdateUserSlackProfileJob(BaseBackgroundJob, ABC):
 
     @property
     def job_data_type(self) -> type:
-        return UpdateExternalUserProfileJobData
+        return UpdateUserSlackProfileJobData
 
-    def exec(self, data: UpdateExternalUserProfileJobData):
+    def exec(self, data: UpdateUserSlackProfileJobData):
         user = UserMongoRepository().get(data.user_id)
         bots = DedicatedBotRepository().get_all(user_id=data.user_id, only_valid=True, include_deleted=False)
         for bot in bots:
-            if bot.type == SourceType.SLACK:
-                slack = SlackClient(bot.token, bot.cookies)
-                UpdateExternalUserProfileJob.__update_slack_profile(user, slack)
+            slack = SlackClient(bot.token, bot.cookies)
+            UpdateUserSlackProfileJob.__update_profile(user, slack)
 
     @staticmethod
-    def __update_slack_profile(user: UserModel, slack: SlackClient):
+    def __update_profile(user: UserModel, slack: SlackClient):
         profile = slack.get_team_profile()
         title_section_id = None
         title_field_id = None

lgt_jobs/jobs/user_balance_update.py

@@ -1,10 +1,10 @@
 import datetime
 from abc import ABC
 from typing import Optional
-from lgt_jobs.lgt_data.engine import UserCreditStatementDocument
-from lgt_jobs.lgt_data.enums import UserAccountState, UserAction
-from lgt_jobs.lgt_data.model import UserModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, to_object_id
+from lgt_data.engine import UserCreditStatementDocument
+from lgt_data.enums import UserAccountState, UserAction
+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
 
@@ -49,7 +49,7 @@ class UpdateUserBalanceJob(BaseBackgroundJob, ABC):
             # suspend account
             if user.state != UserAccountState.Suspended.value:
                 UserMongoRepository().set(user.id, leads_proceeded=count,
-                                          credits_exceeded_at=datetime.datetime.now(datetime.UTC),
+                                          credits_exceeded_at=datetime.datetime.utcnow(),
                                           state=UserAccountState.Suspended.value)
                 return
 

lgt_jobs/jobs/workspace_connect.py

@@ -1,11 +1,11 @@
 from abc import ABC
 from typing import Dict
 import requests
-from lgt_jobs.lgt_common.helpers import update_credentials, get_formatted_bot_name
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.enums import StatusConnection, SourceType
-from lgt_jobs.lgt_data.model import UserWorkspace, SlackUser, DedicatedBotModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
+from lgt.common.python.helpers import update_credentials, get_formatted_bot_name
+from lgt.common.python.slack_client.web_client import SlackWebClient
+from lgt_data.enums import StatusConnection, SourceType
+from lgt_data.model import UserWorkspace, SlackUser, DedicatedBotModel
+from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 from .bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
 from ..runner import BackgroundJobRunner
@@ -129,6 +129,4 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
             if auth.status_code == 200 and dedicated_bot.source.source_id not in user_workspaces_map.keys():
                 dedicated_bot.banned = True
                 dedicated_bot.invalid_creds = True
-                for server in dedicated_bot.servers:
-                    server.deleted = True
                 dedicated_bots_repository.add_or_update(dedicated_bot)

lgt_jobs/main.py

@@ -2,11 +2,11 @@ import json
 import sys
 import threading
 import time
-from lgt_common.pubsub.pubsubfactory import PubSubFactory
-from lgt_common.lgt_logging import log
-from lgt_jobs.env import project_id, background_jobs_topic, background_jobs_subscriber
-from lgt_jobs.runner import BackgroundJobRunner
-from lgt_jobs import jobs_map
+from lgt_jobs import BackgroundJobRunner, jobs_map
+from lgt.common.python.pubsub.pubsubfactory import PubSubFactory
+from lgt.common.python.lgt_logging import log
+
+from lgt_jobs import env
 
 lock = threading.Lock()
 
@@ -35,10 +35,12 @@ def run_background_job_with_lock(message):
 
 
 if __name__ == '__main__':
-    factory = PubSubFactory(project_id)
-    factory.create_topic_if_doesnt_exist(background_jobs_topic)
-    factory.create_subscription_if_doesnt_exist(background_jobs_subscriber, background_jobs_topic,600)
-    bot_subscription_path = factory.get_subscription_path(background_jobs_subscriber, background_jobs_topic)
+    factory = PubSubFactory(env.project_id)
+    factory.create_topic_if_doesnt_exist(env.background_jobs_topic)
+    factory.create_subscription_if_doesnt_exist(env.background_jobs_subscriber, env.background_jobs_topic,
+                                                ack_deadline_seconds=600)
+    bot_subscription_path = factory.get_subscription_path(env.background_jobs_subscriber, env.background_jobs_topic)
+
     factory.subscriber.subscribe(bot_subscription_path, callback=run_background_job_with_lock)
     log.info(f'Listening for messages on {bot_subscription_path}')
     while True:

lgt_jobs/runner.py

@@ -1,7 +1,7 @@
 import json
-from datetime import datetime, UTC
-from lgt_jobs.lgt_common.pubsub.messages import publish_message2_pubsub
-from lgt_jobs.lgt_data.engine import DelayedJob
+from datetime import datetime
+from lgt.common.python.pubsub.messages import _publish_message2_pubsub
+from lgt_data.engine import DelayedJob
 from .basejobs import InvalidJobTypeException, BaseBackgroundJobData, BaseBackgroundJob
 from .env import background_jobs_topic
 
@@ -33,19 +33,22 @@ class BackgroundJobRunner:
 
     @staticmethod
     def submit_data(data: dict):
-        json_str = json.dumps(data, ensure_ascii=False, default=datetime_converter)
+        json_str = json.dumps(data,
+                              ensure_ascii=False,
+                              default=datetime_converter)
         BackgroundJobRunner.submit_json(json_str)
 
     @staticmethod
     def submit_json(json_str: str):
-        publish_message2_pubsub(background_jobs_topic, message_json=json_str)
+        _publish_message2_pubsub(background_jobs_topic,
+                                 message_json=json_str)
 
     @staticmethod
     def schedule(jib: str, job: type, data: BaseBackgroundJobData, scheduled_at: datetime):
         job_data = BaseBackgroundJob.dumps(job, data.model_dump())
         DelayedJob(
             jib=jib,
-            created_at=datetime.now(UTC),
+            created_at=datetime.utcnow(),
             scheduled_at=scheduled_at,
             job_type=job.__name__,
             data=json.dumps(job_data, ensure_ascii=False, default=datetime_converter)

lgt_jobs/smtp.py

@@ -1,7 +1,7 @@
 from abc import ABC
 import smtplib
 from pydantic import BaseModel
-from lgt_jobs.lgt_common.lgt_logging import log
+from lgt.common.python.lgt_logging import log
 from .basejobs import BaseBackgroundJobData, BaseBackgroundJob
 from .env import smtp_login, smtp_password, smtp_host
 

leadguru_jobs-0.413.0.dist-info/RECORD

@@ -1,49 +0,0 @@
-lgt_jobs/__init__.py,sha256=B_w69fjqL6YCSZia0YFtmNx6xV0hriyMo9ZmONGzffg,2149
-lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
-lgt_jobs/env.py,sha256=yzZ3Z2zAlA8B9FAY1GGEz2pkN_IiFqL-Reql1_Ub5qg,639
-lgt_jobs/main.py,sha256=SBav9t4vGpZOmGGP4ivFoxKtzdIAgHY0UMxfV19IXAM,1524
-lgt_jobs/runner.py,sha256=MZ3_UvfyDSM707UI4uPDntlKKCXkIyN6h95D1i1SoQQ,2125
-lgt_jobs/simple_job.py,sha256=sta7MP-57iwRewPycmTAc9dvSbocbGjWhb1QYYj7ccA,519
-lgt_jobs/smtp.py,sha256=2PdCvyonQdyWZbPH9ozXFwapZp00fcxhBe7lQiVtMCo,1354
-lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/jobs/analytics.py,sha256=iN1Z9ZtRHrpjzmSN4cbqwL6XzGWQYFmDBnBG-NvmlMc,974
-lgt_jobs/jobs/archive_leads.py,sha256=Rc9MTWvVUCMEXi7mTrHWKZVyaRiseCFpHqUZcXekmIk,849
-lgt_jobs/jobs/bot_stats_update.py,sha256=YlsD217E1L6mEkn0ggMKJk0Q0w9wHWlBFzWWFYED-Ws,7023
-lgt_jobs/jobs/chat_history.py,sha256=QkB49zyGad1WMA-CKmdWgN6T8upRfDfyAAFmEyrtXqs,5338
-lgt_jobs/jobs/inbox_leads.py,sha256=HGnhZEzMZw_Yzf40tQIRQc3E3QmcmEUyc1c5KTmJHFI,4646
-lgt_jobs/jobs/mass_message.py,sha256=jLO-yykQzf-V7JY7a6PFwVoT4z91SJWN5UPrHj_xAP8,2039
-lgt_jobs/jobs/send_code.py,sha256=ei5WHVpI2w2gv0JGU8wjg0HJYUO_OZqNJPm-W6yO1dA,828
-lgt_jobs/jobs/send_slack_message.py,sha256=B14J7twVS7gjjjfKSLttrzbnJ3Eena4Ym4nf9t1s1Uk,1530
-lgt_jobs/jobs/update_slack_profile.py,sha256=uA68Vp5BcU4YPJ0cX5YBkNMty1vmAEvColRZkZlVviA,2758
-lgt_jobs/jobs/user_balance_update.py,sha256=hbUuOj-O0RqyHjZUrBwxiySFifyO3BJ_hKiTl-qM4iw,2397
-lgt_jobs/jobs/workspace_connect.py,sha256=_IGxKWP2RHZZo750_R3sTHXcxO1-q8ZuyTbMyCxsEg8,7099
-lgt_jobs/lgt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/helpers.py,sha256=tJNrKJYPa_MBmfRVrpHryoOWe4gnv7xOlmHuTh-bMBw,428
-lgt_jobs/lgt_common/lgt_logging.py,sha256=wM68GBauFLWa5GfGDB1q14BuI-vypMs8RDGsgfAt5Go,541
-lgt_jobs/lgt_common/discord_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/discord_client/discord_client.py,sha256=tvRn0P039Dp5d22-DivQhP2uQMC7ixZc7oe7IA4WrPE,2442
-lgt_jobs/lgt_common/discord_client/methods.py,sha256=C46Vq9_-dlvs0nEW6ck8QvAmE_nPUfU89MJUhHaPMLk,391
-lgt_jobs/lgt_common/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/enums/slack_errors.py,sha256=5VNbBaMKya2RIR5uyr3YI8N6Xll9WexItk7uJtoJ4NQ,142
-lgt_jobs/lgt_common/pubsub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/pubsub/command.py,sha256=tr7J51NGbt6Iq5CTEUyASu3o7KqP-Q64NfKaI1WVC64,278
-lgt_jobs/lgt_common/pubsub/messages.py,sha256=rm7uKbxwDTWJqsVA8Kee-4YT58bThjCEV2Q0559Lrzg,1397
-lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=7HAg_P2sZ6DDJkDyxzc4yI-i38bDSMxySulEGlHUhxc,2441
-lgt_jobs/lgt_common/slack_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/slack_client/methods.py,sha256=-PxK8StkJ-dyACHdRRiQlRL2qaG9KEyWB7wo4eh7ifU,1506
-lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=fpfkk8uBMiTknMwgSNFGiGegN3qoJADJhjbpkpLKO8Y,15896
-lgt_jobs/lgt_common/slack_client/web_client.py,sha256=d3fY_DxuJEr74_QWEitF_U-KAG3aRRyXZb6oH9Qxg80,6259
-lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/analytics.py,sha256=qo5nNFQxOTTk8i3tmCq0d3F9iaV9MTIR84SSi6uNrJ8,23427
-lgt_jobs/lgt_data/engine.py,sha256=iTcLvU7QZvB14hcERQrxSql9cVEcMEzu_tUcWD2Z24A,8076
-lgt_jobs/lgt_data/enums.py,sha256=A5nWwBgTVW7XaqL30NHNmO0SG_yeDk1dI-U5xrgU2zg,1552
-lgt_jobs/lgt_data/helpers.py,sha256=58ycqKF1z5nAw0vs6yVCg-SQet107YHyKYXaQUc7M68,157
-lgt_jobs/lgt_data/model.py,sha256=Z0Www576hBMSCnvQEEiEW78Kzeh3-To2S6xhHM-p7z8,27970
-lgt_jobs/lgt_data/mongo_repository.py,sha256=jVayqxxshJy4YF7DIlVTNdpuBc1eCTYhkT-INfl8qFs,37331
-lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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.413.0.dist-info/METADATA,sha256=19YoZrsVeAfj-sn5LsibL_e9PVHiK6MGGiFTnLsaKPQ,1296
-leadguru_jobs-0.413.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-leadguru_jobs-0.413.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.413.0.dist-info/RECORD,,