chgksuite 0.27.2__py3-none-any.whl → 0.28.0__py3-none-any.whl

chgksuite/cli.py

@@ -12,6 +12,7 @@ from chgksuite.common import (
     load_settings,
 )
 from chgksuite.composer import gui_compose
+from chgksuite.composer.telegram import get_saved_telegram_targets
 from chgksuite.handouter.runner import gui_handouter
 from chgksuite.parser import gui_parse
 from chgksuite.trello import gui_trello
@@ -34,7 +35,14 @@ class ArgparseBuilder:
         if self.use_wrapper:
             return getattr(parser, func)(*args, **kwargs)
         else:
-            for k in ("caption", "advanced", "argtype", "hide", "filetypes"):
+            for k in (
+                "caption",
+                "advanced",
+                "argtype",
+                "hide",
+                "filetypes",
+                "combobox_values",
+            ):
                 try:
                     kwargs.pop(k)
                 except KeyError:
@@ -654,12 +662,15 @@ class ArgparseBuilder:
             help="a made-up string designating account to use.",
             caption="Аккаунт для постинга",
         )
+        saved_targets = get_saved_telegram_targets()
         self.add_argument(
             cmdcompose_telegram,
             "--tgchannel",
             required=True,
             help="a channel to post questions to.",
             caption="Название канала, в который постим",
+            argtype="combobox",
+            combobox_values=saved_targets,
         )
         self.add_argument(
             cmdcompose_telegram,
@@ -667,6 +678,8 @@ class ArgparseBuilder:
             required=True,
             help="a chat connected to the channel.",
             caption="Название чата, привязанного к каналу",
+            argtype="combobox",
+            combobox_values=saved_targets,
         )
         self.add_argument(
             cmdcompose_telegram,

chgksuite/composer/telegram.py

@@ -17,6 +17,28 @@ from chgksuite.composer.composer_common import BaseExporter, parseimg
 from chgksuite.composer.telegram_bot import run_bot_in_thread
 
 
+def get_saved_telegram_targets():
+    """
+    Load all saved channel/chat usernames from resolve.db.
+    Returns a list of usernames that have been previously used.
+    """
+    chgksuite_dir = get_chgksuite_dir()
+    resolve_db_path = os.path.join(chgksuite_dir, "resolve.db")
+
+    if not os.path.exists(resolve_db_path):
+        return []
+
+    try:
+        conn = sqlite3.connect(resolve_db_path)
+        cursor = conn.cursor()
+        cursor.execute("SELECT username FROM resolve ORDER BY username")
+        results = cursor.fetchall()
+        conn.close()
+        return [row[0] for row in results]
+    except Exception:
+        return []
+
+
 def get_text(msg_data):
     if "message" in msg_data and "text" in msg_data["message"]:
         return msg_data["message"]["text"]
@@ -44,19 +66,14 @@ class TelegramExporter(BaseExporter):
         self.chat_id = None  # Discussion group ID linked to the channel
         self.auth_uuid = uuid.uuid4().hex[:8]
         self.chat_auth_uuid = uuid.uuid4().hex[:8]
+        self.session = requests.Session()
         self.init_telegram()
 
     def check_connectivity(self):
-        req_me = requests.get(f"https://api.telegram.org/bot{self.bot_token}/getMe")
-        if req_me.status_code != 200:
-            raise Exception(
-                f"getMe request wasn't successful: {req_me.status_code} {req_me.text}"
-            )
-        obj = req_me.json()
-        assert obj["ok"]
+        result = self.send_api_request("getMe")
         if self.args.debug:
-            print(f"connection successful! {obj}")
-        self.bot_id = obj["result"]["id"]
+            print(f"connection successful! {result}")
+        self.bot_id = result["id"]
 
     def init_temp_db(self):
         self.db_conn = sqlite3.connect(self.temp_db_path)
@@ -102,8 +119,6 @@ class TelegramExporter(BaseExporter):
             ).fetchall()
             if messages and json.loads(messages[0][0])["status"] == "ok":
                 break
-        # Request user authentication
-        self.authenticate_user()
 
     def authenticate_user(self):
         print("\n" + "=" * 50)
@@ -208,32 +223,46 @@ class TelegramExporter(BaseExporter):
     def send_api_request(self, method, data=None, files=None):
         """Send a request to the Telegram Bot API."""
         url = f"https://api.telegram.org/bot{self.bot_token}/{method}"
