Fix Modal hydration error (#23)

.github/workflows/ci_cd.yaml

@@ -76,5 +76,4 @@ jobs:
       - name: Deploy Modal stubs as applications
         working-directory: ./backend
         run: |
-          poetry run modal deploy src.api.app
-          poetry run modal deploy src.modal_functions.functions
+          poetry run modal deploy src.common

backend/src/__init__.py

@@ -0,0 +1,2 @@
+from .api.app import fastapi_app
+from .modal_functions.functions import square

backend/src/api/app.py

@@ -1,22 +1,22 @@
 """Module containing the FastAPI app."""
 from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-from modal import Image, Stub, asgi_app
+from starlette.middleware.cors import CORSMiddleware
+from modal import Image, asgi_app
 from src.api.graphql_router import graphql_router
+from src.common import stub
 
 # Construct FastAPI app
 web_app = FastAPI()
+web_app.include_router(graphql_router)
 origins = ["*"]
 web_app.add_middleware(
     CORSMiddleware,
-    allow_origins=origins,  # List of allowed origins
+    allow_origin_regex='https://modalproject-.*\.vercel\.app',
     allow_credentials=True,  # This allows cookies and credentials to be sent along with the requests.
     allow_methods=["*"],  # Allows all methods
     allow_headers=["*"],  # Allows all headers
 )
-web_app.include_router(graphql_router)
 
-stub = Stub("api")
 # TODO: Construct Modal image directly from pyproject.toml
 image = Image.debian_slim().pip_install("strawberry-graphql[debug-server,fastapi]>=0.217.1,<1.0.0")
 

backend/src/common.py

@@ -0,0 +1,3 @@
+from modal import Stub
+
+stub = Stub("modalproject")

backend/src/modal_functions/functions.py

@@ -1,6 +1,4 @@
-from modal import Stub
-
-stub = Stub("functions")
+from src.common import stub
 
 @stub.function()
 def square(num: int):