fix: remove supabase-py-async with supabase-py

Author: AtticusZeller

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "pydantic[email]>=2.8.2",
     "pydantic-settings>=2.4.0",
     "python-multipart>=0.0.9",
-    "supabase-py-async",
+    "supabase>=2.7.4",
 ]
 
 [project.optional-dependencies]

src/app/__init__.py

@@ -1,7 +0,0 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 10/01/2024
-@Description  :
-"""

src/app/api/deps.py

@@ -1,19 +1,11 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 05/01/2024
-@Description  :
-"""
-
 import logging
 from typing import Annotated
 
 from fastapi import Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer
 from gotrue.errors import AuthApiError
-from supabase_py_async import AsyncClient, create_client
-from supabase_py_async.lib.client_options import ClientOptions
+from supabase._async.client import AsyncClient, create_client
+from supabase.lib.client_options import ClientOptions
 
 from app.core.config import settings
 from app.schemas.auth import UserIn
@@ -62,9 +54,10 @@ async def get_db(user: CurrentUser) -> AsyncClient:
         client = await create_client(
             settings.SUPABASE_URL,
             settings.SUPABASE_KEY,
-            access_token=user.access_token,
             options=ClientOptions(
-                postgrest_client_timeout=10, storage_client_timeout=10
+                postgrest_client_timeout=30,
+                storage_client_timeout=30,
+                headers={"Authorization": f"Bearer {user.access_token}"},
             ),
         )
         # checks all done in supabase-py !
@@ -77,9 +70,6 @@ async def get_db(user: CurrentUser) -> AsyncClient:
         raise HTTPException(
             status_code=401, detail="Invalid authentication credentials"
         )
-    finally:
-        if client:
-            await client.auth.sign_out()
 
 
 SessionDep = Annotated[AsyncClient, Depends(get_db)]

src/app/core/config.py

@@ -1,11 +1,3 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 05/01/2024
-@Description  :
-"""
-
 import logging
 import os
 from typing import ClassVar

src/app/crud/__init__.py

@@ -1,11 +1,3 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 07/01/2024
-@Description  :
-"""
-
 from .crud_item import item
 
 # For a new basic set of CRUD operations you could just do

src/app/crud/base.py

@@ -1,6 +1,6 @@
 from typing import Generic, TypeVar
 
-from supabase_py_async import AsyncClient
+from supabase._async.client import AsyncClient
 
 from app.schemas.auth import UserIn
 from app.schemas.base import CreateBase, ResponseBase, UpdateBase

src/app/crud/crud_item.py

@@ -1,4 +1,4 @@
-from supabase_py_async import AsyncClient
+from supabase._async.client import AsyncClient
 
 from app.crud.base import CRUDBase
 from app.schemas import Item, ItemCreate, ItemUpdate

src/app/main.py

@@ -1,11 +1,3 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 05/01/2024
-@Description  :
-"""
-
 import uvicorn
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware

src/app/schemas/base.py

@@ -1,11 +1,3 @@
-"""
--*- coding: utf-8 -*-
-@Organization : SupaVision
-@Author       : 18317
-@Date Created : 11/01/2024
-@Description  :
-"""
-
 from typing import ClassVar
 
 from pydantic import BaseModel, ConfigDict

tests/api/api_v1/test_items.py

@@ -2,7 +2,7 @@
 import pytest
 from faker import Faker
 from starlette.testclient import TestClient
-from supabase_py_async import AsyncClient
+from supabase._async.client import AsyncClient
 
 from app.schemas import Token
 from tests.utils import get_auth_header
@@ -68,18 +68,15 @@ async def test_read_item_by_owner(
     headers = get_auth_header(token.access_token)
     test_data = Faker().sentence()
 
-    # 创建条目
     client.post(
         "/api/v1/items/create-item",
         headers=headers,
         json={"test_data": test_data},
     )
 
-    # 获取当前用户的ID
     user = await db.auth.get_user(jwt=token.access_token)
     user_id = user.user.id
 
-    # 按拥有者读取条目
     read_response = client.get(
         "/api/v1/items/get-by-owner",
         headers=headers,
@@ -118,7 +115,7 @@ async def test_update_item(client: TestClient, token: Token) -> None:
 
 @pytest.mark.anyio
 async def test_delete_item(client: TestClient, token: Token) -> None:
-    # 创建条目
+
     headers = get_auth_header(token.access_token)
     test_data = Faker().sentence()
     create_response = client.post(
@@ -129,14 +126,12 @@ async def test_delete_item(client: TestClient, token: Token) -> None:
     assert create_response.status_code == 200
     created_item_id = create_response.json()["id"]
 
-    # 删除条目
     delete_response = client.delete(
         f"/api/v1/items/delete/{created_item_id}",
         headers=headers,
     )
     assert delete_response.status_code == 200
 
-    # 尝试获取删除的条目
     get_response = client.get(
         f"/api/v1/items/get-by-id/{created_item_id}",
         headers=headers,