+        retry_delay = 10  # Start with 10 seconds
+        max_retry_delay = 120  # Cap at 2 minutes
 
-        try:
-            if files:
-                response = requests.post(url, data=data, files=files, timeout=60)
-            else:
-                response = requests.post(url, json=data, timeout=30)
+        while True:
+            try:
+                if files:
+                    response = self.session.post(
+                        url, data=data, files=files, timeout=60
+                    )
+                else:
+                    response = self.session.post(url, json=data, timeout=30)
 
-            response_data = response.json()
+                response_data = response.json()
 
-            if not response_data.get("ok"):
-                error_message = response_data.get("description", "Unknown error")
-                self.logger.error(f"Telegram API error: {error_message}")
+                if not response_data.get("ok"):
+                    error_message = response_data.get("description", "Unknown error")
+                    self.logger.error(f"Telegram API error: {error_message}")
 
-                # Handle rate limiting
-                if "retry_after" in response_data:
-                    retry_after = response_data["retry_after"]
-                    self.logger.info(f"Rate limited. Waiting for {retry_after} seconds")
-                    time.sleep(retry_after + 1)
-                    return self.send_api_request(method, data, files)
+                    # Handle rate limiting
+                    if "retry_after" in response_data:
+                        retry_after = response_data["retry_after"]
+                        self.logger.info(
+                            f"Rate limited. Waiting for {retry_after} seconds"
+                        )
+                        time.sleep(retry_after + 1)
+                        return self.send_api_request(method, data, files)
 
-                raise Exception(f"Telegram API error: {error_message}")
+                    raise Exception(f"Telegram API error: {error_message}")
 
-            return response_data["result"]
-        except requests.exceptions.RequestException as e:
-            self.logger.error(f"Request error: {e}")
-            raise
+                return response_data["result"]
+            except requests.exceptions.RequestException as e:
+                if "Connection reset by peer" in str(e):
+                    self.logger.warning(
+                        f"Connection reset by peer. Retrying in {retry_delay} seconds..."
+                    )
+                    time.sleep(retry_delay)
+                    retry_delay = min(retry_delay * 2, max_retry_delay)
+                    continue
+                self.logger.error(f"Request error: {e}")
+                raise
 
     def get_message_link(self, chat_id, message_id, username=None):
         """Generate a link to a Telegram message."""
@@ -851,66 +880,82 @@ class TelegramExporter(BaseExporter):
         channel_result = self.extract_id_from_link(self.args.tgchannel)
         chat_result = self.extract_id_from_link(self.args.tgchat)
 
-        # Handle channel resolution
+        # First, try to resolve both IDs without user interaction
+        channel_id = None
+        chat_id = None
+        needs_channel_interaction = False
+        needs_chat_interaction = False
+
         if isinstance(channel_result, int):
             channel_id = channel_result
         elif isinstance(channel_result, str):
             channel_id = self.resolve_username_to_id(channel_result)
             if not channel_id:
-                print("\n" + "=" * 50)
-                print("Please forward any message from the target channel to the bot.")
-                print("This will allow me to extract the channel ID automatically.")
-                print("=" * 50 + "\n")
-
-                # Wait for a forwarded message with channel information
-                channel_id = self.wait_for_forwarded_message(
-                    entity_type="channel", check_type=True
-                )
-                if channel_id:
-                    self.save_username(channel_result, channel_id)
-                else:
-                    raise Exception("Failed to get channel ID from forwarded message")
+                needs_channel_interaction = True
         else:
             raise Exception("Channel ID is undefined")
 
-        # Handle chat resolution
         if isinstance(chat_result, int):
             chat_id = chat_result
         elif isinstance(chat_result, str):
             chat_id = self.resolve_username_to_id(chat_result)
             if not chat_id:
-                print("\n" + "=" * 50)
-                print(
-                    f"Please write a message in the discussion group with text: {self.chat_auth_uuid}"
-                )
-                print("This will allow me to extract the group ID automatically.")
-                print(
-                    "The bot MUST be added do the group and made admin, else it won't work!"
-                )
-                print("=" * 50 + "\n")
+                needs_chat_interaction = True
+        else:
+            raise Exception("Chat ID is undefined")
 
