leadguru-jobs 0.588.0__py3-none-any.whl → 0.590.0__py3-none-any.whl

{leadguru_jobs-0.588.0.dist-info → leadguru_jobs-0.590.0.dist-info}/METADATA

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

{leadguru_jobs-0.588.0.dist-info → leadguru_jobs-0.590.0.dist-info}/RECORD

@@ -13,13 +13,13 @@ 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=yDA6-FqSC5T2jTPaHImSjnuI6OD0pw-BF9VagsfmkXM,7806
-lgt_jobs/jobs/chat_history.py,sha256=tZ4XyOGdy1k6r4uotxSSKbXjTR_oRK6Ym0YthFYBtl8,6200
+lgt_jobs/jobs/chat_history.py,sha256=KiwiPl8FuI7FphfZT5VgKSTiO_W9j7tNyiSbnSe5GAs,6106
 lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
 lgt_jobs/jobs/inbox_leads.py,sha256=OSX-FNx27gWEKNBBc-hyq2odCxXytz7WHtQJajtz274,5670
 lgt_jobs/jobs/load_slack_people.py,sha256=az3Pl8_0nUXizShpCksH6XMHFALLkta4QpMr_MkM9Io,3199
 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=_fuzqgspl7KRO6h4IRJya6sMT5JTqq_czodKB87GYqM,2451
 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=LSZkkuPuHTqxvaTgqz_Y_kGIkF3Mmn_xwKf2h0uDWVg,7115
@@ -36,19 +36,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=icHapSOszFYnSofJ-eWl4lUWSOqng6S9XSRFfMx87Rg,13836
-lgt_jobs/lgt_common/slack_client/web_client.py,sha256=JrkEepL6EhEtX3Psv_sd25bcRB2P23LoGnFHcczQpnc,4778
+lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=XUwXQfjDC1etFjKlcmP2d5tUWbNzxjklBLHRobY3gsw,13820
+lgt_jobs/lgt_common/slack_client/web_client.py,sha256=6ybC5v-oK-Kuat8qM2fskS6nCnA9cJ5U0yIKhp_Y4kM,4939
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/analytics.py,sha256=fiN88zcIxs_bRMmXL7ftp4FvBeJ5I7QBPE4tbwKJ39E,21689
 lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7728
 lgt_jobs/lgt_data/enums.py,sha256=jBH5WGBtDAvFrh4iiPIzlQ-XrImMpuwqstuasG55mJ0,2209
 lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
-lgt_jobs/lgt_data/model.py,sha256=G_x0C7mR__OtM_ps2X5_Rg7iK1ijh4iCYbavsLxdaqA,28652
+lgt_jobs/lgt_data/model.py,sha256=I8_7GS1IXRML0SLT9e_PxY7To-4haVVg40YYdr_TGoM,28678
 lgt_jobs/lgt_data/mongo_repository.py,sha256=kLE906lfqhHF9gp1qvH_3XKCZGCZnxjLMrBLWBy7doo,46099
 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=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.588.0.dist-info/METADATA,sha256=mNpBVVDSgA8qFCeXo11tSbhkFiTBuo9JltOZIk7Efa8,1319
-leadguru_jobs-0.588.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.588.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.588.0.dist-info/RECORD,,
+leadguru_jobs-0.590.0.dist-info/METADATA,sha256=XNIlY8XNPIlcXWBbqhIyMdX0pfPzxVO7F7XUTgKMRBE,1319
+leadguru_jobs-0.590.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.590.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.590.0.dist-info/RECORD,,

lgt_jobs/jobs/chat_history.py

@@ -100,8 +100,7 @@ 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(bot, m, contact.sender_id) 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,6 @@ 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(bot, message, data.sender_id)
         message_model.viewed = True
         ChatRepository().upsert_messages([message_model.to_dic()])

lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -179,12 +179,13 @@ class SlackClient:
         url = f'{self.base_url}{SlackMethods.conversations_replies}?{self.__ts_payload(channel, id)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
