leadguru-jobs 0.582.0__tar.gz → 0.584.0__tar.gz

{leadguru_jobs-0.582.0 → leadguru_jobs-0.584.0}/PKG-INFO

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

{leadguru_jobs-0.582.0 → leadguru_jobs-0.584.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.582.0 → leadguru_jobs-0.584.0}/lgt_jobs/jobs/bot_stats_update.py

@@ -33,8 +33,6 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         users_rep = UserMongoRepository()
         bot = bots_rep.get_one(id=data.bot_id, include_deleted=True)
         received_messages, filtered_messages = get_bots_aggregated_analytics(bot_ids=[str(bot.id)])
-        bot.messages_received = sum([received_messages[doc] for doc in received_messages])
-        bot.messages_filtered = sum([filtered_messages[doc] for doc in filtered_messages])
 
         if bot.source.source_type == SourceType.DISCORD:
             client = DiscordClient(bot.token)
@@ -74,6 +72,8 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                 if discord_server.icon:
                     discord_server.icon = (f'https://cdn.discordapp.com/icons/{discord_server.id}/'
                                            f'{discord_server.icon}.png')
+                discord_server.messages_received = received_messages.get(discord_server.id)
+                discord_server.messages_filtered = filtered_messages.get(discord_server.id)
                 time.sleep(random.randint(1, 2))
 
             bot.servers = discord_servers
@@ -126,14 +126,12 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         connected_channels = 0
         channels_users = {}
         active_channels = {}
-        users_count = 0
         for channel in channels:
             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.connected_channels = connected_channels
@@ -141,6 +139,7 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         bot.channels_users = channels_users
         if bot.recent_messages is None:
             bot.recent_messages = []
+        max_users_count = 0
         if bot.servers:
             channels = [Channel.from_dic(channel_dict) for channel_dict in channels]
             for channel in channels:
@@ -150,8 +149,12 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                     channel.subscribers = channels_users.get(slack_channel.id, 0)
                 else:
                     channel.active = channel.is_member
+                if channel.subscribers > max_users_count:
+                    max_users_count = channel.subscribers
             bot.servers[0].channels = channels
-            bot.servers[0].subscribers = users_count
+            bot.servers[0].subscribers = max_users_count
+            bot.servers[0].messages_received = received_messages.get(bot.source.source_id, 0)
+            bot.servers[0].messages_filtered = filtered_messages.get(bot.source.source_id, 0)
 
         # save only last 50 messages
         bot.recent_messages = bot.recent_messages[-50:]

{leadguru_jobs-0.582.0 → leadguru_jobs-0.584.0}/lgt_jobs/lgt_common/discord_client/discord_client.py

@@ -29,7 +29,8 @@ class DiscordClient:
         return {}
 
     def get_servers(self) -> list | dict:
-        response = requests.get(f"{self.base_url}{DiscordMethods.USER_GUILDS.value}?with_counts=true", headers=self.headers)
+        response = requests.get(f"{self.base_url}{DiscordMethods.USER_GUILDS.value}?with_counts=true",
+                                headers=self.headers)
         return self.__response(response).json()
 
     def get_dms(self) -> list | dict:
@@ -43,7 +44,8 @@ class DiscordClient:
         return response.json()
 
     def get_channels(self, guild_id: str) -> list | dict:
-        response = requests.get(f"{self.base_url}{DiscordMethods.guild_channels(guild_id)}", headers=self.headers)
+        response = requests.get(f"{self.base_url}{DiscordMethods.guild_channels(guild_id)}?with_counts=true",
+                                headers=self.headers)
         return self.__response(response).json()
 
     def get_invite_link(self, channel_id: str) -> Response:

{leadguru_jobs-0.582.0 → leadguru_jobs-0.584.0}/lgt_jobs/lgt_data/model.py

@@ -102,8 +102,6 @@ class BaseBotModel(Credentials):
         self.connected_channels = None
         self.channels_users = None
         self.users_count = None
-        self.messages_received: int = 0
-        self.messages_filtered: int = 0
         self.recent_messages: List[str] = []
         self.icon = None
         self.active_channels = {}
@@ -163,6 +161,8 @@ class Server:
         self.deleted = False
         self.subscribers = 0
         self.approximate_member_count = 0
+        self.messages_received: int = 0
+        self.messages_filtered: int = 0
 
     @classmethod
     def from_dic(cls, dic: dict):
@@ -328,11 +328,11 @@ class UserModel(BaseModel):
     def subscription_expired(self):
         return self.subscription_expired_at.replace(tzinfo=UTC) < datetime.now(UTC)
 
-    def get_slack_user(self, slack_email: str):
-        return next(filter(lambda x: slack_email == x.email and not x.deleted, self.slack_users), None)
+    def get_slack_user(self, slack_email: str) -> SlackUser:
+        return next(filter(lambda x: slack_email == x.email, self.slack_users), None)
 
-    def get_discord_user(self, login: str):
-        return next(filter(lambda x: login == x.login and not x.deleted, self.discord_users), None)
+    def get_discord_user(self, login: str) -> DiscordUser:
+        return next(filter(lambda x: login == x.login, self.discord_users), None)
 
 
 class DiscordUser(DictionaryModel):