leadguru-jobs 0.559.0__py3-none-any.whl → 0.561.0__py3-none-any.whl

{leadguru_jobs-0.559.0.dist-info → leadguru_jobs-0.561.0.dist-info}/METADATA

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

{leadguru_jobs-0.559.0.dist-info → leadguru_jobs-0.561.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-lgt_jobs/__init__.py,sha256=kmM5J3qBJd-fOZa2I4gkh36IytrgN6_18gWwwpR3n6Y,2156
+lgt_jobs/__init__.py,sha256=lrhMUJ7a5YSkYswQkQe981b_w8h8NHyncwfEduXEq6Q,1992
 lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
 lgt_jobs/env.py,sha256=cRO03GGvstUjBsv3uYO-iakrOvAk_ZWUP_fnmf21iZQ,789
 lgt_jobs/main.py,sha256=cK_nkBtJHnUNDbba1WZotqPtI_6OWxiYQkAgco9OAmE,1539
@@ -13,12 +13,11 @@ lgt_jobs/assets/images/mail.png,sha256=eORzQcAMkFr7DjgtABVhJ_zFuXgO7OXv78lLF4b39
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=IIsWt4A1qUw3w-S-8W16uKY1FRVWfXXA41_mu4uCNiM,979
 lgt_jobs/jobs/bot_stats_update.py,sha256=R6mf5FxhWbyx92AYXlj0FZVjz2Tgz86mBvLHrsQ9AFE,7502
-lgt_jobs/jobs/chat_history.py,sha256=tZ4XyOGdy1k6r4uotxSSKbXjTR_oRK6Ym0YthFYBtl8,6200
-lgt_jobs/jobs/connect_sources.py,sha256=CD15PKYrloepfr8fqUP0XkmvXb9VZDXfLNhYiiYeQ3U,3668
+lgt_jobs/jobs/chat_history.py,sha256=QZdSWlk_DrDJt5yrNApYHiUEWQMYcKyuXaP_PlzkjYw,6303
 lgt_jobs/jobs/inbox_leads.py,sha256=EYxdQPseNBY5ON7BK3LpnXDCgQpzHTPLRJCZmZiAAHA,5582
 lgt_jobs/jobs/mass_message.py,sha256=1mFcBlL2MhzLbj5yrd_NyJc7TXDWCcROAzGDnr0miMU,2035
 lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,824
-lgt_jobs/jobs/send_slack_message.py,sha256=IuRqDGcDrz2EAZzF6nrLXO0aSA4mETB_tGOEbcMhjHE,2562
+lgt_jobs/jobs/send_slack_message.py,sha256=WdXXh7QpjJKSvDU93YT9QKzoGRNBpPCJgiIxPs5gp1s,2782
 lgt_jobs/jobs/update_slack_profile.py,sha256=0fUHBd2gEBne52sTfxwji2Wu-oYDM5dLGsL-rHq5kwM,2765
 lgt_jobs/jobs/user_balance_update.py,sha256=HxeEmDdloK9EcoEj1ybYTgxIkB0IQNLnss_kk3rLI1Q,2404
 lgt_jobs/jobs/workspace_connect.py,sha256=qgjIRzAQRbJBx--eYsTtYgOUh2-p3N_-LIltfbJrYYo,7102
@@ -35,19 +34,19 @@ lgt_jobs/lgt_common/pubsub/messages.py,sha256=rm7uKbxwDTWJqsVA8Kee-4YT58bThjCEV2
 lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=rfUDooYuhBQ2pE9FdDxZOpXjbrvlpiiQLCGOtnTFbSg,2204
 lgt_jobs/lgt_common/slack_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/slack_client/methods.py,sha256=ctKF_1UHEmSWaRsoGEgMZicVabV7eEufZ7pjxdMAx8g,1455
-lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=fxSTaU696yfe5tFWnuW6LuH4EUkgB2kdqDxQ96GYMJY,13799
-lgt_jobs/lgt_common/slack_client/web_client.py,sha256=JrkEepL6EhEtX3Psv_sd25bcRB2P23LoGnFHcczQpnc,4778
+lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=icHapSOszFYnSofJ-eWl4lUWSOqng6S9XSRFfMx87Rg,13836
+lgt_jobs/lgt_common/slack_client/web_client.py,sha256=hiexBYtCnwz0oZvU6GnlQkD3aDqt9v5CvfPWMbz3Z50,6311
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/analytics.py,sha256=TFUffL8Dn-vIJ3ZaCVN-cj1Qnjb8F9GJyuk6Fo7mR1s,21645
 lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7728
 lgt_jobs/lgt_data/enums.py,sha256=GZn6wm-kOd3veEOo1qlOR8QYje4vKaGV0na9jGt9388,2160
 lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
-lgt_jobs/lgt_data/model.py,sha256=BtVpJC_TRXUOklpzwRiDywyuKCCV2GGXtjsRYcPibDc,28454
-lgt_jobs/lgt_data/mongo_repository.py,sha256=wdhslZTfTU-3Ad4Gm8NVl9HZFM5aK_vgG47EqNQBARk,45179
+lgt_jobs/lgt_data/model.py,sha256=DDfoWeH6rLWKoZsFJ2tI5Yagj1WlOa0PIJp-GqBIVSA,28112
+lgt_jobs/lgt_data/mongo_repository.py,sha256=qqbt-oJ-RHmICLARgWvHuyPwVeKFkUqJZ2MA1bfIlXs,44762
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=GLWsJkIC8rv6xLFaLwcMm4EwBlVDu0njORwkZqBJaE4,2086
 lgt_jobs/templates/new_message.html,sha256=BD_E90akmQ1Wf07wtZAjeK_7DUKRmja5HFHVo_AKI24,6994
-leadguru_jobs-0.559.0.dist-info/METADATA,sha256=A_vZrWjKQsHxV06Ou4NsbjAhA24uX3QqaknlN0NcKkk,1319
-leadguru_jobs-0.559.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.559.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.559.0.dist-info/RECORD,,
+leadguru_jobs-0.561.0.dist-info/METADATA,sha256=-bP6WNVz3lmRi9b290wt67FhtcWHWcskt_G98oSboBA,1319
+leadguru_jobs-0.561.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.561.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.561.0.dist-info/RECORD,,

lgt_jobs/__init__.py

@@ -3,7 +3,6 @@ name = "lgt_jobs"
 from .jobs.user_balance_update import UpdateUserBalanceJob, UpdateUserBalanceJobData
 from .jobs.send_slack_message import SendSlackMessageJob, SendSlackMessageJobData
 from .jobs.analytics import (TrackAnalyticsJob, TrackAnalyticsJobData)
-from .jobs.connect_sources import (ConnectSourceJobData, ConnectSourceJob)
 from .jobs.bot_stats_update import (BotStatsUpdateJob, BotStatsUpdateJobData)
 from .jobs.chat_history import (LoadChatHistoryJob, LoadChatHistoryJobData)
 from .jobs.update_slack_profile import (UpdateExternalUserProfileJob, UpdateExternalUserProfileJobData)
@@ -23,7 +22,6 @@ jobs_map = {
     "SendSlackMessageJob": SendSlackMessageJob,
     "UpdateUserBalanceJob": UpdateUserBalanceJob,
     "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
-    "ConnectSourceJob": ConnectSourceJob
 }
 __all__ = [
     # Jobs
@@ -37,7 +35,6 @@ __all__ = [
     SendSlackMessageJob,
     UpdateUserBalanceJob,
     SendMassMessageSlackChannelJob,
-    ConnectSourceJob,
 
     # module classes
     BackgroundJobRunner,
@@ -53,7 +50,6 @@ __all__ = [
     SendSlackMessageJobData,
     UpdateUserBalanceJobData,
     SendMassMessageSlackChannelJobData,
-    ConnectSourceJobData,
     # mapping
     jobs_map
 ]

lgt_jobs/jobs/chat_history.py

@@ -100,8 +100,9 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         if not messages:
             return None
 
-        messages = [SlackMessageConvertService.from_slack_response(bot.user_name, m, contact.sender_id,
-                                                                   bot.id, user.id) for m in messages]
+        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 = self._get_new_messages(contact, bot, messages)
         chat_history = [message.to_dic() for message in new_messages]
         self.chat_repo.upsert_messages(chat_history)

lgt_jobs/jobs/send_slack_message.py

@@ -54,7 +54,9 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
         message = resp.get('message') if 'message' in resp \
             else slack_client.conversation_replies(channel_id, resp['file_msg_ts'])['messages'][0]
 
-        message_model: ChatMessage = SlackMessageConvertService.from_slack_response(bot.user_name, message,
-                                                                                    data.sender_id, bot.id, user.id)
+        message_model: ChatMessage = SlackMessageConvertService.from_slack_response(user.email, "slack_files",
+                                                                                    bot.token, message, data.sender_id,
+                                                                                    bot.id, user.id,
+                                                                                    slack_client.client.cookies)
         message_model.viewed = True
         ChatRepository().upsert_messages([message_model.to_dic()])

lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -54,13 +54,14 @@ class SlackClient:
 
     def users_list(self, cursor=None, limit: int = 1000):
         url = f'{self.base_url}{SlackMethods.users_list}'
+        payload = {}
         if cursor:
-            url += f'&cursor={cursor}'
+            payload['cursor'] = cursor
 
         if limit:
-            url += f'&limit={limit}'
+            payload['limit'] = limit
 
-        return requests.get(url=url, cookies=self.cookies, headers=self.headers).json()
+        return requests.get(url=url, cookies=self.cookies, headers=self.headers, params=payload).json()
 
     def upload_file(self, file, file_name):
         payload = {"content": file, "filename": file_name}

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -1,13 +1,28 @@
+import requests
 from google.cloud import storage
 from datetime import datetime, timedelta
-from lgt_jobs.lgt_data.model import ChatMessage, LeadGuruFile
-from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
-from lgt_jobs.lgt_data.mongo_repository import to_object_id
+from lgt_jobs.lgt_data.model import ChatMessage
+from .slack_client import SlackClient
+from ...lgt_data.mongo_repository import to_object_id
+
+
+def get_file_url(blob_path):
+    storage_client = storage.Client()
+    bucket = storage_client.get_bucket(SlackFilesClient.bucket_name)
+    blob = bucket.get_blob(blob_path)
+    if not blob:
+        return None
+    # valid for 3 days
+    return blob.generate_signed_url(timedelta(3))
 
 
 class SlackMessageConvertService:
     @staticmethod
-    def from_slack_response(bot_name, dic, sender_id, bot_id, user_id) -> ChatMessage:
+    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, user_id, cookies=None):
+
+        """
+        :rtype: SlackHistoryMessageModel
+        """
         result = ChatMessage()
         result.sender_id = sender_id
         result.bot_id = bot_id
@@ -17,15 +32,24 @@ class SlackMessageConvertService:
         result.attachments = dic.get('attachments', [])
         result.files = []
         result.user_id = to_object_id(user_id)
+
         if 'files' in dic:
             for file in dic.get('files'):
-                if file.get('mode') != "tombstone" and file.get('url_private_download'):
-                    leadguru_file = LeadGuruFile()
-                    leadguru_file.id = file['id']
-                    leadguru_file.content_type = file['mimetype']
-                    leadguru_file.file_name = file['name']
-                    leadguru_file.blob_path = f'slack_files/{bot_name}/slack_files/{file["id"]}'
-                    result.files.append(leadguru_file)
+                if file.get('mode', '') == "tombstone" or not file.get('url_private_download'):
+                    continue
+                new_file = ChatMessage.SlackFileModel()
+                new_file.id = file.get('id')
+                new_file.name = file.get('name')
+                new_file.title = file.get('title')
+                new_file.filetype = file.get('filetype')
+                new_file.size = file.get('size')
+                new_file.mimetype = file.get('mimetype')
+
+                url_private_download = file.get('url_private_download')
+                new_file.download_url = SlackFilesClient.get_file_url(user_email, bot_name, bot_token,
+                                                                      new_file.id, url_private_download,
+                                                                      new_file.mimetype, cookies)
+                result.files.append(new_file)
 
         js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])
         result.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
