leadguru-jobs 0.173.0__py3-none-any.whl → 0.175.0__py3-none-any.whl

{leadguru_jobs-0.173.0.dist-info → leadguru_jobs-0.175.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru-jobs
-Version: 0.173.0
+Version: 0.175.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable
@@ -20,6 +20,6 @@ Classifier: Topic :: Internet
 Requires-Dist: loguru
 Requires-Dist: pydantic
 Requires-Dist: cachetools (>=3.1.0)
-Requires-Dist: leadguru-common (>=0.272.0)
-Requires-Dist: leadguru-data (>=0.279.0)
+Requires-Dist: leadguru-common (>=0.273.0)
+Requires-Dist: leadguru-data (>=0.280.0)
 

{leadguru_jobs-0.173.0.dist-info → leadguru_jobs-0.175.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 lgt_jobs/__init__.py,sha256=pKgJxoeO0rQFY5svK240kM0vGQdh0K4eUeE2uhp8jq8,3236
 lgt_jobs/basejobs.py,sha256=Bg4wXVGpVlWI-aBiHy1xnHuP-hDmrn7EQYC0Vn42lf8,1281
 lgt_jobs/env.py,sha256=6e2HLmbp54WR-a5xkzs1ctdvyxVEtwgq25EnA1Zs_sQ,953
-lgt_jobs/main.py,sha256=bhabv2JMt9BgIBhjcjkx_PrNv-bfeizcXvT0zdfTi9I,1534
+lgt_jobs/main.py,sha256=HvFVkh-ABOzb6X7liasry3rjO7-601aw9UX4y1EPgek,1589
 lgt_jobs/runner.py,sha256=z-IjPSUCrm-Lhp-xjJC7gNIuvFWccb76mkMlc5mv3QQ,2248
 lgt_jobs/simple_job.py,sha256=rxKichpwaBKjwITnMy9irX5-53cbSK4TFKah9Tc2zYc,534
 lgt_jobs/smtp.py,sha256=MZCz3OOOSrDEbdC2rg7LtC3K-EnveB6T2zHA5PEv34Q,1390
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/jobs/analytics.py,sha256=MXqdXvpfOr4MwrLDtHpFiaacYTmlSPzUs7XoW25ke50,1301
+lgt_jobs/jobs/analytics.py,sha256=vO6nuDtZALujNp3O0GT4aYLQ2jXHCn6RPXm4VTisC2M,1309
 lgt_jobs/jobs/archive_leads.py,sha256=Q5AzjQKUNOCcg9tmjhSwyJtXaSKkEhbFh90inS65iYw,858
 lgt_jobs/jobs/bot_stats_update.py,sha256=sHOVFdwACKt8EerUk6tue220Ejtt1IZTmKekC3-TFmI,2975
-lgt_jobs/jobs/chat_history.py,sha256=hs0Q34gGn16xTgt3FnbwHVXnLoUl4zd0Nuhw3uqqlU4,5757
+lgt_jobs/jobs/chat_history.py,sha256=WlzyNjsGtE28oI--Zf1zm57uTl0sXYTIDh5f1cvmgww,5812
 lgt_jobs/jobs/clear_user_analytics.py,sha256=VJWkgGGk6QmlZnvCSiZ7jo04VI6gfyPzNw2nsUSHhSo,2532
 lgt_jobs/jobs/connected_workspaces.py,sha256=7QgRdc9Yjx7JLWmjdohodDDRJ5deTu981LzWJVZeGZg,7439
 lgt_jobs/jobs/conversation_replied.py,sha256=JyWEiKQ2G0gsTu3dXFy1VsKi2nGI9H4044poI07ArR4,2932
@@ -18,9 +18,9 @@ lgt_jobs/jobs/reindex_conversation_history.py,sha256=Jvve9swOYUmCv7qqG8B_iKLxljN
 lgt_jobs/jobs/send_slack_message.py,sha256=BWos34bHn9QA8LM9hmKixEnY51auzXLH2jEkRjW3iBw,1812
 lgt_jobs/jobs/update_slack_profile.py,sha256=uj-3vGy_iwph8tNFnozmdTULGM9z04qW_d-7Prkv7vg,3918
 lgt_jobs/jobs/user_balance_update.py,sha256=5rLS3xUCoDZ03ypw8Vq4-zcjS2VubQc0eBXxpfSG8nQ,2366
-lgt_jobs/jobs/user_limits_update.py,sha256=aXJOVLeLFKFMikly92JuCPWqEhWTGaJlCIo5o7jsZXo,2662
+lgt_jobs/jobs/user_limits_update.py,sha256=ux9p9Dtpc3DQ73QokV71N6ilX47z6IPzpjXgKgCTJUA,2797
 lgt_jobs/templates/new_message_mail_template.html,sha256=gn913h6LSm5kEiqRNrKCtUtVj9WXVU5BrbYGe8vA8fY,3704
-leadguru_jobs-0.173.0.dist-info/METADATA,sha256=7ZSTX19zmiE4wtRs2yRD-UsLbZ73n3fNkaMKQe6ym6g,1008
-leadguru_jobs-0.173.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-leadguru_jobs-0.173.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.173.0.dist-info/RECORD,,
+leadguru_jobs-0.175.0.dist-info/METADATA,sha256=TyG6RlJzCX5IFpmFJyed3ui2wbqK37byMGNfYFXE63M,1008
+leadguru_jobs-0.175.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+leadguru_jobs-0.175.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.175.0.dist-info/RECORD,,

lgt_jobs/jobs/analytics.py

@@ -1,6 +1,6 @@
 from abc import ABC
 import datetime
-from typing import Optional
+from typing import Optional, List
 
 from pydantic import BaseModel, conlist
 from pymongo import MongoClient
@@ -17,7 +17,7 @@ class TrackAnalyticsJobData(BaseBackgroundJobData, BaseModel):
     data: str
     name: str
     event: str
-    extra_id: Optional[str]
+    extra_ids: List[str] = []
     attributes: conlist(Optional[str], min_items=1)
     created_at: datetime.datetime
 

lgt_jobs/jobs/chat_history.py

@@ -31,7 +31,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         for message in current_chat:
             same_message = [msg for msg in saved_chat if msg.ts == message.ts]
             if same_message:
-                message.text = same_message[0].text
+                same_message[0].text = message.text
+                same_message[0].files = message.files
             else:
                 saved_chat.append(message)
 

lgt_jobs/jobs/user_limits_update.py

@@ -1,27 +1,27 @@
 from abc import ABC
 from datetime import datetime
 from typing import List
-from cachetools import cached, TTLCache
 from lgt_data.engine import UserCreditStatementDocument
 from lgt_data.enums import UserAccountState
 from lgt_data.model import UserModel
 from lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, to_object_id
 from pydantic import BaseModel
 from .analytics import TrackAnalyticsJobData, TrackAnalyticsJob
+from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
 """
 User limits handling
 """
 
 
-class UpdateUserDataUsageJobData(BaseModel):
+class UpdateUserDataUsageJobData(BaseBackgroundJobData, BaseModel):
     channel_id: str
     bot_name: str
     filtered: bool
     user_ids: List[str]
 
 
-class UpdateUserDataUsageJob(ABC):
+class UpdateUserDataUsageJob(BaseBackgroundJob, ABC):
     @property
     def job_data_type(self) -> type:
         return UpdateUserDataUsageJobData
@@ -69,4 +69,6 @@ class UpdateUserDataUsageJob(ABC):
 
             dedicated_bot = DedicatedBotRepository().get_by_user_and_name(user.id, data.bot_name)
             if dedicated_bot and not dedicated_bot.invalid_creds:
-                self.increment(f"{user.id}", data.filtered, bot_name=data.bot_name, dedicated_bot_id=dedicated_bot.id)
+                self.increment(f"{user.id}", data.filtered,
+                               bot_name=data.bot_name,
+                               dedicated_bot_id=str(dedicated_bot.id))

lgt_jobs/main.py

@@ -10,6 +10,7 @@ from lgt_jobs import env
 
 lock = threading.Lock()
 
+
 def run_background_job(data):
     try:
         log.info(f"[JOB]: {data} [START]")
@@ -18,6 +19,7 @@ def run_background_job(data):
     except Exception:
         raise
 
+
 def run_background_job_with_lock(message):
     try:
         data = json.loads(message.data)
@@ -35,10 +37,11 @@ def run_background_job_with_lock(message):
 if __name__ == '__main__':
     factory = PubSubFactory(env.project_id)
     factory.create_topic_if_doesnt_exist(env.background_jobs_topic)
-    factory.create_subscription_if_doesnt_exist(env.background_jobs_subscriber, env.background_jobs_topic, ack_deadline_seconds=600)
+    factory.create_subscription_if_doesnt_exist(env.background_jobs_subscriber, env.background_jobs_topic,
+                                                ack_deadline_seconds=600)
     bot_subscription_path = factory.get_subscription_path(env.background_jobs_subscriber, env.background_jobs_topic)
 
     factory.subscriber.subscribe(bot_subscription_path, callback=run_background_job_with_lock)
     print(f'Listening for messages on {bot_subscription_path}')
     while True:
-        time.sleep(1)
+        time.sleep(1)