telegrinder 0.1.dev161__py3-none-any.whl → 0.1.dev163__py3-none-any.whl

telegrinder/api/api.py

@@ -16,7 +16,7 @@ def compose_data(
     data: dict[str, typing.Any],
     files: dict[str, tuple[str, bytes]],
 ) -> typing.Any:
-    converter = DataConverter(files=files)
+    converter = DataConverter(files=files.copy())
     return client.get_form(
         data={k: converter(v) for k, v in data.items()},
         files=converter.files,
@@ -24,6 +24,8 @@ def compose_data(
 
 
 class API(ABCAPI, APIMethods):
+    """Bot API with available API methods."""
+
     API_URL = "https://api.telegram.org/"
 
     def __init__(self, token: Token, *, http: ABCClient | None = None) -> None:
@@ -60,7 +62,7 @@ class API(ABCAPI, APIMethods):
             assert "result" in response
             return Ok(response["result"])
         return Error(APIError(
-            code=response.get("error_code", 0),
+            code=response.get("error_code", 400),
             error=response.get("description"),
         ))
 

telegrinder/api/error.py

@@ -1,12 +1,12 @@
 class APIError(BaseException):
-    def __init__(self, code: int, error: str | None = None):
+    def __init__(self, code: int, error: str | None = None) -> None:
         self.code, self.error = code, error
     
     def __str__(self) -> str:
-        return f"[{self.code}] {self.error}"
+        return f"[{self.code}] {self.error or 'Something went wrong'}"
 
     def __repr__(self) -> str:
-        return f"<APIError {self.__str__()}>"
+        return f"<APIError: {self.__str__()}>"
 
 
 class InvalidTokenError(BaseException):

telegrinder/bot/bot.py

@@ -11,11 +11,7 @@ PollingT = typing.TypeVar("PollingT", bound=ABCPolling, default=Polling)
 LoopWrapperT = typing.TypeVar("LoopWrapperT", bound=ABCLoopWrapper, default=LoopWrapper)
 
 
-class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
-    dispatch: DispatchT
-    polling: PollingT
-    loop_wrapper: LoopWrapperT
-
+class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):    
     def __init__(
         self,
         api: API,
@@ -23,11 +19,11 @@ class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
         polling: PollingT | None = None,
         dispatch: DispatchT | None = None,
         loop_wrapper: LoopWrapperT | None = None,
-    ):
+    ) -> None:
         self.api = api
-        self.dispatch = dispatch or Dispatch()  # type: ignore
-        self.polling = polling or Polling(api)  # type: ignore
-        self.loop_wrapper = loop_wrapper or LoopWrapper()  # type: ignore
+        self.dispatch = typing.cast(DispatchT, dispatch or Dispatch())
+        self.polling = typing.cast(PollingT, polling or Polling(api))
+        self.loop_wrapper = typing.cast(LoopWrapperT, loop_wrapper or LoopWrapper())
 
     @property
     def on(self) -> DispatchT:
@@ -38,7 +34,7 @@ class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
             return
         await self.api.delete_webhook()
 
-    async def run_polling(self, offset: int = 0, skip_updates: bool = False) -> None:
+    async def run_polling(self, *, offset: int = 0, skip_updates: bool = False) -> None:
         if skip_updates:
             logger.debug("Dropping pending updates")
             await self.reset_webhook()
@@ -50,9 +46,9 @@ class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
                 logger.debug("Received update (update_id={})", update.update_id)
                 self.loop_wrapper.add_task(self.dispatch.feed(update, self.api))
 
-    def run_forever(self, offset: int = 0, skip_updates: bool = False) -> None:
+    def run_forever(self, *, offset: int = 0, skip_updates: bool = False) -> None:
         logger.debug("Running blocking polling (id={})", self.api.id)
-        self.loop_wrapper.add_task(self.run_polling(offset, skip_updates=skip_updates))
+        self.loop_wrapper.add_task(self.run_polling(offset=offset, skip_updates=skip_updates))
         self.loop_wrapper.run_event_loop()
 
 

telegrinder/bot/cute_types/base.py

@@ -33,8 +33,6 @@ if typing.TYPE_CHECKING:
 else:
 
     class BaseCute(typing.Generic[UpdateT]):
-        api: ABCAPI
-
         @classmethod
         def from_update(cls, update, bound_api):
             return cls(**update.to_dict(), api=bound_api)
@@ -115,8 +113,7 @@ def shortcut(
                 params[k] = kwargs.pop(k, p.default) if p.default is not p.empty else kwargs.pop(k)
 
             return await executor(self, method_name, get_params(params))
-
-        func.__repr__ = lambda _: f"<Shortcut {method_name!r}@{func!r}>"   
+        
         inner.__shortcut__ = Shortcut(  # type: ignore
             method_name=method_name,
             executor=executor,