mm-telegram 0.0.8__py3-none-any.whl → 0.1.1__py3-none-any.whl

mm_telegram/__init__.py

@@ -1,2 +1 @@
-from .simple_message import async_send_message as async_send_message
 from .simple_message import send_message as send_message

mm_telegram/simple_message.py

@@ -1,58 +1,31 @@
 import asyncio
-import time
 
-import pydash
-from mm_std import Err, Ok, Result, hr, hra
+from mm_std import Result, http_request
 
 
-def send_message(bot_token: str, chat_id: int, message: str, long_message_delay: int = 3) -> Result[list[int]]:
+async def send_message(bot_token: str, chat_id: int, message: str, long_message_delay: int = 3) -> Result[list[int]]:
     messages = _split_string(message, 4096)
     responses = []
     result = []
     while True:
         text = messages.pop(0)
         params = {"chat_id": chat_id, "text": text}
-        res = hr(f"https://api.telegram.org/bot{bot_token}/sendMessage", method="post", params=params)
-        responses.append(res.json)
-        if res.error is not None:
-            return Err(res.error, data={"last_res": res.to_dict(), "responses": responses})
+        res = await http_request(f"https://api.telegram.org/bot{bot_token}/sendMessage", method="post", json=params)
+        responses.append(res.to_dict())
+        if res.is_err():
+            return Result.err(res.error or "error", extra={"responses": [responses]})
 
-        message_id = pydash.get(res.json, "result.message_id")
+        message_id = res.parse_json_body("result.message_id", none_on_error=True)
         if message_id:
             result.append(message_id)
         else:
-            return Err("unknown_response", data={"last_res": res.to_dict(), "responses": responses})
-
-        if len(messages):
-            time.sleep(long_message_delay)
-        else:
-            break
-    return Ok(result, data={"responses": responses})
-
-
-async def async_send_message(bot_token: str, chat_id: int, message: str, long_message_delay: int = 3) -> Result[list[int]]:
-    messages = _split_string(message, 4096)
-    responses = []
-    result = []
-    while True:
-        text = messages.pop(0)
-        params = {"chat_id": chat_id, "text": text}
-        res = await hra(f"https://api.telegram.org/bot{bot_token}/sendMessage", method="post", params=params)
-        responses.append(res.json)
-        if res.error is not None:
-            return Err(res.error, data={"last_res": res.to_dict(), "responses": responses})
-
-        message_id = pydash.get(res.json, "result.message_id")
-        if message_id:
-            result.append(message_id)
-        else:
-            return Err("unknown_response", data={"last_res": res.to_dict(), "responses": responses})
+            return Result.err("unknown_response", extra={"responses": responses})
 
         if len(messages):
             await asyncio.sleep(long_message_delay)
         else:
             break
-    return Ok(result, data={"responses": responses})
+    return Result.ok(result, extra={"responses": responses})
 
 
 def _split_string(text: str, chars_per_string: int) -> list[str]:

{mm_telegram-0.0.8.dist-info → mm_telegram-0.1.1.dist-info}/METADATA

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: mm-telegram
-Version: 0.0.8
+Version: 0.1.1
 Requires-Python: >=3.12
-Requires-Dist: mm-std>=0.3.17
+Requires-Dist: mm-std~=0.4.8

mm_telegram-0.1.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+mm_telegram/__init__.py,sha256=Nl5I50id12u28Q0H_uHziyd2t_bjySeZAH1etBOVW3A,57
+mm_telegram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_telegram/simple_message.py,sha256=fT0zhmUPqq_w2EvTdOKLC0JhVMh3nZmthApY8dmY_fk,1193
+mm_telegram-0.1.1.dist-info/METADATA,sha256=8Iusxz_r-QCJMu7dN8BNW9VN2EFNUZBxO3G0NwNYnEc,108
+mm_telegram-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_telegram-0.1.1.dist-info/RECORD,,

mm_telegram-0.0.8.dist-info/RECORD

@@ -1,6 +0,0 @@
-mm_telegram/__init__.py,sha256=Lt7dNthxAyeswHnf72il9uFGq1c083CA9c8OCRZU0jY,126
-mm_telegram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_telegram/simple_message.py,sha256=O0ubcTHBBCruByDr6l9DiL14BeVQFeBHTYyURz1ckRc,2175
-mm_telegram-0.0.8.dist-info/METADATA,sha256=MixRPCFyPcPOddqHb1f2bIzkKgjBWCwJpVrRV-SxEv4,109
-mm_telegram-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_telegram-0.0.8.dist-info/RECORD,,