@@ -35,12 +59,23 @@ class SlackMessageConvertService:
 class SlackFilesClient:
     bucket_name = 'lgt_service_file'
 
-    def get_file_url(self, blob_path):
+    # Consider to cache these file somewhere in the super-fast cache solution
+    @staticmethod
+    def get_file_url(user_email, bot_name, bot_token, file_id, url_private_download, mimetype, cookies=None):
         storage_client = storage.Client()
-        bucket = storage_client.get_bucket(self.bucket_name)
+        bucket = storage_client.get_bucket(SlackFilesClient.bucket_name)
+        blob_path = f'slack_files/{user_email}/{bot_name}/{file_id}'
         blob = bucket.get_blob(blob_path)
+
         if not blob:
-            return None
+            res = requests.get(url_private_download, headers={'Authorization': f'Bearer {bot_token}'}, cookies=cookies)
+            if res.status_code != 200:
+                raise Exception(
+                    f'Failed to download file: {url_private_download} from slack due to response: '
+                    f'Code: {res.status_code} Error: {res.content}')
+            blob = bucket.blob(blob_path)
+            blob.upload_from_string(res.content, content_type=mimetype)
+
         # valid for 3 days
         return blob.generate_signed_url(timedelta(3))
 
@@ -103,10 +138,10 @@ class SlackWebClient:
     def confirm_email(self, email: str, user_agent: str, locale: str = 'en-US') -> bool:
         return self.client.confirm_email(email, user_agent, locale)
 