-    def post_message(self, channel: str, text: str):
+    def post_message(self, channel: str, text: str, thread_ts: str = None):
         import uuid
         payload = {
             'channel': channel,
             'text': text,
-            'client_msg_id': str(uuid.uuid4())
+            'client_msg_id': str(uuid.uuid4()),
+            'thread_ts': thread_ts
         }
         url = f'{self.base_url}{SlackMethods.chat_post_message}'
         return requests.post(url=url, cookies=self.cookies, headers=self.headers, data=payload).json()
@@ -201,17 +202,13 @@ class SlackClient:
         payload = {'email': email}
         headers = {'User-Agent': user_agent}
         response = requests.post(f"{self.base_url}/{SlackMethods.check_email}", params=payload, headers=headers)
-        if response.status_code != 200:
-            return False
-        return response.json()['ok']
+        return response.json()['ok'] if response.status_code == 200 else False
 
     def confirm_email(self, email: str, user_agent: str, locale: str = 'en-US') -> bool:
         payload = {'email': email, 'locale': locale}
         headers = {'User-Agent': user_agent}
         response = requests.post(f"{self.base_url}/{SlackMethods.confirm_email}", params=payload, headers=headers)
-        if response.status_code != 200:
-            return False
-        return response.json()['ok']
+        return response.json()['ok'] if response.status_code == 200 else False
 
     def confirm_code(self, email: str, code: str, user_agent: str) -> requests.Response:
         payload = {'email': email, 'code': code}
@@ -249,8 +246,7 @@ class SlackClient:
 
     def test_auth(self):
         headers = {"Authorization": f"Bearer {self.token}"}
-        return requests.post(f"{self.base_url}/{SlackMethods.auth_test}", headers=headers,
-                             cookies=self.cookies)
+        return requests.post(f"{self.base_url}/{SlackMethods.auth_test}", headers=headers, cookies=self.cookies)
 
     def __user_info_payload(self, user):
         payload = {

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -1,30 +1,31 @@
 from google.cloud import storage
 from datetime import datetime, timedelta
-from lgt_jobs.lgt_data.model import ChatMessage, LeadGuruFile
+from lgt_jobs.lgt_data.model import ChatMessage, LeadGuruFile, DedicatedBotModel
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
 from lgt_jobs.lgt_data.mongo_repository import to_object_id
 
 
 class SlackMessageConvertService:
     @staticmethod
-    def from_slack_response(bot_name, dic, sender_id, bot_id, user_id) -> ChatMessage:
+    def from_slack_response(bot: DedicatedBotModel, message_data: dict, sender_id: str) -> ChatMessage:
         result = ChatMessage()
         result.sender_id = sender_id
-        result.bot_id = bot_id
-        result.text = dic.get('text', '')
-        result.user = dic.get('user', '')
-        result.id = dic.get('ts', '')
-        result.attachments = dic.get('attachments', [])
+        result.bot_id = to_object_id(bot.id)
+        result.text = message_data.get('text', '')
+        result.user = message_data.get('user', '')
+        result.id = message_data.get('ts', '')
+        result.attachments = message_data.get('attachments', [])
         result.files = []
-        result.user_id = to_object_id(user_id)
-        if 'files' in dic:
-            for file in dic.get('files'):
+        result.user_id = to_object_id(bot.user_id)
+        result.source_id = bot.source.source_id
+        if 'files' in message_data:
+            for file in message_data.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"]}'
+                    leadguru_file.blob_path = f'slack_files/{bot.user_name}/slack_files/{file["id"]}'
                     result.files.append(leadguru_file)
 
         js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])

lgt_jobs/lgt_data/model.py

@@ -561,6 +561,7 @@ class ChatMessage:
     files: list
     attachments: list[dict] | None
     created_at: datetime | None
+    source_id: str | None
 
     class SlackFileModel:
         def __init__(self):