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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: leadguru-jobs
3
- Version: 0.180.0
3
+ Version: 0.182.0
4
4
  Summary: LGT jobs builds
5
5
  Author-email: developer@leadguru.co
6
6
  Classifier: Development Status :: 5 - Production/Stable
@@ -20,8 +20,8 @@ Classifier: Topic :: Internet
20
20
  Requires-Dist: loguru
21
21
  Requires-Dist: pydantic
22
22
  Requires-Dist: cachetools (>=3.1.0)
23
- Requires-Dist: leadguru-common (>=0.277.0)
24
- Requires-Dist: leadguru-data (>=0.284.0)
23
+ Requires-Dist: leadguru-common (>=0.278.0)
24
+ Requires-Dist: leadguru-data (>=0.285.0)
25
25
  Requires-Dist: wheel
26
26
  Requires-Dist: setuptools
27
27
  Requires-Dist: twine
@@ -1,6 +1,6 @@
1
1
  lgt_jobs/__init__.py,sha256=JNPm7vUWrmdZ3OD9TP0DChNxO6fazIWiz5MKQTfImSA,3155
2
2
  lgt_jobs/basejobs.py,sha256=wNbFvUXMyxwNTnQAy5VdRQyDA0Oh_byGFgafhTJSeCk,1230
3
- lgt_jobs/env.py,sha256=ipiDynggI70CeqUALvPumC7igo4l2XICZe7A0fI77f0,934
3
+ lgt_jobs/env.py,sha256=_NfAGQhqpkYbaQjIS0oP23R6DQkiIg8AOue2KrD-7cA,505
4
4
  lgt_jobs/main.py,sha256=HKvSWq-H4iaYadmOpGguYsbr0Gl-bs3entB6h90URHM,1542
5
5
  lgt_jobs/runner.py,sha256=4BTaokK7qmYEU0-6TUtfdbR2VdJVsMIIn_7ufgA7Z_k,2180
6
6
  lgt_jobs/simple_job.py,sha256=L8gBO3DXMy0eHnYYfowRvX-4vh16mmrgdSv-i3wVsW4,517
@@ -9,7 +9,7 @@ lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
9
  lgt_jobs/jobs/analytics.py,sha256=ezj_MWtdqKcw13ebn6Fft337fbbet5SUS2KmihQogu0,1267
10
10
  lgt_jobs/jobs/archive_leads.py,sha256=wZ4LwbuC9G7NB16AO15YiMemEV40LoJVjd8VRqaFv9o,831
11
11
  lgt_jobs/jobs/bot_stats_update.py,sha256=OlnaqUxLY3cWynwQiCyfrciiujWpVBIHx_8OvYRzfuo,2758
12
- lgt_jobs/jobs/chat_history.py,sha256=YpfXyGyQPOdUpq6Vv-Pzt7dJbiIjEO9L8mbQQQVdc_A,5678
12
+ lgt_jobs/jobs/chat_history.py,sha256=FNKbxqv9vcQfTXlnEL3vPfCLPcMJzQXkWFZHIwiYnDQ,5425
13
13
  lgt_jobs/jobs/clear_user_analytics.py,sha256=sP90jhOcZqs67hJV-lJyFJH9Iciqai8IsbNs5fSc90U,2478
14
14
  lgt_jobs/jobs/connected_workspaces.py,sha256=h5zcXHZxflmR-z1apc4nQXkEL-Qsndk7MdT6gKx1njE,7302
15
15
  lgt_jobs/jobs/conversation_replied.py,sha256=Y7QORfQEofHLIzkezbdUJKkMmSfWTGxXC4EdDuQ50qI,2862
@@ -20,7 +20,7 @@ lgt_jobs/jobs/update_slack_profile.py,sha256=dTVZdO9x7kywvGyzOUVj1qnEK7pDo-UQLnh
20
20
  lgt_jobs/jobs/user_balance_update.py,sha256=x8mcq-S-f4-weGmuvyqram0ixJ2HcdDg5wgMI1SKQFE,2295
21
21
  lgt_jobs/jobs/user_limits_update.py,sha256=pQPPpirOumlgaTV1VI7CncIDR8RvC-mqFbL1Oi3rlBM,2723
22
22
  lgt_jobs/templates/new_message_mail_template.html,sha256=82XdDPtmkJVUWUcZtgd8bv_9-viAG2WWOnf3AhR6PeY,3635