-    def confirm_code(self, email: str, code: str, user_agent: str):
+    def confirm_code(self, email: str, code: str, user_agent: str, ) -> requests.Response:
         return self.client.confirm_code(email, code, user_agent)
 
-    def find_workspaces(self, user_agent: str):
+    def find_workspaces(self, user_agent: str, ) -> requests.Response:
         return self.client.find_workspaces(user_agent)
 
     def conversation_replies(self, channel: str, id: str) -> dict:

lgt_jobs/lgt_data/model.py

@@ -322,10 +322,6 @@ class UserModel(BaseModel):
     def is_admin(self):
         return UserRole.ADMIN in self.roles
 
-    @property
-    def subscription_expired(self):
-        return self.subscription_expired_at.replace(tzinfo=UTC) < datetime.now(UTC)
-
     def get_slack_user(self, slack_email: str):
         return next(filter(lambda x: slack_email == x.email, self.slack_users), None)
 
@@ -583,7 +579,9 @@ class ChatMessage:
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)
-        result['files'] = [x.to_dic() for x in result.get('files', [])]
+        if self.files and 'files' in result:
+            result['files'] = [x.to_dic() if isinstance(x, ChatMessage.SlackFileModel) else x for x in self.files]
+
         return result
 
     @classmethod
@@ -871,8 +869,7 @@ class ExtendedSlackMemberInformation(SlackMemberInformation):
         if not hasattr(contact, "display_name"):
             contact.display_name = contact.name
 
