leadguru-jobs 0.181.0__py3-none-any.whl → 0.182.0__py3-none-any.whl

{leadguru_jobs-0.181.0.dist-info → leadguru_jobs-0.182.0.dist-info}/METADATA

@@ -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.dist-info → leadguru_jobs-0.182.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lgt_jobs/__init__.py,sha256=JNPm7vUWrmdZ3OD9TP0DChNxO6fazIWiz5MKQTfImSA,3155
 lgt_jobs/basejobs.py,sha256=wNbFvUXMyxwNTnQAy5VdRQyDA0Oh_byGFgafhTJSeCk,1230
-lgt_jobs/env.py,sha256=ipiDynggI70CeqUALvPumC7igo4l2XICZe7A0fI77f0,934
+lgt_jobs/env.py,sha256=_NfAGQhqpkYbaQjIS0oP23R6DQkiIg8AOue2KrD-7cA,505
 lgt_jobs/main.py,sha256=HKvSWq-H4iaYadmOpGguYsbr0Gl-bs3entB6h90URHM,1542
 lgt_jobs/runner.py,sha256=4BTaokK7qmYEU0-6TUtfdbR2VdJVsMIIn_7ufgA7Z_k,2180
 lgt_jobs/simple_job.py,sha256=L8gBO3DXMy0eHnYYfowRvX-4vh16mmrgdSv-i3wVsW4,517
@@ -9,7 +9,7 @@ lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=ezj_MWtdqKcw13ebn6Fft337fbbet5SUS2KmihQogu0,1267
 lgt_jobs/jobs/archive_leads.py,sha256=wZ4LwbuC9G7NB16AO15YiMemEV40LoJVjd8VRqaFv9o,831
 lgt_jobs/jobs/bot_stats_update.py,sha256=OlnaqUxLY3cWynwQiCyfrciiujWpVBIHx_8OvYRzfuo,2758
-lgt_jobs/jobs/chat_history.py,sha256=YpfXyGyQPOdUpq6Vv-Pzt7dJbiIjEO9L8mbQQQVdc_A,5678
+lgt_jobs/jobs/chat_history.py,sha256=FNKbxqv9vcQfTXlnEL3vPfCLPcMJzQXkWFZHIwiYnDQ,5425
 lgt_jobs/jobs/clear_user_analytics.py,sha256=sP90jhOcZqs67hJV-lJyFJH9Iciqai8IsbNs5fSc90U,2478
 lgt_jobs/jobs/connected_workspaces.py,sha256=h5zcXHZxflmR-z1apc4nQXkEL-Qsndk7MdT6gKx1njE,7302
 lgt_jobs/jobs/conversation_replied.py,sha256=Y7QORfQEofHLIzkezbdUJKkMmSfWTGxXC4EdDuQ50qI,2862
@@ -20,7 +20,7 @@ lgt_jobs/jobs/update_slack_profile.py,sha256=dTVZdO9x7kywvGyzOUVj1qnEK7pDo-UQLnh
 lgt_jobs/jobs/user_balance_update.py,sha256=x8mcq-S-f4-weGmuvyqram0ixJ2HcdDg5wgMI1SKQFE,2295
 lgt_jobs/jobs/user_limits_update.py,sha256=pQPPpirOumlgaTV1VI7CncIDR8RvC-mqFbL1Oi3rlBM,2723
 lgt_jobs/templates/new_message_mail_template.html,sha256=82XdDPtmkJVUWUcZtgd8bv_9-viAG2WWOnf3AhR6PeY,3635
-leadguru_jobs-0.181.0.dist-info/METADATA,sha256=07Ra4gD6_C1I9UcUPk-MG-K_Iz2ndFnaHsXD0HweFeA,1163
-leadguru_jobs-0.181.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-leadguru_jobs-0.181.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.181.0.dist-info/RECORD,,
+leadguru_jobs-0.182.0.dist-info/METADATA,sha256=R6JdKuwK05VKQP413PGbuRU1wCfeeIwhhN2dgk9kufk,1163
+leadguru_jobs-0.182.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+leadguru_jobs-0.182.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.182.0.dist-info/RECORD,,

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"

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