leadguru-jobs 0.638.0__py3-none-any.whl → 0.639.0__py3-none-any.whl

{leadguru_jobs-0.638.0.dist-info → leadguru_jobs-0.639.0.dist-info}/METADATA

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

{leadguru_jobs-0.638.0.dist-info → leadguru_jobs-0.639.0.dist-info}/RECORD

@@ -2,8 +2,8 @@ lgt_jobs/__init__.py,sha256=efDX0VsSwC2we92quUu8E62MqC-4audo0Rv37Y6USnk,2144
 lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
 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/runner.py,sha256=pS-Qwyfuk22aQ1Mk3p-Q0ysdZfKy1Bh9YoWBlDaLeM8,2234
+lgt_jobs/simple_job.py,sha256=EBxhre3749GEAzJyaV1GXYy3P0pzwHchxcZ2kSN1vWU,527
 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
@@ -12,19 +12,18 @@ 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=JRPPyqFvGHWuH_NQJNzIDy3DC0Joz14goNExqp-YUrw,8683
-lgt_jobs/jobs/chat_history.py,sha256=pwLGZyPS8N3h2eeoIIWGMwnzskPGFkPO3YVIY0KjQro,5245
-lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
-lgt_jobs/jobs/inbox_leads.py,sha256=LyzRAmXi_TL15hpxwNShNYSuySAy4PIPoq45uOgfKIE,4557
-lgt_jobs/jobs/load_slack_people.py,sha256=az3Pl8_0nUXizShpCksH6XMHFALLkta4QpMr_MkM9Io,3199
+lgt_jobs/jobs/bot_stats_update.py,sha256=COwSaw0conDZOcdI5VkyW4vTFIo6PFn9LgvhTejYYeQ,8448
+lgt_jobs/jobs/chat_history.py,sha256=rj337uHT2XmyDu3oMPbnCBxSsRn4roxDNS0hsbvoI7I,5040
+lgt_jobs/jobs/connect_sources.py,sha256=vOKu2Q9cmQsj4VMVzOoEJkD1wzE9XurbIChx35rES8I,4957
+lgt_jobs/jobs/inbox_leads.py,sha256=6UhPp9AfSAGb3elFDT6jm7j2HZ9jPOPngsUj-hUKAYw,4867
+lgt_jobs/jobs/load_slack_people.py,sha256=JEggnsWvfA7L45lObwuBFIvBVhwfePbq08E89VXpI8E,3264
 lgt_jobs/jobs/mass_message.py,sha256=1mFcBlL2MhzLbj5yrd_NyJc7TXDWCcROAzGDnr0miMU,2035
 lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,824
-lgt_jobs/jobs/send_slack_message.py,sha256=nNtuSsAIK5dzvP3B1G-BHNyk_LuZkHfsGmpXHHIqBb0,2329
-lgt_jobs/jobs/update_slack_profile.py,sha256=_ed0OhrVc1U-nE6dLckdmTmzZaxlK-y7h4S7SIpfEiA,3582
-lgt_jobs/jobs/workspace_connect.py,sha256=y48LGLtH7KxB-XAja9JOW4VFq4rzJh8cSf6heNBLSx0,7067
+lgt_jobs/jobs/send_slack_message.py,sha256=yJVzGQijM5KL-QDA0EQy-8-kvR7TSZmRw-4tX1ge5Hk,2343
+lgt_jobs/jobs/update_slack_profile.py,sha256=GU28azaNz1zYsCAAF_BShJxLUecQb7AbO5XPgiv7yHg,3654
+lgt_jobs/jobs/workspace_connect.py,sha256=iapbDVdFL6ZkZJlIZywASATAmK25ZikSd1IiB1LLrRo,7203
 lgt_jobs/lgt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/helpers.py,sha256=3T47_Abw7datSIxVqIHTCB-sh-rnahWrmrFG8sSY9ZE,178
-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=IA5JgoZq-oowkEGLRReZbW4Wa7cTtdSTPfGKF6ymNm8,4067
 lgt_jobs/lgt_common/discord_client/methods.py,sha256=qFbNRsI1VlPZD2os5d4bdZhrnu69OW__fhMRssF0oMk,633
