yaylib 2.1.0__tar.gz → 2.2.0__tar.gz

{yaylib-2.1.0 → yaylib-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaylib
-Version: 2.1.0
+Version: 2.2.0
 Summary: Yay! API client SDK
 License: MIT
 Keywords: Yay!,yay-api,Yay! API

{yaylib-2.1.0 → yaylib-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yaylib"
-version = "2.1.0"
+version = "2.2.0"
 description = "Yay! API client SDK"
 authors = ["ekkx"]
 license = "MIT"

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "0.1.0"
+__version__ = "2.2.0"
 
 # import apis into sdk package
 from yaylib.api.activities_api import ActivitiesApi

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/_config.py

@@ -12,6 +12,14 @@ DEFAULT_API_KEY = (
     "ccd59ee269c01511ba763467045c115779fcae3050238a252f1bd1a4b65cfec6"
 )
 
+# API key used by the browser-login fallback. When the primary email
+# login is rejected with a plain "unauthorized", the client retries
+# against POST /v2/users/login_with_email, which validates against this
+# key instead of DEFAULT_API_KEY. Set web_api_key="" to disable.
+DEFAULT_WEB_API_KEY = (
+    "e9f1ae4c4470f29a92c0168dc42b13637cc332692103f23e626bc2b016f66603"
+)
+
 # HS256 key used by signed_version and X-Jwt.
 DEFAULT_API_VERSION_KEY = "34c8c1cdf29b46a492e8ec58e6db37ec"
 

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/api/calls_api.py

@@ -23,6 +23,7 @@ from yaylib.models.call_action_signature_response import CallActionSignatureResp
 from yaylib.models.call_gift_history_response import CallGiftHistoryResponse
 from yaylib.models.call_status_response import CallStatusResponse
 from yaylib.models.conference_call_response import ConferenceCallResponse
+from yaylib.models.joinable_by import JoinableBy
 from yaylib.models.rtm_token_response import RtmTokenResponse
 from yaylib.models.user_response import UserResponse
 from yaylib.models.users_by_timestamp_response import UsersByTimestampResponse
@@ -4495,7 +4496,7 @@ class CallsApi:
         call_id: StrictInt,
         category_id: Optional[StrictStr] = None,
         game_title: Optional[StrictStr] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -4519,7 +4520,7 @@ class CallsApi:
         :param game_title:
         :type game_title: str
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -4573,7 +4574,7 @@ class CallsApi:
         call_id: StrictInt,
         category_id: Optional[StrictStr] = None,
         game_title: Optional[StrictStr] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -4597,7 +4598,7 @@ class CallsApi:
         :param game_title:
         :type game_title: str
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -4651,7 +4652,7 @@ class CallsApi:
         call_id: StrictInt,
         category_id: Optional[StrictStr] = None,
         game_title: Optional[StrictStr] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -4675,7 +4676,7 @@ class CallsApi:
         :param game_title:
         :type game_title: str
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/api/chat_rooms_api.py

@@ -18,6 +18,7 @@ from typing_extensions import Annotated
 
 from pydantic import StrictBool, StrictInt, StrictStr
 from typing import List, Optional
+from yaylib.models.call_type import CallType
 from yaylib.models.chat_room_response import ChatRoomResponse
 from yaylib.models.chat_rooms_response import ChatRoomsResponse
 from yaylib.models.create_chat_room_response import CreateChatRoomResponse
@@ -5551,7 +5552,7 @@ class ChatRoomsApi:
         self,
         id: StrictInt,
         attachment_file_name: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         font_size: Optional[StrictInt] = None,
         gif_image_id: Optional[StrictInt] = None,
         message_type: Optional[MessageType] = None,
@@ -5581,7 +5582,7 @@ class ChatRoomsApi:
         :param attachment_file_name:
         :type attachment_file_name: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param font_size:
         :type font_size: int
         :param gif_image_id:
@@ -5657,7 +5658,7 @@ class ChatRoomsApi:
         self,
         id: StrictInt,
         attachment_file_name: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         font_size: Optional[StrictInt] = None,
         gif_image_id: Optional[StrictInt] = None,
         message_type: Optional[MessageType] = None,
@@ -5687,7 +5688,7 @@ class ChatRoomsApi:
         :param attachment_file_name:
         :type attachment_file_name: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param font_size:
         :type font_size: int
         :param gif_image_id:
@@ -5763,7 +5764,7 @@ class ChatRoomsApi:
         self,
         id: StrictInt,
         attachment_file_name: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         font_size: Optional[StrictInt] = None,
         gif_image_id: Optional[StrictInt] = None,
         message_type: Optional[MessageType] = None,
@@ -5793,7 +5794,7 @@ class ChatRoomsApi:
         :param attachment_file_name:
         :type attachment_file_name: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param font_size:
         :type font_size: int
         :param gif_image_id:

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/api/posts_api.py

@@ -18,8 +18,10 @@ from typing_extensions import Annotated
 
 from pydantic import StrictBool, StrictInt, StrictStr
 from typing import Any, Dict, List, Optional
+from yaylib.models.call_type import CallType
 from yaylib.models.create_post_response import CreatePostResponse
 from yaylib.models.gift_transactions_response import GiftTransactionsResponse
+from yaylib.models.joinable_by import JoinableBy
 from yaylib.models.like_posts_response import LikePostsResponse
 from yaylib.models.noreply_mode import NoreplyMode
 from yaylib.models.post import Post
@@ -63,13 +65,13 @@ class PostsApi:
         attachment_8_filename: Optional[StrictStr] = None,
         attachment_9_filename: Optional[StrictStr] = None,
         attachment_filename: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         category_id: Optional[StrictInt] = None,
         color: Optional[StrictInt] = None,
         font_size: Optional[StrictInt] = None,
         game_title: Optional[StrictStr] = None,
         group_id: Optional[StrictInt] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         language: Optional[StrictStr] = None,
         message_tags: Optional[Dict[str, Any]] = None,
         signed_info: Optional[StrictStr] = None,
@@ -113,7 +115,7 @@ class PostsApi:
         :param attachment_filename:
         :type attachment_filename: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param category_id:
         :type category_id: int
         :param color:
@@ -125,7 +127,7 @@ class PostsApi:
         :param group_id:
         :type group_id: int
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param language:
         :type language: str
         :param message_tags:
@@ -217,13 +219,13 @@ class PostsApi:
         attachment_8_filename: Optional[StrictStr] = None,
         attachment_9_filename: Optional[StrictStr] = None,
         attachment_filename: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         category_id: Optional[StrictInt] = None,
         color: Optional[StrictInt] = None,
         font_size: Optional[StrictInt] = None,
         game_title: Optional[StrictStr] = None,
         group_id: Optional[StrictInt] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         language: Optional[StrictStr] = None,
         message_tags: Optional[Dict[str, Any]] = None,
         signed_info: Optional[StrictStr] = None,
@@ -267,7 +269,7 @@ class PostsApi:
         :param attachment_filename:
         :type attachment_filename: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param category_id:
         :type category_id: int
         :param color:
@@ -279,7 +281,7 @@ class PostsApi:
         :param group_id:
         :type group_id: int
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param language:
         :type language: str
         :param message_tags:
@@ -371,13 +373,13 @@ class PostsApi:
         attachment_8_filename: Optional[StrictStr] = None,
         attachment_9_filename: Optional[StrictStr] = None,
         attachment_filename: Optional[StrictStr] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         category_id: Optional[StrictInt] = None,
         color: Optional[StrictInt] = None,
         font_size: Optional[StrictInt] = None,
         game_title: Optional[StrictStr] = None,
         group_id: Optional[StrictInt] = None,
-        joinable_by: Optional[StrictStr] = None,
+        joinable_by: Optional[JoinableBy] = None,
         language: Optional[StrictStr] = None,
         message_tags: Optional[Dict[str, Any]] = None,
         signed_info: Optional[StrictStr] = None,
@@ -421,7 +423,7 @@ class PostsApi:
         :param attachment_filename:
         :type attachment_filename: str
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param category_id:
         :type category_id: int
         :param color:
@@ -433,7 +435,7 @@ class PostsApi:
         :param group_id:
         :type group_id: int
         :param joinable_by:
-        :type joinable_by: str
+        :type joinable_by: JoinableBy
         :param language:
         :type language: str
         :param message_tags:
@@ -2436,7 +2438,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
         _request_timeout: Union[
@@ -2462,7 +2464,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param exclude_recent_gomimushi:
@@ -2522,7 +2524,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
         _request_timeout: Union[
@@ -2548,7 +2550,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param exclude_recent_gomimushi:
@@ -2608,7 +2610,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
         _request_timeout: Union[
@@ -2634,7 +2636,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param exclude_recent_gomimushi:
@@ -2728,7 +2730,7 @@ class PostsApi:
             
         if call_type is not None:
             
-            _query_params.append(('call_type', call_type))
+            _query_params.append(('call_type', call_type.value))
             
         if include_circle_call is not None:
             
@@ -2781,7 +2783,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         cross_generation: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
@@ -2810,7 +2812,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param cross_generation:
@@ -2875,7 +2877,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         cross_generation: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
@@ -2904,7 +2906,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param cross_generation:
@@ -2969,7 +2971,7 @@ class PostsApi:
         from_timestamp: Optional[StrictInt] = None,
         number: Optional[StrictInt] = None,
         category_id: Optional[StrictInt] = None,
-        call_type: Optional[StrictStr] = None,
+        call_type: Optional[CallType] = None,
         include_circle_call: Optional[StrictBool] = None,
         cross_generation: Optional[StrictBool] = None,
         exclude_recent_gomimushi: Optional[StrictBool] = None,
@@ -2998,7 +3000,7 @@ class PostsApi:
         :param category_id:
         :type category_id: int
         :param call_type:
-        :type call_type: str
+        :type call_type: CallType
         :param include_circle_call:
         :type include_circle_call: bool
         :param cross_generation:
@@ -3102,7 +3104,7 @@ class PostsApi:
             
         if call_type is not None:
             
-            _query_params.append(('call_type', call_type))
+            _query_params.append(('call_type', call_type.value))
             
         if include_circle_call is not None:
             

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/auth.py

@@ -7,9 +7,12 @@
 
 from __future__ import annotations
 
+import json
 from typing import Optional
 
-from yaylib.errors import as_api_error
+from yaylib._error_codes import ErrCodeUnauthorized
+from yaylib.errors import as_api_error, code_of
+from yaylib.exceptions import ApiException
 from yaylib.models.login_email_user_request import LoginEmailUserRequest
 from yaylib.models.login_user_response import LoginUserResponse
 from yaylib.session import NoSessionError, Session, SessionSaveFailed
@@ -60,6 +63,68 @@ def _activate_cached_session(client, session: Session) -> None:
     client.set_login_identity(session.email, session.user_id)
 
 
+async def _login_with_email_web(
+    client,
+    *,
+    email: str,
+    password: str,
+    uuid: str,
+    two_fa_code: Optional[str],
+) -> Optional[LoginUserResponse]:
+    """Fallback login against the browser endpoint (POST
+    /v2/users/login_with_email) using the client's ``web_api_key``.
+
+    Sent through the UNWRAPPED transport (``send_unwrapped``): no header
+    injection, no Bearer, no 401 refresh — a login must authenticate
+    purely by its body credentials (PORTING.md §6.1/§6.2). Only the
+    body's api_key and the endpoint version differ from the app login.
+
+    Returns the decoded response on success, or ``None`` when the
+    fallback is itself rejected (non-2xx) so the caller surfaces the
+    primary error. Raises an ``ApiException`` carrying the raw body when
+    a 2xx response fails to decode (§15), rather than masking it behind
+    the primary 401.
+    """
+    payload = {
+        "email": email,
+        "password": password,
+        "api_key": client.web_api_key,
+        "uuid": uuid,
+    }
+    if two_fa_code:
+        payload["two_fa_code"] = two_fa_code
+
+    # Present as the browser client. The web version string is not
+    # otherwise known to the SDK, so app_version stands in for it.
+    web_ua = (
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) "
+        "AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/120.0.0.0 Safari/537.36"
+    )
+    headers = {
+        "Content-Type": "application/json;charset=UTF-8",
+        "User-Agent": web_ua,
+        "Agent": f"YayWeb {client.app_version}",
+        "X-Device-Info": f"Yay {client.app_version} Web ({web_ua})",
+    }
+    url = f"{client.base_url}/v2/users/login_with_email"
+    try:
+        res = await client._transport.send_unwrapped(
+            "POST", url, headers, json.dumps(payload)
+        )
+    except Exception:  # noqa: BLE001
+        return None
+    if not (200 <= res.status <= 299):
+        return None
+    raw = res.data.decode("utf-8", "replace")
+    try:
+        return LoginUserResponse.from_json(raw)
+    except Exception as err:  # noqa: BLE001
+        # A 2xx we couldn't decode is a genuine login result: surface it
+        # with the raw body, not the primary 401.
+        raise ApiException(status=res.status, reason=res.reason, body=raw) from err
+
+
 async def _execute_login(
     client,
     *,
@@ -101,7 +166,35 @@ async def _execute_login(
             login_email_user_request=body
         )
     except Exception as err:  # noqa: BLE001
-        raise as_api_error(err)
+        api_err = as_api_error(err)
+        # Fallback (PORTING.md §6.2): a plain "unauthorized" retries
+        # against the browser login endpoint with web_api_key. Skipped
+        # for other 401s — notably Required2FA (the caller must supply a
+        # code, not switch keys) — and when the caller pinned a specific
+        # api_key, or when web_api_key is empty (the off switch).
+        caller_pinned = api_key is not None and api_key != client.api_key
+        if (
+            client.web_api_key
+            and not caller_pinned
+            and code_of(api_err) == ErrCodeUnauthorized
+        ):
+            fallback = await _login_with_email_web(
+                client,
+                email=email,
+                password=password,
+                uuid=uuid or client.device_uuid,
+                two_fa_code=two_fa_code,
+            )
+            if fallback is None:
+                # Fallback itself rejected: surface the primary error.
+                raise api_err
+            client._logger.debug(
+                "web login fallback ok",
+                extra={"event": "login_fallback", "outcome": "ok"},
+            )
+            resp = fallback
+        else:
+            raise api_err
 
     access = resp.access_token or ""
     refresh = resp.refresh_token or ""

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/client.py

@@ -51,6 +51,7 @@ from yaylib._facade import GeneratedFacade
 from yaylib._config import (
     DEFAULT_ACCEPT_LANGUAGE,
     DEFAULT_API_KEY,
+    DEFAULT_WEB_API_KEY,
     DEFAULT_API_VERSION_KEY,
     DEFAULT_API_VERSION_NAME,
     DEFAULT_APP_VERSION,
@@ -125,6 +126,7 @@ class Client(GeneratedFacade):
         cassandra_base_url: Optional[str] = None,
         event_stream_url: Optional[str] = None,
         api_key: Optional[str] = None,
+        web_api_key: Optional[str] = None,
         api_version_key: Optional[str] = None,
         api_version_name: Optional[str] = None,
         app_version: Optional[str] = None,
@@ -142,6 +144,11 @@ class Client(GeneratedFacade):
         self.cassandra_base_url = cassandra_base_url or DEFAULT_CASSANDRA_BASE_URL
         self.event_stream_url = event_stream_url or DEFAULT_EVENT_STREAM_URL
         self.api_key = api_key or DEFAULT_API_KEY
+        # Empty string is a meaningful value here (disables the login
+        # fallback), so only fall back to the default when unset.
+        self.web_api_key = (
+            web_api_key if web_api_key is not None else DEFAULT_WEB_API_KEY
+        )
         self.api_version_key = api_version_key or DEFAULT_API_VERSION_KEY
         self.api_version_name = api_version_name or DEFAULT_API_VERSION_NAME
         self.app_version = app_version or DEFAULT_APP_VERSION

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/models/__init__.py

@@ -53,6 +53,7 @@ from yaylib.models.call_finished_data import CallFinishedData
 from yaylib.models.call_gift_history_response import CallGiftHistoryResponse
 from yaylib.models.call_message import CallMessage
 from yaylib.models.call_status_response import CallStatusResponse
+from yaylib.models.call_type import CallType
 from yaylib.models.callback import Callback
 from yaylib.models.campaign_dto import CampaignDTO
 from yaylib.models.campaign_invited_users_response import CampaignInvitedUsersResponse
@@ -211,6 +212,7 @@ from yaylib.models.invited_user_details_dto import InvitedUserDetailsDTO
 from yaylib.models.item import Item
 from yaylib.models.j0_a import J0A
 from yaylib.models.js_event import JSEvent
+from yaylib.models.joinable_by import JoinableBy
 from yaylib.models.last_status_screen_user_rank import LastStatusScreenUserRank
 from yaylib.models.level_up import LevelUp
 from yaylib.models.level_up_details import LevelUpDetails

yaylib-2.2.0/yaylib/models/call_type.py

@@ -0,0 +1,59 @@
+# coding: utf-8
+
+"""
+    Yay! API
+
+    No description provided
+
+    Schema version: 4.26.1
+    Code generated; DO NOT EDIT
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class CallType(str, Enum):
+    """
+    CallType
+    """
+
+    """
+    allowed enum values
+    """
+    VDO = 'vdo'
+    VOICE = 'voice'
+
+    @classmethod
+    def __get_pydantic_core_schema__(cls, source_type, handler):
+        # Accept any string the server sends, not only the values
+        # enumerated above, so a value added server-side still
+        # decodes. A typed constant passed in stays a member (so
+        # callers and request serializers keep working); an unknown
+        # string passes through unchanged.
+        from pydantic_core import core_schema
+        def _v(value):
+            if isinstance(value, cls):
+                return value
+            try:
+                return cls(value)
+            except ValueError:
+                return value
+        return core_schema.no_info_plain_validator_function(
+            _v,
+            serialization=core_schema.plain_serializer_function_ser_schema(
+                lambda value: value.value if isinstance(value, cls) else value
+            ),
+        )
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of CallType from a JSON string"""
+        return cls(json.loads(json_str))
+
+

{yaylib-2.1.0 → yaylib-2.2.0}/yaylib/models/conference_call.py

@@ -20,8 +20,10 @@ import json
 from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from yaylib.models.bump_params import BumpParams
+from yaylib.models.call_type import CallType
 from yaylib.models.game import Game
 from yaylib.models.genre import Genre
+from yaylib.models.joinable_by import JoinableBy
 from yaylib.models.model_conference_call_user_role import ModelConferenceCallUserRole
 from yaylib.models.user import User
 from typing import Optional, Set
@@ -35,7 +37,7 @@ class ConferenceCall(BaseModel):
     agora_token: Optional[StrictStr] = None
     anonymous_call_users_count: Optional[StrictInt] = None
     bump_params: Optional[BumpParams] = None
-    call_type: Optional[StrictStr] = None
+    call_type: Optional[CallType] = None
     conference_call_user_uuid: Optional[StrictStr] = None
     conference_call_users: Optional[List[User]] = None
     conference_call_users_role: Optional[List[ModelConferenceCallUserRole]] = None
@@ -45,7 +47,7 @@ class ConferenceCall(BaseModel):
     group_id: Optional[StrictInt] = None
     id: Optional[StrictInt] = None
     is_active: Optional[StrictBool] = None
-    joinable_by: Optional[StrictStr] = None
+    joinable_by: Optional[JoinableBy] = None
     max_participants: Optional[StrictInt] = None
     post_id: Optional[StrictInt] = None
     __properties: ClassVar[List[str]] = ["agora_channel", "agora_token", "anonymous_call_users_count", "bump_params", "call_type", "conference_call_user_uuid", "conference_call_users", "conference_call_users_role", "duration_seconds", "game", "genre", "group_id", "id", "is_active", "joinable_by", "max_participants", "post_id"]