twitter-openapi-python 0.0.13__tar.gz → 0.0.15__tar.gz

{twitter_openapi_python-0.0.13 → twitter_openapi_python-0.0.15}/PKG-INFO

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

{twitter_openapi_python-0.0.13 → twitter_openapi_python-0.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twitter_openapi_python"
-version = "0.0.13"
+version = "0.0.15"
 description = "Twitter OpenAPI"
 authors = ["fa0311 <yuki@yuki0311.com>"]
 license = "proprietary" # or "AGPL-3.0-only"
@@ -14,7 +14,7 @@ include = ["twitter_openapi_python/py.typed"]
 python = "^3.7"
 pydantic = ">=2.6"
 
-twitter-openapi-python-generated = "0.0.9"
+twitter-openapi-python-generated = "0.0.11"
 
 [tool.poetry.dev-dependencies]
 

{twitter_openapi_python-0.0.13 → twitter_openapi_python-0.0.15}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import find_packages, setup
 
 NAME = "twitter_openapi_python"
-VERSION = "0.0.13"
+VERSION = "0.0.15"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "twitter_openapi_python_generated == 0.0.9",

{twitter_openapi_python-0.0.13 → twitter_openapi_python-0.0.15}/twitter_openapi_python/client.py

@@ -110,8 +110,8 @@ 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,

{twitter_openapi_python-0.0.13 → twitter_openapi_python-0.0.15}/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.13 → twitter_openapi_python-0.0.15}/twitter_openapi_python.egg-info/PKG-INFO

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