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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.415.0
+Version: 0.416.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -17,11 +17,8 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Environment :: Console
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet
-Requires-Dist: loguru
+Requires-Dist: cachetools ==3.1.0
 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
@@ -31,4 +28,12 @@ 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.416.0.dist-info/RECORD

@@ -0,0 +1,49 @@
+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=GpYqa9V24zFB78mFW6RfB2sRWidijzYUhyIhLK6Gf_c,37419
+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.416.0.dist-info/METADATA,sha256=bV5A7ljvZqbyI5gN_aq1T_TIbFgSe89iJPpVA8C_4bc,1296
+leadguru_jobs-0.416.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+leadguru_jobs-0.416.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.416.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 (UpdateUserSlackProfileJob, UpdateUserSlackProfileJobData)
+from .jobs.update_slack_profile import (UpdateExternalUserProfileJob, UpdateExternalUserProfileJobData)
 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,
-    "UpdateUserSlackProfileJob": UpdateUserSlackProfileJob,
+    "UpdateExternalUserProfileJob": UpdateExternalUserProfileJob,
     "SendSlackMessageJob": SendSlackMessageJob,
     "UpdateUserBalanceJob": UpdateUserBalanceJob,
     "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
@@ -33,7 +33,7 @@ __all__ = [
     SendMailJob,
     SimpleTestJob,
     LoadChatHistoryJob,
-    UpdateUserSlackProfileJob,
+    UpdateExternalUserProfileJob,
     TrackAnalyticsJob,
     SendSlackMessageJob,
     UpdateUserBalanceJob,
@@ -49,7 +49,7 @@ __all__ = [
     SendMailJobData,
     SimpleTestJobData,
     LoadChatHistoryJobData,
-    UpdateUserSlackProfileJobData,
+    UpdateExternalUserProfileJobData,
     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.common.python.lgt_logging import log
+from lgt_jobs.lgt_common.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_data.mongo_repository import UserLeadMongoRepository
+from lgt_jobs.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.utcnow() - datetime.timedelta(days=90))
+                                          to_date=datetime.datetime.now(datetime.UTC) - 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.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 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 pydantic import BaseModel
-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 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 ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 
 """

lgt_jobs/jobs/chat_history.py

@@ -1,14 +1,15 @@
 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 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 pydantic import BaseModel
-from ..runner import BackgroundJobRunner
+from lgt_jobs.lgt_data.enums import SourceType
+from lgt_jobs.runner import BaseBackgroundJob, BaseBackgroundJobData, BackgroundJobRunner
 from ..env import portal_url
-from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
 from ..smtp import SendMailJobData, SendMailJob
 
 """
@@ -27,72 +28,76 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         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:
+        bots = DedicatedBotRepository().get_all(only_valid=True, user_id=user.id, source_type=SourceType.SLACK)
+        if not bots:
             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:
+        for bot in bots:
+            contacts = UserContactsRepository().find(user.id, spam=False, source_id=bot.source.source_id)
+            if not contacts:
                 continue
 
-            if not last_message:
-                last_message = message
-                last_message_contact = contact
+            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)
+
+                if not message:
+                    continue
 
-            if message.created_at > last_message.created_at and message.user == contact.sender_id:
-                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
 
         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())
+            UserMongoRepository().set(data.user_id, new_message_notified_at=datetime.datetime.now(datetime.UTC))
 
     @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
+    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
 
     @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'):
+    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)}')
                 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
+            if not history['ok']:
+                log.error(f'Failed to load chat for the contact: {contact.id}. ERROR: {history.get("error", "")}')
+                return
 
-        UserContactsRepository().update(user.id, contact.sender_id, chat_history=chat_history)
-        return messages[-1] if bot.associated_user != contact.sender_id else None
+            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
 
     @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.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, \
+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, \
     SlackContactUserRepository, BoardsMongoRepository, UserContactsRepository
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJob, BaseBackgroundJobData
@@ -80,7 +80,6 @@ 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.common.python.slack_client.web_client import SlackWebClient
-from lgt_data.mongo_repository import DedicatedBotRepository
+from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
+from lgt_jobs.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.common.python.slack_client.web_client import SlackWebClient
+from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 

lgt_jobs/jobs/send_slack_message.py

@@ -1,10 +1,8 @@
-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 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 pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -27,7 +25,6 @@ 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
@@ -44,22 +41,6 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
 
         channel_id = resp['channel']['id']
         if data.files_ids:
-            resp = slack_client.share_files(data.files_ids, channel_id, data.text)
+            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)
+            slack_client.post_message(channel_id, data.text)

lgt_jobs/jobs/update_slack_profile.py

@@ -1,34 +1,32 @@
 from abc import ABC
-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 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 pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
-"""
-Update Slack User profile
-"""
 
-
-class UpdateUserSlackProfileJobData(BaseBackgroundJobData, BaseModel):
+class UpdateExternalUserProfileJobData(BaseBackgroundJobData, BaseModel):
     user_id: str
 
 
-class UpdateUserSlackProfileJob(BaseBackgroundJob, ABC):
+class UpdateExternalUserProfileJob(BaseBackgroundJob, ABC):
 
     @property
     def job_data_type(self) -> type:
-        return UpdateUserSlackProfileJobData
+        return UpdateExternalUserProfileJobData
 