@@ -42,14 +41,14 @@ lgt_jobs/lgt_data/analytics.py,sha256=yfrFPXrBofzZqUNn479JkrbZXDa2ljgk-Le0YrQ9re
 lgt_jobs/lgt_data/engine.py,sha256=GY8FOl3dl7euKjQRML_H3ophaSTgfQ8ICMRv1NpE2oE,7745
 lgt_jobs/lgt_data/enums.py,sha256=27Gd_o5QVCrSUMIfL0DJ72xV77T9fK0kYrOaC78O0SU,2292
 lgt_jobs/lgt_data/helpers.py,sha256=S_1P7pnx14dllmen-TzjA9pkKWQr39x8-v6iv7FUYnQ,423
-lgt_jobs/lgt_data/model.py,sha256=RBVmt5yjgyPBIZhi4JhBEmn0gzieKBVx8rMMkYzc3JY,34814
-lgt_jobs/lgt_data/mongo_repository.py,sha256=h0yydTUhjVg9LgiGgRYw8HkwBgA8EUbeQKYE-JmcBbo,47437
+lgt_jobs/lgt_data/model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lgt_jobs/lgt_data/mongo_repository.py,sha256=FBhE2nhrQ42njW9Muf3DZElJRva5IiZ_f-XmEQwgzrc,54209
 lgt_jobs/lgt_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/models/message_request.py,sha256=3kzFkpinOvIeTu1ViZrhU__eHKeh-YJuZFv5ELkotpY,446
+lgt_jobs/lgt_data/models/base.py,sha256=YaiceCaaF45snOLx-bQoYJ1aTWrfgMQeHWjAaRnzGKE,592
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.638.0.dist-info/METADATA,sha256=Cc0iZRB0EaB1tPBFbpOvwCVmTKopIVYn8ZVmvezi9UM,1319
-leadguru_jobs-0.638.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-leadguru_jobs-0.638.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.638.0.dist-info/RECORD,,
+leadguru_jobs-0.639.0.dist-info/METADATA,sha256=MAx8qvGobve7qzMmzciWlx-I0WGlZLzOlBNdJ8z_5ac,1319
+leadguru_jobs-0.639.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+leadguru_jobs-0.639.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.639.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -1,12 +1,12 @@
 import random
 import time
 from abc import ABC
-from datetime import datetime, UTC, timedelta
 from typing import Optional
 from lgt_jobs.lgt_common.discord_client.discord_client import DiscordClient
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import DedicatedBotModel, Server, Channel, DiscordUser
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import Server, Channel, DedicatedBotModel
+from lgt_jobs.lgt_data.models.external.discord.user import DiscordUser
 from lgt_jobs.lgt_data.mongo_repository import (DedicatedBotRepository, UserMongoRepository, SlackContactUserRepository,
                                                 LeadMongoRepository, UserLeadMongoRepository)
 from pydantic import BaseModel
@@ -33,15 +33,7 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         bots_rep = DedicatedBotRepository()
         users_rep = UserMongoRepository()
         bot = bots_rep.get_one(id=data.bot_id, include_deleted=True)
-
         user = users_rep.get(bot.user_id)
-        if user.subscription_expired_at.replace(tzinfo=UTC) < (datetime.now(UTC) - timedelta(7)):
-            bot.deleted = True
-            for server in bot.servers:
-                server.deleted = True
-            bots_rep.add_or_update(bot)
-            return
-
         received_messages, filtered_messages = get_bots_aggregated_analytics(bot_ids=[str(bot.id)])
 
         if bot.source.source_type == SourceType.DISCORD:

lgt_jobs/jobs/chat_history.py

@@ -3,7 +3,9 @@ from abc import ABC
 from typing import Optional, List
 import logging as log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.model import ChatMessage, UserContact, DedicatedBotModel
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import DedicatedBotModel
+from lgt_jobs.lgt_data.models.chat.message import ChatMessage
+from lgt_jobs.lgt_data.models.contacts.contact import UserContact
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, UserContactsRepository, \
     ChatRepository, UserLeadMongoRepository
 from pydantic import BaseModel
@@ -39,7 +41,6 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
             return
         last_message = None
         last_message_contact = None
-        last_message_bot = None
         contacts_groups = self.contacts_repo.find_grouped_actual_contacts(user.id, spam=False, with_chat_only=False)
         for bot in bots:
             contacts = contacts_groups.get(bot.source.source_id)
@@ -54,12 +55,10 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
                     continue
 
                 if not last_message:
