twitter-openapi-python 0.0.36__tar.gz → 0.0.37__tar.gz

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter_openapi_python
-Version: 0.0.36
+Version: 0.0.37
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twitter_openapi_python"
-version = "0.0.36"
+version = "0.0.37"
 description = "Twitter OpenAPI"
 authors = ["fa0311 <yuki@yuki0311.com>"]
 license = "proprietary" # or "AGPL-3.0-only"
@@ -15,7 +15,7 @@ python = "^3.7"
 pydantic = ">=2.6"
 urllib3 = ">= 2.1.0 < 3.0.0"
 
-twitter-openapi-python-generated = "0.0.31"
+twitter-openapi-python-generated = "0.0.33"
 
 [tool.poetry.dev-dependencies]
 

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/setup.py

@@ -5,13 +5,9 @@ import re
 from setuptools import find_packages, setup
 
 NAME = "twitter_openapi_python"
-VERSION = "0.0.36"
+VERSION = "0.0.37"
 PYTHON_REQUIRES = ">=3.7"
-REQUIRES = [
-    "twitter_openapi_python_generated == 0.0.31",
-    "pydantic >= 2.6",
-    "urllib3 >= 2.1.0, < 3.0.0"
-]
+REQUIRES = ["twitter_openapi_python_generated == 0.0.33", "pydantic >= 2.6", "urllib3 >= 2.1.0, < 3.0.0"]
 GITHUB_RAW_URL = (
     "https://raw.githubusercontent.com/fa0311/twitter_openapi_python/refs/heads/master/twitter_openapi_python/"
 )

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/default_api.py

@@ -2,6 +2,7 @@ from typing import Any, Callable, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import TweetApiUtilsData, TwitterApiUtilsResponse
 from twitter_openapi_python.utils import (
@@ -21,9 +22,10 @@ class DefaultApiUtils:
     api: twitter.DefaultApi
     flag: ParamType
 
-    def __init__(self, api: twitter.DefaultApi, flag: ParamType):
+    def __init__(self, api: twitter.DefaultApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def request(
         self,
@@ -32,7 +34,7 @@ class DefaultApiUtils:
         key: str,
         param: ParamType,
     ):
-        args = get_kwargs(flag=self.flag[key], additional=param)
+        args = get_kwargs(flag=self.flag[key], additional=param, ct=self.ct)
         res = apiFn(**args)
         data = convertFn(res.data)
         return build_response(res, data)

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/post_api.py

@@ -2,9 +2,11 @@ from typing import Any, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import TwitterApiUtilsResponse
 from twitter_openapi_python.utils import build_response, non_nullable
+from twitter_openapi_python.utils.api import get_headers
 
 T = TypeVar("T")
 ResponseType = TwitterApiUtilsResponse[T]
@@ -15,9 +17,10 @@ class PostApiUtils:
     api: twitter.PostApi
     flag: ParamType
 
-    def __init__(self, api: twitter.PostApi, flag: ParamType):
+    def __init__(self, api: twitter.PostApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def post_create_tweet(
         self,
@@ -61,6 +64,7 @@ class PostApiUtils:
                 variables=variables,
                 features=features,
             ),
+            _headers=get_headers(self.flag["CreateTweet"], self.ct),
         )
         return build_response(res, res.data)
 
@@ -79,6 +83,7 @@ class PostApiUtils:
                 queryId=self.flag["DeleteTweet"]["queryId"],
                 variables=variables,
             ),
+            _headers=get_headers(self.flag["DeleteTweet"], self.ct),
         )
         return build_response(res, res.data)
 
@@ -97,6 +102,7 @@ class PostApiUtils:
                 queryId=self.flag["CreateRetweet"]["queryId"],
                 variables=variables,
             ),
+            _headers=get_headers(self.flag["CreateRetweet"], self.ct),
         )
         return build_response(res, res.data)
 
