try sys.path

app/common.py

@@ -1,8 +1,9 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
 router = APIRouter(include_in_schema=False)
 
 
 @router.get("/")
-async def home():
-    return {"message": "Hello World from FastAPI"}
+async def home(request: Request):
+    client_host = request.client.host
+    return {"message": "Hello World from FastAPI", "client_host": client_host}

app/config.py

@@ -0,0 +1,24 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+# from typing import Annotated
+# from pydantic import AfterValidator, HttpUrl
+# HttpUrlString = Annotated[HttpUrl, AfterValidator(str)]
+
+
+class Settings(BaseSettings):
+    frontendschema: str = "http"
+    frontendhost: str = "localhost"
+    frontendport: int = 7000
+    frontendreload: bool = False
+
+    backendschema: str = "http"
+    backendhost: str = "localhost"
+    backendport: int = 8000
+    backendreload: bool = False
+
+    tz: str = "UTC"
+
+    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
+
+
+settings = Settings()

app/main.py

@@ -1,18 +1,24 @@
+import os
+import sys
+
+import uvicorn
 from fastapi import FastAPI
 from starlette.middleware.cors import CORSMiddleware
 
+sys.path.append(os.getcwd())
 from app import common, events, health, users
-
-from .lifespan import lifespan
+from app.config import settings
+from app.lifespan import lifespan
 
 
 def make_app(lifespan):
     app = FastAPI(lifespan=lifespan)
 
-    # Set all CORS enabled origins
     app.add_middleware(
         CORSMiddleware,
-        allow_origins=["*"],
+        allow_origins=[
+            f"{settings.frontendschema}://{settings.frontendhost}:{settings.frontendport}"
+        ],
         allow_credentials=True,
         allow_methods=["*"],
         allow_headers=["*"],
@@ -27,3 +33,12 @@ def make_app(lifespan):
 
 
 app = make_app(lifespan)
+
+if __name__ == "__main__":
+    print(f"Backend: {settings=}")
+    uvicorn.run(
+        "main:app",
+        host=settings.backendhost,
+        port=settings.backendport,
+        reload=settings.backendreload,
+    )

fastui_app/_lifespan.py

@@ -1,6 +1,4 @@
-import edgedb
 import svcs
-from edgedb.asyncio_client import AsyncIOClient
 from fastapi import FastAPI
 from httpx import AsyncClient
 
@@ -9,8 +7,9 @@
 
 async def _lifespan(app: FastAPI, registry: svcs.Registry):
     # Web client(connect to backend)
-    host = str(settings.backendhost).rstrip("/")  # any better ways?
-    base_url = f"{host}:{settings.backendport}"
+    base_url = (
+        f"{settings.backendschema}://{settings.backendhost}:{settings.backendport}"
+    )
     client = AsyncClient(base_url=base_url)
 
     async def setup_httpx_client():
@@ -20,21 +19,6 @@ async def setup_httpx_client():
         AsyncClient,
         setup_httpx_client,
     )
-    if settings.frontenddebug:
-        # EdgeDB client
-        db_client = edgedb.create_async_client()
-
-        async def setup_db_client():
-            yield db_client
-
-        async def ping_db_callable(_db_client):
-            return await _db_client.query("select 1;")
-
-        registry.register_factory(
-            AsyncIOClient,
-            setup_db_client,
-            ping=ping_db_callable,
-        )
 
     yield
 

fastui_app/config.py

@@ -1,19 +1,24 @@
-from pydantic import HttpUrl
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+# from typing import Annotated
+# from pydantic import AfterValidator, HttpUrl
+# HttpUrlString = Annotated[HttpUrl, AfterValidator(str)]
+
 
 class Settings(BaseSettings):
-    frontendhost: HttpUrl = "http://localhost"
+    frontendschema: str = "http"
+    frontendhost: str = "localhost"
     frontendport: int = 7000
-    frontenddebug: bool = False
+    frontendreload: bool = False
 
-    backendhost: HttpUrl = "http://localhost"
+    backendschema: str = "http"
+    backendhost: str = "localhost"
     backendport: int = 8000
+    backendreload: bool = False
 
     tz: str = "UTC"
 
     model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
 
 
 settings = Settings()
-# print(f"{settings=} from frontend")

fastui_app/main.py

@@ -1,15 +1,19 @@
+import os
+import sys
+
+import uvicorn
 from fastapi import FastAPI
 from starlette.middleware.cors import CORSMiddleware
 
+sys.path.append(os.getcwd())
 from fastui_app import common, events, users
-
-from .lifespan import lifespan
+from fastui_app.config import settings
+from fastui_app.lifespan import lifespan
 
 
 def make_app(lifespan):
     app = FastAPI(lifespan=lifespan)
 
-    # Set all CORS enabled origins
     app.add_middleware(
         CORSMiddleware,
         allow_origins=["*"],
@@ -27,3 +31,12 @@ def make_app(lifespan):
 
 
 app = make_app(lifespan)
+
+if __name__ == "__main__":
+    print(f"Frontend: {settings=}")
+    uvicorn.run(
+        "main:app",
+        host=settings.frontendhost,
+        port=settings.frontendport,
+        reload=settings.frontendreload,
+    )