twitter-openapi-python 0.0.12__py3-none-any.whl → 0.0.15__py3-none-any.whl

twitter_openapi_python/client.py

@@ -66,7 +66,8 @@ class TwitterOpenapiPython:
 
     api_key = {
         "Accept": "*/*",
-        "AcceptEncoding": "gzip, deflate, br",
+        # "AcceptEncoding": "gzip, deflate, br",
+        # "AcceptEncoding": "deflate, br",
         "AcceptLanguage": "en-US,en;q=0.9",
         "CacheControl": "no-cache",
         "Pragma": "no-cache",
@@ -109,14 +110,14 @@ class TwitterOpenapiPython:
         api: twitter.ApiClient,
     ) -> TwitterOpenapiPythonClient:
         http = urllib3.PoolManager()
-        flag = http.request("GET", self.placeholder_url.format(hash=self.hash)).json()
-        return TwitterOpenapiPythonClient(api, flag)
+        flag = http.request("GET", self.placeholder_url.format(hash=self.hash))
+        return TwitterOpenapiPythonClient(api, json.loads(flag.data))
 
     def get_client_from_cookies(
         self,
         cookies: dict[str, str],
     ) -> TwitterOpenapiPythonClient:
-        api_key = self.api_key
+        api_key = self.api_key.copy()
 
         if cookies.get("ct0"):
             api_key.update({"AuthType": "OAuth2Session"})
@@ -142,7 +143,7 @@ class TwitterOpenapiPython:
             "GET",
             "https://twitter.com",
             redirect=False,
-            headers=self.browser_headers,
+            headers=self.browser_headers.copy(),
         )
         cookie = res_1.headers._container["set-cookie"][1:]
         session.update(self.cookie_normalize(cookie))
@@ -150,7 +151,8 @@ class TwitterOpenapiPython:
             "GET",
             "https://twitter.com",
             redirect=False,
-            headers=self.browser_headers | {"Cookie": self.cookie_to_str(session)},
+            headers=self.browser_headers.copy()
+            | {"Cookie": self.cookie_to_str(session)},
         )
 
         find = re.findall(r'document.cookie="(.*?)";', res_2.data.decode())
@@ -159,7 +161,7 @@ class TwitterOpenapiPython:
         session.pop("ct0")
 
         if not session.get("gt"):