-                    last_message_bot = bot
                     last_message = message
                     last_message_contact = contact
 
                 if message.created_at > last_message.created_at and message.user == contact.sender_id:
-                    last_message_bot = bot
                     last_message = message
                     last_message_contact = contact
 
@@ -67,8 +66,6 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         has_to_be_notified = (not last_notification or (last_message and last_message.created_at > last_notification))
         if last_message and has_to_be_notified and last_message.user == last_message_contact.sender_id:
             user.notification_settings.incoming_messages.need_to_notify = True
-            user.notification_settings.incoming_messages.attributes = [last_message_contact.sender_id,
-                                                                       last_message_bot.source.source_id]
             UserMongoRepository().set(data.user_id, notification_settings=user.notification_settings.to_dic())
 
     def _get_new_messages(self, contact: UserContact, bot: DedicatedBotModel, slack_chat: List[ChatMessage]):

lgt_jobs/jobs/connect_sources.py

@@ -5,10 +5,13 @@ import logging as log
 from lgt_jobs.jobs.load_slack_people import LoadSlackPeopleJob, LoadSlackPeopleJobData
 from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
 from lgt_jobs.jobs.bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
+from lgt_jobs.lgt_data.models.base import BaseModel
+from lgt_jobs.lgt_data.models.bots.base_bot import Source
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import DedicatedBotModel, Server
+from lgt_jobs.lgt_data.models.external.slack.user import SlackUser
 from lgt_jobs.runner import BackgroundJobRunner
 from lgt_jobs.lgt_data.engine import UserTrackAction
 from lgt_jobs.lgt_data.enums import SourceType, UserAction, StatusConnection
-from lgt_jobs.lgt_data.model import BaseModel, DedicatedBotModel, Server, Source, SlackUser
 from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserMongoRepository
 
 

lgt_jobs/jobs/inbox_leads.py

@@ -1,8 +1,10 @@
 from abc import ABC
 import logging as log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation
-from lgt_jobs.lgt_data.models.message_request import MessageRequest
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import DedicatedBotModel
+from lgt_jobs.lgt_data.models.chat.request import MessageRequest
+from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
+from lgt_jobs.lgt_data.models.user.user import UserModel
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, \
     SlackContactUserRepository, UserContactsRepository, MessageRequestsRepository
 from pydantic import BaseModel
@@ -84,6 +86,8 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
                     if not sender_request:
                         log.info(f"[InboxLeadsJob]: New message request from {sender_id} for user: {user.email}")
                         requests_repo.upsert(user.id, sender_id, message_request)
+                        user.notification_settings.inbox.need_to_notify = True
+                        UserMongoRepository().set(user.id, notification_settings=user.notification_settings.to_dic())
 
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):

lgt_jobs/jobs/load_slack_people.py

@@ -1,7 +1,8 @@
 from abc import ABC
 from lgt_jobs.lgt_common.enums.slack_errors import SlackErrors
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
-from lgt_jobs.lgt_data.model import Source, SlackMemberInformation
+from lgt_jobs.lgt_data.models.bots.base_bot import Source
+from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
 from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, SlackContactUserRepository
 import logging as log
 from pydantic import BaseModel

lgt_jobs/jobs/send_slack_message.py

@@ -3,7 +3,7 @@ from abc import ABC
 from typing import Optional
 import logging as log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.model import ChatMessage
+from lgt_jobs.lgt_data.models.chat.message import ChatMessage
 from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserContactsRepository, ChatRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob

lgt_jobs/jobs/update_slack_profile.py

@@ -2,7 +2,8 @@ from abc import ABC
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
 from lgt_jobs.lgt_common.slack_client.web_client import SlackFilesClient
 from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import Profile, SlackUser
+from lgt_jobs.lgt_data.models.external.slack.user import SlackUser
+from lgt_jobs.lgt_data.models.people.profile import Profile
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob

lgt_jobs/jobs/workspace_connect.py

@@ -4,7 +4,9 @@ import requests
 from lgt_jobs.lgt_common.helpers import update_credentials
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.enums import StatusConnection, SourceType
-from lgt_jobs.lgt_data.model import UserWorkspace, SlackUser, DedicatedBotModel
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import DedicatedBotModel
+from lgt_jobs.lgt_data.models.external.slack.user import SlackUser
+from lgt_jobs.lgt_data.models.external.user_workspace import UserWorkspace
 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