leadguru-jobs 0.584.0__py3-none-any.whl → 0.586.0__py3-none-any.whl

{leadguru_jobs-0.584.0.dist-info → leadguru_jobs-0.586.0.dist-info}/METADATA

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

{leadguru_jobs-0.584.0.dist-info → leadguru_jobs-0.586.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ lgt_jobs/env.py,sha256=cRO03GGvstUjBsv3uYO-iakrOvAk_ZWUP_fnmf21iZQ,789
 lgt_jobs/main.py,sha256=cK_nkBtJHnUNDbba1WZotqPtI_6OWxiYQkAgco9OAmE,1539
 lgt_jobs/runner.py,sha256=7KHpMHWwCjDlPDKnkNqrGAyIVn4Po62VqjYGVa85if8,2218
 lgt_jobs/simple_job.py,sha256=sta7MP-57iwRewPycmTAc9dvSbocbGjWhb1QYYj7ccA,519
-lgt_jobs/smtp.py,sha256=Svaq2ghMjGwpPA4J92wVnzrLlVbI2FcM2d4liiAbHLo,1210
+lgt_jobs/smtp.py,sha256=k0qh-Qk9AeSU3WrCOVmuWkfpi9xzwaPMzbw9cED-pZw,1150
 lgt_jobs/assets/images/arrow.png,sha256=Lr_zG1TyySAWX78jiojcV7j8BHe2S_Oi7eZYAfe4YbM,536
 lgt_jobs/assets/images/firework.png,sha256=9d_0lUpDFfT3e4JTgp5XVb03qAdtO9yNVi1c1KoQDp8,33754
 lgt_jobs/assets/images/lock.png,sha256=515llTFqboG9PYXIrXhlbPZ5lQOHXjEYyQkXc9WfJxc,5978
@@ -12,7 +12,7 @@ lgt_jobs/assets/images/logo.png,sha256=nt377FGkBalBF9Z9TYQRv9loHolTXwU8_VRYvCXXz
 lgt_jobs/assets/images/mail.png,sha256=eORzQcAMkFr7DjgtABVhJ_zFuXgO7OXv78lLF4b39B0,7168
 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=yDA6-FqSC5T2jTPaHImSjnuI6OD0pw-BF9VagsfmkXM,7806
+lgt_jobs/jobs/bot_stats_update.py,sha256=R6mf5FxhWbyx92AYXlj0FZVjz2Tgz86mBvLHrsQ9AFE,7502
 lgt_jobs/jobs/chat_history.py,sha256=tZ4XyOGdy1k6r4uotxSSKbXjTR_oRK6Ym0YthFYBtl8,6200
 lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
 lgt_jobs/jobs/inbox_leads.py,sha256=OSX-FNx27gWEKNBBc-hyq2odCxXytz7WHtQJajtz274,5670
@@ -22,12 +22,12 @@ lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,82
 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=LSZkkuPuHTqxvaTgqz_Y_kGIkF3Mmn_xwKf2h0uDWVg,7115
+lgt_jobs/jobs/workspace_connect.py,sha256=qgjIRzAQRbJBx--eYsTtYgOUh2-p3N_-LIltfbJrYYo,7102
 lgt_jobs/lgt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/helpers.py,sha256=tJNrKJYPa_MBmfRVrpHryoOWe4gnv7xOlmHuTh-bMBw,428
 lgt_jobs/lgt_common/lgt_logging.py,sha256=Zxr2sPpY-qU_YbL_47OM6dE_JA1ejG_Vr1PNnjF_jwo,576
 lgt_jobs/lgt_common/discord_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_common/discord_client/discord_client.py,sha256=_zX7yfDi6ShNuA3zhuDvf9TZacJwGPX0Tcu1OIAmj_U,2540
+lgt_jobs/lgt_common/discord_client/discord_client.py,sha256=tvRn0P039Dp5d22-DivQhP2uQMC7ixZc7oe7IA4WrPE,2442
 lgt_jobs/lgt_common/discord_client/methods.py,sha256=C46Vq9_-dlvs0nEW6ck8QvAmE_nPUfU89MJUhHaPMLk,391
 lgt_jobs/lgt_common/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/enums/slack_errors.py,sha256=nK7uoguq0F8bIHROp73oeszehT7CgS_VU45n9_Gq_WY,172
@@ -39,16 +39,16 @@ lgt_jobs/lgt_common/slack_client/methods.py,sha256=ctKF_1UHEmSWaRsoGEgMZicVabV7e
 lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=icHapSOszFYnSofJ-eWl4lUWSOqng6S9XSRFfMx87Rg,13836
 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=fiN88zcIxs_bRMmXL7ftp4FvBeJ5I7QBPE4tbwKJ39E,21689
+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=jBH5WGBtDAvFrh4iiPIzlQ-XrImMpuwqstuasG55mJ0,2209
 lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
-lgt_jobs/lgt_data/model.py,sha256=G_x0C7mR__OtM_ps2X5_Rg7iK1ijh4iCYbavsLxdaqA,28652
+lgt_jobs/lgt_data/model.py,sha256=QAWnCPHEoNdXaPPCgMi_tHLx11zj0xcGUUUg2CDS3DQ,28554
 lgt_jobs/lgt_data/mongo_repository.py,sha256=kLE906lfqhHF9gp1qvH_3XKCZGCZnxjLMrBLWBy7doo,46099
 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=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.584.0.dist-info/METADATA,sha256=908hY0c8mcnidsnn9K3u_3wWpOoeVbRXvy6v6Q4ToOA,1319
-leadguru_jobs-0.584.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.584.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.584.0.dist-info/RECORD,,
+leadguru_jobs-0.586.0.dist-info/METADATA,sha256=nQOygMxPU916N2ufLOUtLfKM2-_HXSvTNlmuAR3B_k8,1319
+leadguru_jobs-0.586.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.586.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.586.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -32,7 +32,6 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         bots_rep = DedicatedBotRepository()
         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)])
 
         if bot.source.source_type == SourceType.DISCORD:
             client = DiscordClient(bot.token)
