twitter-openapi-python 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

twitter_openapi_python/api/initial_state_api.py

@@ -24,7 +24,8 @@ class InitialStateApiUtils:
         }
 
     def request(self, url: str) -> HTTPResponse:
-        return self.api.rest_client.get_request(
+        return self.api.rest_client.request(
+            "GET",
             url=url,
             headers=self.header,
         )

twitter_openapi_python/api/post_api.py

@@ -4,7 +4,7 @@ import twitter_openapi_python_generated as twitter
 import twitter_openapi_python_generated.models as models
 
 from twitter_openapi_python.models import TwitterApiUtilsResponse
-from twitter_openapi_python.utils import build_response, check_error
+from twitter_openapi_python.utils import build_response, check_error, non_nullable
 
 T = TypeVar("T")
 ResponseType = TwitterApiUtilsResponse[T]
@@ -31,21 +31,44 @@ class PostApiUtils:
         self,
         tweet_text: str,
         media_ids: Optional[list[str]] = None,
+        tagged_users: Optional[list[list[str]]] = None,
+        in_reply_to_tweet_id: Optional[str] = None,
+        attachment_url: Optional[str] = None,
+        conversation_control: Optional[str] = None,
     ) -> ResponseType[models.CreateTweetResponse]:
-        variables = twitter.PostCreateTweetRequestVariables.from_dict(
-            self.flag["CreateTweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostCreateTweetRequestVariables.from_dict(
+                self.flag["CreateTweet"]["variables"]
+            )
         )
-        features = twitter.PostCreateTweetRequestFeatures.from_dict(
-            self.flag["CreateTweet"]["features"]
+        features = non_nullable(
+            twitter.PostCreateTweetRequestFeatures.from_dict(
+                self.flag["CreateTweet"]["features"]
+            )
         )
         variables.tweet_text = tweet_text
-        variables.media.media_entities = [
-            twitter.PostCreateTweetRequestVariablesMediaMediaEntitiesInner(
-                media_id=media_id,
-                tagged_users=[],
+        if media_ids:
+            tagged_or = tagged_users or []
+            variables.media.media_entities = [
+                twitter.PostCreateTweetRequestVariablesMediaMediaEntitiesInner(
+                    media_id=media_id,
+                    tagged_users=tagged_or[idx] if len(tagged_or) > idx else [],
+                )
+                for idx, media_id in enumerate(media_ids)
+            ]
+        variables.attachment_url = attachment_url
+        if conversation_control:
+            variables.conversation_control = (
+                twitter.PostCreateTweetRequestVariablesConversationControl(
+                    mode=conversation_control
+                )
+            )
+
+        if in_reply_to_tweet_id:
+            variables.reply = twitter.PostCreateTweetRequestVariablesReply(
+                exclude_reply_user_ids=[],
+                in_reply_to_tweet_id=in_reply_to_tweet_id,
             )
-            for media_id in media_ids or []
-        ]
 
         res = self.api.post_create_tweet_with_http_info(
             path_query_id=self.flag["CreateTweet"]["queryId"],
@@ -62,8 +85,10 @@ class PostApiUtils:
         self,
         tweet_id: str,
     ) -> ResponseType[models.DeleteTweetResponse]:
-        variables = twitter.PostCreateRetweetRequestVariables.from_dict(
-            self.flag["DeleteTweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostCreateRetweetRequestVariables.from_dict(
+                self.flag["DeleteTweet"]["variables"]
+            )
         )
         variables.tweet_id = tweet_id
 
@@ -81,8 +106,10 @@ class PostApiUtils:
         self,
         tweet_id: str,
     ) -> ResponseType[models.CreateRetweetResponse]:
-        variables = twitter.PostCreateRetweetRequestVariables.from_dict(
-            self.flag["CreateRetweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostCreateRetweetRequestVariables.from_dict(
+                self.flag["CreateRetweet"]["variables"]
+            )
         )
         variables.tweet_id = tweet_id
 
@@ -100,8 +127,10 @@ class PostApiUtils:
         self,
         source_tweet_id: str,
     ) -> ResponseType[models.DeleteRetweetResponse]:
