telegrinder 0.1.dev160__py3-none-any.whl → 0.1.dev162__py3-none-any.whl

telegrinder/api/abc.py

@@ -17,6 +17,9 @@ class Token(str):
         if token.count(":") != 1 or not token.split(":")[0].isdigit():
             raise InvalidTokenError("Invalid token, it should look like this '123:ABC'.")
         return super().__new__(cls, token)
+    
+    def __repr__(self) -> str:
+        return f"<Token: {self.bot_id}:{''.join(self.split(':')[-1])[:6]}...>"
 
     @classmethod
     def from_env(

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,7 +24,9 @@ def compose_data(
 
 
 class API(ABCAPI, APIMethods):
-    API_URL: typing.ClassVar[str] = "https://api.telegram.org/"
+    """Bot API with available API methods."""
+
+    API_URL = "https://api.telegram.org/"
 
     def __init__(self, token: Token, *, http: ABCClient | None = None) -> None:
         self.token = token
@@ -32,9 +34,9 @@ class API(ABCAPI, APIMethods):
         super().__init__(self)
     
     def __repr__(self) -> str:
-        return "<{}: id={}, http={!r}>".format(
+        return "<{}: token={!r}, http={!r}>".format(
             self.__class__.__name__,
-            self.id,
+            self.token,
             self.http,
         )
 
@@ -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

@@ -15,7 +15,7 @@ class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
     dispatch: DispatchT
     polling: PollingT
     loop_wrapper: LoopWrapperT
-
+    
     def __init__(
         self,
         api: API,
@@ -23,7 +23,7 @@ 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

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,