fix: delete unused files and folders (#13)

Author: mslaursen

fastapi_forge/project_io.py

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

fastapi_forge/template/cookiecutter.json

@@ -17,12 +17,6 @@
     "use_rabbitmq": {
         "default": true
     },
-    "create_routes": {
-        "default": true
-    },
-    "create_tests": {
-        "default": true
-    },
     "models": {
         "models": []
     },

fastapi_forge/template/hooks/post_gen_project.py

@@ -7,48 +7,20 @@
 
 
 def git_init() -> None:
-    subprocess.run(
-        [
-            "git",
-            "init",
-        ]
-    )
-
-    subprocess.run(
-        [
-            "git",
-            "add",
-            ".",
-        ]
-    )
+    subprocess.run(["git", "init"])
+    subprocess.run(["git", "add", "."])
 
 
 def uv_init() -> None:
-    subprocess.run(
-        [
-            "uv",
-            "lock",
-        ]
-    )
+    subprocess.run(["uv", "lock"])
 
 
 def lint() -> None:
-    subprocess.run(
-        [
-            "make",
-            "lint",
-        ]
-    )
+    subprocess.run(["make", "lint"])
 
 
 def make_env() -> None:
-    subprocess.run(
-        [
-            "cp",
-            ".env.example",
-            ".env",
-        ]
-    )
+    subprocess.run(["cp", ".env.example", ".env"])
 
 
 def _get_delete_flagged() -> tuple[list[str], list[str]]:
@@ -80,6 +52,37 @@ def _get_delete_flagged() -> tuple[list[str], list[str]]:
     return files, folders
 
 
+def delete_empty_init_folders(root_dir: str = "src") -> None:
+    """Delete folders that only contain empty __init__.py files."""
+    for dirpath, dirnames, filenames in os.walk(root_dir, topdown=False):
+        # Skip the root directory itself
+        if dirpath == root_dir:
+            continue
+
+        if set(filenames) == {"__init__.py"} and not dirnames:
+            init_file = os.path.join(dirpath, "__init__.py")
+
+            try:
+                with open(init_file, "r") as f:
+                    content = f.read()
+                    has_code = any(
+                        line.strip() and not line.strip().startswith("#")
+                        for line in content.splitlines()
+                    )
+                    if "__all__ = []" in content:
+                        print(45747457745)
+                    else:
+                        print(123123123)
+                if not has_code:
+                    os.remove(init_file)
+                    os.rmdir(dirpath)
+                    logger.info(f"Deleted empty package: {dirpath}")
+                else:
+                    logger.info(f"Keeping package with code: {dirpath}")
+            except OSError as exc:
+                logger.info(f"Error processing package {dirpath}: {exc}")
+
+
 def cleanup():
     files, folders = _get_delete_flagged()
 
@@ -97,6 +100,8 @@ def cleanup():
         except OSError as exc:
             logger.info(f"Error deleting folder {folder_path}: {exc}")
 
+    delete_empty_init_folders()
+
 
 if __name__ == "__main__":
     cleanup()

fastapi_forge/template/{{cookiecutter.project_name}}/forge-config.yaml

@@ -21,6 +21,7 @@ config:
       - src/dtos/auth_dtos.py
       - src/routes/auth_routes.py
       - src/utils/auth_utils.py
+      - src/constants.py
 
   use_redis:
     value: {{cookiecutter.use_redis | lower}}
@@ -33,3 +34,5 @@ config:
     type: bool
     paths:
       - src/services/rabbitmq
+      - src/routes/demo_routes.py
+

fastapi_forge/template/{{cookiecutter.project_name}}/pyproject.toml

@@ -1,4 +1,9 @@
 [project]
+name = "{{cookiecutter.project_name}}"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
 dependencies = [
     "fastapi>=0.115.8",
     "uvicorn>=0.34.0",
@@ -30,11 +35,7 @@ dependencies = [
     {%- if cookiecutter.use_rabbitmq -%}
     "aio-pika>=9.5.5",
     {%- endif %}
-]name = "{{cookiecutter.project_name}}"
-version = "0.1.0"
-description = "Add your description here"
-readme = "README.md"
-requires-python = ">=3.12"
+]
 
 [tool.pytest.ini_options]
 env = [
@@ -63,6 +64,7 @@ ignore = [
     #### specific rules
     "A001",
     "A002",
+    "ARG001",
     "B904",
     "BLE001",
     "D100",

fastapi_forge/template/{{cookiecutter.project_name}}/src/routes/__init__.py

@@ -1,9 +1,7 @@
 from src.routes.health_routes import router as health_router
-{% if cookiecutter.create_routes %}
 {% for model in cookiecutter.models.models if model.metadata.create_endpoints -%}
 from src.routes.{{ model.name }}_routes import router as {{ model.name }}_router
 {% endfor %}
-{% endif %}
 {% if cookiecutter.use_builtin_auth %}
 from src.routes.auth_routes import router as auth_router
 {% endif %}