23
- leadguru_jobs-0.180.0.dist-info/METADATA,sha256=yVS2o1etwSHNMbSYMniJj-H7YrY8er7Pc9ha5zM-Aa0,1163
24
- leadguru_jobs-0.180.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
25
- leadguru_jobs-0.180.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
26
- leadguru_jobs-0.180.0.dist-info/RECORD,,
23
+ leadguru_jobs-0.182.0.dist-info/METADATA,sha256=R6JdKuwK05VKQP413PGbuRU1wCfeeIwhhN2dgk9kufk,1163
24
+ leadguru_jobs-0.182.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
25
+ leadguru_jobs-0.182.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
26
+ leadguru_jobs-0.182.0.dist-info/RECORD,,
lgt_jobs/env.py CHANGED
@@ -1,19 +1,11 @@
1
1
  import os
2
2
 
3
3
  project_id = os.environ.get('PROJECT_ID')
4
- slack_login_url = os.environ.get('SLACK_LOGIN_URL')
5
4
  background_jobs_topic = os.environ.get('BACKGROUND_JOBS_TOPIC')
6
5
  background_jobs_subscriber = os.environ.get('BACKGROUND_JOBS_SUBSCRIBER')
7
6
  mongo_connection_string = os.environ.get('MONGO_CONNECTION_STRING')
8
7
  smtp_host = os.environ.get('SMTP_HOST')
9
8
  smtp_login = os.environ.get('SMTP_LOGIN')
10
9
  smtp_password = os.environ.get('SMTP_PASSWORD')
11
- k8namespace = os.environ.get('K8_NAMESPACE')
12
- k8config = os.environ.get('KUBE_CONFIG_DEFAULT_LOCATION')
13
- backend_uri = os.environ.get('BACKEND_URI')
14
- aggregator_topic = os.environ.get('AGGREGATOR_TOPIC')
15
10
  google_app_credentials = os.environ.get('GOOGLE_APPLICATION_CREDENTIALS')
16
11
  portal_url = os.environ.get('PORTAL_URL')
17
- push_gateway_url = os.environ.get('PUSH_GATEWAY_URL')
18
- environment = os.environ.get('ENVIRONMENT')
19
- write_analytics = os.environ.get("WRITE_ANALYTICS", "true").lower() == "true"
@@ -1,13 +1,12 @@
1
1
  import datetime
2
2
  from abc import ABC
3
3
  from typing import Optional, List
4
-
5
4
  from lgt.common.python.lgt_logging import log
6
- from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService, get_slack_credentials
5
+ from lgt.common.python.slack_client.web_client import SlackWebClient, SlackMessageConvertService, \
6
+ return_cred_if_contact_connected
7
7
  from lgt_data.engine import LeadChat
8
- from lgt_data.model import SlackHistoryMessageModel, UserLeadModel, UserModel, UserBotCredentialsModel
9
- from lgt_data.mongo_repository import UserLeadMongoRepository, UserMongoRepository, \
10
- UserBotCredentialsMongoRepository
8
+ from lgt_data.model import SlackHistoryMessageModel, UserLeadModel, UserModel
9
+ from lgt_data.mongo_repository import UserLeadMongoRepository, UserMongoRepository
11
10
  from pydantic import BaseModel
12
11
 
13
12
  from ..runner import BackgroundJobRunner
@@ -39,12 +38,10 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
39
38
  return saved_chat
40
39
 
41
40
  @staticmethod
42
- def _update_history(user_bots: List[UserBotCredentialsModel],
43
- user: UserModel,
44
- lead: UserLeadModel) -> Optional[SlackHistoryMessageModel]:
41
+ def _update_history(user: UserModel, lead: UserLeadModel) -> Optional[SlackHistoryMessageModel]:
45
42
  saved_chat_history = lead.chat_history if lead.chat_history else list()
46
43
 
47
- creds = get_slack_credentials(user, lead, user_bots=user_bots)
44
+ creds = return_cred_if_contact_connected(user.id, lead.message.name)
48
45
  if not creds or creds.invalid_creds:
49
46
  return None
50
47
 
@@ -102,14 +99,13 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
102
99
  if not leads:
103
100
  return
104
101
 
105
- user_bots = UserBotCredentialsMongoRepository().get_bot_credentials(user_id=data.user_id)
106
102
  last_message = None
107
103
  last_message_lead = None
108
104
  for lead in leads:
109
105
  if not lead.slack_channel:
110
106
  continue
111
107
 
112
- message = LoadChatHistoryJob._update_history(user_bots=user_bots, user=user, lead=lead)
108
+ message = LoadChatHistoryJob._update_history(user=user, lead=lead)
113
109
 
114
110
  if not message:
115
111
  continue