-        variables = twitter.PostDeleteRetweetRequestVariables.from_dict(
-            self.flag["DeleteRetweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostDeleteRetweetRequestVariables.from_dict(
+                self.flag["DeleteRetweet"]["variables"]
+            )
         )
         variables.source_tweet_id = source_tweet_id
 
@@ -120,8 +149,10 @@ class PostApiUtils:
         self,
         tweet_id: str,
     ) -> ResponseType[models.FavoriteTweetResponseData]:
-        variables = twitter.PostCreateRetweetRequestVariables.from_dict(
-            self.flag["FavoriteTweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostCreateBookmarkRequestVariables.from_dict(
+                self.flag["FavoriteTweet"]["variables"]
+            )
         )
         variables.tweet_id = tweet_id
 
@@ -139,8 +170,10 @@ class PostApiUtils:
         self,
         tweet_id: str,
     ) -> ResponseType[models.UnfavoriteTweetResponseData]:
-        variables = twitter.PostCreateRetweetRequestVariables.from_dict(
-            self.flag["UnfavoriteTweet"]["variables"]
+        variables = non_nullable(
+            twitter.PostCreateRetweetRequestVariables.from_dict(
+                self.flag["UnfavoriteTweet"]["variables"]
+            )
         )
         variables.tweet_id = tweet_id
 

twitter_openapi_python/api/tweet_api.py

@@ -17,6 +17,7 @@ from twitter_openapi_python.utils import (
     instruction_to_entry,
     tweet_entries_converter,
 )
+from twitter_openapi_python.utils.api import non_nullable
 
 T = TypeVar("T")
 ResponseType = TwitterApiUtilsResponse[TimelineApiUtilsResponse[TweetApiUtilsData]]
@@ -199,7 +200,9 @@ class TweetApiUtils:
 
         response = self.request(
             apiFn=self.api.get_user_tweets_with_http_info,
-            convertFn=lambda e: e.data.user.result.timeline_v2.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.user.result.timeline_v2.timeline
+            ).instructions,
             type=models.UserTweetsResponse,
             key="UserTweets",
             param=param,
@@ -223,7 +226,9 @@ class TweetApiUtils:
 
         response = self.request(
             apiFn=self.api.get_user_tweets_and_replies_with_http_info,
-            convertFn=lambda e: e.data.user.result.timeline_v2.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.user.result.timeline_v2.timeline
+            ).instructions,
             type=models.UserTweetsResponse,
             key="UserTweetsAndReplies",
             param=param,
@@ -247,7 +252,9 @@ class TweetApiUtils:
 
         response = self.request(
             apiFn=self.api.get_user_media_with_http_info,
-            convertFn=lambda e: e.data.user.result.timeline_v2.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.user.result.timeline_v2.timeline
+            ).instructions,
             type=models.UserTweetsResponse,
             key="UserMedia",
             param=param,
@@ -271,7 +278,9 @@ class TweetApiUtils:
 
         response = self.request(
             apiFn=self.api.get_likes_with_http_info,
-            convertFn=lambda e: e.data.user.result.timeline_v2.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.user.result.timeline_v2.timeline
+            ).instructions,
             type=models.UserTweetsResponse,
             key="Likes",
             param=param,

twitter_openapi_python/api/user_list_api.py

@@ -15,6 +15,7 @@ from twitter_openapi_python.utils import (
     entries_cursor,
     get_kwargs,
     instruction_to_entry,
+    non_nullable,
     user_entries_converter,
     user_result_converter,
 )
@@ -144,7 +145,9 @@ class UserListApiUtils:
             param.update(extra_param)
         return self.request(
             apiFn=self.api.get_favoriters_with_http_info,
-            convertFn=lambda e: e.data.favoriters_timeline.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.favoriters_timeline.timeline
+            ).instructions,
             type=models.TweetFavoritersResponse,
             key="Favoriters",
             param=param,
@@ -166,7 +169,9 @@ class UserListApiUtils:
             param.update(extra_param)
         return self.request(
             apiFn=self.api.get_retweeters_with_http_info,
-            convertFn=lambda e: e.data.retweeters_timeline.timeline.instructions,
+            convertFn=lambda e: non_nullable(
+                e.data.retweeters_timeline.timeline
+            ).instructions,
             type=models.TweetRetweetersResponse,
             key="Retweeters",
             param=param,

twitter_openapi_python/client.py

@@ -58,43 +58,54 @@ class TwitterOpenapiPythonClient:
 
 
 class TwitterOpenapiPython:
-    hash: str = "4f39fa1a95e3b03fcc64ae4c54c3d4389582fd39"
+    hash: str = "0c64eebbfb93b3ed69c3aba923ec8d6894a39902"
     placeholder_url = "https://raw.githubusercontent.com/fa0311/twitter-openapi/{hash}/src/config/placeholder.json"
-    placeholder: ParamType
-    user_agent: str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+    header = "https://raw.githubusercontent.com/fa0311/latest-user-agent/refs/heads/main/header.json"
     access_token: str = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
+    twitter_url: str = "https://x.com/home"
+    additional_browser_headers = {}
+    additional_api_headers = {}
+
+    def get_header(self) -> tuple[dict[str, str], dict[str, str]]:
+        http = urllib3.PoolManager()
+        res = http.request("GET", self.header)
+        data = json.loads(res.data)
+        ignore = ["host", "connection"]
 
-    api_key = {
-        "Accept": "*/*",
-        # "AcceptEncoding": "gzip, deflate, br",
-        # "AcceptEncoding": "deflate, br",
-        "AcceptLanguage": "en-US,en;q=0.9",
-        "CacheControl": "no-cache",
-        "Pragma": "no-cache",
-        "SecChUa": '"Chromium";v="116", "Not)A;Brand";v="24", "Google Chrome";v="116"',
-        "SecChUaMobile": "?0",
-        "SecChUaPlatform": '"Windows"',
-        "SecFetchDest": "empty",
-        "SecFetchMode": "cors",
-        "SecFetchSite": "same-origin",
-        "ClientLanguage": "en",
-        "ActiveUser": "yes",
-    }
-
-    browser_headers = {
-        "accept": "text/plain, */*; q=0.01",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "en-US,en;q=0.9",
-        "cache-control": "no-cache",
-        "pragma": "no-cache",
-        "sec-ch-ua": '"Chromium";v="116", "Not)A;Brand";v="24", "Google Chrome";v="116"',
-        "sec-ch-ua-mobile": "?0",
-        "sec-ch-ua-platform": '"Windows"',
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": user_agent,
-    }
+        def getHader(name: str) -> dict[str, str]:
+            return {
+                key: value for key, value in data[name].items() if key not in ignore
+            }
+
+        return (
+            {
+                **getHader("chrome-fetch"),
+                "accept-encoding": "identity",
+                "pragma": "no-cache",
+                "referer": self.twitter_url,
+                "priority": "u=1, i",
+                "x-twitter-client-language": "en",
+                "x-twitter-active-user": "yes",
+                # 'x-twitter-auth-type': 'xxxx'
+                # 'x-csrf-token': 'xxxx',
+                # 'x-guest-token': 'xxxx',
+                "authorization": f"Bearer {self.access_token}",
+                **self.additional_api_headers,
+            },
+            {
+                **getHader("chrome"),
+                **self.additional_browser_headers,
+            },
+        )
+
+    def kebab_to_upper_camel(self, text: dict[str, Any]) -> dict[str, Any]:
+        res = {}
+        for key, value in text.items():
+            new_key = "".join(
+                [x.capitalize() for x in key.replace("x-twitter-", "").split("-")]
+            )
+            res[new_key] = value
+        return res
 
     def cookie_normalize(self, cookie: list[str]) -> dict[str, str]:
         return {
@@ -117,7 +128,7 @@ class TwitterOpenapiPython:
         self,
         cookies: dict[str, str],
     ) -> TwitterOpenapiPythonClient:
-        api_key = self.api_key.copy()
+        api_key = self.kebab_to_upper_camel(self.get_header()[0])
 
         if cookies.get("ct0"):
             api_key.update({"AuthType": "OAuth2Session"})
@@ -132,27 +143,28 @@ class TwitterOpenapiPython:
             configuration=api_conf,
             cookie=self.cookie_to_str(cookies),
         )
-        api_client.user_agent = self.user_agent
+        api_client.user_agent = api_key["UserAgent"]
         return self.get_twitter_openapi_python_client(api_client)
 
     def get_guest_client(self) -> TwitterOpenapiPythonClient:
         http = urllib3.PoolManager()
         session = {}
 
+        header = self.get_header()
+
         res_1 = http.request(
             "GET",
-            "https://twitter.com",
+            self.twitter_url,
             redirect=False,
-            headers=self.browser_headers.copy(),
+            headers=header[1],
         )
         cookie = res_1.headers._container["set-cookie"][1:]
         session.update(self.cookie_normalize(cookie))
         res_2 = http.request(
             "GET",
-            "https://twitter.com",
+            self.twitter_url,
             redirect=False,
-            headers=self.browser_headers.copy()
-            | {"Cookie": self.cookie_to_str(session)},
+            headers=header[1],
         )
 
         find = re.findall(r'document.cookie="(.*?)";', res_2.data.decode())
@@ -161,15 +173,13 @@ class TwitterOpenapiPython:
         session.pop("ct0")
 
         if not session.get("gt"):
-            activate_header = self.browser_headers.copy() | {
-                "authorization": "Bearer {}".format(self.access_token),
-                "x-twitter-active-user": "yes",
-                "x-twitter-client-language": "en",
+            activate_header = header[0] | {
+                "cookie": self.cookie_to_str(session),
             }
             res_3 = http.request(
                 "POST",
-                "https://api.twitter.com/1.1/guest/activate.json",
-                headers=activate_header | {"Cookie": self.cookie_to_str(session)},
+                "https://api.x.com/1.1/guest/activate.json",
+                headers=activate_header,
             )
             gt = json.loads(res_3.data.decode())["guest_token"]
             session.update({"gt": gt})

twitter_openapi_python/utils/__init__.py

@@ -18,4 +18,5 @@ from twitter_openapi_python.utils.api import (
     user_entries_converter,
     user_or_null_converter,
     user_result_converter,
+    non_nullable,
 )

twitter_openapi_python/utils/api.py

@@ -23,6 +23,11 @@ def flat(matrix: List[List[T]]) -> List[T]:
     return [x for row in matrix for x in row]
 
 
+def non_nullable(x: Optional[T]) -> T:
+    if x is None:
+        raise Exception("No data")
+    return x
+
 def non_nullable_list(x: List[Optional[T]]) -> List[T]:
     def filter_fn(x: Optional[T]) -> TypeGuard[T]:
         return x is not None

{twitter_openapi_python-0.0.22.dist-info → twitter_openapi_python-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter-openapi-python
-Version: 0.0.22
+Version: 0.0.24
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311
@@ -10,7 +10,7 @@ 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.16
+Requires-Dist: twitter-openapi-python-generated ==0.0.21
 Requires-Dist: pydantic >=2.6
 
         Twitter scraping with data validation by pydantic.

{twitter_openapi_python-0.0.22.dist-info → twitter_openapi_python-0.0.24.dist-info}/RECORD

@@ -1,13 +1,13 @@
 twitter_openapi_python/__init__.py,sha256=stqYIfWDqM0yC93SQNp4-b2hSz-ONWR3QxOG5g2oREg,339
-twitter_openapi_python/client.py,sha256=HzxtpWo-yNzIlfPIZKbAxM8QidAw2E83bwLUd7lfcQE,6500
+twitter_openapi_python/client.py,sha256=i0ynE5orodZtPCLGUYmalBD7lL4HMBBItypdUmlJYJg,6673
 twitter_openapi_python/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 twitter_openapi_python/api/__init__.py,sha256=-2hoS75Fp0KvCIWKYQFpvAl0pcbFyt7Be3ood08P7n8,643
 twitter_openapi_python/api/default_api.py,sha256=PeHYaAw6xaUB9ZE3An5SKcEvW71JLTFSgyte80BBvX4,2751
-twitter_openapi_python/api/initial_state_api.py,sha256=b_ehegseXC3dtGEQ99QEg5g7-KGuZWM3VT4iWkkK3W8,2339
-twitter_openapi_python/api/post_api.py,sha256=q9v-AUZXOmrZ28seD81hOO8bIXbqB5S0vN-QkJlmuIc,5607
-twitter_openapi_python/api/tweet_api.py,sha256=eP1pbtCB2dV9rbI3M5R9ta_CyViBngnSLWZztMfEycU,9941
+twitter_openapi_python/api/initial_state_api.py,sha256=N4yA3oXDbke7bH-XOuKQ4WVUm5sKbC2C3Dd3AvFINLY,2355
+twitter_openapi_python/api/post_api.py,sha256=9xvA0LrtcxWOVBkkVwvMS-zBcJFh1ZVUF_dm1zzZq5o,6826
+twitter_openapi_python/api/tweet_api.py,sha256=iZC3PlFS9SD3olb4BRrMYfyoCUf1UuD2XToXd33S-UM,10184
 twitter_openapi_python/api/user_api.py,sha256=oH5JBNemBSCyUFAbDSDbjRUOZN3bZMa_tI8PQ4C1wYk,2619
-twitter_openapi_python/api/user_list_api.py,sha256=nhLbqXF4nnM9ONTGa-Szh5booZk5LeEfOfR7lEYyT1M,5637
+twitter_openapi_python/api/user_list_api.py,sha256=7o1dqRrXzk0F6ywQ-dhyMR0eCzsGJ6HeUHYswPDx3hI,5748
 twitter_openapi_python/api/users_api.py,sha256=82CM20-dp7JfpTRqSIzU5Lbm4xoB32Cq18ECRfVMt_I,1789
 twitter_openapi_python/api/v11_get_api.py,sha256=OimuRRA4oG2z6IGhJuzgo2CvJqpoD4-CDNZrwZRg6GQ,2254
 twitter_openapi_python/api/v11_post_api.py,sha256=d7H-ewGhLql-lQagkGLdOm9FybtjN05lCoGatDMh9rc,2051
@@ -17,11 +17,11 @@ twitter_openapi_python/models/header.py,sha256=hP0fjrm-3Mogt9IkAucQnmDletRuzMmCf
 twitter_openapi_python/models/initial_state.py,sha256=h8P3hC_tLVSmDuYxB03fuSviz22cpp-4RfSR2npP_Yo,530
 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=U31tIEyCWa4RRnYvMXqcdtHTpbEUftNey68XmAP0lnk,430
-twitter_openapi_python/utils/api.py,sha256=G7h83x_BcXP9ou_XlYEFd4M4yElG7Ck-U8W8dvWkFaI,9915
-twitter_openapi_python-0.0.22.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
-twitter_openapi_python-0.0.22.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
-twitter_openapi_python-0.0.22.dist-info/METADATA,sha256=xZForYf3jllPiDsMYdI9hFfaiXeMgYy8Dkrgqj7qDas,551
-twitter_openapi_python-0.0.22.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-twitter_openapi_python-0.0.22.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
-twitter_openapi_python-0.0.22.dist-info/RECORD,,
+twitter_openapi_python/utils/__init__.py,sha256=QVT1eCClP9EVfcZ4QU96TVegfAUDEtJ-PVp3zv6qy6w,449
+twitter_openapi_python/utils/api.py,sha256=JTSXE1Wh3AiuOb_APTDTQMrR4HTkI9AihzrXkJGV2d8,10026
+twitter_openapi_python-0.0.24.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
+twitter_openapi_python-0.0.24.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
+twitter_openapi_python-0.0.24.dist-info/METADATA,sha256=gAfBFLyf8j_Nb0LtsAPTmWrRdaG62cbE7WdveewWmsU,551
+twitter_openapi_python-0.0.24.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+twitter_openapi_python-0.0.24.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
+twitter_openapi_python-0.0.24.dist-info/RECORD,,