leadguru-jobs 0.413.0__tar.gz → 0.415.0__tar.gz

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/PKG-INFO

@@ -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,11 +31,3 @@ 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.413.0 → leadguru_jobs-0.415.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -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,11 +31,3 @@ 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/leadguru_jobs.egg-info/SOURCES.txt

@@ -0,0 +1,34 @@
+MANIFEST.in
+README.md
+setup.cfg
+setup.py
+leadguru_jobs.egg-info/PKG-INFO
+leadguru_jobs.egg-info/SOURCES.txt
+leadguru_jobs.egg-info/dependency_links.txt
+leadguru_jobs.egg-info/not-zip-safe
+leadguru_jobs.egg-info/requires.txt
+leadguru_jobs.egg-info/top_level.txt
+lgt_jobs/__init__.py
+lgt_jobs/basejobs.py
+lgt_jobs/env.py
+lgt_jobs/main.py
+lgt_jobs/runner.py
+lgt_jobs/simple_job.py
+lgt_jobs/smtp.py
+lgt_jobs/jobs/__init__.py
+lgt_jobs/jobs/analytics.py
+lgt_jobs/jobs/archive_leads.py
+lgt_jobs/jobs/bot_stats_update.py
+lgt_jobs/jobs/chat_history.py
+lgt_jobs/jobs/inbox_leads.py
+lgt_jobs/jobs/mass_message.py
+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/workspace_connect.py
+lgt_jobs/services/__init__.py
+lgt_jobs/services/web_client.py
+lgt_jobs/templates/new_message_mail_template.html
+tests/__init__.py
+tests/job_data_test.py

leadguru_jobs-0.415.0/leadguru_jobs.egg-info/requires.txt

@@ -0,0 +1,14 @@
+loguru
+pydantic
+cachetools>=3.1.0
+leadguru-common==0.383.0
+leadguru-data==0.390.0
+wheel
+setuptools
+twine
+build
+kubernetes
+pyyaml
+pymongo
+pytz
+requests

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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,

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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
 

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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)

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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
 
 """

leadguru_jobs-0.415.0/lgt_jobs/jobs/chat_history.py

@@ -0,0 +1,111 @@
+import datetime
+from abc import ABC
+from typing import Optional, List
+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 ..runner import BackgroundJobRunner
+from ..env import portal_url
+from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
+from ..smtp import SendMailJobData, SendMailJob
+
+"""
+Load slack chat history
+"""
+
+
+class LoadChatHistoryJobData(BaseBackgroundJobData, BaseModel):
+    user_id: str
+    template_path: str = 'lgt_jobs/templates/new_message_mail_template.html'
+
+
+class LoadChatHistoryJob(BaseBackgroundJob, ABC):
+    @property
+    def job_data_type(self) -> type:
+        return LoadChatHistoryJobData
+
+    def exec(self, data: LoadChatHistoryJobData):
+        """download chat history"""
+        user = UserMongoRepository().get(data.user_id)
+        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 contact in contacts:
+            message = LoadChatHistoryJob._update_history(user=user, contact=contact)
+
+            if not message:
+                continue
+
+            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
+
+        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.utcnow())
+
+    @staticmethod
+    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) -> 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
+
+        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
+
+        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):
+        with open(template_path, mode='r') as template_file:
+            html = template_file.read()
+            html = html.replace("{sender}", contact.name if hasattr(contact, 'name') else contact.real_name)
+            html = html.replace("{view_message_link}", f'{portal_url}/')
+
+            message_data = {
+                "html": html,
+                "subject": 'New message(s) on LEADGURU',
+                "recipient": user.email,
+                "sender": None
+            }
+
+        BackgroundJobRunner.submit(SendMailJob, SendMailJobData(**message_data))

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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},

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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
 

leadguru_jobs-0.415.0/lgt_jobs/jobs/send_slack_message.py

@@ -0,0 +1,65 @@
+import datetime
+from abc import ABC
+from typing import Optional
+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
+
+"""
+Send Slack Message
+"""
+
+
+class SendSlackMessageJobData(BaseBackgroundJobData, BaseModel):
+    lead_id: str
+    user_id: str
+    text: Optional[str]
+    files_ids: Optional[list]
+
+
+class SendSlackMessageJob(BaseBackgroundJob, ABC):
+    @property
+    def job_data_type(self) -> type:
+        return SendSlackMessageJobData
+
+    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
+
+        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)
+        resp = slack_client.im_open(lead.message.sender_id)
+        if not resp['ok']:
+            log.warning(f"Unable to open im with user: {resp}")
+            return
+
+        channel_id = resp['channel']['id']
+        if data.files_ids:
+            resp = slack_client.share_files(data.files_ids, channel_id, data.text)
+        else:
+            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)

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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
 

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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)

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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:

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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)

{leadguru_jobs-0.413.0 → leadguru_jobs-0.415.0}/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 → leadguru_jobs-0.415.0}/setup.py

@@ -21,8 +21,11 @@ version_parts[1] = f'{float(version_parts[1]) + 1}'
 last_version = ".".join(version_parts[0:-1])
 
 install_requires = [
-    'cachetools==3.1.0',
+    'loguru',
     'pydantic',
+    'cachetools>=3.1.0',
+    'leadguru-common==0.383.0',
+    'leadguru-data==0.390.0',
     'wheel',
     'setuptools',
     'twine',
@@ -31,15 +34,7 @@ install_requires = [
     'pyyaml',
     'pymongo',
     'pytz',
-    'requests',
-    'mongoengine',
-    'google',
-    'google-cloud-pubsub',
-    'google-cloud-storage',
-    'websockets',
-    'aiohttp',
-    'nameparser',
-    'loguru'
+    'requests'
 ]
 
 setup(name=package_name,