leadguru-jobs 0.637.0__tar.gz → 0.639.0__tar.gz

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/PKG-INFO

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

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/leadguru_jobs.egg-info/SOURCES.txt

@@ -34,7 +34,6 @@ lgt_jobs/jobs/update_slack_profile.py
 lgt_jobs/jobs/workspace_connect.py
 lgt_jobs/lgt_common/__init__.py
 lgt_jobs/lgt_common/helpers.py
-lgt_jobs/lgt_common/lgt_logging.py
 lgt_jobs/lgt_common/discord_client/__init__.py
 lgt_jobs/lgt_common/discord_client/discord_client.py
 lgt_jobs/lgt_common/discord_client/methods.py
@@ -55,7 +54,7 @@ lgt_jobs/lgt_data/helpers.py
 lgt_jobs/lgt_data/model.py
 lgt_jobs/lgt_data/mongo_repository.py
 lgt_jobs/lgt_data/models/__init__.py
-lgt_jobs/lgt_data/models/message_request.py
+lgt_jobs/lgt_data/models/base.py
 lgt_jobs/services/__init__.py
 lgt_jobs/services/web_client.py
 lgt_jobs/templates/new_message.html

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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:

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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]):

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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
 
 

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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):

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/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

leadguru_jobs-0.639.0/lgt_jobs/lgt_data/models/base.py

@@ -0,0 +1,29 @@
+import copy
+from abc import ABC
+from datetime import datetime, UTC
+
+
+class DictionaryModel(ABC):
+    @classmethod
+    def from_dic(cls, dic: dict):
+        if not dic:
+            return None
+
+        model = cls()
+        for k, v in dic.items():
+            setattr(model, k, v)
+
+        if '_id' in dic:
+            setattr(model, 'id', dic['_id'])
+
+        return model
+
+    def to_dic(self):
+        result = copy.deepcopy(self.__dict__)
+        return result
+
+
+class BaseModel(DictionaryModel):
+    def __init__(self):
+        self.id = None
+        self.created_at = datetime.now(UTC)

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -6,14 +6,30 @@ from dateutil import tz
 from pymongo import MongoClient, UpdateOne
 from bson.objectid import ObjectId
 from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetPasswordModel, BoardModel, BoardedStatus,
-                                     DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
-                                     ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
-                                     GroupedMessagesModel, UserVerificationModel, UsersPage, Subscription,
-                                     ScheduledMessage)
 from datetime import datetime, UTC, timedelta
 from collections import OrderedDict
-from lgt_jobs.lgt_data.models.message_request import MessageRequest
+
+from lgt_jobs.lgt_data.models.base import BaseModel
+from lgt_jobs.lgt_data.models.boards.board import BoardModel
+from lgt_jobs.lgt_data.models.boards.status import BoardedStatus
+from lgt_jobs.lgt_data.models.bots.dedicated_bot import DedicatedBotModel
+from lgt_jobs.lgt_data.models.chat.grouped_messages import GroupedMessagesModel
+from lgt_jobs.lgt_data.models.chat.message import ChatMessage
+from lgt_jobs.lgt_data.models.chat.scheduled_message import ScheduledMessage
+from lgt_jobs.lgt_data.models.chat.request import MessageRequest
+from lgt_jobs.lgt_data.models.contacts.contact import UserContact
+from lgt_jobs.lgt_data.models.leads.extended_lead import ExtendedLeadModel
+from lgt_jobs.lgt_data.models.leads.lead import LeadModel
+from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
+from lgt_jobs.lgt_data.models.templates.template import UserTemplateModel
+from lgt_jobs.lgt_data.models.user.reset_password import UserResetPasswordModel
+from lgt_jobs.lgt_data.models.user.subscription import Subscription
+from lgt_jobs.lgt_data.models.user.user import UserModel
+from lgt_jobs.lgt_data.models.user.user_follow_ups import UserFollowUps
+from lgt_jobs.lgt_data.models.user.user_page import UsersPage
+from lgt_jobs.lgt_data.models.user.verification import UserVerificationModel
+from lgt_jobs.lgt_data.models.user_leads.extended_user_lead import ExtendedUserLeadModel
+from lgt_jobs.lgt_data.models.user_leads.user_lead import UserLeadModel
 
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
@@ -73,6 +89,10 @@ class UserMongoRepository(BaseMongoRepository):
         connected_slack_email = kwargs.get('connected_slack_email')
         soon_subscription_expiration = kwargs.get('soon_subscription_expiration')
         has_new_message = kwargs.get('has_new_message')