-    def exec(self, data: UpdateUserSlackProfileJobData):
+    def exec(self, data: UpdateExternalUserProfileJobData):
         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:
-            slack = SlackClient(bot.token, bot.cookies)
-            UpdateUserSlackProfileJob.__update_profile(user, slack)
+            if bot.type == SourceType.SLACK:
+                slack = SlackClient(bot.token, bot.cookies)
+                UpdateExternalUserProfileJob.__update_slack_profile(user, slack)
 
     @staticmethod
-    def __update_profile(user: UserModel, slack: SlackClient):
+    def __update_slack_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_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 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 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.utcnow(),
+                                          credits_exceeded_at=datetime.datetime.now(datetime.UTC),
                                           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.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 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 ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 from .bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
 from ..runner import BackgroundJobRunner
@@ -129,4 +129,6 @@ 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/lgt_common/discord_client/discord_client.py

@@ -0,0 +1,62 @@
+import loguru
+import requests
+from requests import Response
+from lgt_jobs.lgt_common.discord_client.methods import DiscordMethods
+
+
+class DiscordClient:
+    base_url = 'https://discord.com/api/'
+    discord_api_version = 'v9/'
+    token: str
+    headers: dict
+
+    def __init__(self, token: str = None):
+        self.token = token
+        self.headers = {"Authorization": self.token}
+
+    def login(self, login: str, password: str, captcha_key: str = None) -> dict:
+        payload = {
+            'login': login,
+            'password': password,
+            'captcha_key': captcha_key,
+            "undelete": False,
+            "login_source": "",
+            "gift_code_sku_id": None
+        }
+        response = requests.post(f"{self.base_url}{self.discord_api_version}{DiscordMethods.LOGIN.value}", json=payload)
+        if response.status_code == 400 or response.status_code == 200:
+            return response.json()
+        return {}
+
+    def get_servers(self) -> list | dict:
+        response = requests.get(f"{self.base_url}{DiscordMethods.USER_GUILDS.value}", headers=self.headers)
+        return self.__response(response).json()
+
+    def get_dms(self) -> list | dict:
+        response = requests.get(f"{self.base_url}{DiscordMethods.USER_DMS.value}", headers=self.headers)
+        return self.__response(response).json()
+
+    def get_current_user(self) -> dict:
+        response = requests.get(f"{self.base_url}{DiscordMethods.USER.value}", headers=self.headers)
+        if response.status_code != 200:
+            self.__log_error(response)
+        return response.json()
+
+    def get_channels(self, guild_id: str) -> list | dict:
+        response = requests.get(f"{self.base_url}{DiscordMethods.guild_channels(guild_id)}", headers=self.headers)
+        return self.__response(response).json()
+
+    def get_invite_link(self, channel_id: str) -> Response:
+        response = requests.post(f'{self.base_url}{self.discord_api_version}'
+                                 f'{DiscordMethods.channels_invites(channel_id)}', headers=self.headers)
+        return self.__response(response)
+
+    @staticmethod
+    def __log_error(response: Response):
+        loguru.logger.warning(f"[DiscordClient WARNING]: {response.url}, {response.status_code}, {response.content}")
+
+    @staticmethod
+    def __response(response: Response):
+        if response.status_code != 200:
+            DiscordClient.__log_error(response)
+        return response

lgt_jobs/lgt_common/discord_client/methods.py

@@ -0,0 +1,16 @@
+from enum import Enum
+
+
+class DiscordMethods(str, Enum):
+    USER_GUILDS = 'users/@me/guilds'
+    USER_DMS = 'users/@me/channels'
+    USER = 'users/@me'
+    LOGIN = 'auth/login'
+
+    @staticmethod
+    def guild_channels(guild_id: str):
+        return f'guilds/{guild_id}/channels'
+
+    @staticmethod
+    def channels_invites(channel_id: str):
+        return f'channels/{channel_id}/invites'

lgt_jobs/lgt_common/enums/slack_errors.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class SlackErrors(str, Enum):
+    INVALID_AUTH = 'invalid_auth'
+    TWO_FACTOR_REQUIRED = 'two_factor_setup_required'

lgt_jobs/lgt_common/helpers.py

@@ -0,0 +1,18 @@
+import re
+
+
+def update_credentials(credentials, token, cookies):
+    credentials.token = token
+    credentials.cookies = cookies
+    credentials.invalid_creds = False
+    return credentials
+
+
+def get_formatted_bot_name(name):
+    bot_name = name
+    bot_name.replace(" ", "_") \
+        .replace(".", "dot_") \
+        .replace("#", "") \
+        .replace("+", "_plus")
+
+    return re.sub(r'[^A-Za-z0-9]', "", bot_name).lower()

lgt_jobs/lgt_common/lgt_logging.py

@@ -0,0 +1,15 @@
+import sys
+from loguru import logger as log
+
+log.remove()
+log.add(sys.stdout, format="{time} {name} {level} {message}", level="INFO",
+        filter=lambda record: record['level'] == 'INFO')
+log.add(sys.stderr, format="{time} {name} {level} {message}", level="WARNING",
+        filter=lambda record: record['level'] == 'WARNING')
+log.add(sys.stderr, format="{time} {name} {level} {message}", level="ERROR",
+        filter=lambda record: record['level'] in ['ERROR', 'FATAL', 'CRITICAL'])
+
+
+log.info('Logger has been configured') 
+
+log = log