-                # Wait for a forwarded message with chat information
+        # Only authenticate if we need user interaction
+        if needs_channel_interaction or needs_chat_interaction:
+            self.authenticate_user()
+
+        # Handle channel resolution with user interaction if needed
+        if needs_channel_interaction:
+            print("\n" + "=" * 50)
+            print("Please forward any message from the target channel to the bot.")
+            print("This will allow me to extract the channel ID automatically.")
+            print("=" * 50 + "\n")
+
+            # Wait for a forwarded message with channel information
+            channel_id = self.wait_for_forwarded_message(
+                entity_type="channel", check_type=True
+            )
+            if channel_id:
+                self.save_username(channel_result, channel_id)
+            else:
+                raise Exception("Failed to get channel ID from forwarded message")
+
+        # Handle chat resolution with user interaction if needed
+        if needs_chat_interaction:
+            print("\n" + "=" * 50)
+            print(
+                f"Please write a message in the discussion group with text: {self.chat_auth_uuid}"
+            )
+            print("This will allow me to extract the group ID automatically.")
+            print(
+                "The bot MUST be added do the group and made admin, else it won't work!"
+            )
+            print("=" * 50 + "\n")
+
+            # Wait for a forwarded message with chat information
+            chat_id = self.wait_for_forwarded_message(
+                entity_type="chat", check_type=False
+            )
+            if not chat_id:
+                self.logger.error("Failed to get chat ID from forwarded message")
+                return False
+            while chat_id == channel_id:
+                error_msg = (
+                    "Chat ID and channel ID are the same. The problem may be that "
+                    "you posted a message in the channel, not in the discussion group."
+                )
+                self.logger.error(error_msg)
                 chat_id = self.wait_for_forwarded_message(
-                    entity_type="chat", check_type=False
+                    entity_type="chat",
+                    check_type=False,
+                    add_msg=error_msg,
                 )
-                if not chat_id:
-                    self.logger.error("Failed to get chat ID from forwarded message")
-                    return False
-                while chat_id == channel_id:
-                    error_msg = (
-                        "Chat ID and channel ID are the same. The problem may be that "
-                        "you posted a message in the channel, not in the discussion group."
-                    )
-                    self.logger.error(error_msg)
-                    chat_id = self.wait_for_forwarded_message(
-                        entity_type="chat",
-                        check_type=False,
-                        add_msg=error_msg,
-                    )
-                if chat_id:
-                    self.save_username(chat_result, chat_id)
-        else:
-            raise Exception("Chat ID is undefined")
+            if chat_id:
+                self.save_username(chat_result, chat_id)
 
         if not channel_id:
             raise Exception("Channel ID is undefined")
@@ -1234,14 +1279,15 @@ class TelegramExporter(BaseExporter):
             return None
 
     def verify_access(self, telegram_id, hr_type=None):
-        url = f"https://api.telegram.org/bot{self.bot_token}/getChatAdministrators"
         if not str(telegram_id).startswith("-100"):
             telegram_id = f"-100{telegram_id}"
-        req = requests.post(url, data={"chat_id": telegram_id})
-        if self.args.debug:
-            print(req.status_code, req.text)
-        if req.status_code != 200:
-            raise Exception(f"Bot isn't added to {hr_type}")
-        obj = req.json()
-        admin_ids = {x["user"]["id"] for x in obj["result"]}
-        return self.bot_id in admin_ids
+        try:
+            result = self.send_api_request(
+                "getChatAdministrators", {"chat_id": telegram_id}
+            )
+            if self.args.debug:
+                print(f"getChatAdministrators result: {result}")
+            admin_ids = {x["user"]["id"] for x in result}
+            return self.bot_id in admin_ids
+        except Exception as e:
+            raise Exception(f"Bot isn't added to {hr_type}: {e}")

chgksuite/parser.py

@@ -38,7 +38,6 @@ from chgksuite.common import (
     init_logger,
     load_settings,
     log_wrap,
-    read_text_file,
     set_lastdir,
 )
 from chgksuite.composer import gui_compose

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.27.2"
+__version__ = "0.28.0"

