Load proj from db conn string

Author: mslaursen

Makefile

@@ -15,4 +15,7 @@ test:
 	uv run pytest tests -s -v
 
 test-filter:
-	uv run pytest tests -v -s -k $(filter)
+	uv run pytest tests -v -s -k $(filter)
+
+db:
+	docker compose up

docker-compose.yaml

@@ -0,0 +1,19 @@
+services:
+  postgres:
+    image: postgres:13.8-bullseye
+    hostname: forge
+    container_name: forge
+    environment:
+      POSTGRES_PASSWORD: forge
+      POSTGRES_USER: forge
+      POSTGRES_DB: forge
+    volumes:
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+    ports:
+      - "5432:5432"
+    restart: always
+    healthcheck:
+      test: pg_isready -U forge
+      interval: 2s
+      timeout: 3s
+      retries: 40

fastapi_forge/__main__.py

@@ -3,6 +3,7 @@
 import click
 
 from fastapi_forge.frontend import init
+from fastapi_forge.project_io import ProjectLoader
 
 
 @click.group()
@@ -14,44 +15,52 @@ def main() -> None:
 @click.option(
     "--use-example",
     is_flag=True,
-    help="Generate a new project using a prebuilt example provided by FastAPI Forge. "
-    "This option is ideal for quickly getting started with a standard template.",
+    help="Generate a new project using a prebuilt example provided by FastAPI Forge.",
 )
 @click.option(
     "--no-ui",
     is_flag=True,
-    help="Generate the project directly in the terminal without launching the UI. "
-    "Use this option for headless environments or when you prefer a CLI-only workflow.",
+    help="Generate the project directly in the terminal without launching the UI.",
 )
 @click.option(
     "--from-yaml",
     type=click.Path(exists=True, dir_okay=False, readable=True),
-    help="Generate a project using a custom configuration from a YAML file. "
-    "Provide the path to the YAML file (supports relative or absolute paths, and '~' for home directory). "
-    "Use '--no-ui' to generate the project immediately, otherwise the configuration will be loaded into the UI for further customization.",
+    help="Generate a project using a custom configuration from a YAML file.",
 )
-def start(use_example: bool, no_ui: bool, from_yaml: str | None = None) -> None:
+@click.option(
+    "--db-url",
+    help="PostgreSQL connection URL (e.g., postgresql://user:password@host:port/dbname)",
+)
+def start(
+    use_example: bool,
+    no_ui: bool,
+    from_yaml: str | None = None,
+    db_url: str | None = None,
+) -> None:
     """Start the FastAPI Forge server and generate a new project."""
-    if use_example and from_yaml:
-        msg = "Cannot use '--use-example' and '--from-yaml' together."
-        raise click.UsageError(
-            msg,
-        )
+    if sum([use_example, bool(from_yaml), bool(db_url)]) > 1:
+        msg = "Only one of '--use-example', '--from-yaml', or '--db-url' can be used."
+        raise click.UsageError(msg)
 
-    yaml_path = None
-    if from_yaml:
-        yaml_path = Path.expanduser(Path(from_yaml)).resolve()
+    project_spec = None
 
-        if not yaml_path.exists():
-            raise click.FileError(f"YAML file not found: {yaml_path}")
+    if from_yaml:
+        yaml_path = Path(from_yaml).expanduser().resolve()
         if not yaml_path.is_file():
-            raise click.FileError(f"Path is not a file: {yaml_path}")
+            raise click.FileError(f"YAML file not found: {yaml_path}")
+        project_spec = ProjectLoader(project_path=yaml_path).load_project_input()
+
+    elif db_url:
+        project_spec = ProjectLoader.load_project_spec_from_db(
+            connection_string=db_url,
+        )
+
+    else:
+        base_path = Path(__file__).parent / "example-projects"
+        path = base_path / ("game_zone.yaml" if use_example else "empty-service.yaml")
+        project_spec = ProjectLoader(project_path=path).load_project_input()
 
-    init(
-        use_example=use_example,
-        no_ui=no_ui,
-        yaml_path=yaml_path,
-    )
+    init(project_spec=project_spec, no_ui=no_ui)
 
 
 @main.command()

fastapi_forge/enums.py

@@ -21,6 +21,27 @@ def as_python_type(self) -> str:
             FieldDataType.JSONB: "dict[str, Any]",
         }[self]
 
+    @classmethod
+    def from_db_type(cls, db_type: str) -> "FieldDataType":
+        db_type = db_type.lower()
+        match db_type:
+            case _ if db_type.startswith("character varying") or db_type == "text":
+                return cls.STRING
+            case "integer" | "bigint" | "smallint":
+                return cls.INTEGER
+            case "numeric":
+                return cls.FLOAT
+            case "boolean":
+                return cls.BOOLEAN
+            case "uuid":
+                return cls.UUID
+            case _ if db_type.startswith("timestamp") or "date":
+                return cls.DATETIME
+            case "jsonb":
+                return cls.JSONB
+            case _:
+                raise ValueError(f"Unsupported database type: {db_type}")
+
 
 class HTTPMethod(StrEnum):
     GET = "get"

fastapi_forge/frontend/main.py

@@ -1,9 +1,8 @@
 import asyncio
-from pathlib import Path
 
 from nicegui import native, ui
 
-from fastapi_forge import project_io as p
+from fastapi_forge.dtos import ProjectSpec
 from fastapi_forge.forge import build_project
 from fastapi_forge.frontend import (
     Header,
@@ -14,12 +13,6 @@
 from fastapi_forge.frontend.state import state
 
 
-async def _init_no_ui(project_path: Path) -> None:
-    """Initialize project without UI"""
-    project_spec = p.ProjectLoader(project_path).load_project_spec()
-    await build_project(project_spec)
-
-
 def setup_ui() -> None:
     """Setup basic UI configuration"""
     ui.add_head_html(
@@ -30,11 +23,6 @@ def setup_ui() -> None:
     Header()
 
 
-def load_initial_project(path: Path) -> p.ProjectSpec:
-    """Load project specification from file"""
-    return p.ProjectLoader(project_path=path).load_project_input()
-
-
 def create_ui_components() -> None:
     """Create all UI components"""
     with ui.column().classes("w-full h-full items-center justify-center mt-4"):
@@ -57,30 +45,20 @@ def run_ui(reload: bool) -> None:
 
 def init(
     reload: bool = False,
-    use_example: bool = False,
     no_ui: bool = False,
-    yaml_path: Path | None = None,
+    project_spec: ProjectSpec | None = None,
 ) -> None:
-    """Main initialization function"""
-    base_path = Path(__file__).parent.parent / "example-projects"
-    default_path = base_path / "empty-service.yaml"
-    example_path = base_path / "game_zone.yaml"
+    if project_spec:
+        if no_ui:
+            asyncio.run(build_project(project_spec))
+            return
 
-    path = example_path if use_example else yaml_path if yaml_path else default_path
-
-    if no_ui:
-        asyncio.run(_init_no_ui(path))
-        return
+        state.initialize_from_project(project_spec)
 
     setup_ui()
-
-    if use_example or yaml_path:
-        initial_project = load_initial_project(path)
-        state.initialize_from_project(initial_project)
-
     create_ui_components()
     run_ui(reload)
 
 
 if __name__ in {"__main__", "__mp_main__"}:
-    init(reload=True, use_example=False)
+    init(reload=True)