leadguru-jobs 0.560.0__tar.gz → 0.562.0__tar.gz

{leadguru_jobs-0.560.0 → leadguru_jobs-0.562.0}/PKG-INFO

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

{leadguru_jobs-0.560.0 → leadguru_jobs-0.562.0}/leadguru_jobs.egg-info/PKG-INFO

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

leadguru_jobs-0.562.0/lgt_jobs/jobs/connect_sources.py

@@ -0,0 +1,90 @@
+from abc import ABC
+from typing import List
+import logging as log
+from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
+from lgt_jobs.jobs.bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
+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
+
+
+class ConnectSourceJobData(BaseBackgroundJobData, BaseModel):
+    slack_email: str
+    sources_ids: List[str]
+    action_user_email: str
+    user_email: str
+
+
+class ConnectSourceJob(BaseBackgroundJob, ABC):
+    @property
+    def job_data_type(self) -> type:
+        return ConnectSourceJobData
+
+    def exec(self, data: ConnectSourceJobData):
+        users_repository = UserMongoRepository()
+        bots_repository = DedicatedBotRepository()
+        action_user = users_repository.get_by_email(data.action_user_email)
+        user = users_repository.get_by_email(data.user_email)
+        if not action_user:
+            log.info(f'[ConnectSourceJobData]: Unable to find user with email: {data.action_user_email}')
+            return
+
+        slack_user: SlackUser = action_user.get_slack_user(data.slack_email)
+        if not slack_user:
+            log.info(f"[ConnectSourceJobData]: You have no credentials for {data.slack_email}. Try to login to Slack.")
+            slack_user.status = StatusConnection.COMPLETE
+            users_repository.set(action_user.id, slack_users=[user.to_dic() for user in action_user.slack_users])
+            return
+        bots = []
+        for ws in slack_user.workspaces:
+            try:
+                if ws.id in data.sources_ids:
+                    active_bot = bots_repository.get_one(user_id=action_user.id, active_server_id=ws.id)
+                    bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, include_deleted=True,
+                                                  user_name=data.slack_email)
+                    if active_bot:
+                        continue
+                    if not bot:
+                        bot = DedicatedBotModel()
+                        bot.servers = [Server()]
+
+                    bot.user_name = slack_user.email
+                    bot.slack_url = ws.url
+                    bot.user_id = action_user.id
+                    bot.created_by = user.email
+                    bot.registration_link = ws.url
+                    bot.token = ws.token
+                    bot.cookies = slack_user.cookies
+                    bot.deleted = False
+                    bot.paused = False
+                    bot.invalid_creds = False
+                    bot.banned = False
+                    bot.two_factor_required = ws.two_factor_required
+                    source = Source()
+
+                    for server in bot.servers:
+                        server.id = ws.id
+                        server.name = ws.domain
+                        server.deleted = False
+                        server.active = True
+                        server.icon = ws.icon
+
+                    source.source_id = ws.id
+                    source.source_name = ws.domain
+                    bot.type = source.source_type = SourceType.SLACK
+                    bot.icon = ws.icon
+                    bot.source = source
+                    bots_repository.add_or_update(bot)
+                    UserTrackAction.track(action_user.id, UserAction.START_SOURCE, ws.id)
+                    bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, user_name=slack_user.email)
+                    bots.append(bot)
+                    BackgroundJobRunner.submit(BotStatsUpdateJob, BotStatsUpdateJobData(bot_id=str(bot.id)))
+            except Exception:
+                import traceback
+                log.exception(f"[ConnectSourceJobData]: Error to connect {ws.id}")
+                traceback.print_exc()
+        slack_user.status = StatusConnection.COMPLETE
+        users_repository.set(action_user.id, slack_users=[user.to_dic() for user in action_user.slack_users])
+        return bots

{leadguru_jobs-0.560.0 → leadguru_jobs-0.562.0}/lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -54,13 +54,14 @@ class SlackClient:
 
     def users_list(self, cursor=None, limit: int = 1000):
         url = f'{self.base_url}{SlackMethods.users_list}'
