ChaterJee 0.5.2__tar.gz → 0.5.4__tar.gz

{chaterjee-0.5.2 → chaterjee-0.5.4}/ChaterJee/ChaterJee.py

@@ -116,7 +116,7 @@ class ChatLogs:
         reply_keyboard = [[f'{job}'] for job in list(self.jobs.keys())[::-1]]   # inverse to show latest jobs on top
         await context.bot.sendChatAction(chat_id=self.CHATID, action="typing")
         msg = await update.message.reply_text("Select a job to get updates on",\
-        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, input_field_placeholder="Select the job."\
+        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, resize_keyboard=True, input_field_placeholder="Select the job."\
         ),\
         )
         self.smsID.append(msg.message_id)
@@ -134,6 +134,7 @@ class ChatLogs:
         logDIR = Path(jobs[job_name]['logDIR'])
         logFILE = jobs[job_name]['logFILE']
         logIMAGE = jobs[job_name]['logIMAGE']
+        logDICT = jobs[job_name]['logDICT']
         
         self.txt = self.get_last_line(logDIR / logFILE)
 
@@ -142,6 +143,10 @@ class ChatLogs:
             #await self.sendUpdate(update, context)
             #msg = await context.bot.send_message(chat_id=self.CHATID, text=txt)
             #self.smsID.append(msg.message_id)
+        elif logDICT is not None:
+            self.txt = self.txt + '\n'
+            for key, value in logDICT.items():
+                self.txt = self.txt + f"{key}: {value}\n"
         
         await context.bot.sendChatAction(chat_id=self.CHATID, action="typing")
         msg = await update.message.reply_text(
@@ -241,7 +246,7 @@ class ChatLogs:
             await context.bot.sendChatAction(chat_id=self.CHATID, action="typing")
             if len(JSONfiles):
                 msg = await update.message.reply_text("Select a JSON file to edit",\
-                    reply_markup=ReplyKeyboardMarkup(JSONfiles, one_time_keyboard=True, input_field_placeholder="Select the file."\
+                    reply_markup=ReplyKeyboardMarkup(JSONfiles, one_time_keyboard=True, resize_keyboard=True, input_field_placeholder="Select the file."\
                     ),\
                     )
                 self.smsID.append(msg.message_id)
@@ -274,7 +279,8 @@ class ChatLogs:
                 KeyboardButton(
                     text="Editor Babu",
                     web_app=WebAppInfo(url="https://pallab-dutta.github.io/EditorBabu"+extender),
-                    )
+                    ),
+                resize_keyboard=True, one_time_keyboard=True
                 ),
             )
         self.smsID.append(msg.message_id)
@@ -374,7 +380,7 @@ class ChatLogs:
         print(reply_keyboard)
         await context.bot.sendChatAction(chat_id=self.CHATID, action="typing")
         msg = await update.message.reply_text("Entire chat history in the current session will be cleared. Proceed?",\
-        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, input_field_placeholder="Select to proceed."\
+        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, resize_keyboard=True, input_field_placeholder="Select to proceed."\
         ),\
         )
         self.smsID.append(msg.message_id)
@@ -396,7 +402,7 @@ class ChatLogs:
         print(reply_keyboard)
         await context.bot.sendChatAction(chat_id=self.CHATID, action="typing")
         msg = await update.message.reply_text("Your job will be killed. Proceed?",\
-        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, input_field_placeholder="Select to proceed."\
+        reply_markup=ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True, resize_keyboard=True, input_field_placeholder="Select to proceed."\
         ),\
         )
         self.smsID.append(msg.message_id)
@@ -432,8 +438,9 @@ class NoteLogs:
         self.logDIR = None
         self.logFILE = None
         self.logIMAGE = None
+        self.logDICT = None
 
-    def write(self, jobNAME: str, logDIR: str = None, logSTRING: str = None, logFILE: str = 'log_file.out', logIMAGE: str = 'log_file.png'):
+    def write(self, jobNAME: str, logDIR: str = None, logSTRING: str = None, logFILE: str = 'log_file.out', logIMAGE: str = 'log_file.png', logDICT: dict = None):
         if logDIR is None:
             pwd = Path.cwd()
             _logDIR = pwd / jobNAME
@@ -454,6 +461,7 @@ class NoteLogs:
         self.logDIR = logDIR
         self.logFILE = logFILE
         self.logIMAGE = logIMAGE
+        self.logDICT = logDICT
         self.save_job_JSON()
 
     def save_job_JSON(self):
@@ -465,12 +473,22 @@ class NoteLogs:
                 jobs = json.load(ffr)
         except FileNotFoundError:
             jobs = {}
-        jobs[self.jobNAME] = {\
-                "logDIR": self.logDIR, \
-                "logFILE": self.logFILE, \
-                "logIMAGE": self.logIMAGE \
-                }
-        with open(jobs_file, 'w') as ffw:
-            json.dump(jobs, ffw, indent=4)
+        try:
+            jobD = jobs[self.jobNAME]
+        except KeyError:
+            jobs[self.jobNAME] = {}
+            jobD = {}
+        if self.logDIR is not None:
+            jobD["logDIR"] = self.logDIR
+        if self.logFILE is not None:
+            jobD["logFILE"] = self.logFILE
+        if self.logIMAGE is not None:
+            jobD["logIMAGE"] = self.logIMAGE
+        if self.logDICT is not None:
+            jobD["logDICT"] = self.logDICT
+        if len(jobD):
+            jobs[self.jobNAME] = jobD
+            with open(jobs_file, 'w') as ffw:
+                json.dump(jobs, ffw, indent=4)
 
 

{chaterjee-0.5.2 → chaterjee-0.5.4}/ChaterJee.egg-info/PKG-INFO

@@ -1,19 +1,12 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: ChaterJee
-Version: 0.5.2
+Version: 0.5.4
 Summary: Communicate your project updates via Telegram Bot!
 Author: Pallab Dutta
 Author-email: pallab9997@gmail.com
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: python-telegram-bot==20.7
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # ChaterJee
 

{chaterjee-0.5.2 → chaterjee-0.5.4}/PKG-INFO

@@ -1,19 +1,12 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: ChaterJee
-Version: 0.5.2
+Version: 0.5.4
 Summary: Communicate your project updates via Telegram Bot!
 Author: Pallab Dutta
 Author-email: pallab9997@gmail.com
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: python-telegram-bot==20.7
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # ChaterJee
 

{chaterjee-0.5.2 → chaterjee-0.5.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ChaterJee',
-    version='0.5.2',
+    version='0.5.4',
     packages=find_packages(),
     install_requires=[
         'python-telegram-bot==20.7',