+        has_new_message_request = kwargs.get('has_new_message_request')
+        has_deactivated_sources = kwargs.get('has_deactivated_sources')
+        has_new_replies = kwargs.get('has_new_replies')
+        has_new_reactions = kwargs.get('has_new_reactions')
         min_days = kwargs.get('min_days_soon_subscription_expiration', 3)
 
         if subscription_expired:
@@ -87,6 +107,22 @@ class UserMongoRepository(BaseMongoRepository):
             pipeline['notification_settings.incoming_messages.enabled'] = True
             pipeline['notification_settings.incoming_messages.need_to_notify'] = True
 
+        if has_new_message_request:
+            pipeline['notification_settings.inbox.enabled'] = True
+            pipeline['notification_settings.inbox.need_to_notify'] = True
+
+        if has_deactivated_sources:
+            pipeline['notification_settings.source_deactivation.enabled'] = True
+            pipeline['notification_settings.source_deactivation.need_to_notify'] = True
+
+        if has_new_replies:
+            pipeline['notification_settings.bulk_replies.enabled'] = True
+            pipeline['notification_settings.bulk_replies.need_to_notify'] = True
+
+        if has_new_reactions:
+            pipeline['notification_settings.bulk_reactions.enabled'] = True
+            pipeline['notification_settings.bulk_reactions.need_to_notify'] = True
+
         if connected_slack_email:
             pipeline['slack_users.email'] = connected_slack_email
 
@@ -106,7 +142,7 @@ class UserMongoRepository(BaseMongoRepository):
         search = kwargs.get('search')
         sort_field = kwargs.get('sort_field', 'email')
         sort_direction = kwargs.get('sort_direction', 'ASCENDING')
-        sort_direction: int = pymongo.ASCENDING if sort_direction == 'ASCENDING' else pymongo.DESCENDING
+        sort_direction = pymongo.ASCENDING if sort_direction == 'ASCENDING' else pymongo.DESCENDING
         if not include_inactive:
             match_pipeline['inactive'] = False
         if email:
@@ -176,6 +212,81 @@ class UserLeadMongoRepository(BaseMongoRepository):
     collection_name = 'user_leads'
     model = ExtendedUserLeadModel
 
+    def get_leads_with_follow_ups(self):
+        now = datetime.now(UTC)
+        this_day = datetime(now.year, now.month, now.day, 21, 00, 00, tzinfo=UTC)
+        after_week = this_day + timedelta(7)
+        pipeline = [
+            {'$match': {'archived': False, 'followup_date': {'$ne': None}}},
+            {
+                '$lookup': {
+                    'from': 'users',
+                    'localField': 'user_id',
+                    'foreignField': '_id',
+                    'as': 'user'
+                }
+            },
+            {
+                '$lookup': {
+                    'from': 'slack_contact',
+                    'localField': 'message.sender_id',
+                    'foreignField': 'sender_id',
+                    'as': 'contact'
+                }
+            },
+            {'$addFields': {'contact': {'$first': '$contact'}, 'user': {'$first': '$user'}}},
+            {
+                '$project': {
+                    'user_id': 1,
+                    'user_email': '$user.email',
+                    'notification_settings': '$user.notification_settings',
+                    'followup_to': {
+                        '$cond': {
+                            'if': {'$eq': ['$user.notification_settings.follow_ups.type', 'once_a_day']},
+                            'then': this_day,
+                            'else': after_week
+                        }
+                    },
+                    'followup_date': 1,
+                    'contact': 1,
+                    'message.sender_id': 1,
+                    'message.source': 1
+                }
+            },
+            {'$group': {'_id': '$user_id', 'leads': {'$push': '$$ROOT'}}},
+            {
+                '$addFields': {
+                    'actual_follow_ups': {
+                        '$filter': {
+                            'input': '$leads',
+                            'as': 'lead',
+                            'cond': {
+                                '$and': [
+                                    {'$gte': ['$$lead.followup_date', now]},
+                                    {'$lte': ['$$lead.followup_date', '$$lead.followup_to']}
+                                ]
+                            }
+                        }
+                    },
+                    'overdue_follow_ups': {
+                        '$filter': {
+                            'input': '$leads',
+                            'as': 'lead',
+                            'cond': {'$lt': ['$$lead.followup_date', now]}
+                        }
+                    }
+                }
+            },
+            {
+                '$addFields': {
+                    'email': {'$first': '$leads.user_email'},
+                    'notification_settings': {'$first': '$leads.notification_settings'}}
+            },
+            {'$match': {'actual_follow_ups': {'$ne': []}}},
+            {'$unset': ['leads']}
+        ]
+        return [UserFollowUps.from_dic(doc) for doc in list(self.collection().aggregate(pipeline))]
+
     def update_source(self, source_id: str, source_data: dict):
         self.collection().update_many({'message.source.source_id': source_id},
                                       {'$set': {'message.source': source_data}})