+        payload = {}
         if cursor:
-            url += f'&cursor={cursor}'
+            payload['cursor'] = cursor
 
         if limit:
-            url += f'&limit={limit}'
+            payload['limit'] = limit
 
-        return requests.get(url=url, cookies=self.cookies, headers=self.headers).json()
+        return requests.get(url=url, cookies=self.cookies, headers=self.headers, params=payload).json()
 
     def upload_file(self, file, file_name):
         payload = {"content": file, "filename": file_name}

{leadguru_jobs-0.560.0 → leadguru_jobs-0.562.0}/lgt_jobs/lgt_data/enums.py

@@ -43,6 +43,7 @@ class UserAction(str, Enum):
 
 
 class StatusConnection(str, Enum):
+    SOURCES_IN_PROGRESS = 'Sources in progress',
     IN_PROGRESS = 'In progress',
     COMPLETE = 'Complete',
     FAILED = 'Failed'

leadguru_jobs-0.560.0/lgt_jobs/jobs/connect_sources.py

@@ -1,82 +0,0 @@
-from abc import ABC
-from typing import List
-import logging as log
-from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
-from lgt_jobs.jobs.bot_stats_update import BotStatsUpdateJob, BotStatsUpdateJobData
-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
-
-
-class ConnectSourceJobData(BaseBackgroundJobData, BaseModel):
-    slack_email: str
-    sources_ids: List[str]
-    action_user_email: str
-    user_email: str
-
-
-class ConnectSourceJob(BaseBackgroundJob, ABC):
-    @property
-    def job_data_type(self) -> type:
-        return ConnectSourceJobData
-
-    def exec(self, data: ConnectSourceJobData):
-        users_repository = UserMongoRepository()
-        bots_repository = DedicatedBotRepository()
-        action_user = users_repository.get_by_email(data.action_user_email)
-        user = users_repository.get_by_email(data.user_email)
-        if not action_user:
-            log.info(f'Unable to find user with email: {data.action_user_email}')
-            return
-
-        slack_user: SlackUser = action_user.get_slack_user(data.slack_email)
-        if not slack_user:
-            log.info(f"You have no credentials for {data.slack_email}. Try to login to Slack.")
-        bots = []
-        for ws in slack_user.workspaces:
-            if ws.id in data.sources_ids:
-                active_bot = bots_repository.get_one(user_id=action_user.id, active_server_id=ws.id)
-                bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, include_deleted=True,
-                                              user_name=data.slack_email)
-                if active_bot:
-                    continue
-                if not bot:
-                    bot = DedicatedBotModel()
-                    bot.servers = [Server()]
-
-                bot.user_name = slack_user.email
-                bot.slack_url = ws.url
-                bot.user_id = action_user.id
-                bot.created_by = user.email
-                bot.registration_link = ws.url
-                bot.token = ws.token
-                bot.cookies = slack_user.cookies
-                bot.deleted = False
-                bot.paused = False
-                bot.invalid_creds = False
-                bot.banned = False
-                bot.two_factor_required = ws.two_factor_required
-                source = Source()
-
-                for server in bot.servers:
-                    server.id = ws.id
-                    server.name = ws.domain
-                    server.deleted = False
-                    server.active = True
-                    server.icon = ws.icon
-
-                source.source_id = ws.id
-                source.source_name = ws.domain
-                bot.type = source.source_type = SourceType.SLACK
-                bot.icon = ws.icon
-                bot.source = source
-                bots_repository.add_or_update(bot)
-                UserTrackAction.track(action_user.id, UserAction.START_SOURCE, ws.id)
-                bot = bots_repository.get_one(user_id=action_user.id, server_id=ws.id, user_name=slack_user.email)
-                bots.append(bot)
-                BackgroundJobRunner.submit(BotStatsUpdateJob, BotStatsUpdateJobData(bot_id=str(bot.id)))
-        slack_user.status = StatusConnection.COMPLETE
-        users_repository.set(action_user.id, slack_users=[user.to_dic() for user in action_user.slack_users])
-        return bots