Merge pull request #19 from fa0311/develop

fa0311 · web-flow · commit ce0b7113397d · 2024-02-06T16:06:27.000+09:00
v0.0.13
diff --git a/example/.vscode/extensions.json b/example/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "ms-python.debugpy",
+        "charliermarsh.ruff"
+    ]
+}
diff --git a/example/.vscode/launch.json b/example/.vscode/launch.json
@@ -3,11 +3,11 @@
   "configurations": [
     {
       "name": "Python: Current File",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "program": "${file}",
       "console": "integratedTerminal",
       "justMyCode": false
     }
   ]
-}
+}
diff --git a/example/.vscode/settings.json b/example/.vscode/settings.json
@@ -1,5 +1,8 @@
 {
-  "flake8.args": [],
   "editor.unicodeHighlight.ambiguousCharacters": false,
-  "python.analysis.typeCheckingMode": "basic"
-}
+  "python.analysis.typeCheckingMode": "basic",
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit",
+    "source.fixAll": "explicit"
+  },
+}
diff --git a/example/requirements.txt b/example/requirements.txt
diff --git a/example/sample/download_media.py b/example/sample/download_media.py
@@ -1,15 +1,15 @@
+import os
+import urllib.request
+from pathlib import Path
+from typing import Optional
+
+import login as login
 from twitter_openapi_python import (
-    TwitterOpenapiPython,
-    TimelineTimelineCursor,
     MediaExtended,
+    TimelineTimelineCursor,
     TweetApiUtilsData,
+    TwitterOpenapiPython,
 )
-from typing import Optional
-import login as login
-import urllib.request
-import os
-from pathlib import Path
-
 
 cookies_dict = login.login().get_cookies().get_dict()
 𝕏 = TwitterOpenapiPython().get_client_from_cookies(cookies=cookies_dict)
diff --git a/example/sample/login.py b/example/sample/login.py
@@ -1,8 +1,8 @@
 import json
-
 from pathlib import Path
-from tweepy_authlib import CookieSessionUserHandler
+
 from requests.cookies import RequestsCookieJar
+from tweepy_authlib import CookieSessionUserHandler
 
 
 def login():
diff --git a/example/sample/tweet.py b/example/sample/tweet.py
@@ -1,7 +1,7 @@
 import datetime
-from twitter_openapi_python import TwitterOpenapiPython
-import login as login
 
+import login as login
+from twitter_openapi_python import TwitterOpenapiPython
 
 cookies_dict = login.login().get_cookies().get_dict()
 𝕏 = TwitterOpenapiPython().get_client_from_cookies(cookies=cookies_dict)
diff --git a/example/sample/tweet_media.py b/example/sample/tweet_media.py
@@ -1,9 +1,6 @@
-from twitter_openapi_python import TwitterOpenapiPython
-
-
 import login as login
 import tweepy
-
+from twitter_openapi_python import TwitterOpenapiPython
 
 auth_handler = login.login()
 cookies_dict = auth_handler.get_cookies().get_dict()
diff --git a/example/sample/user.py b/example/sample/user.py
@@ -1,11 +1,10 @@
-from twitter_openapi_python import TwitterOpenapiPython
-import login as login
-
-
-import urllib.request
-from urllib.parse import urlparse
 import os
+import urllib.request
 from pathlib import Path
+from urllib.parse import urlparse
+
+import login as login
+from twitter_openapi_python import TwitterOpenapiPython
 
 cookies_dict = login.login().get_cookies().get_dict()
 𝕏 = TwitterOpenapiPython().get_client_from_cookies(cookies=cookies_dict)
diff --git a/twitter_openapi_python/.vscode/launch.json b/twitter_openapi_python/.vscode/launch.json
@@ -3,11 +3,11 @@
   "configurations": [
     {
       "name": "Python: Current File",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "program": "${file}",
       "console": "integratedTerminal",
       "justMyCode": false
     }
   ]
-}
+}
diff --git a/twitter_openapi_python/pyproject.toml b/twitter_openapi_python/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twitter_openapi_python"
-version = "0.0.12"
+version = "0.0.13"
 description = "Twitter OpenAPI"
 authors = ["fa0311 <yuki@yuki0311.com>"]
 license = "proprietary" # or "AGPL-3.0-only"
@@ -12,9 +12,9 @@ include = ["twitter_openapi_python/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-pydantic = "^1.10.5, <2"
+pydantic = ">=2.6"
 
-twitter-openapi-python-generated = "0.0.7"
+twitter-openapi-python-generated = "0.0.9"
 
 [tool.poetry.dev-dependencies]
 
diff --git a/twitter_openapi_python/requirements.txt b/twitter_openapi_python/requirements.txt
diff --git a/twitter_openapi_python/setup.py b/twitter_openapi_python/setup.py
@@ -3,11 +3,11 @@
 from setuptools import find_packages, setup
 
 NAME = "twitter_openapi_python"
-VERSION = "0.0.12"
+VERSION = "0.0.13"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
-    "twitter_openapi_python_generated == 0.0.6",
-    "pydantic >= 1.10.5, < 2",
+    "twitter_openapi_python_generated == 0.0.9",
+    "pydantic >= 2.6",
 ]
 
 setup(
diff --git a/twitter_openapi_python/twitter_openapi_python/models/__init__.py b/twitter_openapi_python/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,
diff --git a/twitter_openapi_python/twitter_openapi_python/models/base.py b/twitter_openapi_python/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}
diff --git a/twitter_openapi_python/twitter_openapi_python/models/response.py b/twitter_openapi_python/twitter_openapi_python/models/response.py
@@ -3,7 +3,7 @@
 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()
diff --git a/twitter_openapi_python/twitter_openapi_python/models/timeline.py b/twitter_openapi_python/twitter_openapi_python/models/timeline.py
@@ -4,7 +4,7 @@
 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)

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`	`"configurations": [`
`4`	`4`	`{`
`5`	`5`	`"name": "Python: Current File",`
`6`		`- "type": "python",`
	`6`	`+ "type": "debugpy",`
`7`	`7`	`"request": "launch",`
`8`	`8`	`"program": "${file}",`
`9`	`9`	`"console": "integratedTerminal",`
`10`	`10`	`"justMyCode": false`
`11`	`11`	`}`
`12`	`12`	`]`
`13`		`-}`
	`13`	`+}`