-            activate_header = self.browser_headers | {
+            activate_header = self.browser_headers.copy() | {
                 "authorization": "Bearer {}".format(self.access_token),
                 "x-twitter-active-user": "yes",
                 "x-twitter-client-language": "en",

twitter_openapi_python/models/__init__.py

@@ -3,7 +3,7 @@
 # flake8: noqa
 
 
-from twitter_openapi_python.models.base import BaseModel, GenericModel
+from twitter_openapi_python.models.base import BaseModel
 from twitter_openapi_python.models.header import ApiUtilsHeader
 from twitter_openapi_python.models.initial_state import (
     InitialStateApiUtilsRaw,

twitter_openapi_python/models/base.py

@@ -1,12 +1,9 @@
-from pydantic import BaseModel as PydanticBaseModel
-from pydantic.generics import GenericModel as PydanticGenericModel
+from typing import TypeVar
 
+from pydantic import BaseModel as PydanticBaseModel
 
-class BaseModel(PydanticBaseModel):
-    class Config:
-        arbitrary_types_allowed = True
+T = TypeVar("T")
 
 
-class GenericModel(PydanticGenericModel):
-    class Config:
-        arbitrary_types_allowed = True
+class BaseModel(PydanticBaseModel):
+    model_config = {"arbitrary_types_allowed": True}

twitter_openapi_python/models/response.py

@@ -3,7 +3,7 @@ from typing import Generic, TypeVar
 import twitter_openapi_python_generated as twitter
 from pydantic import Field
 
-from twitter_openapi_python.models import ApiUtilsHeader, BaseModel, GenericModel
+from twitter_openapi_python.models import ApiUtilsHeader, BaseModel
 
 T1 = TypeVar("T1")
 T2 = TypeVar("T2")
@@ -13,7 +13,7 @@ class TwitterApiUtilsRaw(BaseModel):
     response: twitter.ApiResponse = Field()
 
 
-class TwitterApiUtilsResponse(GenericModel, Generic[T1]):
+class TwitterApiUtilsResponse(BaseModel, Generic[T1]):
     raw: TwitterApiUtilsRaw = Field()
     data: T1 = Field()
     header: ApiUtilsHeader = Field()

twitter_openapi_python/models/timeline.py

@@ -4,7 +4,7 @@ from typing import Any, Generic, List, Optional, TypeVar
 import twitter_openapi_python_generated.models as models
 from pydantic import Field
 
-from twitter_openapi_python.models import BaseModel, GenericModel
+from twitter_openapi_python.models import BaseModel
 
 T = TypeVar("T")
 
@@ -34,7 +34,7 @@ class UserApiUtilsData(BaseModel):
     user: models.User = Field()
 
 
-class TimelineApiUtilsResponse(GenericModel, Generic[T]):
+class TimelineApiUtilsResponse(BaseModel, Generic[T]):
     raw: ApiUtilsRaw = Field()
     cursor: CursorApiUtilsResponse = Field()
     data: List[T] = Field(default_factory=list)

twitter_openapi_python/utils/api.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Dict, List, Optional, TypeGuard, TypeVar
+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
@@ -83,35 +83,55 @@ def instruction_to_entry(
 def tweet_entries_converter(
     input: List[models.TimelineAddEntry],
 ) -> List[TweetApiUtilsData]:
-    def map_fn(x: models.TimelineAddEntry) -> Optional[TweetApiUtilsData]:
+    def map_fn(x: models.TimelineAddEntry) -> Optional[List[TweetApiUtilsData]]:
         one_of = x.content.actual_instance
 
         if isinstance(one_of, models.TimelineTimelineItem):
             item = one_of.item_content.actual_instance
             if isinstance(item, models.TimelineTweet):
-                return build_tweet_api_utils(
-                    result=item.tweet_results,
-                    promoted_metadata=item.promoted_metadata,
-                    reply=[],
+                return non_nullable_list(
+                    [
+                        build_tweet_api_utils(
+                            result=item.tweet_results,
+                            promoted_metadata=item.promoted_metadata,
+                            reply=[],
+                        )
+                    ]
                 )
         elif isinstance(one_of, models.TimelineTimelineModule):
             module = one_of.items or []
             timelineList = non_nullable_list(list(map(map_fn_2, module)))
             if len(timelineList) == 0:
                 return None
-            timeline = timelineList[0]
-            return build_tweet_api_utils(
-                result=timeline.tweet_results,
-                promoted_metadata=timeline.promoted_metadata,
-                reply=timelineList[1:],
-            )
+            if one_of.display_type == models.DisplayType.VERTICALGRID:
+                return non_nullable_list(
+                    [
+                        build_tweet_api_utils(
+                            result=x.tweet_results,
+                            promoted_metadata=x.promoted_metadata,
+                            reply=[],
+                        )
+                        for x in timelineList
+                    ]
+                )
+            else:
+                timeline = timelineList[0]
+                return non_nullable_list(
+                    [
+                        build_tweet_api_utils(
+                            result=timeline.tweet_results,
+                            promoted_metadata=timeline.promoted_metadata,
+                            reply=timelineList[1:],
+                        )
+                    ]
+                )
 
     def map_fn_2(x: models.ModuleItem) -> Optional[models.TimelineTweet]:
         item = x.item.item_content.actual_instance
         if isinstance(item, models.TimelineTweet):
             return item
 
-    return non_nullable_list(list(map(map_fn, input)))
+    return flat(non_nullable_list(list(map(map_fn, input))))
 
 
 def user_or_null_converter(user: models.UserUnion) -> Optional[models.User]:
@@ -245,7 +265,12 @@ def build_response(
     if response.headers is None:
         raise Exception("headers is None")
 
-    header = build_header(response.headers)
+    if isinstance(response.headers, Dict):
+        header = build_header(response.headers)
+    elif isinstance(response.headers, Mapping):
+        header = build_header(dict(response.headers))
+    else:
+        raise Exception("headers is not a dict")
 
     return TwitterApiUtilsResponse(
         raw=TwitterApiUtilsRaw(response=response),

{twitter_openapi_python-0.0.12.dist-info → twitter_openapi_python-0.0.15.dist-info}/METADATA

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

{twitter_openapi_python-0.0.12.dist-info → twitter_openapi_python-0.0.15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 twitter_openapi_python/__init__.py,sha256=stqYIfWDqM0yC93SQNp4-b2hSz-ONWR3QxOG5g2oREg,339
-twitter_openapi_python/client.py,sha256=ulxrA7II5Efw8u7rRp600VoCjDZe2wSPPGsVGLkk0QI,6403
+twitter_openapi_python/client.py,sha256=eFfafgpGhD-x3qHawQAf2XjD0x4zcqUwwF-FRVp9LqE,6500
 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
@@ -11,17 +11,17 @@ twitter_openapi_python/api/user_list_api.py,sha256=nhLbqXF4nnM9ONTGa-Szh5booZk5L
 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
-twitter_openapi_python/models/__init__.py,sha256=hZZYM0Ly9jzADqwVKHyniTbktFdoLmJDo33fkivj1F8,597
-twitter_openapi_python/models/base.py,sha256=cHBRhpFJQN6NIqvWdOv1NQygAwURv1yEfw4msBrDKqY,327
+twitter_openapi_python/models/__init__.py,sha256=uKZYFWWoXinGRjMU7ErbunUhfsThEuZf8aGFBd7lus0,583
+twitter_openapi_python/models/base.py,sha256=3C1SKqgEZhf3QQIHPNob5vasEV7FE8KxP9rNwWYmHG0,198
 twitter_openapi_python/models/header.py,sha256=hP0fjrm-3Mogt9IkAucQnmDletRuzMmCfoEBaAtoyJ0,594
 twitter_openapi_python/models/initial_state.py,sha256=h8P3hC_tLVSmDuYxB03fuSviz22cpp-4RfSR2npP_Yo,530
-twitter_openapi_python/models/response.py,sha256=PW-TBYa2mG9ypSIg_hrOlJK_-8n4DoGQOut5HNGn3kM,497
-twitter_openapi_python/models/timeline.py,sha256=XuvcIALfEyB_4Mk8yB6bS9y0KNzda02nWjebqZLui80,1409
+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=UCAPQaNNCKelZvCtL9jffGk_GHPpqCgS8B90t4SUU9Q,8894
-twitter_openapi_python-0.0.12.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
-twitter_openapi_python-0.0.12.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
-twitter_openapi_python-0.0.12.dist-info/METADATA,sha256=LHymmk7edX7lqDRUGxJ2aun2aby9I7LU86ZdJr_DTl0,556
-twitter_openapi_python-0.0.12.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-twitter_openapi_python-0.0.12.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
-twitter_openapi_python-0.0.12.dist-info/RECORD,,
+twitter_openapi_python/utils/api.py,sha256=G7h83x_BcXP9ou_XlYEFd4M4yElG7Ck-U8W8dvWkFaI,9915
+twitter_openapi_python-0.0.15.dist-info/LICENSE,sha256=xthyYzrtSmRlBu2gnfuIxzsZeHrqtIZgZPL9UPrYiQU,1524
+twitter_openapi_python-0.0.15.dist-info/LICENSE.AGPL,sha256=Nv6u1ubULm-E2y6q2-pQPK8s2BzkOltLaVlPKQ3tkcs,35182
+twitter_openapi_python-0.0.15.dist-info/METADATA,sha256=VzI-OeJMiNX7rc4YOEkpC9nX1p6HxWX5cbCvoY953DY,550
+twitter_openapi_python-0.0.15.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+twitter_openapi_python-0.0.15.dist-info/top_level.txt,sha256=wKFCnW_S6aWD3nFPmd65SxZIviiqQ30LqHOLLpcnTdE,23
+twitter_openapi_python-0.0.15.dist-info/RECORD,,