feat: 适配最新 strawberry-graphql (#648)

顺便更新了其他所有依赖

Author: he0119

home/storage/types.py

@@ -3,8 +3,8 @@
 import strawberry
 import strawberry_django
 from django.db.models import Q
-from strawberry import relay
-from strawberry_django import FilterLookup
+from strawberry import Info, relay
+from strawberry_django import FilterLookup, StrFilterLookup
 
 from home.users.types import User
 
@@ -27,8 +27,8 @@ class PictureOrder:
 @strawberry.input
 class StorageFilterLookup:
     id: relay.GlobalID | None = strawberry.UNSET
-    name: FilterLookup[str] | None = strawberry.UNSET
-    description: FilterLookup[str] | None = strawberry.UNSET
+    name: StrFilterLookup | None = strawberry.UNSET
+    description: StrFilterLookup | None = strawberry.UNSET
     level: FilterLookup[int] | None = strawberry.UNSET
     is_null: bool | None = strawberry.UNSET
 
@@ -122,9 +122,9 @@ class Picture(relay.Node):
     box_w: strawberry.auto
 
     @strawberry.field
-    def name(self, info) -> str:
+    def name(self, info: Info) -> str:
         return self.picture.name.split("/")[-1]  # type: ignore
 
     @strawberry.field
-    def url(self, info) -> str:
+    def url(self, info: Info) -> str:
         return self.picture.url  # type: ignore

home/tests.py

@@ -21,23 +21,6 @@ def authenticate(self, user):
         """登录"""
         self.client.force_login(user)
 
-    def request(
-        self,
-        body: dict[str, object],
-        headers: dict[str, object] | None = None,
-        files: dict[str, object] | None = None,
-    ):
-        kwargs: dict[str, object] = {"data": body}
-        # 默认的测试客户端居然没用上 headers
-        if headers:
-            kwargs.update(headers)
-        if files:
-            kwargs["format"] = "multipart"
-        else:
-            kwargs["content_type"] = "application/json"
-
-        return self.client.post(self.path, **kwargs)  # type: ignore
-
     def execute(
         self,
         query: str,
@@ -50,7 +33,7 @@ def execute(
 
         和之前的格式相同
         """
-        return super().query(query, variables, headers, asserts_errors, files)  # type: ignore
+        return super().query(query, variables, headers, files, asserts_errors)  # type: ignore
 
 
 class GraphQLTestCase(TestCase):

home/users/tests.py

@@ -414,7 +414,7 @@ def test_get_session(self):
                 }
             }
         """
-        content = self.client.execute(query, headers={"HTTP_X_FORWARDED_FOR": "1.1.1.1"})
+        content = self.client.execute(query, headers={"X-Forwarded-For": "1.1.1.1"})
 
         data = content.data["viewer"]["session"]
         # 必须排序确保新的会话在后面
@@ -433,7 +433,7 @@ def test_get_session(self):
 
         # 再次请求，这次应该能够获取到正确的 IP 地址
         # 因为在上一次请求中，已经将 IP 地址写入到了 session 中
-        content = self.client.execute(query, headers={"HTTP_X_FORWARDED_FOR": "1.1.1.1"})
+        content = self.client.execute(query, headers={"X-Forwarded-For": "1.1.1.1"})
 
         data = content.data["viewer"]["session"]
         data.sort(key=lambda x: x["isCurrent"])

pyproject.toml

@@ -7,25 +7,25 @@ readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.13.5"
 dependencies = [
-  "django>=5.2.8",
-  "strawberry-graphql-django>=0.67.1",
+  "django>=5.2.12,<6.0",
+  "strawberry-graphql-django>=0.82.0",
   "channels>=4.3.2",
   "channels-redis[cryptography]>=4.3.0",
-  "celery>=5.5.3",
+  "celery>=5.6.2",
   "django-celery-beat>=2.8.1",
   "django-cleanup>=9.0.0",
   "django-mptt>=0.18.0",
   "django-storages[s3]>=1.14.6",
-  "markdown>=3.10",
-  "pillow>=12.0.0",
-  "psycopg[binary]>=3.2.13",
-  "sentry-sdk>=2.45.0",
+  "markdown>=3.10.2",
+  "pillow>=12.1.1",
+  "psycopg[binary]>=3.3.3",
+  "sentry-sdk>=2.54.0",
   "geoip2>=5.2.0",
   "httpx>=0.28.1",
-  "gunicorn>=23.0.0",
-  "uvicorn[standard]>=0.38.0",
+  "gunicorn>=25.1.0",
+  "uvicorn[standard]>=0.42.0",
   "uvicorn-worker>=0.4.0",
-  "mozilla-django-oidc>=4.0.1",
+  "mozilla-django-oidc>=5.0.2",
 ]
 
 [project.urls]
@@ -36,12 +36,12 @@ Changelog = "https://github.com/he0119/smart-home/blob/main/CHANGELOG.md"
 
 [dependency-groups]
 dev = [
-  "coverage>=7.12.0",
+  "coverage>=7.13.4",
   "django-cors-headers>=4.9.0",
   "eventlet>=0.40.4",
   "daphne>=4.2.1",
-  "strawberry-graphql-django[debug-toolbar]>=0.67.2",
-  "poethepoet>=0.37.0",
+  "strawberry-graphql-django[debug-toolbar]>=0.82.0",
+  "poethepoet>=0.42.1",
   "bump-my-version>=1.2.7",
 ]