@@ -222,22 +333,22 @@ class UserLeadMongoRepository(BaseMongoRepository):
         archived = kwargs.get('archived')
         from_date = kwargs.get('from_date')
         to_date = kwargs.get('to_date')
-        has_followup = kwargs.get('has_followup', None)
-        followup_to = kwargs.get('followup_to_date', None)
-        followup_from = kwargs.get('followup_from_date', None)
-        created_to = kwargs.get('created_to_date', None)
-        created_from = kwargs.get('created_from_date', None)
-        sender_ids = kwargs.get('sender_ids', None)
-        text = kwargs.get('text', None)
-        stop_words = kwargs.get('stop_words', None)
-        tags = kwargs.get('tags', None)
-        configs = kwargs.get('config', None)
-        bots_names = kwargs.get('bots_names', None)
-        locations = kwargs.get('locations', None)
-        with_chat = kwargs.get('with_chat', None)
-        leads_ids = kwargs.get('leads_ids', None)
-        exclude_leads = kwargs.get('exclude_leads', None)
-        exclude_senders = kwargs.get('exclude_senders', None)
+        has_followup = kwargs.get('has_followup')
+        followup_to = kwargs.get('followup_to_date')
+        followup_from = kwargs.get('followup_from_date')
+        created_to = kwargs.get('created_to_date')
+        created_from = kwargs.get('created_from_date')
+        sender_ids = kwargs.get('sender_ids')
+        text = kwargs.get('text')
+        stop_words = kwargs.get('stop_words')
+        tags = kwargs.get('tags')
+        configs = kwargs.get('config')
+        bots_names = kwargs.get('bots_names')
+        locations = kwargs.get('locations')
+        with_chat = kwargs.get('with_chat')
+        leads_ids = kwargs.get('leads_ids')
+        exclude_leads = kwargs.get('exclude_leads')
+        exclude_senders = kwargs.get('exclude_senders')
         deleted = kwargs.get('deleted', False)
 
         pipeline['message.profile.display_name'] = {
@@ -549,18 +660,17 @@ class LeadMongoRepository(BaseMongoRepository):
         from_date: datetime = kwargs.get('from_date')
         to_date: datetime = kwargs.get('to_date')
 
-        country = kwargs.get('country', None)
-        user_id = kwargs.get('user_id', None)
-        tags = kwargs.get('tags', None)
-        text = kwargs.get('text', None)
-        stop_words = kwargs.get('stop_words', None)
-        exclude_leads = kwargs.get('exclude_leads', None)
-        exclude_senders = kwargs.get('exclude_senders', None)
-        excluded_channels = kwargs.get('excluded_channels', None)
-        sender_ids = kwargs.get('sender_ids', None)
-        configs = kwargs.get('config', None)
-        bots_names = kwargs.get('bots_names', None)
-        locations = kwargs.get('locations', None)
+        country = kwargs.get('country')
+        user_id = kwargs.get('user_id')
+        tags = kwargs.get('tags')
+        text = kwargs.get('text')
+        stop_words = kwargs.get('stop_words')
+        exclude_leads = kwargs.get('exclude_leads')
+        exclude_senders = kwargs.get('exclude_senders')
+        sender_ids = kwargs.get('sender_ids')
+        configs = kwargs.get('config')
+        bots_names = kwargs.get('bots_names')
+        locations = kwargs.get('locations')
         publication_text = kwargs.get('publication_text')
 
         pipeline['message.profile.display_name'] = {
@@ -610,13 +720,6 @@ class LeadMongoRepository(BaseMongoRepository):
         if exclude_senders:
             pipeline['message.sender_id'] = {'$nin': exclude_senders}
 
-        if excluded_channels:
-            pipeline['$and'] = []
-            for ws, channels in excluded_channels.items():
-                if channels is not None:
-                    pipeline['$and'].append(
-                        {'$or': [{'message.name': {'$ne': ws}}, {'message.channel_id': {'$nin': channels}}]})
-
         if sender_ids:
             pipeline['message.sender_id'] = {'$in': sender_ids}
 
@@ -848,6 +951,9 @@ class DedicatedBotRepository(BaseMongoRepository):
         kwargs["only_valid"] = only_valid
         pipeline = self.__create_bots_filter(**kwargs)
         docs = self.collection().find(pipeline)
+        sort_by = kwargs.get('sort_by')
+        if sort_by:
+            docs = docs.sort({sort_by: 1})
         return [DedicatedBotModel.from_dic(doc) for doc in docs]
 
     def get_source_ids_for_user(self, **kwargs):
@@ -864,7 +970,7 @@ class DedicatedBotRepository(BaseMongoRepository):
 
     @staticmethod
     def __create_bots_filter(**kwargs):
-        pipeline = {}
+        pipeline: dict = {}
         name = kwargs.get('name')
         source_type = kwargs.get('source_type', None)
         user_name = kwargs.get('user_name')
@@ -876,6 +982,8 @@ class DedicatedBotRepository(BaseMongoRepository):
         source_id = kwargs.get('source_id')
         server_id = kwargs.get('server_id')
         active_server_id = kwargs.get('active_server_id')
+        invalid_creds = kwargs.get('invalid_creds')
+        sort_by = kwargs.get('sort_by')
 
         if bot_id:
             pipeline["_id"] = to_object_id(bot_id)
@@ -904,12 +1012,18 @@ class DedicatedBotRepository(BaseMongoRepository):
         if only_valid:
             pipeline['invalid_creds'] = False
 
+        if invalid_creds is not None:
+            pipeline['invalid_creds'] = invalid_creds
+
         if not include_deleted:
             pipeline['deleted'] = False
 
         if not include_paused and source_type == SourceType.DISCORD:
             pipeline['paused'] = False
 
+        if sort_by:
+            pipeline['sort_by'] = {'$exists': True}
+
         return pipeline
 
 
@@ -1144,15 +1258,59 @@ class ChatRepository(BaseMongoRepository):
 
         if from_date:
             start = datetime(from_date.year, from_date.month, from_date.day, tzinfo=tz.tzutc())
-            pipeline['last_action_at']['$gte'] = start
+            pipeline['created_at']['$gte'] = start
 
         if to_date:
             end = datetime(to_date.year, to_date.month, to_date.day, 23, 59, 59, tzinfo=tz.tzutc())
-            pipeline['last_action_at']['$lte'] = end
+            pipeline['created_at']['$lte'] = end
 
         return [ChatMessage.from_dic(msg)
                 for msg in self.collection().find(pipeline).sort("id", pymongo.ASCENDING)]
 
+    def get_aggregated_list(self, **kwargs):
+        match_pipeline = {}
+        user_id = kwargs.get('user_id')
+        from_date = kwargs.get('from_date')
+        to_date = kwargs.get('to_date')
+        sort_by = kwargs.get('sort_by', 'id')
+        viewed = kwargs.get('viewed')
+
+        if user_id:
+            match_pipeline['user_id'] = to_object_id(user_id)
+
+        if from_date or to_date:
+            match_pipeline['created_at'] = {}
+
+        if viewed is not None:
+            match_pipeline['viewed'] = viewed
+
+        if from_date:
+            start = datetime(from_date.year, from_date.month, from_date.day, tzinfo=tz.tzutc())
+            match_pipeline['created_at']['$gte'] = start
+
+        if to_date:
+            end = datetime(to_date.year, to_date.month, to_date.day, 23, 59, 59, tzinfo=tz.tzutc())
+            match_pipeline['created_at']['$lte'] = end
+
+        pipeline = [
+            {'$match': match_pipeline},
+            {
+                '$lookup': {
+                    'from': 'slack_contact',
+                    'localField': 'sender_id',
+                    'foreignField': 'sender_id',
+                    'as': 'user'
+                }
+            },
+            {
+                '$addFields': {'user': {'$first': '$user'}}
+            },
+            {
+                '$sort': {sort_by: 1}
+            }]
+
+        return self.collection().aggregate(pipeline)
+
     def get_grouped_messages(self, **kwargs):
         match_pipeline = {}
         pipeline = [
@@ -1202,6 +1360,28 @@ class MessageRequestsRepository(BaseMongoRepository):
         self.collection().update_one({'user_id': to_object_id(user_id), 'sender_id': sender_id},
                                      {'$set': message_request.to_dic()}, upsert=True)
 
+    def get_many(self, user_id: str, viewed: bool = False):
+        pipeline = [
+            {
+                '$match': {'user_id': to_object_id(user_id), 'viewed': viewed}
+            },
+            {
+                '$lookup': {
+                    'from': 'slack_contact',
+                    'localField': 'sender_id',
+                    'foreignField': 'sender_id',
+                    'as': 'user'
+                }
+            },
+            {
+                '$addFields': {'user': {'$first': '$user'}}
+            },
+            {
+                '$sort': {'created_at': 1}
+            }
+        ]
+        return self.collection().aggregate(pipeline)
+
     def find(self, user_id: str, sender_id: str):
         return self.collection().find_one({'user_id': to_object_id(user_id), 'sender_id': sender_id})
 

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/lgt_jobs/runner.py

@@ -2,8 +2,8 @@ import json
 from datetime import datetime, UTC
 from lgt_jobs.lgt_common.pubsub.messages import publish_message2_pubsub
 from lgt_jobs.lgt_data.engine import DelayedJob
-from .basejobs import InvalidJobTypeException, BaseBackgroundJobData, BaseBackgroundJob
-from .env import background_jobs_topic
+from lgt_jobs.basejobs import InvalidJobTypeException, BaseBackgroundJobData, BaseBackgroundJob
+from lgt_jobs.env import background_jobs_topic
 
 
 def datetime_converter(o):

{leadguru_jobs-0.637.0 → leadguru_jobs-0.639.0}/lgt_jobs/simple_job.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Optional
 from pydantic import BaseModel
-from .basejobs import BaseBackgroundJobData, BaseBackgroundJob
+from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 
 class SimpleTestJobData(BaseBackgroundJobData, BaseModel):

leadguru_jobs-0.637.0/lgt_jobs/lgt_common/lgt_logging.py

@@ -1,15 +0,0 @@
-import sys
-from loguru import logger as log
-
-# log.remove()
-# log.add(sys.stdout, format="{time} {name} {level} {message}", level="INFO",
-#         filter=lambda record: record['level'].name == 'INFO')
-# log.add(sys.stderr, format="{time} {name} {level} {message}", level="WARNING",
-#         filter=lambda record: record['level'].name == 'WARNING')
-# log.add(sys.stderr, format="{time} {name} {level} {message}", level="ERROR",
-#         filter=lambda record: record['level'].name in ['ERROR', 'FATAL', 'CRITICAL'])
-#
-#
-# log.info('Logger has been configured')
-#
-# log = log