leadguru-jobs 0.163.0__tar.gz → 0.165.0__tar.gz

{leadguru_jobs-0.163.0 → leadguru_jobs-0.165.0}/PKG-INFO

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

{leadguru_jobs-0.163.0 → leadguru_jobs-0.165.0}/leadguru_jobs.egg-info/PKG-INFO

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

leadguru_jobs-0.165.0/leadguru_jobs.egg-info/requires.txt

@@ -0,0 +1,5 @@
+loguru
+pydantic
+cachetools>=3.1.0
+leadguru-common>=0.266.0
+leadguru-data>=0.273.0

{leadguru_jobs-0.163.0 → leadguru_jobs-0.165.0}/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

{leadguru_jobs-0.163.0 → leadguru_jobs-0.165.0}/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
 
@@ -54,12 +56,19 @@ class ConversationRepliedJob(BaseBackgroundJob, ABC):
                 reply.username = user_response.get("user").get("real_name")
             if not reply.attachments and lead.message.urls_in_message:
                 for attachment in lead.message.urls_in_message:
-                    reply.attachments.append = client.get_attachments(
-                        lead.message.channel_id, lead.message.message_id, attachment)
+                    reply.attachments.append(client.get_attachments(
+                        lead.message.channel_id, lead.message.message_id, attachment))
             replies.append(reply.to_dic())
 
         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})

{leadguru_jobs-0.163.0 → leadguru_jobs-0.165.0}/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})

leadguru_jobs-0.163.0/leadguru_jobs.egg-info/requires.txt

@@ -1,5 +0,0 @@
-loguru
-pydantic
-cachetools>=3.1.0
-leadguru-common>=0.263.0
-leadguru-data>=0.270.0