chgksuite 0.24.0b2__py3-none-any.whl → 0.24.1__py3-none-any.whl

chgksuite/composer/telegram_bot.py

@@ -0,0 +1,115 @@
+import asyncio
+import json
+import os
+import sqlite3
+import threading
+from datetime import datetime
+
+import requests
+import toml
+from telegram import Update
+from telegram.ext import Application, ContextTypes, MessageHandler, filters
+
+from chgksuite.common import get_chgksuite_dir
+
+
+class TelegramSidecarBot:
+    def __init__(self, bot_token, db_path):
+        self.db_path = db_path
+        self._local = threading.local()
+        self.token = bot_token
+
+    @property
+    def conn(self):
+        if not hasattr(self._local, "connection"):
+            self._local.connection = sqlite3.connect(self.db_path)
+        return self._local.connection
+
+    async def handle_message(self, update: Update, _: ContextTypes.DEFAULT_TYPE):
+        cursor = self.conn.cursor()
+        raw_data = json.dumps(update.to_dict(), ensure_ascii=False)
+        cursor.execute(
+            "INSERT INTO messages (raw_data, chat_id, created_at) VALUES (?, ?, ?)",
+            (raw_data, update.message.chat.id, datetime.now().isoformat()),
+        )
+        self.conn.commit()
+
+    async def error_handler(self, update, context):
+        print(f"Update {update} caused error: {context.error}")
+
+    async def check_connectivity(self):
+        url = f"https://api.telegram.org/bot{self.token}/getMe"
+        req = requests.get(url)
+        cursor = self.conn.cursor()
+        if req.status_code == 200 and "ok" in req.json():
+            cursor.execute(
+                "INSERT INTO bot_status (raw_data, created_at) VALUES (?, ?)",
+                (json.dumps({"status": "ok"}), datetime.now().isoformat()),
+            )
+            self.conn.commit()
+        else:
+            print(f"couldn't check status, req: {req.text}")
+            cursor.execute(
+                "INSERT INTO bot_status (raw_data, created_at) VALUES (?, ?)",
+                (
+                    json.dumps(
+                        {
+                            "status": "bad",
+                            "error": req.text,
+                            "status_code": req.status_code,
+                        }
+                    ),
+                    datetime.now().isoformat(),
+                ),
+            )
+            self.conn.commit()
+        return True
+
+    def run(self):
+        loop = asyncio.get_event_loop()
+        application = (
+            Application.builder()
+            .token(self.token)
+            .connect_timeout(30.0)
+            .read_timeout(30.0)
+            .write_timeout(30.0)
+            .build()
+        )
+        application.add_handler(MessageHandler(filters.ALL, self.handle_message))
+        application.add_error_handler(self.error_handler)
+        loop.run_until_complete(application.initialize())
+        loop.run_until_complete(application.start())
+        loop.run_until_complete(
+            application.updater.start_polling(
+                allowed_updates=Update.ALL_TYPES, drop_pending_updates=True
+            )
+        )
+        loop.run_forever()
+
+
+def run_bot_in_thread(bot_token, db_path):
+    """Run the bot in a daemon thread."""
+
+    def thread_function():
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        bot = TelegramSidecarBot(bot_token, db_path)
+        connectivity_ok = loop.run_until_complete(bot.check_connectivity())
+        if not connectivity_ok:
+            raise Exception("bot couldn't connect")
+        bot.run()
+
+    bot_thread = threading.Thread(target=thread_function, daemon=True)
+    bot_thread.start()
+    return bot_thread
+
+
+def main():
+    toml_path = os.path.join(get_chgksuite_dir(), "telegram.toml")
+    with open(toml_path, "r", encoding="utf8") as f:
+        bot_token = toml.load(f)["bot_token"]
+    run_bot_in_thread(bot_token, "test_bot.db")
+
+
+if __name__ == "__main__":
+    main()

chgksuite/resources/regexes_by.json