{chgksuite-0.27.2.dist-info → chgksuite-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.27.2
+Version: 0.28.0
 Summary: A package for chgk automation
 Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
 Author-email: Alexander Pecheny <ap@pecheny.me>

{chgksuite-0.27.2.dist-info → chgksuite-0.28.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
 chgksuite/_html2md.py,sha256=IzPlRo4dVZNVdlnoCQFjSEfvpFZ0KdvVzfKSeIt15lM,2454
-chgksuite/cli.py,sha256=fHa7HNJeQeUNXpbqnMnSXHOMpbxpaph6d3KdVNx9uNg,41257
+chgksuite/cli.py,sha256=B081O0Ats_gCJO4yVA6CeJ5x3apu_rvQQmZGKOWFQ-U,41657
 chgksuite/common.py,sha256=27HEx5Us0xXywUAWtjlkhsXs67-Cx7ylJSlUViUsOgU,11778
 chgksuite/lastdir,sha256=BbZVRYZnXBQzJUrl7a2e4xuUcfmq6asNI705pTxBfD4,49
-chgksuite/parser.py,sha256=JJ_koqLDHAl-IHUe4sTyOK2gySL6uVW5HJmO1xcqD8Q,46042
+chgksuite/parser.py,sha256=G9AkqEd2nSOGOWhCxpJpZmxNzO8aoij7gL6utJAzo_Q,46022
 chgksuite/parser_db.py,sha256=Ngh2ZYhAyetb6Sa-5xC9aX8quX9Ar1WheSfhSy-JADw,11105
 chgksuite/trello.py,sha256=hc_RMlWrNrPzg9AsgC8KE9ow3JUbetMJM_HuiJlBSIk,14693
 chgksuite/typotools.py,sha256=J2AEQbfcR0HHSu5WCALpj4Ya_ngOMXRh7esJgcybWQM,12797
-chgksuite/version.py,sha256=_CerHyxnUJ2hU0sB7noT3JBjjI0ohEM5boAPBoFxOg4,23
+chgksuite/version.py,sha256=MRQGtOXBhcDKeeNOL0LiB-cllo6kfd8_KGJOvaDp0XQ,23
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
 chgksuite/composer/__init__.py,sha256=a02nOz1QqPi84621-v3JD0Nn1_M0_fHyzKqG5Wp2ahI,6511
 chgksuite/composer/chgksuite_parser.py,sha256=ItlTenviFDuqP-f1960nzD-gRPFDQy4RdOL39PswTvg,9044
@@ -21,7 +21,7 @@ chgksuite/composer/markdown.py,sha256=hWajBAvop_BTyBI6rzeIwAaj7p_6p2kQre4WDMalD9
 chgksuite/composer/openquiz.py,sha256=BF506tH6b1IoocC61l5xBU969l38S1IjqMi6mqhG_HI,6990
 chgksuite/composer/pptx.py,sha256=9O0tfx2xpyx9Y4ceatVIXdiwvslnj8gliZIlxsDe5Ow,23971
 chgksuite/composer/stats.py,sha256=GbraSrjaZ8Mc2URs5aGAsI4ekboAKzlJJOqsbe96ELA,3995
-chgksuite/composer/telegram.py,sha256=KM9Bnkf2bxdJNMrhjCCw2xx-sWcIQioBc1FdSY4OX-g,47431
+chgksuite/composer/telegram.py,sha256=lOykDAeOyYn6NJe8b33clWZdm83yqpsWFql0VyAhXzc,48862
 chgksuite/composer/telegram_bot.py,sha256=xT5D39m4zGmIbHV_ZfyQ9Rc8PAmG2V5FGUeDKpkgyTw,3767
 chgksuite/handouter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/handouter/gen.py,sha256=CJfGl8R2vnElnsjBo0n4u-y8KD-l2qxrIuUHj5WZBuI,5241
@@ -56,8 +56,8 @@ chgksuite/resources/regexes_uz_cyr.json,sha256=D4AyaEPEY753I47Ky2Fwol_4kxQsl-Yu9
 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.27.2.dist-info/METADATA,sha256=zGPoXuzOtUiNMdE7NDeSJE25K6XHaoQ4pPLBkfBLz_c,1152
-chgksuite-0.27.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-chgksuite-0.27.2.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.27.2.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.27.2.dist-info/RECORD,,
+chgksuite-0.28.0.dist-info/METADATA,sha256=sHAtIIRiyBXxgQp8lfUl8-NPRdjwd5h4YC1SQR_lp_o,1152
+chgksuite-0.28.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+chgksuite-0.28.0.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.28.0.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.28.0.dist-info/RECORD,,