twitter-openapi-python 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

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/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/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,56 @@ class TweetApiUtils:
             param=param,
         )
         return response
+
+    def get_community_tweets_timeline(
+        self,
+        communityId: str,
+        cursor: Optional[str] = None,
+        count: Optional[int] = None,
+        rankingMode: Optional[Literal["Recency", "Relevance"]] = None,
+        extra_param: Optional[ParamType] = None,
+    ) -> ResponseType:
+        param: ParamType = {"communityId": communityId}
+        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,
+        communityId: str,
+        cursor: Optional[str] = None,
+        count: Optional[int] = None,
+        extra_param: Optional[ParamType] = None,
+    ) -> ResponseType:
+        param: ParamType = {"communityId": communityId}
+        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/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/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/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/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,
@@ -25,12 +26,13 @@ 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)
@@ -123,7 +125,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/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/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.dist-info → twitter_openapi_python-0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter-openapi-python
-Version: 0.0.36
+Version: 0.0.38
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311
@@ -10,9 +10,9 @@ Keywords: OpenAPI,OpenAPI-Generator,Twitter OpenAPI
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE.AGPL
-Requires-Dist: twitter-openapi-python-generated ==0.0.31
-Requires-Dist: pydantic >=2.6
-Requires-Dist: urllib3 <3.0.0,>=2.1.0
+Requires-Dist: twitter-openapi-python-generated==0.0.33
+Requires-Dist: pydantic>=2.6
+Requires-Dist: urllib3<3.0.0,>=2.1.0
 
 # twitter_openapi_python
 

{twitter_openapi_python-0.0.36.dist-info → twitter_openapi_python-0.0.38.dist-info}/RECORD

@@ -1,14 +1,15 @@
 twitter_openapi_python/__init__.py,sha256=stqYIfWDqM0yC93SQNp4-b2hSz-ONWR3QxOG5g2oREg,339
-twitter_openapi_python/client.py,sha256=WsRY6SUkUZX7I4OlkqyyyvlmewT4DIwuHrvNuPkaHZA,6753
+twitter_openapi_python/client.py,sha256=mFe9wE92YpM1PfstIK6on-b56N-UqefPjwEXJ7SoX7E,6887
 twitter_openapi_python/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+twitter_openapi_python/tid.py,sha256=gYw3QWmWNRA_skpjLnMUARx_ea20ZDLCcDhdQvAlAZk,846
 twitter_openapi_python/api/__init__.py,sha256=-2hoS75Fp0KvCIWKYQFpvAl0pcbFyt7Be3ood08P7n8,643
-twitter_openapi_python/api/default_api.py,sha256=oYKuwEtj9Y072qmP5Rlc-BQAOmvntHbcwzYscL30ivc,2557
+twitter_openapi_python/api/default_api.py,sha256=kq-8kdgs0yL60sbYQx6aMrp6Me3cNvSG2ThO62YPw78,2666
 twitter_openapi_python/api/initial_state_api.py,sha256=eByv3zyjmDHL2bu_rA7_KNvh-oc36AsIUi78Dg1SYK0,2341
-twitter_openapi_python/api/post_api.py,sha256=bAT79kH6NIoxfUJ1LqohwYagA6rEeQXz9JAnvy5_qm4,6107
-twitter_openapi_python/api/tweet_api.py,sha256=luJ7brGW7Nt7SoACJelsJVFLlAHhMsi4j4MnIxfmtsc,9892
-twitter_openapi_python/api/user_api.py,sha256=YvywjW8Qb_4wDN1VkCoFS2YEpfgVCbOICa0n2ekrGqI,2428
-twitter_openapi_python/api/user_list_api.py,sha256=Vnc0LEUwYLGKv7STjUNEJpjH4z5nlF37y84Fs8hKZug,5564
-twitter_openapi_python/api/users_api.py,sha256=cqC8S2Obd5gjlVmVLo7jqzgzFnJkoq7byhl0CVSTmz4,1697
+twitter_openapi_python/api/post_api.py,sha256=jZV_XfLVYG8R_cJeX7iwXUoaP-M7M364tnXX7LGoysI,6692
+twitter_openapi_python/api/tweet_api.py,sha256=HrcBd1PP9_P_x7T0C35VYOtbPiJf5Z6PpdRkdoXTxgI,12028
+twitter_openapi_python/api/user_api.py,sha256=ffC5D8vX8XsWikE8eOsZD5zCb_y8br0VoMvC29KsB3g,2537
+twitter_openapi_python/api/user_list_api.py,sha256=qK1hHL0pw5Fjhp3yl4hrww6hxCbBlkd0pHqJWjSX1EI,5673
+twitter_openapi_python/api/users_api.py,sha256=25Z11AfWbUQBJR5FcdB4s1aS5DOIjUK3Lm1HWyaI_-4,1806
 twitter_openapi_python/api/v11_get_api.py,sha256=Gz5hLf4yJkGdpzjmJIsSqdr1eI6mqtjB3DHQii_uzzg,2144
 twitter_openapi_python/api/v11_post_api.py,sha256=y1jJ5Q_-CYLC4HGjvl3eKDnKdtCVbHVRC2VAbJr8_EM,1945
 twitter_openapi_python/models/__init__.py,sha256=uKZYFWWoXinGRjMU7ErbunUhfsThEuZf8aGFBd7lus0,583
@@ -18,10 +19,10 @@ twitter_openapi_python/models/initial_state.py,sha256=h8P3hC_tLVSmDuYxB03fuSviz2
 twitter_openapi_python/models/response.py,sha256=ZuaX36mKRsVx5aiJhNw3CjrvVGVaGjMCGdXy28PMFy8,480
 twitter_openapi_python/models/timeline.py,sha256=AoWfrJsonYImlweciaUSjFzmeciaX0zshi7d-FkT4LM,1392
 twitter_openapi_python/utils/__init__.py,sha256=2Am22zCH-BUwPxKnnPoHQvKEF-gWX_eryKgA4OZeiog,449
-twitter_openapi_python/utils/api.py,sha256=NLLPNaG0A4O1XF6qa97M-3FLOR3CjqBH48mW_alVVyw,9964
-twitter_openapi_python-0.0.36.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
-twitter_openapi_python-0.0.36.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
-twitter_openapi_python-0.0.36.dist-info/METADATA,sha256=e-dRCXZgFvavDWwp72EnrW1PcwpJuDM68k-4O7ER0Fw,3109
-twitter_openapi_python-0.0.36.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-twitter_openapi_python-0.0.36.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
-twitter_openapi_python-0.0.36.dist-info/RECORD,,
+twitter_openapi_python/utils/api.py,sha256=d6lCw3inSis9FVdQosDdTcwJPUl9UNGWT04bdd_l8xs,10325
+twitter_openapi_python-0.0.38.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
+twitter_openapi_python-0.0.38.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
+twitter_openapi_python-0.0.38.dist-info/METADATA,sha256=r1ld3vQ7oYXnYxQQuUmMcN8KtU52wZ2VQUHPJz_ycSc,3106
+twitter_openapi_python-0.0.38.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+twitter_openapi_python-0.0.38.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
+twitter_openapi_python-0.0.38.dist-info/RECORD,,

{twitter_openapi_python-0.0.36.dist-info → twitter_openapi_python-0.0.38.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any