@@ -72,8 +71,6 @@ 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
@@ -110,6 +107,7 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
             bot.source.source_name = bot_name
             bot.slack_url = bot.registration_link = team_info['team']['url']
             bots_rep.add_or_update(bot)
+        received_messages, filtered_messages = get_bots_aggregated_analytics(bot_ids=[bot.id])
         try:
             channels_response = client.channels_list()
         except:
@@ -126,20 +124,23 @@ 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.messages_received = received_messages.get(bot.source.source_id, 0)
+        bot.messages_filtered = filtered_messages.get(bot.source.source_id, 0)
         bot.connected_channels = connected_channels
         bot.channels = len(channels)
         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:
@@ -149,12 +150,8 @@ 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 = 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)
+            bot.servers[0].subscribers = users_count
 
         # save only last 50 messages
         bot.recent_messages = bot.recent_messages[-50:]

lgt_jobs/jobs/workspace_connect.py

@@ -7,7 +7,7 @@ from lgt_jobs.lgt_data.enums import StatusConnection, SourceType
 from lgt_jobs.lgt_data.model import UserWorkspace, SlackUser, DedicatedBotModel
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
-from lgt_jobs.jobs.bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
+from .bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
 from lgt_jobs.runner import BackgroundJobRunner
 import logging as log
 from pydantic import BaseModel

lgt_jobs/lgt_common/discord_client/discord_client.py

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

lgt_jobs/lgt_data/analytics.py

@@ -8,7 +8,7 @@ from lgt_jobs.lgt_data.mongo_repository import to_object_id
 from pymongo import MongoClient
 
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
-db = client.get_database('lgt_admin')
+db = client.lgt_admin
 
 
 def _build_date_aggregated_analytics_pipeline(source_id=None, email=None, started_at: datetime = None,
@@ -540,12 +540,12 @@ def get_bots_aggregated_analytics(from_date: datetime = None,
     if bot_ids is not None:
         pipeline.insert(0, {"$match": {"extra_ids": {"$in": bot_ids}}})
 
-    received_messages = list(db.get_collection('received_messages').aggregate(pipeline))
+    received_messages = list(db[f'received_messages'].aggregate(pipeline))
 
     if configs is not None:
         pipeline.insert(0, {"$match": {"attributes": {"$in": configs}}})
 
-    filtered_messages = list(db.get_collection('filtered_messages').aggregate(pipeline))
+    filtered_messages = list(db[f'filtered_messages'].aggregate(pipeline))
     received_messages_dic = OrderedDict()
     filtered_messages_dic = OrderedDict()
 

lgt_jobs/lgt_data/model.py

@@ -102,6 +102,8 @@ 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 = {}
@@ -160,9 +162,6 @@ class Server:
         self.active = False
         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):
@@ -175,7 +174,6 @@ class Server:
                 setattr(model, k, v)
 
         model.channels = [Channel.from_dic(channel) for channel in dic.get("channels", [])]
-        model.subscribers = dic.get('approximate_member_count')
         return model
 
     def to_dic(self):
@@ -328,11 +326,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) -> SlackUser:
-        return next(filter(lambda x: slack_email == x.email, self.slack_users), None)
+    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_discord_user(self, login: str) -> DiscordUser:
-        return next(filter(lambda x: login == x.login, self.discord_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)
 
 
 class DiscordUser(DictionaryModel):

lgt_jobs/smtp.py

@@ -2,7 +2,7 @@ from abc import ABC
 from pydantic import BaseModel
 import logging as log
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
-from lgt_jobs.env import smtp_login, smtp_password, smtp_host
+from lgt_jobs.env import smtp_login, smtp_password
 from lgt_jobs.lgt_data.enums import ImageName
 
 """
@@ -14,7 +14,7 @@ class SendMailJobData(BaseBackgroundJobData, BaseModel):
     html: str
     subject: str
     recipient: str
-    sender: str = "noreply@leadguru.co"
+    sender: str = "noreply@leadguru.io"
     images: list[ImageName] = []
 
 
@@ -24,13 +24,14 @@ class SendMailJob(BaseBackgroundJob, ABC):
         return SendMailJobData
 
     def exec(self, data: SendMailJobData):
-        from redmail import EmailSender
-        email = EmailSender(host=smtp_host, port=587, username=smtp_login, password=smtp_password, use_starttls=True)
+        from redmail import gmail
+        gmail.username = smtp_login
+        gmail.password = smtp_password
         body_image = {}
         for image in data.images:
             body_image[f'IMAGE_{ImageName(image.value).name}'] = f'lgt_jobs/assets/images/{image.value}'
 
-        email.send(
+        gmail.send(
             sender=f"Leadguru <{data.sender}>",
             receivers=[data.recipient],
             subject=data.subject,