leadguru-jobs 0.408.0__py3-none-any.whl → 0.409.0__py3-none-any.whl

{leadguru_jobs-0.408.0.dist-info → leadguru_jobs-0.409.0.dist-info}/METADATA

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

{leadguru_jobs-0.408.0.dist-info → leadguru_jobs-0.409.0.dist-info}/RECORD

@@ -8,8 +8,8 @@ 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=X9DN85r2slqYjKUTvkUdZoABS2Y_xfzQvKXnjHKezRo,6956
-lgt_jobs/jobs/chat_history.py,sha256=QkB49zyGad1WMA-CKmdWgN6T8upRfDfyAAFmEyrtXqs,5338
+lgt_jobs/jobs/bot_stats_update.py,sha256=YlsD217E1L6mEkn0ggMKJk0Q0w9wHWlBFzWWFYED-Ws,7023
+lgt_jobs/jobs/chat_history.py,sha256=WIpgxQZ2YA1sEwLmJBg0pMZRGOMQBavsA6jXRKOe74g,5329
 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
@@ -32,18 +32,18 @@ lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=7HAg_P2sZ6DDJkDyxzc4yI-i38bDS
 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_common/slack_client/web_client.py,sha256=ZGvfBqaqEkHzVD97NzIjlH1Rx7FP8MSSPVtbcCfBr0g,6149
 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=ptCtitTyOXv02twNwl3NvnMglfmobV3xWIXlIh8v-jc,36883
+lgt_jobs/lgt_data/model.py,sha256=Yc9yuy7AmiajppiMC010wg5zcAxtP90nfL-k70_QJHM,27948
+lgt_jobs/lgt_data/mongo_repository.py,sha256=wI8rprjrKR4zV95I2hgeA-Us8NkvnIox4XsGGqYG0T4,37064
 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.408.0.dist-info/METADATA,sha256=dXDaGjhg05s85iG7ADhohfCXFABbO5vzJaLXXqTave0,1296
-leadguru_jobs-0.408.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-leadguru_jobs-0.408.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.408.0.dist-info/RECORD,,
+leadguru_jobs-0.409.0.dist-info/METADATA,sha256=aciV_dzTDxELx_9x0P-oq3Z46LWQMnOU4TUj28ry3jQ,1296
+leadguru_jobs-0.409.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+leadguru_jobs-0.409.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.409.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -56,7 +56,8 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                     discord_server.deleted = server.deleted
                 else:
                     discord_server.deleted = True
-                discord_channels = [Channel.from_dic(channel) for channel in client.get_channels(discord_server.id)]
+                discord_channels = [Channel.from_dic(channel) for channel in client.get_channels(discord_server.id)
+                                    if channel.get('type', 0) == 0]
                 for discord_channel in discord_channels:
                     if server:
                         channel = next(filter(lambda x: x.id == discord_channel.id, server.channels), None)

lgt_jobs/jobs/chat_history.py

@@ -93,7 +93,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
 
             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]
+                                                                       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)

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -3,7 +3,6 @@ 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):
@@ -18,7 +17,7 @@ def get_file_url(blob_path):
 
 class SlackMessageConvertService:
     @staticmethod
-    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, user_id, cookies=None):
+    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, cookies=None):
 
         """
         :rtype: SlackHistoryMessageModel
@@ -31,7 +30,6 @@ class SlackMessageConvertService:
         result.ts = dic.get('ts', '')
         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'):

lgt_jobs/lgt_data/model.py

@@ -571,7 +571,6 @@ class SlackReplyModel(BaseModel):
 
 class ChatMessage:
     bot_id: ObjectId
-    user_id: ObjectId
     sender_id: str
     text: str
     user: str

lgt_jobs/lgt_data/mongo_repository.py

@@ -806,6 +806,7 @@ class DedicatedBotRepository(BaseMongoRepository):
         user_id = kwargs.get('user_id')
         source_id = kwargs.get('source_id')
         server_id = kwargs.get('server_id')
+        active_server_id = kwargs.get('active_server_id')
 
         if bot_id:
             pipeline["_id"] = to_object_id(bot_id)
@@ -828,6 +829,9 @@ class DedicatedBotRepository(BaseMongoRepository):
         if server_id:
             pipeline["servers"] = {'$elemMatch': {'id': server_id, 'active': True}}
 
+        if active_server_id:
+            pipeline["servers"] = {'$elemMatch': {'id': active_server_id, 'deleted': False}}
+
         if only_valid:
             pipeline['invalid_creds'] = False