@@ -115,6 +121,7 @@ class PostApiUtils:
                 queryId=self.flag["DeleteRetweet"]["queryId"],
                 variables=variables,
             ),
+            _headers=get_headers(self.flag["DeleteRetweet"], self.ct),
         )
         return build_response(res, res.data)
 
@@ -134,6 +141,7 @@ class PostApiUtils:
                 queryId=self.flag["FavoriteTweet"]["queryId"],
                 variables=variables,
             ),
+            _headers=get_headers(self.flag["FavoriteTweet"], self.ct),
         )
         return build_response(res, res.data)
 
@@ -153,5 +161,6 @@ class PostApiUtils:
                 queryId=self.flag["UnfavoriteTweet"]["queryId"],
                 variables=variables,
             ),
+            _headers=get_headers(self.flag["UnfavoriteTweet"], self.ct),
         )
         return build_response(res, res.data)

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/tweet_api.py

@@ -1,7 +1,8 @@
-from typing import Any, Callable, List, Optional, TypeVar
+from typing import Any, Callable, List, Literal, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import (
     ApiUtilsRaw,
@@ -28,9 +29,10 @@ class TweetApiUtils:
     api: twitter.TweetApi
     flag: ParamType
 
-    def __init__(self, api: twitter.TweetApi, flag: ParamType):
+    def __init__(self, api: twitter.TweetApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def request(
         self,
@@ -39,7 +41,7 @@ class TweetApiUtils:
         key: str,
         param: ParamType,
     ) -> ResponseType:
-        args = get_kwargs(flag=self.flag[key], additional=param)
+        args = get_kwargs(flag=self.flag[key], additional=param, ct=self.ct)
         res = apiFn(**args)
         instruction = convertFn(res.data)
         entry = instruction_to_entry(instruction)
@@ -81,7 +83,7 @@ class TweetApiUtils:
     def get_search_timeline(
         self,
         raw_query: str,
-        product: Optional[str] = None,
+        product: Optional[Literal["Top", "Latest", "People", "Photos", "Videos"]] = None,
         cursor: Optional[str] = None,
         count: Optional[int] = None,
         extra_param: Optional[ParamType] = None,
@@ -191,7 +193,7 @@ class TweetApiUtils:
         response = self.request(
             apiFn=self.api.get_user_tweets_with_http_info,
             convertFn=lambda e: error_check(
-                error_check(e.data.user, e.errors).result.timeline_v2.timeline, e.errors
+                error_check(e.data.user, e.errors).result.timeline.timeline, e.errors
             ).instructions,
             key="UserTweets",
             param=param,
@@ -216,7 +218,7 @@ class TweetApiUtils:
         response = self.request(
             apiFn=self.api.get_user_tweets_and_replies_with_http_info,
             convertFn=lambda e: error_check(
-                error_check(e.data.user, e.errors).result.timeline_v2.timeline, e.errors
+                error_check(e.data.user, e.errors).result.timeline.timeline, e.errors
             ).instructions,
             key="UserTweetsAndReplies",
             param=param,
@@ -241,7 +243,7 @@ class TweetApiUtils:
         response = self.request(
             apiFn=self.api.get_user_media_with_http_info,
             convertFn=lambda e: error_check(
-                error_check(e.data.user, e.errors).result.timeline_v2.timeline, e.errors
+                error_check(e.data.user, e.errors).result.timeline.timeline, e.errors
             ).instructions,
             key="UserMedia",
             param=param,
@@ -266,7 +268,7 @@ class TweetApiUtils:
         response = self.request(
             apiFn=self.api.get_likes_with_http_info,
             convertFn=lambda e: error_check(
-                error_check(e.data.user, e.errors).result.timeline_v2.timeline, e.errors
+                error_check(e.data.user, e.errors).result.timeline.timeline, e.errors
             ).instructions,
             key="Likes",
             param=param,
@@ -296,3 +298,54 @@ class TweetApiUtils:
             param=param,
         )
         return response
+
+    def get_community_tweets_timeline(
+        self,
+        cursor: Optional[str] = None,
+        count: Optional[int] = None,
+        rankingMode: Optional[Literal["Recency", "Relevance"]] = None,
+        extra_param: Optional[ParamType] = None,
+    ) -> ResponseType:
+        param: ParamType = {}
+        if cursor is not None:
+            param["cursor"] = cursor
+        if count is not None:
+            param["count"] = count
+        if rankingMode is not None:
+            param["rankingMode"] = rankingMode
+        if extra_param is not None:
+            param.update(extra_param)
+
+        response = self.request(
+            apiFn=self.api.get_community_tweets_timeline_with_http_info,
+            convertFn=lambda e: error_check(
+                error_check(e.data, e.errors).community_results.result.ranked_community_timeline.timeline, e.errors
+            ).instructions,
+            key="CommunityTweetsTimeline",
+            param=param,
+        )
+        return response
+
+    def get_community_media_timeline(
+        self,
+        cursor: Optional[str] = None,
+        count: Optional[int] = None,
+        extra_param: Optional[ParamType] = None,
+    ) -> ResponseType:
+        param: ParamType = {}
+        if cursor is not None:
+            param["cursor"] = cursor
+        if count is not None:
+            param["count"] = count
+        if extra_param is not None:
+            param.update(extra_param)
+
+        response = self.request(
+            apiFn=self.api.get_community_media_timeline_with_http_info,
+            convertFn=lambda e: error_check(
+                error_check(e.data, e.errors).community_results.result.community_media_timeline.timeline, e.errors
+            ).instructions,
+            key="CommunityMediaTimeline",
+            param=param,
+        )
+        return response

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/user_api.py

@@ -2,6 +2,7 @@ from typing import Any, Callable, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import TwitterApiUtilsResponse, UserApiUtilsData
 from twitter_openapi_python.utils import (
@@ -21,9 +22,10 @@ class UserApiUtils:
     api: twitter.UserApi
     flag: ParamType
 
-    def __init__(self, api: twitter.UserApi, flag: ParamType):
+    def __init__(self, api: twitter.UserApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def request(
         self,
@@ -32,7 +34,7 @@ class UserApiUtils:
         key: str,
         param: ParamType,
     ) -> ResponseType:
-        args = get_kwargs(flag=self.flag[key], additional=param)
+        args = get_kwargs(flag=self.flag[key], additional=param, ct=self.ct)
         res = apiFn(**args)
         result = convertFn(res.data)
         if result.result is None:

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/user_list_api.py

@@ -2,6 +2,7 @@ from typing import Any, Callable, List, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import (
     ApiUtilsRaw,
@@ -29,9 +30,10 @@ class UserListApiUtils:
     api: twitter.UserListApi
     flag: ParamType
 
-    def __init__(self, api: twitter.UserListApi, flag: ParamType):
+    def __init__(self, api: twitter.UserListApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def request(
         self,
@@ -40,7 +42,7 @@ class UserListApiUtils:
         key: str,
         param: ParamType,
     ) -> ResponseType:
-        args = get_kwargs(flag=self.flag[key], additional=param)
+        args = get_kwargs(flag=self.flag[key], additional=param, ct=self.ct)
         res = apiFn(**args)
         instruction = convertFn(res.data)
         entry = instruction_to_entry(instruction)

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/api/users_api.py

@@ -2,6 +2,7 @@ from typing import Any, Callable, Optional, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import TwitterApiUtilsResponse, UserApiUtilsData
 from twitter_openapi_python.utils import (
@@ -21,9 +22,10 @@ class UsersApiUtils:
     api: twitter.UsersApi
     flag: ParamType
 
-    def __init__(self, api: twitter.UsersApi, flag: ParamType):
+    def __init__(self, api: twitter.UsersApi, flag: ParamType, ct: ClientTransaction):
         self.api = api
         self.flag = flag
+        self.ct = ct
 
     def request(
         self,
@@ -32,7 +34,7 @@ class UsersApiUtils:
         key: str,
         param: ParamType,
     ) -> ResponseType:
-        args = get_kwargs(flag=self.flag[key], additional=param)
+        args = get_kwargs(flag=self.flag[key], additional=param, ct=self.ct)
         res = apiFn(**args)
         user_result = convertFn(res.data)
         user = user_result_converter(user_result)

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/client.py

@@ -5,6 +5,7 @@ from typing import Any
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.configuration as conf
 import urllib3
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.api import (
     DefaultApiUtils,
@@ -17,6 +18,7 @@ from twitter_openapi_python.api import (
     V11GetApiUtils,
     V11PostApiUtils,
 )
+from twitter_openapi_python.tid import get_tid
 
 ParamType = dict[str, Any]
 
@@ -25,40 +27,41 @@ class TwitterOpenapiPythonClient:
     api: twitter.ApiClient
     placeholder: ParamType
 
-    def __init__(self, api: twitter.ApiClient, placeholder: ParamType):
+    def __init__(self, api: twitter.ApiClient, placeholder: ParamType, ct: ClientTransaction):
         self.api = api
         self.placeholder = placeholder
+        self.ct = ct
 
     def get_default_api(self) -> DefaultApiUtils:
-        return DefaultApiUtils(twitter.DefaultApi(self.api), self.placeholder)
+        return DefaultApiUtils(twitter.DefaultApi(self.api), self.placeholder, self.ct)
 
     def get_initial_state_api(self) -> InitialStateApiUtils:
         return InitialStateApiUtils(self.api)
 
     def get_post_api(self) -> PostApiUtils:
-        return PostApiUtils(twitter.PostApi(self.api), self.placeholder)
+        return PostApiUtils(twitter.PostApi(self.api), self.placeholder, self.ct)
 
     def get_tweet_api(self) -> TweetApiUtils:
-        return TweetApiUtils(twitter.TweetApi(self.api), self.placeholder)
+        return TweetApiUtils(twitter.TweetApi(self.api), self.placeholder, self.ct)
 
     def get_user_api(self) -> UserApiUtils:
-        return UserApiUtils(twitter.UserApi(self.api), self.placeholder)
+        return UserApiUtils(twitter.UserApi(self.api), self.placeholder, self.ct)
 
     def get_users_api(self) -> UsersApiUtils:
-        return UsersApiUtils(twitter.UsersApi(self.api), self.placeholder)
+        return UsersApiUtils(twitter.UsersApi(self.api), self.placeholder, self.ct)
 
     def get_user_list_api(self) -> UserListApiUtils:
-        return UserListApiUtils(twitter.UserListApi(self.api), self.placeholder)
+        return UserListApiUtils(twitter.UserListApi(self.api), self.placeholder, self.ct)
 
     def get_v11_get_api(self) -> V11GetApiUtils:
-        return V11GetApiUtils(twitter.V11GetApi(self.api), self.placeholder)
+        return V11GetApiUtils(twitter.V11GetApi(self.api), self.placeholder, self.ct)
 
     def get_v11_post_api(self) -> V11PostApiUtils:
-        return V11PostApiUtils(twitter.V11PostApi(self.api), self.placeholder)
+        return V11PostApiUtils(twitter.V11PostApi(self.api), self.placeholder, self.ct)
 
 
 class TwitterOpenapiPython:
-    hash: str = "227f4e3716dbb034500945c378bd7874b611f8f5"
+    hash: str = "54acb4a0cef6aea969d3a1c75d37d58d80b0e5c0"
     placeholder_url = "https://raw.githubusercontent.com/fa0311/twitter-openapi/{hash}/src/config/placeholder.json"
     header = "https://raw.githubusercontent.com/fa0311/latest-user-agent/refs/heads/main/header.json"
     access_token: str = (
@@ -123,7 +126,8 @@ class TwitterOpenapiPython:
     ) -> TwitterOpenapiPythonClient:
         http = urllib3.PoolManager()
         flag = http.request("GET", self.placeholder_url.format(hash=self.hash))
-        return TwitterOpenapiPythonClient(api, json.loads(flag.data))
+        ct = get_tid()
+        return TwitterOpenapiPythonClient(api, json.loads(flag.data), ct)
 
     def get_client_from_cookies(
         self,

twitter_openapi_python-0.0.37/twitter_openapi_python/tid.py

@@ -0,0 +1,17 @@
+import bs4
+import requests
+from x_client_transaction import ClientTransaction
+from x_client_transaction.utils import generate_headers, get_ondemand_file_url, handle_x_migration
+
+
+def get_tid():
+    session = requests.Session()
+    session.headers = generate_headers()  # type: ignore
+    home_page_response = handle_x_migration(session=session)
+    home_page = session.get(url="https://x.com")
+    home_page_response = bs4.BeautifulSoup(home_page.content, "html.parser")
+    ondemand_file_url = get_ondemand_file_url(response=home_page_response)
+    ondemand_file = session.get(url=ondemand_file_url)  # type: ignore
+    ondemand_file_response = bs4.BeautifulSoup(ondemand_file.content, "html.parser")
+    ct = ClientTransaction(home_page_response=home_page_response, ondemand_file_response=ondemand_file_response)
+    return ct

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python/utils/api.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, List, Mapping, Optional, TypeGuard, TypeVar
 
 import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
+from x_client_transaction import ClientTransaction
 
 from twitter_openapi_python.models import (
     ApiUtilsHeader,
@@ -36,7 +37,7 @@ def non_nullable_list(x: List[Optional[T]]) -> List[T]:
     return list(filter(filter_fn, x))
 
 
-def get_kwargs(flag: ParamType, additional: ParamType) -> ParamType:
+def get_kwargs(flag: ParamType, additional: ParamType, ct: ClientTransaction) -> ParamType:
     assert flag is not None
     kwargs = {"path_query_id": flag["queryId"]}
     if flag.get("variables") is not None:
@@ -45,9 +46,16 @@ def get_kwargs(flag: ParamType, additional: ParamType) -> ParamType:
         kwargs["features"] = json.dumps(flag["features"])
     if flag.get("fieldToggles") is not None:
         kwargs["field_toggles"] = json.dumps(flag["fieldToggles"])
+    if flag.get("@path") is not None:
+        kwargs["_headers"] = get_headers(flag, ct)
     return kwargs
 
 
+def get_headers(flag: ParamType, ct: ClientTransaction) -> Dict[str, str]:
+    tid = ct.generate_transaction_id(flag["@method"], flag["@path"])
+    return {"x-client-transaction-id": tid}
+
+
 def get_legacy_kwargs(flag: ParamType, additional: ParamType) -> ParamType:
     assert flag is not None
 

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter-openapi-python
-Version: 0.0.36
+Version: 0.0.37
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311

{twitter_openapi_python-0.0.36 → twitter_openapi_python-0.0.37}/twitter_openapi_python.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ setup.py
 twitter_openapi_python/__init__.py
 twitter_openapi_python/client.py
 twitter_openapi_python/py.typed
+twitter_openapi_python/tid.py
 twitter_openapi_python.egg-info/PKG-INFO
 twitter_openapi_python.egg-info/SOURCES.txt
 twitter_openapi_python.egg-info/dependency_links.txt

twitter_openapi_python-0.0.37/twitter_openapi_python.egg-info/requires.txt

@@ -0,0 +1,3 @@
+twitter_openapi_python_generated==0.0.33
+pydantic>=2.6
+urllib3<3.0.0,>=2.1.0

twitter_openapi_python-0.0.36/twitter_openapi_python.egg-info/requires.txt

@@ -1,3 +0,0 @@
-twitter_openapi_python_generated==0.0.31
-pydantic>=2.6
-urllib3<3.0.0,>=2.1.0