leadguru-jobs 0.164.0__py3-none-any.whl → 0.165.0__py3-none-any.whl

{leadguru_jobs-0.164.0.dist-info → leadguru_jobs-0.165.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru-jobs
-Version: 0.164.0
+Version: 0.165.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,6 +20,6 @@ Classifier: Topic :: Internet
 Requires-Dist: loguru
 Requires-Dist: pydantic
 Requires-Dist: cachetools (>=3.1.0)
-Requires-Dist: leadguru-common (>=0.264.0)
-Requires-Dist: leadguru-data (>=0.271.0)
+Requires-Dist: leadguru-common (>=0.266.0)
+Requires-Dist: leadguru-data (>=0.273.0)
 

{leadguru_jobs-0.164.0.dist-info → leadguru_jobs-0.165.0.dist-info}/RECORD

@@ -9,12 +9,12 @@ lgt_jobs/smtp.py,sha256=MZCz3OOOSrDEbdC2rg7LtC3K-EnveB6T2zHA5PEv34Q,1390
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=MXqdXvpfOr4MwrLDtHpFiaacYTmlSPzUs7XoW25ke50,1301
 lgt_jobs/jobs/archive_leads.py,sha256=deMjQXGJj5aiJUIHgIurYNsnL3IF1moEtjWWsX3bHrY,852
-lgt_jobs/jobs/bot_stats_update.py,sha256=bTXmEMRDsL9VN8e5GMTHr-APQPvfNdQsXFOg6RyvaYo,2557
+lgt_jobs/jobs/bot_stats_update.py,sha256=btMfZif8WkRZHsfvKs6pKt2OdZjHDQ4wBozJtBaInQQ,2711
 lgt_jobs/jobs/chat_history.py,sha256=hs0Q34gGn16xTgt3FnbwHVXnLoUl4zd0Nuhw3uqqlU4,5757
 lgt_jobs/jobs/clear_user_analytics.py,sha256=p4kYsemwPkuzt_QTwmq_BAfb0Zz2siZV7hhPUsjE1HY,2624
 lgt_jobs/jobs/connected_workspaces.py,sha256=phhwPtjS8sbbH03aDuQJmfX8EUTFiMrLpf9YopSvYm0,7861
-lgt_jobs/jobs/conversation_replied.py,sha256=-y6wjUBACO5qpGoUte8o0yodscdPEuAFqz9JHREVOXc,2543
-lgt_jobs/jobs/reactions_added.py,sha256=O5oknIvJ2bF21_PrCoAnIY5sg_1VlhvU0gTEyg-fcp8,2116
+lgt_jobs/jobs/conversation_replied.py,sha256=wPjAnFlHkCUqsmBn5dX533POvAdovvccUMvviUMvR6w,3082
+lgt_jobs/jobs/reactions_added.py,sha256=puiwJGf1aKyOLPkZwKSppe-_NC4xvIEI77kjugkFcOU,2647
 lgt_jobs/jobs/reindex_conversation_history.py,sha256=HzX5isUrjizTbPFab69sUTUqIpqKj-tDSLg9Olr-Z5Y,1087
 lgt_jobs/jobs/restart_bots.py,sha256=-PMm8rWasZHQE-b4vSUAEwl4u0sxc-qVIVMavsT9PCw,2099
 lgt_jobs/jobs/restart_dedicated_bots.py,sha256=7j-oVhmL4ViTtCNlaRz6QTr2zaAuauCfQIpCSnfsvzQ,2031
@@ -25,7 +25,7 @@ lgt_jobs/jobs/user_feed_update.py,sha256=AQ-x6hkkCuPau8oh2FTVpFksglCH3WEH3CCJPMY
 lgt_jobs/jobs/user_limits_update.py,sha256=lbdqbFulQTB9_oXJfT9QbTRvRn3lTVP-a-p9YI-P2VQ,3405
 lgt_jobs/templates/bots_service_template.yaml,sha256=FLONZYCMtR-3Oytjxbf7kd5XMerhehuPln9qstFrxEw,417
 lgt_jobs/templates/new_message_mail_template.html,sha256=gn913h6LSm5kEiqRNrKCtUtVj9WXVU5BrbYGe8vA8fY,3704
-leadguru_jobs-0.164.0.dist-info/METADATA,sha256=KBPq0Rn3pk84t8_q_Y0HkZn-21CBxGfiFFCYC8uTVrw,1008
-leadguru_jobs-0.164.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-leadguru_jobs-0.164.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.164.0.dist-info/RECORD,,
+leadguru_jobs-0.165.0.dist-info/METADATA,sha256=YSbLSOjfZlPVlQI7dek4eafq2MH2_EMAMiouDxKyEU4,1008
+leadguru_jobs-0.165.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+leadguru_jobs-0.165.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.165.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -46,13 +46,17 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
 
         connected_channels = 0
         channels_users = {}
+        active_channels = {}
         users_count = 0
         for channel in channels:
-            connected_channels += 1 if channel['is_member'] else 0
+            if channel['is_member']:
+                active_channels[channel['id']] = channel['name']
+                connected_channels += 1
             num_members = channel.get('num_members', 0)
             channels_users[channel['id']] = num_members
             users_count += num_members
 
+        bot.active_channels = active_channels
         bot.messages_received = received_messages.get(bot.name, 0)
         bot.messages_filtered = filtered_messages.get(bot.name, 0)
         bot.connected_channels = connected_channels

lgt_jobs/jobs/conversation_replied.py

@@ -1,11 +1,12 @@
 from abc import ABC
+from typing import Optional
 
 from lgt.common.python.lgt_logging import log
 from lgt.common.python.slack_client.slack_client import SlackClient
 from lgt.common.python.slack_client.web_client import get_system_slack_credentials, SlackWebClient
 from pydantic import BaseModel
 from lgt_data.mongo_repository import LeadMongoRepository, BotMongoRepository, \
-    UserLeadMongoRepository
+    UserLeadMongoRepository, GarbageLeadsMongoRepository, SpamLeadsMongoRepository
 from lgt_data.model import SlackReplyModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -15,7 +16,8 @@ Update messages conversations
 
 
 class ConversationRepliedJobData(BaseBackgroundJobData, BaseModel):
-    message_id: str
+    channel_id: Optional[str]
+    message_id: Optional[str]
     ts: str
 
 
@@ -26,7 +28,7 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
 
     def exec(self, data: ConversationRepliedJobData):
         bots = BotMongoRepository().get()
-        lead = LeadMongoRepository().get_by_message_id(data.message_id)
+        lead = LeadMongoRepository().get(timestamp=data.ts, message_id=data.message_id, channel_id=data.channel_id)
         if not lead:
             return
 
@@ -61,5 +63,12 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
         set_dict = {
             "replies": replies,
         }
-        LeadMongoRepository().collection().update_many({"message_id": data.message_id}, {"$set": set_dict})
-        UserLeadMongoRepository().collection().update_many({"message_id": data.message_id}, {"$set": set_dict})
+        pipeline = {"message.timestamp": data.ts}
+        if data.message_id:
+            pipeline['message.message_id'] = data.message_id
+        if data.channel_id:
+            pipeline['message.channel_id'] = data.channel_id
+        LeadMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
+        UserLeadMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
+        GarbageLeadsMongoRepository().collection().update_many(pipeline, {"$set": set_dict})
+        SpamLeadsMongoRepository().collection().update_many(pipeline, {"$set": set_dict})

lgt_jobs/jobs/reactions_added.py

@@ -1,11 +1,11 @@
 from abc import ABC
+from typing import Optional
 
 from lgt.common.python.lgt_logging import log
 from lgt.common.python.slack_client.web_client import SlackWebClient, get_system_slack_credentials
 from lgt_data.mongo_repository import LeadMongoRepository, BotMongoRepository, \
-    UserLeadMongoRepository
+    UserLeadMongoRepository, GarbageLeadsMongoRepository, SpamLeadsMongoRepository
 from pydantic import BaseModel
-
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """
@@ -14,7 +14,8 @@ Update messages reactions
 
 
 class ReactionAddedJobData(BaseBackgroundJobData, BaseModel):
-    message_id: str
+    channel_id: Optional[str]
+    message_id: Optional[str]
     ts: str
 
 
@@ -27,7 +28,7 @@ class ReactionAddedJob(BaseBackgroundJob, ABC):
         bots = BotMongoRepository().get()
         like_name = '+1'
 
-        lead = LeadMongoRepository().get_by_message_id(data.message_id)
+        lead = LeadMongoRepository().get(timestamp=data.ts, message_id=data.message_id, channel_id=data.channel_id)
         if not lead:
             return
 
@@ -60,5 +61,12 @@ class ReactionAddedJob(BaseBackgroundJob, ABC):
             "likes": lead.likes,
             "reactions": lead.reactions
         }
-        LeadMongoRepository().collection().update_many({"message_id": data.message_id}, {"$set": _set})
-        UserLeadMongoRepository().collection().update_many({"message_id": data.message_id}, {"$set": _set})
+        pipeline = {"message.timestamp": data.ts}
+        if data.message_id:
+            pipeline['message.message_id'] = data.message_id
+        if data.channel_id:
+            pipeline['message.channel_id'] = data.channel_id
+        LeadMongoRepository().collection().update_many(pipeline, {"$set": _set})
+        UserLeadMongoRepository().collection().update_many(pipeline, {"$set": _set})
+        GarbageLeadsMongoRepository().collection().update_many(pipeline, {"$set": _set})
+        SpamLeadsMongoRepository().collection().update_many(pipeline, {"$set": _set})