leadguru-jobs 0.181.0__tar.gz → 0.182.0__tar.gz

{leadguru_jobs-0.181.0 → leadguru_jobs-0.182.0}/PKG-INFO

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

{leadguru_jobs-0.181.0 → leadguru_jobs-0.182.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.181.0 → leadguru_jobs-0.182.0}/lgt_jobs/env.py

@@ -1,19 +1,11 @@
 import os
 
 project_id = os.environ.get('PROJECT_ID')
-slack_login_url = os.environ.get('SLACK_LOGIN_URL')
 background_jobs_topic = os.environ.get('BACKGROUND_JOBS_TOPIC')
 background_jobs_subscriber = os.environ.get('BACKGROUND_JOBS_SUBSCRIBER')
 mongo_connection_string = os.environ.get('MONGO_CONNECTION_STRING')
 smtp_host = os.environ.get('SMTP_HOST')
 smtp_login = os.environ.get('SMTP_LOGIN')
 smtp_password = os.environ.get('SMTP_PASSWORD')
-k8namespace = os.environ.get('K8_NAMESPACE')
-k8config = os.environ.get('KUBE_CONFIG_DEFAULT_LOCATION')
-backend_uri = os.environ.get('BACKEND_URI')
-aggregator_topic = os.environ.get('AGGREGATOR_TOPIC')
 google_app_credentials = os.environ.get('GOOGLE_APPLICATION_CREDENTIALS')
 portal_url = os.environ.get('PORTAL_URL')
-push_gateway_url = os.environ.get('PUSH_GATEWAY_URL')
-environment = os.environ.get('ENVIRONMENT')
-write_analytics = os.environ.get("WRITE_ANALYTICS", "true").lower() == "true"

{leadguru_jobs-0.181.0 → leadguru_jobs-0.182.0}/lgt_jobs/jobs/chat_history.py

@@ -1,13 +1,12 @@
 import datetime
 from abc import ABC
 from typing import Optional, List
-
 from lgt.common.python.lgt_logging import log
-from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService, get_slack_credentials
+from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService, \
+    return_cred_if_contact_connected
 from lgt_data.engine import LeadChat
-from lgt_data.model import SlackHistoryMessageModel, UserLeadModel, UserModel, UserBotCredentialsModel
-from lgt_data.mongo_repository import UserLeadMongoRepository, UserMongoRepository, \
-    UserBotCredentialsMongoRepository
+from lgt_data.model import SlackHistoryMessageModel, UserLeadModel, UserModel
+from lgt_data.mongo_repository import UserLeadMongoRepository, UserMongoRepository
 from pydantic import BaseModel
 
 from ..runner import BackgroundJobRunner
@@ -39,12 +38,10 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         return saved_chat
 
     @staticmethod
-    def _update_history(user_bots: List[UserBotCredentialsModel],
-                        user: UserModel,
-                        lead: UserLeadModel) -> Optional[SlackHistoryMessageModel]:
+    def _update_history(user: UserModel, lead: UserLeadModel) -> Optional[SlackHistoryMessageModel]:
         saved_chat_history = lead.chat_history if lead.chat_history else list()
 
-        creds = get_slack_credentials(user, lead, user_bots=user_bots)
+        creds = return_cred_if_contact_connected(user.id, lead.message.name)
         if not creds or creds.invalid_creds:
             return None
 
@@ -102,14 +99,13 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         if not leads:
             return
 
-        user_bots = UserBotCredentialsMongoRepository().get_bot_credentials(user_id=data.user_id)
         last_message = None
         last_message_lead = None
         for lead in leads:
             if not lead.slack_channel:
                 continue
 
-            message = LoadChatHistoryJob._update_history(user_bots=user_bots, user=user, lead=lead)
+            message = LoadChatHistoryJob._update_history(user=user, lead=lead)
 
             if not message:
                 continue