leadguru-jobs 0.588.0__tar.gz → 0.590.0__tar.gz

{leadguru_jobs-0.588.0 → leadguru_jobs-0.590.0}/PKG-INFO

@@ -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 → leadguru_jobs-0.590.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -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 → leadguru_jobs-0.590.0}/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)

{leadguru_jobs-0.588.0 → leadguru_jobs-0.590.0}/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()])

{leadguru_jobs-0.588.0 → leadguru_jobs-0.590.0}/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 = {

{leadguru_jobs-0.588.0 → leadguru_jobs-0.590.0}/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:])

{leadguru_jobs-0.588.0 → leadguru_jobs-0.590.0}/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):