aioqzone 0.13.0.dev2__tar.gz → 0.14.1.dev8__tar.gz

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 0.13.0.dev2
+Version: 0.14.1.dev8
 Summary: Python wrapper for Qzone login and Qzone HTTP APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -26,8 +26,10 @@ Requires-Dist: lxml (>=4.9.1,<5.0.0)
 Requires-Dist: numpy (>=1.22.3,<2.0.0) ; extra == "captcha"
 Requires-Dist: pillow (>=9.4.0,<10.0.0) ; extra == "captcha"
 Requires-Dist: pychaosvm (>=0.2.3,<0.3.0) ; extra == "captcha"
-Requires-Dist: pydantic (>=1.10.4,<2.0.0)
+Requires-Dist: pydantic (>=2.0.3,<3.0.0)
+Requires-Dist: pydantic-settings (>=2.0.2,<3.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)
+Requires-Dist: tylisten (>=0.5.1,<0.6.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues
 Project-URL: Documentation, https://aioqzone.github.io/aioqzone
 Project-URL: Discussion, https://t.me/aioqzone_chatroom

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "0.13.0.dev2"
+version = "0.14.1.dev8"
 description = "Python wrapper for Qzone login and Qzone HTTP APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -29,15 +29,17 @@ exclude = ["*.js"]
 [tool.poetry.dependencies]
 python = "^3.8"
 httpx = "^0.24.0"
-pydantic = "^1.10.4"
+pydantic = "^2.0.3"
+pydantic-settings = "^2.0.2"
 rsa = "^4.8"
 lxml = "^4.9.1"
 cssselect = "^1.1.0"
+tylisten = { version = "~0.5.1", source = "aioqzone-index" }
 exceptiongroup = { version = "^1.1.1", python = "<3.11"}
 
 numpy = { version = "^1.22.3", optional = true}
 pillow = { version = "^9.4.0", optional = true}
-pychaosvm = { version = "^0.2.3", optional = true, source = "aioqzone-index" }
+pychaosvm = { version = "~0.2.3", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
 captcha = ["numpy", "pillow", "pychaosvm"]
@@ -63,7 +65,7 @@ optional = true
 
 [tool.poetry.group.docs.dependencies]
 Sphinx = "^7.0.1"
-autodoc-pydantic = "*"
+autodoc-pydantic = "^2.0.1"  # autodoc-pydantic/#146 #162
 sphinx-autodoc-typehints = "^1.19.5"
 furo = "*"
 sphinx-intl = "*"

aioqzone-0.14.1.dev8/src/aioqzone/api/__init__.py

@@ -0,0 +1,12 @@
+from .h5 import QzoneH5API
+from .login import *
+from .login._base import Loginable
+
+__all__ = [
+    "UnifiedLoginManager",
+    "LoginMethod",
+    "QrLoginConfig",
+    "UpLoginConfig",
+    "Loginable",
+    "QzoneH5API",
+]

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/src/aioqzone/api/h5/model.py

@@ -3,7 +3,7 @@ from typing import Type, TypeVar
 
 from pydantic import BaseModel, ValidationError
 
-from aioqzone.type.resp.h5 import FeedCount, FeedPageResp, GetMoreResp
+from aioqzone.model import FeedCount, FeedPageResp, GetMoreResp
 
 from .raw import QzoneH5RawAPI
 
@@ -14,7 +14,7 @@ log = logging.getLogger(__name__)
 
 def _parse_obj(model: Type[_model], o: object) -> _model:
     try:
-        return model.parse_obj(o)
+        return model.model_validate(o)
     except ValidationError:
         log.debug(o)
         raise

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/src/aioqzone/api/h5/raw.py

@@ -5,7 +5,7 @@ from typing import Callable, Dict, List, Optional, Tuple, Union
 
 from lxml.html import fromstring
 
-from aioqzone.api.loginman import Loginable
+from aioqzone.api.login import Loginable
 from aioqzone.exception import QzoneError
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import entire_closing, response_callback
@@ -99,7 +99,11 @@ class QzoneH5RawAPI:
             The exceptions this wrapper may raise depends on the login manager you passed in.
             Any exceptions irrelevent to "login needed" will be passed through w/o any change.
 
-            :raises: All error that may be raised from :meth:`.login.new_cookie`, which depends on the login manager you passed in.
+            :raises:
+                All errors that may be raised from :meth:`Loginable.new_cookie`, which depends on
+                the login manager you are using. If you use our built-in manager,
+                :class:`aioqzone.api.loginman.UnifiedLoginManager`,
+                :exc:`SkipLoginInterrupt` and :exc:`LoginError` may be raised.
             """
 
             with QzoneErrorDispatch() as qze, HTTPStatusErrorDispatch() as hse:
@@ -145,7 +149,7 @@ class QzoneH5RawAPI:
             if cb:
                 match = response_callback.search(robj)
                 assert match
-                robj = match.group(1)
+                robj = str(match.group(1))
             r = json_loads(robj)
         else:
             r = robj
@@ -169,7 +173,7 @@ class QzoneH5RawAPI:
     async def index(self) -> StrDict:
         """This api is the redirect page after h5 login, which is also the landing (main) page of h5 qzone.
 
-        :raise RuntimeError: if any failure occurs in data parsing.
+        :raise `RuntimeError`: if any failure occurs in data parsing.
         """
 
         @self._relogin_retry
@@ -203,8 +207,8 @@ class QzoneH5RawAPI:
         return self._rtext_handler(data, cb=False, errno_key=("code", "ret"), data_key="data")
 
     async def get_active_feeds(self, attach_info: str) -> StrDict:
-        """Get next page. If :obj:`.qzonetoken` is not parsed or `attach_info` is empty,
-        it will call :meth:`index` and return its response.
+        """Get next page. If :obj:`.qzonetoken` is not parsed or :obj:`attach_info` is empty,
+        it will call :meth:`.index` and return its response.
 
         :param attach_info: The ``attach_info`` field from last call.
             Pass an empty string equals to call :meth:`.index`.
@@ -235,7 +239,7 @@ class QzoneH5RawAPI:
     async def shuoshuo(self, fid: str, hostuin: int, appid=311, busi_param: str = ""):
         """This can be used to get the detailed summary of a feed.
 
-        :param fid: aka. cellid
+        :param fid: aka. ``cellid``
         :param hostuin: uin of the owner of the given feed
         :param appid: appid of the given feed, default as 311
         :param busi_param: optional encoded params

aioqzone-0.14.1.dev8/src/aioqzone/api/login/__init__.py

@@ -0,0 +1,227 @@
+"""
+Collect some built-in login manager without persistant cookie.
+Users can inherit these managers and implement their own persistance logic.
+
+.. versionchanged:: 0.14.0
+
+    Removed ``UPLoginMan`` and ``QRLoginMan``. Renamed ``MixedLoginMan`` to :class:`UnifiedLoginManager`.
+    For the removed managers, use :class:`.UnifiedLoginManager` instead.
+"""
+
+import asyncio
+import logging
+from typing import Dict, List, Optional, Sequence, Union
+
+from httpx import ConnectError, HTTPError
+from tylisten.futstore import FutureStore
+
+from aioqzone.exception import LoginError, SkipLoginInterrupt
+from aioqzone.message import LoginMethod
+from aioqzone.model import QrLoginConfig, UpLoginConfig
+from qqqr.exception import TencentLoginError, UserBreak
+from qqqr.qr import QrLogin
+from qqqr.up import UpH5Login
+from qqqr.utils.net import ClientAdapter
+
+from ._base import Loginable
+
+log = logging.getLogger(__name__)
+
+__all__ = ["ConstLoginMan", "UnifiedLoginManager", "LoginMethod", "QrLoginConfig", "UpLoginConfig"]
+
+
+class ConstLoginMan(Loginable):
+    """A basic login manager which uses external provided cookie."""
+
+    def __init__(self, uin: int, cookie: Dict[str, str]) -> None:
+        super().__init__(uin)
+        self._cookie = cookie
+
+    @Loginable.cookie.setter
+    def cookie(self, v: Dict[str, str]):
+        self._cookie = v
+
+    async def _new_cookie(self) -> Dict[str, str]:
+        return self._cookie
+
+
+class UnifiedLoginManager(Loginable):
+    """A login manager that will try methods according to the given :obj:`.order`.
+
+    .. versionchanged:: 0.14.0
+
+        Renamed to ``UnifiedLoginManager``.
+    """
+
+    _order: List[LoginMethod]
+
+    def __init__(
+        self,
+        client: ClientAdapter,
+        up_config: Optional[UpLoginConfig] = None,
+        qr_config: Optional[QrLoginConfig] = None,
+        *,
+        h5=True,
+    ) -> None:
+        self.up_config = up_config or UpLoginConfig()
+        self.qr_config = qr_config or QrLoginConfig()
+        super().__init__(self.up_config.uin or self.qr_config.uin)
+
+        self._order = []
+        self.client = client
+        self.channel = FutureStore()
+
+        self.h5(h5, clear_cookie=False)  # init uplogin and qrlogin
+        self.sms_code_required = self.uplogin.sms_code_required
+        self.sms_code_input = self.uplogin.sms_code_input
+        if self.up_config.uin > 0:
+            self._order.append("up")
+
+        self.refresh_times = self.qr_config.max_refresh_times
+        self.poll_freq = self.qr_config.poll_freq
+        self.qr_fetched = self.qrlogin.qr_fetched
+        self.qr_cancelled = self.qrlogin.qr_cancelled
+        self.cancel_qr = self.qrlogin.cancel
+        self.refresh_qr = self.qrlogin.refresh
+        if self.qr_config.uin > 0:
+            self._order.append("qr")
+
+    @property
+    def order(self):
+        """Returns order of :obj:`LoginMethod`. Assign a :obj:`LoginMethod` :obj:`Sequence` to this to
+        change the order of :obj:`LoginMethod`."""
+        return self._order
+
+    @order.setter
+    def order(self, v: Sequence[LoginMethod]):
+        v = list(v)
+        if "qr" in v and self.qr_config.uin <= 0:
+            raise ValueError(self.qr_config)
+        if "up" in v and self.up_config.uin <= 0:
+            raise ValueError(self.up_config)
+        self._order = v
+
+    async def _try_up_login(self) -> Union[Dict[str, str], str]:
+        """
+        :raises:
+            Exceptions except for :exc:`TencentLoginError`, :exc:`NotImplementedError`,
+            :exc:`GeneratorExit`, :exc:`httpx.ConnectError`, :exc:`httpx.HTTPError`
+
+        .. versionchanged:: 0.12.9
+
+            Do not raise :exc:`SystemExit` any more. Any unexpected error will be reraised.
+
+        :return: cookie dict
+        """
+        try:
+            cookie = await self.uplogin.login()
+        except TencentLoginError as e:
+            log.warning(e := str(e))
+            return e
+        except NotImplementedError as e:
+            log.warning(str(e))
+            return "10009：需要手机验证"
+        except (GeneratorExit, ConnectError, HTTPError) as e:
+            omit_exc_info = isinstance(e, (GeneratorExit, ConnectError))
+            log.warning(f"{type(e).__name__} captured, continue.", exc_info=not omit_exc_info)
+            log.debug(e.args, extra=e.__dict__)
+            return str(e)
+        except:
+            log.fatal("密码登录抛出未捕获的异常.", exc_info=True)
+            raise
+            return "密码登录期间出现奇怪的错误😰请检查日志以便寻求帮助."
+
+        return cookie
+
+    async def _try_qr_login(self) -> Union[Dict[str, str], str]:
+        """
+        :raises:
+            Exceptions except for :exc:`UserBreak`, :exc:`KeyboardInterrupt`, :exc:`asyncio.CancelledError`,
+            :exc:`asyncio.TimeoutError`, :exc:`GeneratorExit`, :exc:`httpx.ConnectError`, :exc:`httpx.HTTPError`
+
+        .. versionchanged:: 0.12.9
+
+            Do not raise :exc:`SystemExit` any more. Any unexpected error will be reraised.
+
+        :return: cookie dict
+        """
+
+        try:
+            cookie = await self.qrlogin.login(
+                refresh_times=self.refresh_times, poll_freq=self.poll_freq
+            )
+        except (UserBreak, KeyboardInterrupt, asyncio.CancelledError) as e:
+            return "用户取消了登录"
+        except (asyncio.TimeoutError, GeneratorExit, ConnectError, HTTPError) as e:
+            omit_exc_info = isinstance(e, (ConnectError, GeneratorExit, asyncio.TimeoutError))
+            log.warning(f"{type(e).__name__} captured, continue.", exc_info=not omit_exc_info)
+            log.debug(e.args, extra=e.__dict__)
+            return str(e)
+        except:
+            log.fatal("Unexpected error in QR login.", exc_info=True)
+            raise
+            return "二维码登录期间出现奇怪的错误😰请检查日志以便寻求帮助."
+
+        return cookie
+
+    async def _new_cookie(self) -> Dict[str, str]:
+        """
+        :meta public:
+        :raise `aioqzone.exception.SkipLoginInterrupt`: if :obj:`.order` returns an empty list.
+        :raise `aioqzone.exception.LoginError`: if all login methods failed.
+
+        :return: cookie dict
+        """
+        methods = self.order.copy()
+        if not methods:
+            log.info("No method selected for this login, raise SkipLoginInterrupt.")
+            raise SkipLoginInterrupt
+
+        log.info(f"Methods selected for this login: {methods}")
+        loginables = dict(up=self._try_up_login, qr=self._try_qr_login)
+
+        reasons: Dict[LoginMethod, str] = {}
+        fail_with = lambda meth, msg: self.channel.add_awaitable(
+            self.login_failed.emit(uin=self.uin, method=meth, exc=str(msg))
+        )
+
+        for m in methods:
+            try:
+                result = await loginables[m]()
+            except BaseException as e:
+                fail_with(m, e)
+                break
+
+            if isinstance(result, str):
+                fail_with(m, result)
+                reasons[m] = result
+            else:
+                return result
+
+        raise LoginError(reasons=reasons)
+
+    def h5(self, enable=True, clear_cookie=True):
+        """Change :obj:`.qrlogin` and :obj:`.uplogin` to h5 login proxy.
+
+        :param enable: use h5 mode or not
+        :param clear_cookie: remove existing login cookie in :obj:`~Loginable.cookie`!
+
+        .. versionchanged:: 0.14.1
+
+            Allow user to switch h5 back; Allow to skip clearing cookie.
+        """
+        if clear_cookie:
+            self._cookie.clear()
+            self.client.client.cookies.clear()
+
+        if enable:
+            from qqqr.up import UpH5Login as cls
+        else:
+            from qqqr.up.web import UpWebLogin as cls
+        self.uplogin = cls(
+            client=self.client,
+            uin=self.up_config.uin,
+            pwd=self.up_config.pwd.get_secret_value(),
+            h5=enable,
+        )
+        self.qrlogin = QrLogin(client=self.client, h5=enable)

{aioqzone-0.13.0.dev2/src/aioqzone/api/loginman → aioqzone-0.14.1.dev8/src/aioqzone/api/login}/_base.py

@@ -3,13 +3,14 @@ from abc import ABC, abstractmethod
 from time import time
 from typing import Dict
 
+from tylisten import Emitter
+
+import aioqzone.message as MT
 from qqqr.utils.encrypt import gtk
 
 
 class Loginable(ABC):
-    """Abstract class represents a login manager.
-    It is a :class:`Emittable` class which can emit :class:`LoginEvent`.
-    """
+    """Abstract class represents a login manager."""
 
     last_login: float = 0
     """Last login time stamp. 0 represents no login since created."""
@@ -20,12 +21,12 @@ class Loginable(ABC):
         self._cookie = {}
         self.lock = asyncio.Lock()
 
+        self.login_success = Emitter(MT.login_success)
+        self.login_failed = Emitter(MT.login_failed)
+
     @property
     def cookie(self) -> Dict[str, str]:
-        """Get a cookie dict using any method. Allows cached cookie.
-
-        :return: cookie. Cached cookie is preferable.
-        """
+        """Cached cookie."""
         return self._cookie
 
     @abstractmethod
@@ -60,7 +61,7 @@ class Loginable(ABC):
 
     @property
     def gtk(self) -> int:
-        """Calculate ``gtk`` using ``pskey`` filed in the cookie.
+        """Calculate ``gtk`` using ``pskey`` field in the cookie.
 
         :return: gtk
 

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/src/aioqzone/api/web/model.py

@@ -7,8 +7,8 @@ from typing import List, Optional, Type, TypeVar
 
 from pydantic import ValidationError
 
-from aioqzone.type.internal import AlbumData
-from aioqzone.type.resp import *
+from aioqzone.model import AlbumData
+from aioqzone.model.response.web import *
 
 from .raw import QzoneWebRawAPI
 
@@ -19,7 +19,7 @@ log = logging.getLogger(__name__)
 
 def _parse_obj(model: Type[_model], o: object) -> _model:
     try:
-        return model.parse_obj(o)
+        return model.model_validate(o)
     except ValidationError:
         log.debug(o)
         raise

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/src/aioqzone/api/web/raw.py

@@ -11,9 +11,9 @@ from urllib.parse import parse_qs
 from httpx import HTTPStatusError
 
 import aioqzone.api.web.constant as const
-from aioqzone.api.loginman import Loginable
+from aioqzone.api.login import Loginable
 from aioqzone.exception import CorruptError, QzoneError
-from aioqzone.type.internal import AlbumData, LikeData
+from aioqzone.model import AlbumData, LikeData
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import response_callback
 from aioqzone.utils.time import time_ms

{aioqzone-0.13.0.dev2 → aioqzone-0.14.1.dev8}/src/aioqzone/exception.py

@@ -1,4 +1,8 @@
-from typing import Sequence
+from typing import Mapping
+
+from aioqzone.model import LoginMethod
+
+_meth_name = dict(up="密码登录", qr="二维码登录")  # type: dict[LoginMethod, str]
 
 
 class QzoneError(RuntimeError):
@@ -22,24 +26,27 @@ class LoginError(RuntimeError):
 
     .. versionchanged:: 0.12.9
 
-        :.obj:`.methods_tried` is not optional.
-    """
+        ``methods_tried`` is not optional.
 
-    methods_tried: tuple
-    """Login methods that have been tried in this login."""
+    .. versionchanged:: 0.14.1
+
+        ``msg`` and ``methods_tried`` is merged to a single parameter :obj:`reasons`.
+    """
 
     def __init__(
         self,
-        msg: str,
-        methods_tried: Sequence,
+        reasons: Mapping[LoginMethod, str],
     ) -> None:
-        msg = "登陆失败: " + msg
-        super().__init__(msg, methods_tried)
-        self.msg = msg
-        self.methods_tried = tuple(methods_tried or ())
+        super().__init__(reasons)
+        self.reasons = reasons
+
+    @property
+    def methods_tried(self):
+        """Login methods that have been tried in this login."""
+        return tuple(self.reasons.keys())
 
     def __str__(self) -> str:
-        return f"{self.msg} (tried={self.methods_tried})"
+        return "；".join(f"{_meth_name[k]}：{v}" for k, v in self.reasons.items())
 
 
 class CorruptError(ValueError):

aioqzone-0.14.1.dev8/src/aioqzone/message.py

@@ -0,0 +1,26 @@
+from pydantic import BaseModel
+from tylisten import BaseMessage
+
+from aioqzone.model import LoginMethod
+from qqqr.message import *
+
+__all__ = [
+    "qr_cancelled",
+    "qr_fetched",
+    "qr_refresh",
+    "sms_code_input",
+    "sms_code_required",
+    "login_success",
+    "login_failed",
+]
+
+
+class login_success(BaseModel, BaseMessage):
+    uin: int
+    method: LoginMethod
+
+
+class login_failed(BaseModel, BaseMessage):
+    uin: int
+    method: LoginMethod
+    exc: str

{aioqzone-0.13.0.dev2/src/aioqzone/type → aioqzone-0.14.1.dev8/src/aioqzone/model}/__init__.py

@@ -1,6 +1,5 @@
 """aioqzone typing system. Aims at making full use of pydantic type-validation
 and python typing support after py36."""
 
-from .entity import *
-from .internal import *
-from .resp import *
+from .protocol import *
+from .response import *

aioqzone-0.13.0.dev2/src/aioqzone/type/internal.py → aioqzone-0.14.1.dev8/src/aioqzone/model/protocol/__init__.py

@@ -1,9 +1,11 @@
 """This module defines types that are used internally by aioqzone and its plugins.
 These types are not designed to represent responses from Qzone.
 """
-
 from pydantic import BaseModel
 
+from .config import *
+from .entity import *
+
 
 class PersudoCurkey(str):
     def __new__(cls, uin: int, abstime: int):

aioqzone-0.14.1.dev8/src/aioqzone/model/protocol/config.py

@@ -0,0 +1,25 @@
+from typing import Literal, Union
+
+from pydantic import Field, SecretStr
+from pydantic_settings import BaseSettings
+
+LoginMethod = Union[Literal["qr"], Literal["up"]]
+
+
+class LoginConfig(BaseSettings):
+    uin: int = 0
+    """Login uin (qq)."""
+    min_login_interval: float = 1800
+    """Minimum login interval, in second."""
+
+
+class UpLoginConfig(LoginConfig):
+    pwd: SecretStr = Field(default="")
+    """User password."""
+
+
+class QrLoginConfig(LoginConfig):
+    max_refresh_times: int = 6
+    """Maximum QR code refresh times."""
+    poll_freq: float = 3
+    """QR status polling interval."""

aioqzone-0.14.1.dev8/src/aioqzone/model/response/__init__.py

@@ -0,0 +1 @@
+from .h5 import *

{aioqzone-0.13.0.dev2/src/aioqzone/type/resp → aioqzone-0.14.1.dev8/src/aioqzone/model/response}/h5.py

@@ -1,6 +1,6 @@
 from typing import List, Optional, Set, Union
 
-from pydantic import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field, model_validator
 from pydantic.networks import HttpUrl
 
 
@@ -38,7 +38,7 @@ class UserInfo(BaseModel):
     nickname: str
     uin: int
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def unpack_user(cls, v: dict):
         if "user" in v:
             return v["user"]
@@ -53,7 +53,7 @@ class FeedSummary(BaseModel):
     summary: str = ""
     hasmore: bool = False
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def add_hasmore(cls, v: dict):
         if "hasmore" not in v:
             if len(v.get("summary", "")) >= 499:
@@ -91,7 +91,7 @@ class PhotoUrl(BaseModel):
 class PhotoUrls(BaseModel):
     urls: Set[PhotoUrl]
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def unpack_urls(cls, v: dict):
         return dict(urls=list(v.values()))
 
@@ -129,7 +129,7 @@ class PicData(BaseModel):
     origin_width: int
     origin_phototype: int = 0
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def remove_useless_data(cls, v: dict):
         if "videodata" in v:
             if not v["videodata"]["videourl"]:
@@ -181,8 +181,8 @@ class HasSummary(BaseModel):
 
 
 class HasMedia(BaseModel):
-    pic: Optional[FeedPic]
-    video: Optional[FeedVideo]
+    pic: Optional[FeedPic] = None
+    video: Optional[FeedVideo] = None
 
 
 class HasFid(BaseModel):
@@ -198,7 +198,7 @@ class ShareInfo(BaseModel):
     title: str = ""
     photourl: Optional[PhotoUrls] = None
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def remove_empty_photourl(cls, v: dict):
         if not v.get("photourl"):
             v["photourl"] = None
@@ -212,7 +212,7 @@ class Share(HasCommon):
 class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
     common: FeedCommon = Field(alias="comm")
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def remove_prefix(cls, v: dict):
         return {k[5:] if str.startswith(k, "cell_") else k: i for k, i in v.items()}
 
@@ -222,10 +222,10 @@ class FeedData(HasFid, HasCommon, HasSummary, HasMedia, HasUserInfo):
     like: LikeInfo = Field(default_factory=LikeInfo)
 
     comment: FeedComment = Field(default_factory=FeedComment)
-    original: Union[FeedOriginal, Share, None]
+    original: Union[FeedOriginal, Share, None] = None
     share_info: ShareInfo = Field(default_factory=ShareInfo)
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def unpack_share_info(cls, v: dict):
         if "operation" in v:
             v["share_info"] = v["operation"].get("share_info", {})
@@ -236,7 +236,7 @@ class GetMoreResp(FeedData):
     hasmore: bool = False
     attach_info: str = ""
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def remove_prefix(cls, v: dict):
         return {k[5:] if str.startswith(k, "cell_") else k: i for k, i in v.items()}