tweepy-self 1.6.3__py3-none-any.whl → 1.10.0b1__py3-none-any.whl

twitter/errors.py

@@ -61,12 +61,17 @@ class HTTPException(TwitterException):
         self.api_codes: list[int] = []
         self.api_messages: list[str] = []
         self.detail: str | None = None
+        self.html: str | None = None
 
         # Если ответ — строка, то это html
         if isinstance(data, str):
-            exception_message = (
-                f"(response status: {response.status_code}) HTML Response:\n{data}"
-            )
+            if not data:
+                exception_message = (
+                    f"(response status: {response.status_code}) Empty response body."
+                )
+            else:
+                self.html = data
+                exception_message = f"(response status: {response.status_code}) HTML Response:\n{self.html}"
             if response.status_code == 429:
                 exception_message = (
                     f"(response status: {response.status_code}) Rate limit exceeded."
@@ -75,7 +80,7 @@ class HTTPException(TwitterException):
             super().__init__(exception_message)
             return
 
-        self.api_errors = data.get("errors", [])
+        self.api_errors = data.get("errors", [data])
         self.detail = data.get("detail")
 
         for error in self.api_errors:
@@ -146,7 +151,9 @@ class BadAccount(TwitterException):
 
 class BadToken(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
-        exception_message = "Bad Twitter account's auth_token."
+        exception_message = (
+            "Bad Twitter account's auth_token. Relogin to get new token."
+        )
         super().__init__(http_exception, account, exception_message)
 
 
@@ -154,14 +161,14 @@ class Locked(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
         exception_message = (
             f"Twitter account is locked."
-            f" Set CapSolver API key (capsolver_api_key) to autounlock."
+            f" Set CapSolver API key (capsolver_api_key) to auto-unlock."
         )
         super().__init__(http_exception, account, exception_message)
 
 
 class ConsentLocked(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
-        exception_message = f"Twitter account is consent locked. Relogin to unlock."
+        exception_message = f"Twitter account is locked."
         super().__init__(http_exception, account, exception_message)
 
 

twitter/models.py

@@ -1,26 +1,53 @@
-from datetime import datetime
+from typing import Optional
+from datetime import datetime, timedelta
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field, field_validator
 
-from .utils import to_datetime
+from .utils import to_datetime, tweet_url
 
 
-class UserData(BaseModel):
-    id: int
-    username: str
-    name: str
-    created_at: datetime
-    description: str
-    location: str
-    followers_count: int
-    friends_count: int
-    raw_data: dict
+class Image(BaseModel):
+    type: str = Field(..., alias="image_type")
+    width: int = Field(..., alias="w")
+    height: int = Field(..., alias="h")
+
+
+class Media(BaseModel):
+    id: int = Field(..., alias="media_id")
+    image: Image
+    size: int
+    expires_at: datetime = Field(..., alias="expires_after_secs")
+
+    @field_validator("expires_at", mode="before")
+    @classmethod
+    def set_expires_at(cls, v):
+        return datetime.now() + timedelta(seconds=v)
 
     def __str__(self):
-        return f"({self.id}) @{self.username}"
+        return str(self.id)
+
+
+class User(BaseModel):
+    # fmt: off
+    id:              int      | None = None
+    username:        str      | None = None
+    name:            str      | None = None  # 50
+    created_at:      datetime | None = None
+    description:     str      | None = None  # 160
+    location:        str      | None = None  # 30
+    followers_count: int      | None = None
+    friends_count:   int      | None = None
+    raw_data:        dict     | None = None
+    # fmt: on
+
+    def __str__(self):
+        return str(self.id)
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}(id={self.id}, username={self.username})"
 
     @classmethod
-    def from_raw_user_data(cls, data: dict):
+    def from_raw_data(cls, data: dict):
         legacy = data["legacy"]
         keys = ("name", "description", "location", "followers_count", "friends_count")
         values = {key: legacy[key] for key in keys}
@@ -36,44 +63,93 @@ class UserData(BaseModel):
 
 
 class Tweet(BaseModel):
-    user_id: int
-    id: int
-    created_at: datetime
-    full_text: str
-    lang: str
-    favorite_count: int
-    quote_count: int
-    reply_count: int
-    retweet_count: int
-    retweeted: bool
-    raw_data: dict
-    url: str | None = None
+    # fmt: off
+    id:              int
+    text:            str
+    language:        str
+    created_at:      datetime
+
+    conversation_id: int
+
+    quoted:          bool
+    retweeted:       bool
+    bookmarked:      bool
+    favorited:       bool
+
+    quote_count:     int
+    retweet_count:   int
+    bookmark_count:  int
+    favorite_count:  int
+    reply_count:     int
+
+    quoted_tweet:    Optional["Tweet"] = None
+    retweeted_tweet: Optional["Tweet"] = None
+
+    user:            User
+    url:             str
+
+    raw_data:        dict
+
+    # TODO hashtags
+    # TODO media
+    # TODO symbols
+    # TODO timestamps
+    # TODO urls
+    # TODO user_mentions
+    # TODO views
+    # fmt: on
 
     def __str__(self):
-        short_text = (
-            f"{self.full_text[:32]}..." if len(self.full_text) > 16 else self.full_text
-        )
-        return f"({self.id}) {short_text}"
+        return str(self.id)
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}(id={self.id}, user_id={self.user.id})"
+
+    @property
+    def short_text(self) -> str:
+        return f"{self.text[:32]}..." if len(self.text) > 16 else self.text
 
     @classmethod
     def from_raw_data(cls, data: dict):
-        legacy = data["legacy"]
-        keys = (
-            "full_text",
-            "lang",
-            "favorite_count",
-            "quote_count",
-            "reply_count",
-            "retweet_count",
-            "retweeted",
-        )
-        values = {key: legacy[key] for key in keys}
-        values.update(
-            {
-                "user_id": int(legacy["user_id_str"]),
-                "id": int(legacy["id_str"]),
-                "created_at": to_datetime(legacy["created_at"]),
-                "raw_data": data,
-            }
-        )
+        legacy_data = data["legacy"]
+
+        user_data = data["core"]["user_results"]["result"]
+        user = User.from_raw_data(user_data)
+
+        id = int(legacy_data["id_str"])
+        url = tweet_url(user.username, id)
+
+        retweeted_tweet = None
+        if "retweeted_status_result" in legacy_data:
+            retweeted_tweet_data = legacy_data["retweeted_status_result"]["result"]
+            retweeted_tweet = cls.from_raw_data(retweeted_tweet_data)
+
+        quoted_tweet = None
+        if "quoted_status_result" in data:
+            quoted_tweet_data = data["quoted_status_result"]["result"]
+            quoted_tweet = cls.from_raw_data(quoted_tweet_data)
+
+        values = {
+            "id": id,
+            "text": legacy_data["full_text"],
+            "language": legacy_data["lang"],
+            "created_at": to_datetime(legacy_data["created_at"]),
+            "conversation_id": int(legacy_data["conversation_id_str"]),
+            "quoted": legacy_data["is_quote_status"],
+            "retweeted": legacy_data["retweeted"],
+            "bookmarked": legacy_data["bookmarked"],
+            "favorited": legacy_data["favorited"],
+            "quote_count": legacy_data["quote_count"],
+            "retweet_count": legacy_data["retweet_count"],
+            "bookmark_count": legacy_data["bookmark_count"],
+            "favorite_count": legacy_data["favorite_count"],
+            "reply_count": legacy_data["reply_count"],
+            "user": user.model_dump(),
+            "quoted_tweet": quoted_tweet.model_dump() if quoted_tweet else None,
+            "retweeted_tweet": (
+                retweeted_tweet.model_dump() if retweeted_tweet else None
+            ),
+            "url": url,
+            "raw_data": data,
+        }
         return cls(**values)

twitter/utils/__init__.py

@@ -16,6 +16,7 @@ from .other import (
     tweet_url,
     to_datetime,
     hidden_value,
+    tweets_data_from_instructions,
 )
 
 
@@ -33,4 +34,5 @@ __all__ = [
     "tweet_url",
     "to_datetime",
     "hidden_value",
+    "tweets_data_from_instructions",
 ]

twitter/utils/other.py

@@ -14,6 +14,19 @@ def tweet_url(username: str, tweet_id: int) -> str:
     return f"https://x.com/{username}/status/{tweet_id}"
 
 
+def tweets_data_from_instructions(instructions: dict) -> list[dict]:
+    tweets = []
+    for instruction in instructions:
+        if instruction["type"] == "TimelineAddEntries":
+            for entry in instruction["entries"]:
+                if entry["entryId"].startswith("tweet-"):
+                    tweet_data = entry["content"]["itemContent"]["tweet_results"][
+                        "result"
+                    ]
+                    tweets.append(tweet_data)
+    return tweets
+
+
 def to_datetime(twitter_datetime: str):
     return datetime.strptime(twitter_datetime, "%a %b %d %H:%M:%S +0000 %Y")
 

tweepy_self-1.6.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-twitter/__init__.py,sha256=hdrsdbH_qFhx6ro1ct79qF9SpkgFhxgbYUw9A4RVuec,684
-twitter/account.py,sha256=tHzBdc34pEJI2SRbjLcmKtwAzjhzUFsa4vIQqtXAc1s,3015
-twitter/base/__init__.py,sha256=x0EHKv4q_FI6xEq2nL4V9s8P6VWr6IaHTqdH9sXB5d8,133
-twitter/base/client.py,sha256=7byb0Psai-dvg_ww6Y7uyE2hV1pfTU653hFgVdRiqXo,478
-twitter/base/session.py,sha256=JFPS-9Qae1iY3NfNcywxvWWmRDijaU_Rjs3WaQ00iFA,2071
-twitter/client.py,sha256=TXcIr-HnuqEtYOAiS5fmvY2P7KumlLE0lOAytMq89N8,61346
-twitter/enums.py,sha256=-OH6Ibxarq5qt4E2AhkProVawcEyIf5YG_h_G5xiV9Y,270
-twitter/errors.py,sha256=PsvGP3hps1HNWdKbUPhEkuDqLUmmqzhpAkRtVrJr5jc,5007
-twitter/models.py,sha256=ttSNuhY1knTdI-Yty54OCJF5YzARc8IaA11zKNHV9p0,2063
-twitter/utils/__init__.py,sha256=pyhQXwTdp0HFwV_UNF4dTyklLD9RtaefA16SrQXeNlg,589
-twitter/utils/file.py,sha256=Sz2KEF9DnL04aOP1XabuMYMMF4VR8dJ_KWMEVvQ666Y,1120
-twitter/utils/html.py,sha256=hVtIRFI2yRAdWEaShFNBG-_ZWxd16og8i8OVDnFy5Hc,1971
-twitter/utils/other.py,sha256=UnUxS3uDR4eggbNN16xiw96VC_MNt9tOgnBlNWvRBoY,559
-tweepy_self-1.6.3.dist-info/METADATA,sha256=Nl46Hi1yQY6s47FPLnT0bMjhWTYR7gM18SJsZaDxhJQ,9304
-tweepy_self-1.6.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tweepy_self-1.6.3.dist-info/RECORD,,