leadguru-jobs 0.554.0__py3-none-any.whl → 0.555.0__py3-none-any.whl

{leadguru_jobs-0.554.0.dist-info → leadguru_jobs-0.555.0.dist-info}/METADATA

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

{leadguru_jobs-0.554.0.dist-info → leadguru_jobs-0.555.0.dist-info}/RECORD

@@ -13,12 +13,12 @@ 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=QZdSWlk_DrDJt5yrNApYHiUEWQMYcKyuXaP_PlzkjYw,6303
+lgt_jobs/jobs/chat_history.py,sha256=tZ4XyOGdy1k6r4uotxSSKbXjTR_oRK6Ym0YthFYBtl8,6200
 lgt_jobs/jobs/connect_sources.py,sha256=2tl1MGdm6l0yFwCXlD0J2tFSQpj7i1eT9sYd1nMOwWA,3596
 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=WdXXh7QpjJKSvDU93YT9QKzoGRNBpPCJgiIxPs5gp1s,2782
+lgt_jobs/jobs/send_slack_message.py,sha256=IuRqDGcDrz2EAZzF6nrLXO0aSA4mETB_tGOEbcMhjHE,2562
 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
@@ -36,18 +36,18 @@ lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=rfUDooYuhBQ2pE9FdDxZOpXjbrvlp
 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=hiexBYtCnwz0oZvU6GnlQkD3aDqt9v5CvfPWMbz3Z50,6311
+lgt_jobs/lgt_common/slack_client/web_client.py,sha256=JrkEepL6EhEtX3Psv_sd25bcRB2P23LoGnFHcczQpnc,4778
 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=HZenmwr_fmxVw0XhUlgHZJOaSK_Ouv9mBcY6DfC61oU,28098
+lgt_jobs/lgt_data/model.py,sha256=KLfryiir_OfvACBFaJtbCssc5B5Xxw7XGlrnsypX1hA,28148
 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.554.0.dist-info/METADATA,sha256=Rney8pzxyO6HwI3AvxAeekzMpaaXotwznfx8IgZ3fmM,1319
-leadguru_jobs-0.554.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.554.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.554.0.dist-info/RECORD,,
+leadguru_jobs-0.555.0.dist-info/METADATA,sha256=uiUeMuopoV1T2SIcBVBCwuWZQgS4K3S8wnztsysxJ1k,1319
+leadguru_jobs-0.555.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.555.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.555.0.dist-info/RECORD,,

lgt_jobs/jobs/chat_history.py

@@ -100,9 +100,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         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]
+        messages = [SlackMessageConvertService.from_slack_response(bot.user_name, m, contact.sender_id,
+                                                                   bot.id, user.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,9 +54,7 @@ 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(user.email, "slack_files",
-                                                                                    bot.token, message, data.sender_id,
-                                                                                    bot.id, user.id,
-                                                                                    slack_client.client.cookies)
+        message_model: ChatMessage = SlackMessageConvertService.from_slack_response(bot.user_name, message,
+                                                                                    data.sender_id, bot.id, user.id)
         message_model.viewed = True
         ChatRepository().upsert_messages([message_model.to_dic()])

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -1,28 +1,13 @@
-import requests
 from google.cloud import storage
 from datetime import datetime, timedelta
-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))
+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
 
 
 class SlackMessageConvertService:
     @staticmethod
-    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, user_id, cookies=None):
-
-        """
-        :rtype: SlackHistoryMessageModel
-        """
+    def from_slack_response(bot_name, dic, sender_id, bot_id, user_id) -> ChatMessage:
         result = ChatMessage()
         result.sender_id = sender_id
         result.bot_id = bot_id
@@ -32,24 +17,15 @@ 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" 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)
+                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)
 
         js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])
         result.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
@@ -59,23 +35,12 @@ class SlackMessageConvertService:
 class SlackFilesClient:
     bucket_name = 'lgt_service_file'
 
-    # 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):
+    def get_file_url(self, blob_path):
         storage_client = storage.Client()
-        bucket = storage_client.get_bucket(SlackFilesClient.bucket_name)
-        blob_path = f'slack_files/{user_email}/{bot_name}/{file_id}'
+        bucket = storage_client.get_bucket(self.bucket_name)
         blob = bucket.get_blob(blob_path)
-
         if not blob:
-            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)
-
+            return None
         # valid for 3 days
         return blob.generate_signed_url(timedelta(3))
 
@@ -138,10 +103,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, ) -> requests.Response:
+    def confirm_code(self, email: str, code: str, user_agent: str):
         return self.client.confirm_code(email, code, user_agent)
 
-    def find_workspaces(self, user_agent: str, ) -> requests.Response:
+    def find_workspaces(self, user_agent: str):
         return self.client.find_workspaces(user_agent)
 
     def conversation_replies(self, channel: str, id: str) -> dict:

lgt_jobs/lgt_data/model.py

@@ -290,8 +290,8 @@ class UserModel(BaseModel):
         self.subscription_expired_at: datetime | None = None
         self.balance: str | None = None
         self.subscription_name: str | None = None
-        self.trial_expiration_notified = False
-        self.trial_expiration_warning_notified = False
+        self.subscription_expiration_notified = False
+        self.subscription_expiration_warning_notified = False
 
     @classmethod
     def from_dic(cls, dic: dict):
@@ -579,9 +579,7 @@ class ChatMessage:
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)
-        if self.files and 'files' in result:
-            result['files'] = [x.to_dic() if isinstance(x, ChatMessage.SlackFileModel) else x for x in self.files]
-
+        result['files'] = [x.to_dic() for x in result.get('files', [])]
         return result
 
     @classmethod
@@ -971,3 +969,10 @@ 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