-        lead.linkedin_urls = [
-            f"https://www.linkedin.com/search/results/all/?keywords={contact.real_name}&origin=GLOBAL_SEARCH_HEADER&sid=u%40F"]
+        lead.linkedin_urls = [f"https://www.linkedin.com/search/results/all/?keywords={contact.real_name}&origin=GLOBAL_SEARCH_HEADER&sid=u%40F"]
         lead.message = MessageModel()
         lead.message.message = contact.real_name
         if contact.title:
@@ -974,19 +971,3 @@ class Subscription(BaseModel):
         model: Subscription | None = super().from_dic(dic)
         model.features = [Feature.from_dic(feature) for feature in dic.get('features', [])]
         return model
-
-
-class LeadGuruFile(DictionaryModel):
-    id: str = None
-    blob_path: str
-    content_type: str
-    file_name: str = None
-
-
-class ScheduledMessage(BaseModel):
-    post_at: datetime
-    bot_id: ObjectId
-    user_id: ObjectId
-    sender_id: str
-    text: str | None
-    files: list

lgt_jobs/lgt_data/mongo_repository.py

@@ -9,8 +9,7 @@ from lgt_jobs.lgt_data.enums import SourceType
 from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetPasswordModel, BoardModel, BoardedStatus,
                                      DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
                                      ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
