fix: Merge pull request #139 from Atticuszz/work-with-supabase-py

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

.vscode/PythonImportHelper-v2-Completion.json

@@ -278,74 +278,74 @@
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "create_client",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "AsyncClient",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "create_client",
-        "importPath": "supabase_py_async",
-        "description": "supabase_py_async",
+        "importPath": "supabase._async.client",
+        "description": "supabase._async.client",
         "isExtraImport": true,
-        "detail": "supabase_py_async",
+        "detail": "supabase._async.client",
         "documentation": {}
     },
     {
         "label": "ClientOptions",
-        "importPath": "supabase_py_async.lib.client_options",
-        "description": "supabase_py_async.lib.client_options",
+        "importPath": "supabase.lib.client_options",
+        "description": "supabase.lib.client_options",
         "isExtraImport": true,
-        "detail": "supabase_py_async.lib.client_options",
+        "detail": "supabase.lib.client_options",
         "documentation": {}
     },
     {
@@ -754,82 +754,82 @@
     {
         "label": "bin_dir",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "bin_dir = os.path.dirname(abs_file)\nbase = bin_dir[: -len(\"bin\") - 1]  # strip away the bin part from the __file__, plus the path separator\n# prepend bin to PATH (this file is inside the bin directory)\nos.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "bin_dir = os.path.dirname(abs_file)\nbase = bin_dir[: -len(\"Scripts\") - 1]  # strip away the bin part from the __file__, plus the path separator\n# prepend bin to PATH (this file is inside the bin directory)\nos.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "base",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "base = bin_dir[: -len(\"bin\") - 1]  # strip away the bin part from the __file__, plus the path separator\n# prepend bin to PATH (this file is inside the bin directory)\nos.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "base = bin_dir[: -len(\"Scripts\") - 1]  # strip away the bin part from the __file__, plus the path separator\n# prepend bin to PATH (this file is inside the bin directory)\nos.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "os.environ[\"PATH\"]",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "os.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "os.environ[\"PATH\"] = os.pathsep.join([bin_dir, *os.environ.get(\"PATH\", \"\").split(os.pathsep)])\nos.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "os.environ[\"VIRTUAL_ENV\"]",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "os.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "os.environ[\"VIRTUAL_ENV\"] = base  # virtual env is right above bin directory\nos.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "os.environ[\"VIRTUAL_ENV_PROMPT\"]",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "os.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "os.environ[\"VIRTUAL_ENV_PROMPT\"] = \"\" or os.path.basename(base)  # noqa: SIM222\n# add the virtual environments libraries to the host python import mechanism\nprev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "prev_length",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
-        "peekOfCode": "prev_length = len(sys.path)\nfor lib in \"../lib/python3.12/site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
+        "peekOfCode": "prev_length = len(sys.path)\nfor lib in \"..\\\\Lib\\\\site-packages\".split(os.pathsep):\n    path = os.path.realpath(os.path.join(bin_dir, lib))\n    site.addsitedir(path)\nsys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "sys.path[:]",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
         "peekOfCode": "sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]\nsys.real_prefix = sys.prefix\nsys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "sys.real_prefix",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
         "peekOfCode": "sys.real_prefix = sys.prefix\nsys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
         "label": "sys.prefix",
         "kind": 5,
-        "importPath": ".venv.bin.activate_this",
-        "description": ".venv.bin.activate_this",
+        "importPath": ".venv.Scripts.activate_this",
+        "description": ".venv.Scripts.activate_this",
         "peekOfCode": "sys.prefix = base",
-        "detail": ".venv.bin.activate_this",
+        "detail": ".venv.Scripts.activate_this",
         "documentation": {}
     },
     {
@@ -873,7 +873,7 @@
         "kind": 5,
         "importPath": "src.app.api.deps",
         "description": "src.app.api.deps",
-        "peekOfCode": "CurrentUser = Annotated[UserIn, Depends(get_current_user)]\nasync def get_db(user: CurrentUser) -> AsyncClient:\n    client: AsyncClient | None = None\n    try:\n        client = await create_client(\n            settings.SUPABASE_URL,\n            settings.SUPABASE_KEY,\n            access_token=user.access_token,\n            options=ClientOptions(\n                postgrest_client_timeout=10, storage_client_timeout=10",
+        "peekOfCode": "CurrentUser = Annotated[UserIn, Depends(get_current_user)]\nasync def get_db(user: CurrentUser) -> AsyncClient:\n    client: AsyncClient | None = None\n    try:\n        client = await create_client(\n            settings.SUPABASE_URL,\n            settings.SUPABASE_KEY,\n            options=ClientOptions(\n                postgrest_client_timeout=30,\n                storage_client_timeout=30,",
         "detail": "src.app.api.deps",
         "documentation": {}
     },

.vscode/settings.json

@@ -1,3 +1,8 @@
 {
-    "DockerRun.DisableAutoGenerateConfig": true
+    "DockerRun.DisableAutoGenerateConfig": true,
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }

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