twitter-openapi-typescript-generated 0.0.17 → 0.0.19

package/twitter-openapi/dist/docs/openapi-3.0.yaml

@@ -564,6 +564,10 @@ components:
           items:
             $ref: '#/components/schemas/Symbol'
           type: array
+        timestamps:
+          items:
+            $ref: '#/components/schemas/Timestamp'
+          type: array
         urls:
           items:
             $ref: '#/components/schemas/Url'
@@ -1656,6 +1660,7 @@ components:
           enum:
           - Top
           - Bottom
+          - TopAndBottom
           type: string
         type:
           $ref: '#/components/schemas/InstructionType'
@@ -1793,6 +1798,20 @@ components:
           $ref: '#/components/schemas/Timeline'
       required:
       - timeline
+    Timestamp:
+      properties:
+        indices:
+          items:
+            type: integer
+          type: array
+        seconds:
+          type: integer
+        text:
+          type: string
+      required:
+      - indices
+      - seconds
+      - text
     TopicContext:
       properties:
         description:
@@ -2159,10 +2178,11 @@ components:
         limited_actions:
           enum:
           - limited_replies
-          - community_tweet_non_member_public_community
           - non_compliant
           - dynamic_product_ad
           - stale_tweet
+          - community_tweet_non_member_public_community
+          - community_tweet_non_member_closed_community
           type: string
         place:
           additionalProperties: true
@@ -2790,6 +2810,8 @@ components:
       properties:
         __typename:
           $ref: '#/components/schemas/TypeName'
+        message:
+          type: string
         reason:
           type: string
       required:

package/twitter-openapi/src/openapi/schemas/instruction.yaml

@@ -150,7 +150,7 @@ components:
           $ref: "#/components/schemas/InstructionType" # TimelineTerminateTimeline
         direction:
           type: string
-          enum: [Top, Bottom]
+          enum: [Top, Bottom, TopAndBottom]
 
     TimelineAddEntry:
       required:

package/twitter-openapi/src/openapi/schemas/tweet.yaml

@@ -680,7 +680,6 @@ components:
             $ref: "#/components/schemas/BirdwatchEntity"
 
     BirdwatchPivotCallToAction:
-      # {'prompt': 'Do you find this helpful?', 'title': 'Rate it', 'destinationUrl': 'https://twitter.com/i/birdwatch/n/1710821689636934115'}
       required:
         - "prompt"
         - "title"
@@ -906,10 +905,11 @@ components:
           type: string
           enum:
             - "limited_replies"
-            - "community_tweet_non_member_public_community"
             - "non_compliant"
             - "dynamic_product_ad"
             - "stale_tweet"
+            - "community_tweet_non_member_public_community"
+            - "community_tweet_non_member_closed_community"
         place:
           additionalProperties: true # todo
 
@@ -948,6 +948,10 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/Media"
+        timestamps:
+          type: array
+          items:
+            $ref: "#/components/schemas/Timestamp"
 
     Hashtag:
       type: object
@@ -1293,3 +1297,18 @@ components:
         resize:
           type: string
           enum: [crop, fit]
+
+    Timestamp:
+      required:
+        - "indices"
+        - "seconds"
+        - "text"
+      properties:
+        indices:
+          type: array
+          items:
+            type: integer
+        seconds:
+          type: integer
+        text:
+          type: string

package/twitter-openapi/src/openapi/schemas/user.yaml

@@ -356,3 +356,5 @@ components:
           $ref: "./typename.yaml#/components/schemas/TypeName" # UserUnavailable
         reason:
           type: string
+        message:
+          type: string

package/twitter-openapi/test/python/openapi-generator-config.yaml

@@ -1,4 +1,4 @@
-inputSpec: dist/compatible/openapi-3.0.yaml
+inputSpec: dist/compatible_discriminator/openapi-3.0.yaml
 outputDir: python_generated
 
 useOneOfDiscriminatorLookup: true

package/twitter-openapi/test/python/test_serialize.py

@@ -326,6 +326,7 @@ if __name__ == "__main__":
         "1697450269259522256",
         "1697450278742884799",
         "1749500209061663043",
+        "1759056048764469303",
     ]
     for id in ids:
         try:

package/twitter-openapi/test/python/test_serialize_guest.py