-                                     GroupedMessagesModel, UserVerificationModel, UsersPage, Subscription,
-                                     ScheduledMessage)
+                                     GroupedMessagesModel, UserVerificationModel, UsersPage, Subscription)
 from datetime import datetime, UTC, timedelta
 from collections import OrderedDict
 
@@ -1208,15 +1207,3 @@ class SubscriptionsRepository(BaseMongoRepository):
             pipeline['expired'] = expired
 
         return Subscription.from_dic(self.collection().find_one(pipeline))
-
-
-class ScheduledMessagesRepository(BaseMongoRepository):
-    pass
-
-    collection_name = 'scheduled_messages'
-
-    def find_all(self, only_actual: bool = True):
-        pipeline = {}
-        if only_actual:
-            pipeline['post_at'] = {'$lte': datetime.now(UTC)}
-        return [ScheduledMessage.from_dic(doc) for doc in self.collection().find(pipeline)]

lgt_jobs/jobs/connect_sources.py

@@ -1,82 +0,0 @@
-from abc import ABC
-from typing import List
-import logging as log
-from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
-from lgt_jobs.jobs.bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
-from lgt_jobs.runner import BackgroundJobRunner
-from lgt_jobs.lgt_data.engine import UserTrackAction
-from lgt_jobs.lgt_data.enums import SourceType, UserAction, StatusConnection
-from lgt_jobs.lgt_data.model import BaseModel, DedicatedBotModel, Server, Source, SlackUser
-from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserMongoRepository
-
-
-class ConnectSourceJobData(BaseBackgroundJobData, BaseModel):
-    slack_email: str
-    sources_ids: List[str]
-    action_user_email: str
-    user_email: str
-
-
-class ConnectSourceJob(BaseBackgroundJob, ABC):
-    @property
-    def job_data_type(self) -> type:
-        return ConnectSourceJobData
-
-    def exec(self, data: ConnectSourceJobData):
-        users_repository = UserMongoRepository()
-        bots_repository = DedicatedBotRepository()
-        action_user = users_repository.get_by_email(data.action_user_email)
-        user = users_repository.get_by_email(data.user_email)
-        if not action_user:
-            log.info(f'Unable to find user with email: {data.action_user_email}')
-            return
-
-        slack_user: SlackUser = action_user.get_slack_user(data.slack_email)
-        if not slack_user:
-            log.info(f"You have no credentials for {data.slack_email}. Try to login to Slack.")
-        bots = []
-        for ws in slack_user.workspaces:
-            if ws.id in data.sources_ids:
-                active_bot = bots_repository.get_one(user_id=action_user.id, active_server_id=ws.id)
-                bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, include_deleted=True,
-                                              user_name=data.slack_email)
-                if active_bot:
-                    continue
-                if not bot:
-                    bot = DedicatedBotModel()
-                    bot.servers = [Server()]
-
-                bot.user_name = slack_user.email
-                bot.slack_url = ws.url
-                bot.user_id = action_user.id
-                bot.created_by = user.email
-                bot.registration_link = ws.url
-                bot.token = ws.token
-                bot.cookies = slack_user.cookies
-                bot.deleted = False
-                bot.paused = False
-                bot.invalid_creds = False
-                bot.banned = False
-                bot.two_factor_required = ws.two_factor_required
-                source = Source()
-
-                for server in bot.servers:
-                    server.id = ws.id
-                    server.name = ws.domain
-                    server.deleted = False
-                    server.active = True
-                    server.icon = ws.icon
-
-                source.source_id = ws.id
-                source.source_name = ws.domain
-                bot.type = source.source_type = SourceType.SLACK
-                bot.icon = ws.icon
-                bot.source = source
-                bots_repository.add_or_update(bot)
-                UserTrackAction.track(action_user.id, UserAction.START_SOURCE, ws.id)
-                bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, user_name=slack_user.email)
-                bots.append(bot)
-                BackgroundJobRunner.submit(BotStatsUpdateJob, BotStatsUpdateJobData(bot_id=str(bot.id)))
-        slack_user.status = StatusConnection.COMPLETE
-        users_repository.set(action_user.id, slack_users=[user.to_dic() for user in action_user.slack_users])
-        return bots