Remove builtin_jwt_token_expire

Author: mslaursen

fastapi_forge/dtos.py

@@ -167,7 +167,6 @@ class ProjectSpec(BaseModel):
     use_builtin_auth: bool
     use_redis: bool
     use_rabbitmq: bool
-    builtin_jwt_token_expire: int | None = Field(None, ge=1, le=365)
     models: list[Model]
 
     @model_validator(mode="after")
@@ -180,9 +179,6 @@ def validate_models(self) -> Self:
         if self.use_alembic and not self.use_postgres:
             raise ValueError("Cannot use Alembic if PostgreSQL is not enabled.")
 
-        if self.builtin_jwt_token_expire and not self.use_builtin_auth:
-            raise ValueError("Cannot set JWT expiration if auth is not enabled.")
-
         return self
 
 
@@ -240,17 +236,13 @@ class ProjectInput(BaseModel):
     use_builtin_auth: bool = False
     use_redis: bool = False
     use_rabbitmq: bool = False
-    builtin_jwt_token_expire: int | None = Field(None, ge=1, le=365)
     models: list[ModelInput] = []
 
     @model_validator(mode="after")
     def _validate(self) -> Self:
         if self.use_alembic and not self.use_postgres:
             raise ValueError("Cannot use Alembic if PostgreSQL is not enabled.")
 
-        if self.builtin_jwt_token_expire and not self.use_builtin_auth:
-            raise ValueError("Cannot set JWT expiration if auth is not enabled.")
-
         model_names = [model.name for model in self.models]
         if len(model_names) != len(set(model_names)):
             raise ValueError("Model names must be unique.")

fastapi_forge/example-projects/dry-service.yaml

@@ -4,7 +4,7 @@ project:
   use_alembic: false
   use_builtin_auth: false
   use_redis: false
-  builtin_jwt_token_expire: null
+  use_rabbitmq: false
 
   models:
 

fastapi_forge/example-projects/restaurant-service.yaml

@@ -5,7 +5,6 @@ project:
   use_builtin_auth: true
   use_redis: true
   use_rabbitmq: true
-  builtin_jwt_token_expire: 30
 
   models:
     - name: auth_user

fastapi_forge/example-projects/trustpilot-api.yaml

@@ -5,7 +5,6 @@ project:
   use_builtin_auth: true
   use_redis: true
   use_rabbitmq: true
-  builtin_jwt_token_expire: 30
 
   models:
     - name: auth_user

fastapi_forge/frontend.py

@@ -251,7 +251,6 @@ async def _export_project(self) -> None:
                 use_builtin_auth=self.project_config_panel.use_builtin_auth.value,
                 use_redis=self.project_config_panel.use_redis.value,
                 use_rabbitmq=self.project_config_panel.use_rabbitmq.value,
-                builtin_jwt_token_expire=30,  # use default for now
                 models=self.models,
             )
 
@@ -839,7 +838,6 @@ async def _create_project(self) -> None:
                 use_builtin_auth=self.use_builtin_auth.value,
                 use_redis=self.use_redis.value,
                 use_rabbitmq=self.use_rabbitmq.value,
-                builtin_jwt_token_expire=30,
                 models=models,
             )
             await build_project(project_spec)
@@ -870,7 +868,10 @@ def setup_ui() -> None:
     ui.input.default_props("dense")
     Header()
 
-def load_initial_project(path: Path) -> tuple[ProjectInput | None, list[ModelInput] | None]:
+
+def load_initial_project(
+    path: Path,
+) -> tuple[ProjectInput | None, list[ModelInput] | None]:
     initial_project = None
     initial_models = None
     if path:
@@ -880,7 +881,10 @@ def load_initial_project(path: Path) -> tuple[ProjectInput | None, list[ModelInp
         initial_models = initial_project.models
     return initial_project, initial_models
 
-def create_ui_components(initial_project: ProjectInput | None, initial_models: list[ModelInput] | None) -> None:
+
+def create_ui_components(
+    initial_project: ProjectInput | None, initial_models: list[ModelInput] | None
+) -> None:
     with ui.column().classes("w-full h-full items-center justify-center mt-4"):
         model_editor_card = ModelEditorCard().classes("no-shadow")
 
@@ -895,13 +899,15 @@ def create_ui_components(initial_project: ProjectInput | None, initial_models: l
 
     model_panel.project_config_panel = project_config_panel
 
+
 def run_ui(reload: bool) -> None:
     ui.run(
         reload=reload,
         title="FastAPI Forge",
         port=native.find_open_port(8777, 8999),
     )
 
+
 def init(
     reload: bool = False,
     use_example: bool = False,
@@ -919,7 +925,12 @@ def init(
         return
 
     setup_ui()
-    initial_project, initial_models = load_initial_project(path)
+
+    initial_project = None
+    initial_models = None
+    if use_example or yaml_path:
+        initial_project, initial_models = load_initial_project(path)
+
     create_ui_components(initial_project, initial_models)
     run_ui(reload)
 

fastapi_forge/project_io.py

@@ -56,7 +56,7 @@ def _load_project_to_dict(self) -> dict[str, Any]:
     def load_project_spec(self) -> ProjectSpec:
         project_dict = self._load_project_to_dict()
         loaded_models = [
-            ModelInput(**model) for model in project_dict.get("models", [])
+            ModelInput(**model) for model in project_dict.get("models", []) or []
         ]
         models = self.model_generator_func(loaded_models)
         project_dict.pop("models")

fastapi_forge/template/cookiecutter.json

@@ -17,9 +17,6 @@
     "use_rabbitmq": {
         "default": true
     },
-    "builtin_jwt_token_expire": {
-        "default": 15
-    },
     "create_routes": {
         "default": true
     },

fastapi_forge/template/{{cookiecutter.project_name}}/src/constants.py

@@ -1,4 +1,4 @@
 {% if cookiecutter.use_builtin_auth %}
 # Auth
-CREATE_TOKEN_EXPIRE_MINUTES = {{ cookiecutter.builtin_jwt_token_expire }}
+CREATE_TOKEN_EXPIRE_MINUTES = 30
 {% endif %}