@@ -1,16 +1,16 @@
 {
-    "tour": "^(# +)?Т[Уу][Рр] ?№? ?([0-9IVXLCDM]*)([\\.:])?$",
-    "tourrev": "^([0-9IVXLCDM]+) [Тт][Уу][Рр]([\\.:])?$",
-    "question": "П[Ыы][Тт][Аа][Нн][Ьь]?[Нн][Ее] ?[№N]?([0-9 ]*) ?([\\.:]|\n|\r\n|$)",
-    "handout": "Р[Аа][Зз][Дд][Аа][Тт]([Аа][Чч][Нн]|[Кк][Аа][Вв])[Ыы][  ][Мм][Аа][Тт][Ээ][Рр][Ыы][Яя][Лл][\\.:]",
-    "answer": "А[Дд][Кк][Аа][Зз][Ыы]? ?[№N]?([0-9]+)? ?[\\.:]",
-    "zachet": "З[Аа][Лл][Іі][Кк] ?[\\.:]",
-    "nezachet": "Н[Ее][Зз][Аа][Лл][Іі][Кк] ?[\\.:]",
-    "comment": "К[Аа][Мм]([Ее][Нн][Тт]([Аа][Рр]([Ыы][Йй])?|\\.)|\\.) ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "А[Ўў][Тт][Аа][Рр](\\(?[Ыы]?\\)?|[Кк][АаИи])? ?[\\.:]",
-    "source": "К[Рр][Ыы][Нн][Іі][Цц][АаЫы] ?[\\.:]",
-    "editor": "[Рр][Ээ][Дд][Аа][Кк][Тт][Аа][Рр]([Ыы])?( ?[\\.:]| [\\-–—]+ )",
-    "date": "Д[Аа][Тт][Аа] ?[\\.:]",
+    "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
+    "question": "П[Ыы][Тт][Аа][Нн][Ьь]?[Нн][Ее]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "handout": "Р[Аа][Зз][Дд][Аа][Тт]([Аа][Чч][Нн]|[Кк][Аа][Вв])[Ыы][\\s\\s][Мм][Аа][Тт][Ээ][Рр][Ыы][Яя][Лл][\\.:]",
+    "answer": "А[Дд][Кк][Аа][Зз][Ыы]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "zachet": "З[Аа][Лл][Іі][Кк]\\s?[\\.:]",
+    "nezachet": "Н[Ее][Зз][Аа][Лл][Іі][Кк]\\s?[\\.:]",
+    "comment": "К[Аа][Мм]([Ее][Нн][Тт]([Аа][Рр]([Ыы][Йй])?|\\.)|\\.)\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "А[Ўў][Тт][Аа][Рр](\\(?[Ыы]?\\)?|[Кк][АаИи])?\\s?[\\.:]",
+    "source": "К[Рр][Ыы][Нн][Іі][Цц][АаЫы]\\s?[\\.:]",
+    "editor": "[Рр][Ээ][Дд][Аа][Кк][Тт][Аа][Рр]([Ыы])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)студзеня|лютага|сакавіка|красавіка|мая|чэрвеня|ліпеня|жніўня|верасня|кастрычніка|лістапада|снежня(\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_en.json

@@ -1,16 +1,16 @@
 {
-    "tour": "^(# +)?(B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd]) ?№? ?([0-9IVXLCDM]*)([\\.:])?$",
-    "tourrev": "^([0-9IVXLCDM]+) (B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd])([\\.:])?$",
-    "question": "Q[Uu][Ee][Ss][Tt][Ii][Oo][Nn] ?[№N]?([0-9 ]*) ?([\\.:]|\n|\r\n|$)",
-    "answer": "A[Nn][Ss][Ww][Ee][Rr] ?[№N]?([0-9]+)? ?[\\.:]",
+    "tour": "^(#\\s+)?(B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd])\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s(B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd])([\\.:])?$",
+    "question": "Q[Uu][Ee][Ss][Tt][Ii][Oo][Nn]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "answer": "A[Nn][Ss][Ww][Ee][Rr]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "handout": "^H[Aa][Nn][Dd][Oo][Uu][Tt][\\.:]",
-    "zachet": "A[Cc][Ee][Pp][Tt] ?[\\.:]",
-    "nezachet": "R[Ee][Jj][Ee][Cc][Tt] ?[\\.:]",
-    "comment": "C[Oo][Mm][Mm]?([Ee][Nn][Tt])? ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "A[Uu][Tt][Hh][Oo][Rr][Ss]? ?[\\.:]",
-    "source": "S[Oo][Uu][Rr][Cc][Ee][Ss]? ?[\\.:]",
-    "editor": "E[Dd][Ii][Tt]([Oo][Rr][Ss]?|[Ee][Dd] [Bb][Yy]) ?( ?[\\.:]| [\\-–—]+ )",
-    "date": "D[Aa][Tt][Ee] ?[\\.:]",
+    "zachet": "A[Cc][Ee][Pp][Tt]\\s?[\\.:]",
+    "nezachet": "R[Ee][Jj][Ee][Cc][Tt]\\s?[\\.:]",
+    "comment": "C[Oo][Mm][Mm]?([Ee][Nn][Tt])?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "A[Uu][Tt][Hh][Oo][Rr][Ss]?\\s?[\\.:]",
+    "source": "S[Oo][Uu][Rr][Cc][Ee][Ss]?\\s?[\\.:]",
+    "editor": "E[Dd][Ii][Tt]([Oo][Rr][Ss]?|[Ee][Dd]\\s[Bb][Yy])\\s?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "D[Aa][Tt][Ee]\\s?[\\.:]",
     "date2": "(^|\\s)Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sep(tember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?(\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_kz_cyr.json

@@ -1,15 +1,15 @@
 {
-    "tour": "^(# +)?([0-9]+) ?[-–—] ?[Тт][Уу][Рр]\\s*$",
-    "question": "([0-9]+) ?[-–—] ? С[Ұұ][Рр][Аа][Ққ]([\\.:]|\n|\r\n|$)",
-    "handout": "^Ү[Лл][Ее][Сс][Тт][Іі][Рр][Уу][  ][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][Ыы][\\.:]",
-    "answer": "Ж[Аа][Уу][Аа][Пп] ?[№N]?([0-9]+)? ?[\\.:]",
-    "zachet": "Қ[Аа][Бб][Ыы][Лл][Дд][Аа][Нн][Аа][Тт][Ыы][Нн] [Жж][Аа][Уу][Аа][Пп](\\([Тт][Аа][Рр]\\))? ?[\\.:]",
-    "nezachet": "Қ[Аа][Бб][Ыы][Лл][Дд][Аа][Нн][Бб][Аа][Йй][Тт][Ыы][Нн] [Жж][Аа][Уу][Аа][Пп](\\([Тт][Аа][Рр]\\))? ?[\\.:]",
-    "comment": "Т[Үү][Сс][Іі][Нн][Іі][Кк][Тт][Ее][Мм][Ее] ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "А[Вв][Тт][Оо][Рр]([Лл][Аа][Рр])? ?[\\.:]",
-    "source": "Д[Ее][Рр][Ее][Кк][Кк][Өө][Зз]([Дд][Ее][Рр])? ?[\\.:]",
-    "editor": "Р[Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Лл][Аа][Рр])?( ?[\\.:]| [\\-–—]+ )",
-    "date": "Д[Аа][Тт][Аа] ?[\\.:]",
+    "tour": "^(#\\s+)?([0-9]+)\\s?[-–—]\\s?[Тт][Уу][Рр]\\s*$",
+    "question": "([0-9]+)\\s?[-–—]\\s?\\sС[Ұұ][Рр][Аа][Ққ]([\\.:]|\n|\r\n|$)",
+    "handout": "^Ү[Лл][Ее][Сс][Тт][Іі][Рр][Уу][\\s\\s][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][Ыы][\\.:]",
+    "answer": "Ж[Аа][Уу][Аа][Пп]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "zachet": "Қ[Аа][Бб][Ыы][Лл][Дд][Аа][Нн][Аа][Тт][Ыы][Нн]\\s[Жж][Аа][Уу][Аа][Пп](\\([Тт][Аа][Рр]\\))?\\s?[\\.:]",
+    "nezachet": "Қ[Аа][Бб][Ыы][Лл][Дд][Аа][Нн][Бб][Аа][Йй][Тт][Ыы][Нн]\\s[Жж][Аа][Уу][Аа][Пп](\\([Тт][Аа][Рр]\\))?\\s?[\\.:]",
+    "comment": "Т[Үү][Сс][Іі][Нн][Іі][Кк][Тт][Ее][Мм][Ее]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "А[Вв][Тт][Оо][Рр]([Лл][Аа][Рр])?\\s?[\\.:]",
+    "source": "Д[Ее][Рр][Ее][Кк][Кк][Өө][Зз]([Дд][Ее][Рр])?\\s?[\\.:]",
+    "editor": "Р[Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Лл][Аа][Рр])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)[Яя][Нн][Вв][Аа][Рр][ЬьЯя]|[Фф][Ее][Вв][Рр][Аа][Лл][ЬьЯя]|[Мм][Аа][Рр][Тт][Аа]?|[Аа][Пп][Рр][Ее][Лл][ЬьЯя]|[Мм][Аа][ЙйЯя]|[Ии][Юю][Нн][ЬьЯя]|[Ии][Юю][Лл][ЬьЯя]|[Аа][Вв][Гг][Уу][Сс][Тт][Аа]?|[Сс][Ее][Нн][Тт][Яя][Бб][Рр][ЬьЯя]|[Оо][Кк][Тт][Яя][Бб][Рр][ЬьЯя]|[Нн][Оо][Яя][Бб][Рр][ЬьЯя]|[Дд][Ее][Кк][Аа][Бб][Рр][ЬьЯя](\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_ru.json

@@ -1,16 +1,16 @@
 {
-    "tour": "^(# +)?Т[Уу][Рр] ?№? ?([0-9IVXLCDM]*)([\\.:])?$",
-    "tourrev": "^([0-9IVXLCDM]+) [Тт][Уу][Рр]([\\.:])?$",
-    "question": "В[Оо][Пп][Рр][Оо][Сс] ?[№N]?([0-9 ]*) ?([\\.:]|\n|\r\n|$)",
-    "handout": "^Р[Аа][Зз][Дд][Аа][Тт][Оо][Чч][Нн][Ыы][Йй] +[Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
-    "answer": "О[Тт][Вв][Ее][Тт][Ыы]? ?[№N]?([0-9]+)? ?[\\.:]",
-    "zachet": "З[Аа][Чч][ЕеЁё][Тт] ?[\\.:]",
-    "nezachet": "Н[Ее][Зз][Аа][Чч][ЕеЁё][Тт] ?[\\.:]",
-    "comment": "К[Оо][Мм][Мм]?([Ее][Нн][Тт]([Аа][Рр][Ии][ИиЙй]|\\.)|\\.) ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "А[Вв][Тт][Оо][Рр](\\(?[Ыы]?\\)?|[Кк][АаИи])? ?[\\.:]",
-    "source": "И[Сс][Тт][Оо][Чч][Нн][Ии][Кк]\\(?[Ии]?\\)? ?[\\.:]",
-    "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ыы]|[Сс][Кк][Аа][Яя] [Гг][Рр][Уу][Пп][Пп][Аа])?( ?[\\.:]| [\\-–—]+ )",
-    "date": "Д[Аа][Тт][Аа] ?[\\.:]",
+    "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
+    "question": "В[Оо][Пп][Рр][Оо][Сс]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "handout": "^Р[Аа][Зз][Дд][Аа][Тт][Оо][Чч][Нн][Ыы][Йй]\\s+[Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
+    "answer": "О[Тт][Вв][Ее][Тт][Ыы]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "zachet": "З[Аа][Чч][ЕеЁё][Тт]\\s?[\\.:]",
+    "nezachet": "Н[Ее][Зз][Аа][Чч][ЕеЁё][Тт]\\s?[\\.:]",
+    "comment": "К[Оо][Мм][Мм]?([Ее][Нн][Тт]([Аа][Рр][Ии][ИиЙй]|\\.)|\\.)\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "А[Вв][Тт][Оо][Рр](\\(?[Ыы]?\\)?|[Кк][АаИи])?\\s?[\\.:]",
+    "source": "И[Сс][Тт][Оо][Чч][Нн][Ии][Кк]\\(?[Ии]?\\)?\\s?[\\.:]",
+    "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ыы]|[Сс][Кк][Аа][Яя]\\s[Гг][Рр][Уу][Пп][Пп][Аа])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)[Яя][Нн][Вв][Аа][Рр][ЬьЯя]|[Фф][Ее][Вв][Рр][Аа][Лл][ЬьЯя]|[Мм][Аа][Рр][Тт][Аа]?|[Аа][Пп][Рр][Ее][Лл][ЬьЯя]|[Мм][Аа][ЙйЯя]|[Ии][Юю][Нн][ЬьЯя]|[Ии][Юю][Лл][ЬьЯя]|[Аа][Вв][Гг][Уу][Сс][Тт][Аа]?|[Сс][Ее][Нн][Тт][Яя][Бб][Рр][ЬьЯя]|[Оо][Кк][Тт][Яя][Бб][Рр][ЬьЯя]|[Нн][Оо][Яя][Бб][Рр][ЬьЯя]|[Дд][Ее][Кк][Аа][Бб][Рр][ЬьЯя](\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_sr.json

@@ -1,16 +1,16 @@
 {
-    "tour": "^(# +)?R[Uu][Nn][Dd][Aa] ?№? ?([0-9IVXLCDM]*)([\\.:])?$",
-    "tourrev": "^([0-9IVXLCDM]+) R[Uu][Nn][Dd][Aa]([\\.:])?$",
-    "question": "P[Ii][Tt][Aa][Nn][Jj][Ee] ?[№N]?([0-9 ]*) ?([\\.:]|\n|\r\n|$)",
-    "answer": "O[Dd][Gg][Oo][Vv][Oo][Rr] ?[№N]?([0-9]+)? ?[\\.:]",
+    "tour": "^(#\\s+)?R[Uu][Nn][Dd][Aa]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\sR[Uu][Nn][Dd][Aa]([\\.:])?$",
+    "question": "P[Ii][Tt][Aa][Nn][Jj][Ee]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "answer": "O[Dd][Gg][Oo][Vv][Oo][Rr]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "handout": "^(M[Aa][Tt][Ee][Rr][Ii][Jj][Aa][Ll]|P[Oo][Dd][Ee][Ll][Jj][Ee][Nn][Oo])[\\.:]",
-    "zachet": "P[Rr][Ii][Hh][Vv][Aa][Tt][Aa] [Ss][Ee] ?[\\.:]",
-    "nezachet": "N[Ee] [Pp][Rr][Ii][Hh][Vv][Aa][Tt][Aa] [Ss][Ee] ?[\\.:]",
-    "comment": "K[Oo][Mm][Ee][Nn][Tt][Aa][Rr] ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "A[Uu][Tt][Oo][Rr][Ii]? ?[\\.:]",
-    "source": "I[Zz][Vv][Oo][Rr][Ii]? ?[\\.:]",
-    "editor": "U[Rr][Ee][Dd][Nn][Ii][Kk][Ii]? ?( ?[\\.:]| [\\-–—]+ )",
-    "date": "D[Aa][Tt][Uu][Mm] ?[\\.:]",
+    "zachet": "P[Rr][Ii][Hh][Vv][Aa][Tt][Aa]\\s[Ss][Ee]\\s?[\\.:]",
+    "nezachet": "N[Ee]\\s[Pp][Rr][Ii][Hh][Vv][Aa][Tt][Aa]\\s[Ss][Ee]\\s?[\\.:]",
+    "comment": "K[Oo][Mm][Ee][Nn][Tt][Aa][Rr]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "A[Uu][Tt][Oo][Rr][Ii]?\\s?[\\.:]",
+    "source": "I[Zz][Vv][Oo][Rr][Ii]?\\s?[\\.:]",
+    "editor": "U[Rr][Ee][Dd][Nn][Ii][Kk][Ii]?\\s?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "D[Aa][Tt][Uu][Mm]\\s?[\\.:]",
     "date2": "WILL_FILL_LATER",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_ua.json

@@ -1,16 +1,16 @@
 {
-    "tour": "^(# +)?Т[Уу][Рр] ?№? ?([0-9IVXLCDM]*)([\\.:])?$",
-    "tourrev": "^([0-9IVXLCDM]+) [Тт][Уу][Рр]([\\.:])?$",
-    "question": "З[Аа][Пп][Ии][Тт][Аа][Нн][Нн][Яя] ?[№N]?([0-9 ]*) ?([\\.:]|\n|\r\n|$)",
-    "handout": "Р[Оо][Зз][Дд][Аа][Тт][Кк][Оо][Вв][Ии][Йй][  ][Мм][Аа][Тт][Ее][Рр][Іі][Аа][Лл][\\.:]",
-    "answer": "В[Іі][Дд][Пп][Оо][Вв][Іі][Дд][Ьь]? ?[№N]?([0-9]+)? ?[\\.:]",
-    "zachet": "З[Аа][Лл][Іі][Кк] ?[\\.:]",
-    "nezachet": "Н[Ее][Зз][Аа]Лл][Іі][Кк] ?[\\.:]",
-    "comment": "К[Оо][Мм][Мм]?([Ее][Нн][Тт]([Аа][Рр]|\\.)|\\.) ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "А[Вв][Тт][Оо][Рр](\\(?[Ии]?\\)?|[Кк][АаИи])? ?[\\.:]",
-    "source": "Д[Жж][Ее][Рр][Ее][Лл][ОоАа] ?[\\.:]",
-    "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ии]|[Сс][Ьь][Кк][Аа] [Гг][Рр][Уу][Пп][Аа])?( ?[\\.:]| [\\-–—]+ )",
-    "date": "Д[Аа][Тт][Аа] ?[\\.:]",
+    "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
+    "question": "З[Аа][Пп][Ии][Тт][Аа][Нн][Нн][Яя]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "handout": "Р[Оо][Зз][Дд][Аа][Тт][Кк][Оо][Вв][Ии][Йй][\\s\\s][Мм][Аа][Тт][Ее][Рр][Іі][Аа][Лл][\\.:]",
+    "answer": "В[Іі][Дд][Пп][Оо][Вв][Іі][Дд][Ьь]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "zachet": "З[Аа][Лл][Іі][Кк]\\s?[\\.:]",
+    "nezachet": "Н[Ее][Зз][Аа]Лл][Іі][Кк]\\s?[\\.:]",
+    "comment": "К[Оо][Мм][Мм]?([Ее][Нн][Тт]([Аа][Рр]|\\.)|\\.)\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "А[Вв][Тт][Оо][Рр](\\(?[Ии]?\\)?|[Кк][АаИи])?\\s?[\\.:]",
+    "source": "Д[Жж][Ее][Рр][Ее][Лл][ОоАа]\\s?[\\.:]",
+    "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ии]|[Сс][Ьь][Кк][Аа]\\s[Гг][Рр][Уу][Пп][Аа])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)cічня|лютого|березня|квітня|травня|червня|липня|серпня|вересня|жовтня|листопада|грудня(\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/resources/regexes_uz_cyr.json

@@ -1,15 +1,15 @@
 {
-    "tour": "^(# +)?([0-9]+) ?[-–—] ?[Тт][Уу][Рр]\\s*$",
-    "question": "([0-9]+) ?[-–—] ? С[Аа][Вв][Оо][Лл]([\\.:]|\n|\r\n|$)",
-    "answer": "Ж[Аа][Вв][Оо][Бб] ?[№N]?([0-9]+)? ?[\\.:]",
-    "handout": "Т[Аа][Рр][Ққ][Аа][Тт][Мм][Аа][  ][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
-    "zachet": "Қ[Аа][Бб][Уу][Лл] ?[\\.:]",
-    "nezachet": "Қ[Аа][Бб][Уу][Лл] [Ээ][Мм][Аа][Сс]?[\\.:]",
-    "comment": "И[Зз][Оо][Ҳҳ] ?[№N]?([0-9]+)? ?[\\.:]",
-    "author": "М[Уу][Аа][Лл][Лл][Ии][Фф]([Лл][Аа][Рр])? ?[\\.:]",
-    "source": "М[Аа][Нн][Бб][Аа] ?[\\.:]",
-    "editor": "(М|Тур м)[Уу][Ҳҳ][Аа][Рр][Рр][Ии][Рр]([Лл][Аа][Рр][Ии]?)?( ?[\\.:]| [\\-–—]+ )",
-    "date": "С[Аа][Нн][Аа] ?[\\.:]",
+    "tour": "^(#\\s+)?([0-9]+)\\s?[-–—]\\s?[Тт][Уу][Рр]\\s*$",
+    "question": "([0-9]+)\\s?[-–—]\\s?\\sС[Аа][Вв][Оо][Лл]([\\.:]|\n|\r\n|$)",
+    "answer": "Ж[Аа][Вв][Оо][Бб]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "handout": "Т[Аа][Рр][Ққ][Аа][Тт][Мм][Аа][\\s\\s][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
+    "zachet": "Қ[Аа][Бб][Уу][Лл]\\s?[\\.:]",
+    "nezachet": "Қ[Аа][Бб][Уу][Лл]\\s[Ээ][Мм][Аа][Сс]?[\\.:]",
+    "comment": "И[Зз][Оо][Ҳҳ]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "М[Уу][Аа][Лл][Лл][Ии][Фф]([Лл][Аа][Рр])?\\s?[\\.:]",
+    "source": "М[Аа][Нн][Бб][Аа]\\s?[\\.:]",
+    "editor": "(М|Тур\\sм)[Уу][Ҳҳ][Аа][Рр][Рр][Ии][Рр]([Лл][Аа][Рр][Ии]?)?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "С[Аа][Нн][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)январь|февраль|март|апрель|май|июнь|июль|август|сентябрь|октябрь|ноябрь|декабрь(\\s|$)",
-    "number": "^[0-9]+[\\.\\)] *"
+    "number": "^[0-9]+[\\.\\)]\\s*"
 }

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.24.0b2"
+__version__ = "0.24.1"

{chgksuite-0.24.0b2.dist-info → chgksuite-0.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.24.0b2
+Version: 0.24.1
 Summary: A package for chgk automation
 Home-page: https://gitlab.com/peczony/chgksuite
 Author: Alexander Pecheny
@@ -24,8 +24,7 @@ Requires-Dist: pyperclip
 Requires-Dist: python-docx
 Requires-Dist: python-pptx
 Requires-Dist: requests
-Requires-Dist: telethon
-Requires-Dist: TgCrypto
+Requires-Dist: python-telegram-bot
 Requires-Dist: toml
 Dynamic: author
 Dynamic: author-email

{chgksuite-0.24.0b2.dist-info → chgksuite-0.24.1.dist-info}/RECORD

@@ -1,25 +1,26 @@
 chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
 chgksuite/cli.py,sha256=8YoHWfc-wv6gdYMPH3X8HxV9SG70S7M6IQqavJaBXV4,31990
-chgksuite/common.py,sha256=lHQG72HghaBudr1X6ognGbrKmStW5k9nGSLdoxydMSA,10834
+chgksuite/common.py,sha256=FkEntLcVTApjLtTFTDf2QiMOath05i322wcmJIFjztQ,11093
 chgksuite/parser.py,sha256=AVNeTUgv0aGHsxWunV_7bM4Ul2hbDslkzqg0dU49lic,37285
 chgksuite/parser_db.py,sha256=W1--OcDnx18mehH1T2ISHu3Saeq-9mqHo-xJopNySXI,11135
 chgksuite/trello.py,sha256=BG1Qb_W7Uu4o3Mfc_tK71ElU8ysdSplGlj_sAKfvUn4,14730
 chgksuite/typotools.py,sha256=Jdk65Wn_bXqpQtOT7PkBZyD2ZG1MBeeZFPMzcHEPkf4,12771
-chgksuite/version.py,sha256=0Oh9QRxXRu7bku7hpnaBfS0Bood-SOaN3j3uUzin3lM,25
+chgksuite/version.py,sha256=23Q5wqrB_jTfEuw8bupXFhwqZO0_-oiISvjn1gCVUsA,23
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
 chgksuite/composer/__init__.py,sha256=MAOVZIYXmZmD6nNQSo9DueV6b5RgxF7_HGeLvsAhMJs,6490
-chgksuite/composer/chgksuite_parser.py,sha256=gOFAqPXRh-I5_GAPM6j1Jki-Wcdald5vPp2vFU1NwOM,8303
+chgksuite/composer/chgksuite_parser.py,sha256=MFcLUWbccMqo3OYEuaAIA0loEvWM_PNS9vR7c1z_c60,8843
 chgksuite/composer/composer_common.py,sha256=S5ipehxep6LlGIZ9dcBnifbVaMYXijMhq6-pUHRISo8,15309
 chgksuite/composer/db.py,sha256=71cINE_V8s6YidvqpmBmmlWbcXraUEGZA1xpVFAUENw,8173
 chgksuite/composer/docx.py,sha256=5MASXACM-ztWrr3VdO8HZ-W-hWWQ5TY1jXMsCQIufGc,18346
 chgksuite/composer/latex.py,sha256=WtLdUICxeX4_5vHEJRF0YhFLpTsOUwBkQFunQS488FA,9248
 chgksuite/composer/lj.py,sha256=nty3Zs3N1H0gNK378U04aAHo71_5cABhCM1Mm9jiUEA,15213
 chgksuite/composer/openquiz.py,sha256=CWGxb_cPG2Qh3dQ3hu0pS5fOfhKc8klZuO38Lo9hUF8,7020
-chgksuite/composer/pptx.py,sha256=05JxulgU80jBmxRqC3cFh0q_B3bMUCe31JzLYvnNZYM,19119
+chgksuite/composer/pptx.py,sha256=y1W2m3Cj28rDWguX5drczZvfIwm9QPsJ8_da5YTd1aE,19164
 chgksuite/composer/reddit.py,sha256=-Eg4CqMHhyGGfCteVwdQdtE1pfUXQ42XcP5OYUrBXmo,3878
 chgksuite/composer/stats.py,sha256=GbraSrjaZ8Mc2URs5aGAsI4ekboAKzlJJOqsbe96ELA,3995
-chgksuite/composer/telegram.py,sha256=Af0LJIjz3vO5OiQikV7XQObx4ABJewBp7YqHRt0P4GY,25670
+chgksuite/composer/telegram.py,sha256=H65LS79JZ3aCcqeq_SrnUU4E4yro1f-EZxCM3IrIyyQ,46526
+chgksuite/composer/telegram_bot.py,sha256=xT5D39m4zGmIbHV_ZfyQ9Rc8PAmG2V5FGUeDKpkgyTw,3767
 chgksuite/composer/telegram_parser.py,sha256=50WqOuvzzdMJJm5wsSLS49oURAQRYToPnbPJjQbMYC4,8096
 chgksuite/resources/cheader.tex,sha256=Jfe3LESk0VIV0HCObbajSQpEMljaIDAIEGSs6YY9rTk,3454
 chgksuite/resources/fix-unnumbered-sections.sty,sha256=FN6ZSWC6MvoRoThPm5AxCF98DdgcxbxyBYG6YImM05s,1409
@@ -33,19 +34,19 @@ chgksuite/resources/labels_ua.toml,sha256=sUZdwwpkddb_56bmrZyO56cDrm68ft_JoMqR38
 chgksuite/resources/labels_uz.toml,sha256=uRnf6tjBf1rYpWjt675ecB2MPn_Ohz-Hj6XDYNPpe3o,609
 chgksuite/resources/labels_uz_cyr.toml,sha256=ztqHItwhJjfBTOIj_vA1hrneYo8s5gvZkkSr0k9S3rs,814
 chgksuite/resources/pptx_config.toml,sha256=pbdQpZTBZajfXxf9Ej6jFQv8luA9_h2Lsihx9hs2jkI,570
-chgksuite/resources/regexes_by.json,sha256=SdmBZScVCKL5iZxbulHVorv22sMFN7z5kUXb7GwcNbg,1252
-chgksuite/resources/regexes_en.json,sha256=Ax_91Diozvhi7Oi9hLyT0xXjT1qbX3yRGJpB3NwibEM,959
-chgksuite/resources/regexes_kz_cyr.json,sha256=cJEOBPU5_zJnxhMRXg3t7RSCc9NdX12q_Nymqp-ECW0,1633
-chgksuite/resources/regexes_ru.json,sha256=Y7lFJKMDNgFgSul0n18bfHRn4vcTEB5HYxYIJB7lDJg,1608
-chgksuite/resources/regexes_sr.json,sha256=B_X0ZciHYwUO75vjbd2vkEt0TL4RG-yywgTtJ9QqoDI,877
-chgksuite/resources/regexes_ua.json,sha256=0pO0WRF1TWRIZis5gr-GmCwlAO_eVforpFuFiO6EQ04,1284
-chgksuite/resources/regexes_uz_cyr.json,sha256=cIQrNXbjDzRwvywDlicy7m6VEvgpE3V1DOOeIlEQAwc,1062
+chgksuite/resources/regexes_by.json,sha256=43K_jjNocNrx75OcSlVxg2zHNJKoHwzceFbtfZgM0Vo,1296
+chgksuite/resources/regexes_en.json,sha256=v1RPW8Oj0UiS_86ieYjpFOGm3qN5-OlM-qgAqa6oCy4,1003
+chgksuite/resources/regexes_kz_cyr.json,sha256=QW6MxkPjSRNU-KPAAqh4jwFZ--ckJo9EOn_p30gihiQ,1679
+chgksuite/resources/regexes_ru.json,sha256=_ZgSG31eV348eIYgmcEWvygKL3cWZeaauXsBWyrCWaM,1652
+chgksuite/resources/regexes_sr.json,sha256=SiDDtxWND41XOBvHM4MgSXcogh7bRTqsY3JbJPT2wF4,925
+chgksuite/resources/regexes_ua.json,sha256=IXtJtoUY15OoBu5Y5yW6adhJUhsDRkwfxWsPYIrbgPA,1330
+chgksuite/resources/regexes_uz_cyr.json,sha256=mIvWjyZZXQ3lr_ntuC7-ybknnYJxSSQEKxqnGluTvow,1106
 chgksuite/resources/template.docx,sha256=Do29TAsg3YbH0rRSaXhVzKEoh4pwXkklW_idWA34HVE,11189
 chgksuite/resources/template.pptx,sha256=hEFWqE-yYpwZ8ejrMCJIPEyoMT3eDqaqtiEeQ7I4fyk,29777
 chgksuite/resources/trello.json,sha256=M5Q9JR-AAJF1u16YtNAxDX-7c7VoVTXuq4POTqYvq8o,555
-chgksuite-0.24.0b2.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.24.0b2.dist-info/METADATA,sha256=YbM_s5ki5fEblYecm8L3X1ScDldUlrvXQJgRdEbDawI,1309
-chgksuite-0.24.0b2.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-chgksuite-0.24.0b2.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.24.0b2.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
-chgksuite-0.24.0b2.dist-info/RECORD,,
+chgksuite-0.24.1.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.24.1.dist-info/METADATA,sha256=lNdWAz-SnWg5kWZy7HIJT5XahbGZkfza4s-HIgKOXAI,1294
+chgksuite-0.24.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+chgksuite-0.24.1.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.24.1.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
+chgksuite-0.24.1.dist-info/RECORD,,

{chgksuite-0.24.0b2.dist-info → chgksuite-0.24.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any