leadguru-jobs 0.173.0__tar.gz → 0.175.0__tar.gz

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/PKG-INFO

@@ -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

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -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

leadguru_jobs-0.175.0/leadguru_jobs.egg-info/requires.txt

@@ -0,0 +1,5 @@
+loguru
+pydantic
+cachetools>=3.1.0
+leadguru-common>=0.273.0
+leadguru-data>=0.280.0

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/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
 

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/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)
 

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/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))

{leadguru_jobs-0.173.0 → leadguru_jobs-0.175.0}/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)

leadguru_jobs-0.173.0/leadguru_jobs.egg-info/requires.txt

@@ -1,5 +0,0 @@
-loguru
-pydantic
-cachetools>=3.1.0
-leadguru-common>=0.272.0
-leadguru-data>=0.279.0