@@ -0,0 +1,49 @@
+import json
+from pathlib import Path
+
+import openapi_client as pt
+
+
+def get_kwargs(key, additional):
+    kwargs = {"path_query_id": placeholder[key]["queryId"]}
+    if placeholder[key].get("variables") is not None:
+        kwargs["variables"] = json.dumps(placeholder[key]["variables"] | additional)
+    if placeholder[key].get("features") is not None:
+        kwargs["features"] = json.dumps(placeholder[key]["features"])
+    if placeholder[key].get("fieldToggles") is not None:
+        kwargs["field_toggles"] = json.dumps(placeholder[key]["fieldToggles"])
+    return kwargs
+
+
+if __name__ == "__main__":
+    if Path("cookie.json").exists():
+        with open("cookie.json", "r") as f:
+            cookies = json.load(f)
+    cookies_str = "; ".join([f"{k}={v}" for k, v in cookies.items()])
+
+    with open("src/config/placeholder.json", "r") as f:
+        placeholder = json.load(f)
+
+    api_conf = pt.Configuration(
+        api_key={
+            "ClientLanguage": "en",
+            "ActiveUser": "yes",
+            "GuestToken": cookies["gt"],
+        },
+    )
+    api_conf.access_token = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
+    api_client = pt.ApiClient(configuration=api_conf, cookie=cookies_str)
+    api_client.user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36"
+
+    pt.TweetApi(api_client).get_user_tweets_with_http_info(
+        **get_kwargs("UserTweets", {}),
+    )
+    pt.TweetApi(api_client).get_user_highlights_tweets_with_http_info(
+        **get_kwargs("UserHighlightsTweets", {}),
+    )
+    pt.DefaultApi(api_client).get_tweet_result_by_rest_id_with_http_info(
+        **get_kwargs("TweetResultByRestId", {}),
+    )
+    pt.UserApi(api_client).get_user_by_screen_name_with_http_info(
+        **get_kwargs("UserByScreenName", {})
+    )

package/twitter-openapi/tools/build_config.py

@@ -1,11 +1,23 @@
-from hooks import *
+from hooks import (
+    AddParametersOnBody,
+    AddParametersOnContent,
+    AddParametersOnParameters,
+    AddPathQueryIdOnParameters,
+    AddSecuritySchemesOnSecuritySchemes,
+    RemoveErrorHandle,
+    SetResponsesHeader,
+)
 
 
 class Config:
     OUTPUT_DIR = "dist/{0}"
     INPUT_DIR = "src/openapi"
 
-    def hooks_generator(self, queryParameterJson=True):
+    def hooks_generator(
+        self,
+        queryParameterJson=True,
+        removeLegacyDiscriminatorBehavior=False,
+    ):
         # https://stackoverflow.com/questions/34820064/defining-an-api-with-swagger-get-call-that-uses-json-in-parameters/45223964
         if queryParameterJson:
             # ["parameters"][0]["content"]["application/json"]["schema"]
@@ -22,6 +34,11 @@ class Config:
                 ignoreKeys=["queryId"],
             )
 
+        # https://github.com/OpenAPITools/openapi-generator/issues/15373
+        additionalHooks = []
+        if removeLegacyDiscriminatorBehavior:
+            additionalHooks.append(RemoveErrorHandle())
+
         return {
             "openapi": [AddSecuritySchemesOnSecuritySchemes()],
             "schemas": [],
@@ -31,6 +48,7 @@ class Config:
                     SetResponsesHeader(suffix=None),
                     AddPathQueryIdOnParameters(split=-1),
                     getParamHook,
+                    *additionalHooks,
                 ]
                 for key in ["default", "user", "users", "user-list", "tweet"]
             }
@@ -43,6 +61,7 @@ class Config:
                         schemaType=None,
                         contentType="application/json",
                     ),
+                    *additionalHooks,
                 ]
                 for key in ["post"]
             }
@@ -70,5 +89,11 @@ class Config:
     def main(self):
         return {
             "docs": self.hooks_generator(),
-            "compatible": self.hooks_generator(queryParameterJson=False),
+            "compatible": self.hooks_generator(
+                queryParameterJson=False,
+            ),
+            "compatible_discriminator": self.hooks_generator(
+                queryParameterJson=False,
+                removeLegacyDiscriminatorBehavior=True,
+            ),
         }

package/twitter-openapi/tools/hooks.py

@@ -1,6 +1,7 @@
-import yaml
 import json
 
+import yaml
+
 
 class HookBase:
     PLACEHOLDER: dict
@@ -193,6 +194,13 @@ class AddPathQueryIdOnParameters(RequestHookBase):
         return path, value
 
 
+class RemoveErrorHandle(RequestHookBase):
+    def hook(self, path: str, value: dict):
+        content = value["responses"]["200"]["content"]["application/json"]
+        content["schema"] = content["schema"]["oneOf"][0]
+        return path, value
+
+
 # OnParameters
 
 

package/twitter-openapi/test/python/replace.py

@@ -1,23 +0,0 @@
-import glob
-
-for file in glob.glob("python_generated/openapi_client/models/*.py"):
-    with open(file, "r") as f:
-        text = f.read()
-
-    indent = "    "
-
-    text = text.replace(
-        f"{indent}{indent}try:",
-        f"{indent}{indent}if match == 0:",
-    )
-    text = text.replace(
-        f"{indent}{indent}except (ValidationError, ValueError) as e:",
-        f"{indent}{indent}else:",
-    )
-    text = text.replace(
-        f"{indent}{indent}{indent}error_messages.append(str(e))",
-        f"{indent}{indent}{indent}pass",
-    )
-
-    with open(file, "w") as f:
-        f.write(text)