- update tests

- some method fix

Author: p1p1daster

poetry.lock

@@ -103,7 +103,7 @@
     BotXAPITypingEventRequestPayload,
     TypingEventMethod,
 )
-from pybotx.client.exceptions.common import InvalidBotAccountError
+from pybotx.client.exceptions.common import ChatNotFoundError, InvalidBotAccountError
 from pybotx.client.files_api.download_file import (
     BotXAPIDownloadFileRequestPayload,
     DownloadFileMethod,
@@ -281,7 +281,7 @@ def __init__(
         exception_handlers: Optional[ExceptionHandlersDict] = None,
         default_callback_timeout: float = BOTX_DEFAULT_TIMEOUT,
         callback_repo: Optional[CallbackRepoProto] = None,
-        auth_version: BotXAuthVersion = BotXAuthVersion.V1,
+        auth_version: BotXAuthVersion = BotXAuthVersion.V2,
     ) -> None:
         if not collectors:
             logger.warning("Bot has no connected collectors")
@@ -1109,6 +1109,37 @@ async def personal_chat(
 
         return botx_api_personal_chat.to_domain()
 
+    async def ensure_personal_chat(
+        self,
+        *,
+        bot_id: UUID,
+        user_huid: UUID,
+        name: Optional[str] = None,
+    ) -> ChatInfo:
+        """Get or create personal chat with user.
+
+        Tries to fetch existing personal chat. If not found, creates it and
+        returns chat info for the new chat.
+
+        :param bot_id: Bot which should perform the request.
+        :param user_huid: Target user HUID.
+        :param name: Optional chat name for creation.
+
+        :return: Chat information.
+        """
+
+        try:
+            return await self.personal_chat(bot_id=bot_id, user_huid=user_huid)
+        except ChatNotFoundError:
+            chat_name = name or f"Personal chat {user_huid}"
+            chat_id = await self.create_chat(
+                bot_id=bot_id,
+                name=chat_name,
+                chat_type=ChatTypes.PERSONAL_CHAT,
+                huids=[user_huid],
+            )
+            return await self.chat_info(bot_id=bot_id, chat_id=chat_id)
+
     async def add_users_to_chat(
         self,
         *,
@@ -1419,6 +1450,8 @@ async def search_user_by_email_post(
     ) -> UserFromSearch:
         """Search user by email for search.
 
+        For multiple emails use `search_user_by_emails`.
+
         :param bot_id: Bot which should perform the request.
         :param email: User email.
 
@@ -2279,9 +2312,87 @@ def _verify_request(
             )
         except jwt.DecodeError as decode_exc:
             raise UnverifiedRequestError(decode_exc.args[0]) from decode_exc
+        if self._is_v2_payload(token_payload):
+            self._verify_request_v2(token, token_payload, decode_algorithms)
+        else:
+            self._verify_request_v1(
+                token,
+                token_payload,
+                decode_algorithms,
+                trusted_issuers,
+            )
 
+    @staticmethod
+    def _is_v2_payload(token_payload: Mapping[str, Any]) -> bool:
+        if token_payload.get("version") == 2:
+            return True
+
+        audience = token_payload.get("aud")
+        issuer = token_payload.get("iss")
+        if not isinstance(audience, str) or not isinstance(issuer, str):
+            return False
+
+        try:
+            UUID(issuer)
+        except (TypeError, ValueError):
+            return False
+
+        return True
+
+    def _verify_request_v2(
+        self,
+        token: str,
+        token_payload: Mapping[str, Any],
+        decode_algorithms: List[str],
+    ) -> None:
+        issuer = token_payload.get("iss")
+        if issuer is None:
+            raise UnverifiedRequestError('Token is missing the "iss" claim')
+        if not isinstance(issuer, str):
+            raise UnverifiedRequestError("Invalid issuer")
+
+        try:
+            bot_id = UUID(issuer)
+        except (TypeError, ValueError) as exc:
+            raise UnverifiedRequestError("Invalid issuer") from exc
+
+        try:
+            bot_account = self._bot_accounts_storage.get_bot_account(bot_id)
+        except UnknownBotAccountError as unknown_bot_exc:
+            raise UnverifiedRequestError(unknown_bot_exc.args[0]) from unknown_bot_exc
+
+        audience = token_payload.get("aud")
+        if not audience or not isinstance(audience, str):
+            raise UnverifiedRequestError("Invalid audience parameter was provided.")
+        if audience != bot_account.host:
+            raise UnverifiedRequestError("Invalid audience parameter was provided.")
+
+        try:
+            jwt.decode(
+                jwt=token,
+                key=bot_account.secret_key,
+                algorithms=decode_algorithms,
+                issuer=str(bot_account.id),
+                audience=bot_account.host,
+                leeway=1,
+            )
+        except jwt.InvalidTokenError as exc:
+            raise UnverifiedRequestError(exc.args[0]) from exc
+
+    def _verify_request_v1(
+        self,
+        token: str,
+        token_payload: Mapping[str, Any],
+        decode_algorithms: List[str],
+        trusted_issuers: Optional[Set[str]],
+    ) -> None:
         audience = token_payload.get("aud")
-        if not audience or not isinstance(audience, Sequence) or len(audience) != 1:
+        if (
+            not audience
+            or not isinstance(audience, Sequence)
+            or isinstance(audience, str)
+            or len(audience) != 1
+        ):
             raise UnverifiedRequestError("Invalid audience parameter was provided.")
 
         try:

pybotx/bot/bot.py

@@ -13,7 +13,7 @@ class BotAccountsStorage:
     def __init__(
         self,
         bot_accounts: List[BotAccountWithSecret],
-        auth_version: BotXAuthVersion = BotXAuthVersion.V1,
+        auth_version: BotXAuthVersion = BotXAuthVersion.V2,
     ) -> None:
         self._bot_accounts = bot_accounts
         self._auth_tokens: Dict[UUID, str] = {}

pybotx/bot/bot_accounts_storage.py

@@ -54,6 +54,9 @@ async def stop_callbacks_waiting(self) -> None:
                         f"Callback with sync_id `{sync_id!s}` can't be received",
                     ),
                 )
+                # Mark exception as retrieved to avoid "Future exception was never retrieved"
+                future.exception()
+        self._callback_futures.clear()
 
     def _get_botx_method_callback(self, sync_id: UUID) -> "Future[BotXMethodCallback]":
         try:

pybotx/bot/callbacks/callback_memory_repo.py

@@ -39,40 +39,41 @@ class BotXAPIPersonalChatMember(VerifiedPayloadBaseModel):
     user_huid: UUID
     user_kind: APIUserKinds
 
-    model_config = ConfigDict(extra="forbid")
+    model_config = ConfigDict(extra="ignore")
 
 
 class BotXAPIPersonalChatResult(VerifiedPayloadBaseModel):
     """Результат API-ответа по персональному чату."""
 
     chat_type: APIChatTypes
-    creator: Optional[UUID]
+    creator: Optional[UUID] = None
     description: Optional[str] = None
     group_chat_id: UUID
     inserted_at: dt
-    members: List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]] = Field(
-        default_factory=list
+    updated_at: Optional[dt] = None
+    members: List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID]] = Field(
+        default_factory=list,
     )
     name: str
     shared_history: bool
 
-    model_config = ConfigDict(extra="forbid")
+    model_config = ConfigDict(extra="ignore")
 
     @field_validator("members", mode="before")
     @classmethod
     def validate_members(
         cls,
-        value: List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]],
+        value: List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID, str]],
         info: Any,
-    ) -> List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]]:
+    ) -> List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID]]:
         return cls._parse_members(value)
 
     @staticmethod
     def _parse_members(
-        members_data: List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]],
-    ) -> List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]]:
+        members_data: List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID, str]],
+    ) -> List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID]]:
         # Явная аннотация решает проблему инвариантности List в mypy
-        parsed: List[Union[BotXAPIPersonalChatMember, Dict[str, Any]]] = []
+        parsed: List[Union[BotXAPIPersonalChatMember, Dict[str, Any], UUID]] = []
         for item in members_data:
             if isinstance(item, dict):
                 try:
@@ -82,6 +83,13 @@ def _parse_members(
                     parsed.append(item)
             elif isinstance(item, BotXAPIPersonalChatMember):
                 parsed.append(item)
+            elif isinstance(item, UUID):
+                parsed.append(item)
+            elif isinstance(item, str):
+                try:
+                    parsed.append(UUID(item))
+                except ValueError:
+                    logger.warning("Unknown member type: %s", item)
             else:
                 logger.warning("Unknown member type: %s", item)
         return parsed
@@ -96,6 +104,12 @@ class BotXAPIPersonalChatResponsePayload(VerifiedPayloadBaseModel):
     model_config = ConfigDict(extra="forbid")
 
     def to_domain(self) -> ChatInfo:
+        if any(
+            not isinstance(member, BotXAPIPersonalChatMember)
+            for member in self.result.members
+        ):
+            logger.warning("Unsupported user type skipped in members list")
+
         members: List[ChatInfoMember] = []
         for member in self.result.members:
             if isinstance(member, BotXAPIPersonalChatMember):
@@ -109,10 +123,6 @@ def to_domain(self) -> ChatInfo:
                     )
                 except Exception as exc:
                     logger.warning("Failed to convert member kind: %s", exc)
-            else:
-                logger.warning(
-                    "Unsupported user type skipped in members list: %s", member
-                )
 
         return ChatInfo(
             chat_type=convert_chat_type_to_domain(self.result.chat_type),

pybotx/client/chats_api/personal_chat.py

@@ -13,37 +13,40 @@ repository = "https://github.com/ExpressApp/pybotx"
 
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.14"
+python = ">=3.10,<4.0"
 
-aiofiles = ">=0.7.0,<=24.1.0"
-httpx = "^0.28.0"
+aiofiles = "^25.1.0"
+httpx = "^0.28.1"
 # The v1.0.3 cause some troubles with no-wait callbacks functionality.
 # It will be fixed in the next versions.
 # https://github.com/encode/httpcore/pull/880
-httpcore = "1.0.9"
-loguru = ">=0.6.0,<0.7.0"
-pydantic = ">=2.8.2,<3.0"
-aiocsv = ">=1.2.3,<=1.4.0"
-pyjwt = ">=2.0.0,<3.0.0"
-mypy-extensions = ">=0.2.0,<=1.1.0"
+httpcore = "^1.0.9"
+loguru = "^0.7.3"
+pydantic = "^2.12.5"
+aiocsv = "^1.4.0"
+pyjwt = "^2.11.0"
+mypy-extensions = "^1.1.0"
 
 [tool.poetry.group.dev.dependencies]
-mypy = "1.15.0"
-typing-extensions = ">=3.7.4,<5.0.0"
-bandit = "1.8.3"  # https://github.com/PyCQA/bandit/issues/837
+mypy = "^1.19.1"
+typing-extensions = "^4.15.0"
+bandit = "^1.9.3"  # https://github.com/PyCQA/bandit/issues/837
 
-pytest = "8.3.5"
-pytest-asyncio = "0.26.0"
-pytest-cov = "6.1.1"
-requests = "2.32.3"
-respx = "0.22.0"
-factory-boy = ">=3.3.3,<=4.0.0"
-deepdiff = "^8.5.0,<=9.0.0"
+pytest = "^9.0.2"
+pytest-asyncio = "^1.3.0"
+pytest-cov = "^7.0.0"
+pytest-timeout = "^2.4.0"
+pytest-xdist = "^3.8.0"
+hypothesis = "^6.151.5"
+requests = "^2.32.5"
+respx = "^0.22.0"
+factory-boy = "^3.3.3"
+deepdiff = "^8.6.1"
 
-fastapi = "0.115.12 "
-starlette = "0.46.2"  # TODO: Drop dependency after updating end-to-end test
-uvicorn = "0.34.2"
-ruff = "0.12.3"
+fastapi = "^0.128.1"
+starlette = ">=0.40,<0.51"  # TODO: Drop dependency after updating end-to-end test
+uvicorn = "^0.40.0"
+ruff = "^0.15.0"
 
 [build-system]
 requires = ["poetry>=1.2.0"]
@@ -56,15 +59,21 @@ testpaths = ["tests"]
 addopts = [
   "--strict-markers",
   "--tb=short",
+  "-n",
+  "auto",
+  "--dist=loadscope",
   "--cov=pybotx",
   "--cov-report=term-missing",
   "--cov-branch",
   "--no-cov-on-fail",
   "--cov-fail-under=100",
+  "--timeout=10",
+  "--timeout-method=thread",
 ]
 markers = [
   "wip: Work in progress",
   "mock_authorization: Mock authorization",
+  "allow_network: Allow real network access in a test",
 ]
 filterwarnings = [
   "ignore:Pydantic serializer warnings:UserWarning",