falco-cli 0.6.1__tar.gz → 0.6.2__tar.gz

{falco_cli-0.6.1 → falco_cli-0.6.2}/.github/workflows/documentation.yml

@@ -13,6 +13,8 @@ jobs:
         python-version: [ "3.10", "3.11", "3.12" ]
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:

{falco_cli-0.6.1 → falco_cli-0.6.2}/.github/workflows/pre-commit-auto-update.yml

@@ -33,7 +33,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Autoupdate generated projects
-        working-directory: "src/falco_blueprints/project_name"
+        working-directory: "."
         run: pre-commit autoupdate
 
       - name: Create Pull Request

{falco_cli-0.6.1 → falco_cli-0.6.2}/.github/workflows/publish.yml

@@ -12,6 +12,8 @@ jobs:
         python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: recursive
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
@@ -45,4 +47,4 @@ jobs:
       run: |
         hatch build
     - name: Publish
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@release/v1

{falco_cli-0.6.1 → falco_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: falco-cli
-Version: 0.6.1
+Version: 0.6.2
 Summary: Enhance your Django developer experience: CLI and Guides for the Modern Developer.
 Project-URL: Homepage, https://falco.oluwatobi.dev/
 Project-URL: Documentation, https://falco.oluwatobi.dev/

falco_cli-0.6.2/blueprints/falco_blueprint_basic/.github/workflows/pre-commit-auto-update.yml

@@ -0,0 +1,47 @@
+# Run pre-commit autoupdate every day at midnight
+# and create a pull request if any changes
+
+name: Pre-commit auto-update
+
+on:
+  schedule:
+    - cron: "15 2 * * *"
+  workflow_dispatch: # to trigger manually
+
+permissions:
+  contents: read
+
+jobs:
+  auto-update:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'Tobi-De'
+    permissions:
+      contents: write # for peter-evans/create-pull-request to create branch
+      pull-requests: write # for peter-evans/create-pull-request to create a PR
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: Install pre-commit
+        run: pip install pre-commit
+
+      - name: Autoupdate template
+        run: pre-commit autoupdate
+
+      - name: Autoupdate generated projects
+        working-directory: "{{ cookiecutter.project_name }}"
+        run: pre-commit autoupdate
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: update/pre-commit-autoupdate
+          title: Auto-update pre-commit hooks
+          commit-message: Auto-update pre-commit hooks
+          body: Update versions of tools in pre-commit configs to latest version
+          labels: update

{falco_cli-0.6.1 → falco_cli-0.6.2}/demo/config/urls.py

@@ -1,7 +1,5 @@
 from django.contrib import admin
-from django.urls import include
-from django.urls import path
-from django.urls import reverse_lazy
+from django.urls import include, path, reverse_lazy
 from django.views.generic.base import RedirectView
 
 urlpatterns = [

falco_cli-0.6.2/demo/templates/products/product_create.html

@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+    <h1 class="text-lg font-bold py-4">Create Product</h1>
+    <form method="post">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <button type="submit"
+                class="cursor-pointer py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white text-center text-base font-semibold focus:outline-none focus:ring-2 focus:ring-offset-2  rounded-lg">
+            Save
+        </button>
+    </form>
+{% endblock content %}

{falco_cli-0.6.1 → falco_cli-0.6.2}/demo/templates/products/product_detail.html

@@ -1,16 +1,10 @@
 {% extends "base.html" %}
-
 {% block content %}
-
     <section class="flex justify-between">
         <h1 class="text-lg font-bold">Product - {{ product }}</h1>
-
-        <a href="{% url 'products:product_list' %}" class="text-blue-600 hover:underline hover:text-blue-500">
-            All Products
-        </a>
+        <a href="{% url 'products:product_list' %}"
+           class="text-blue-600 hover:underline hover:text-blue-500">All Products</a>
     </section>
-
-
     <ul class="py-5">
         <li>
             <span class="font-bold">Name:</span> {{ product.name }}
@@ -28,11 +22,6 @@
             <span class="font-bold">Sku:</span> {{ product.sku }}
         </li>
     </ul>
-
-
     <a class="py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white text-center text-base font-semibold focus:outline-none focus:ring-2 focus:ring-offset-2  rounded-lg"
        href="{% url 'products:product_update' product.pk %}">Edit</a>
-
-
-
 {% endblock content %}

falco_cli-0.6.2/demo/templates/products/product_list.html

@@ -0,0 +1,106 @@
+{% extends 'base.html' %}
+{% load partials %}
+{% block content %}
+    <section class="flex justify-between">
+        <h1 class="text-lg font-bold">Products</h1>
+        <a href="{% url 'products:product_create' %}"
+           class="cursor-pointer py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white text-center text-base font-semibold focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg">
+            New Product
+        </a>
+    </section>
+    {% partialdef table inline=True %}
+    <div id="table">
+        <div class="flex flex-col">
+            <div class="overflow-x-auto sm:-mx-6 lg:-mx-8">
+                <div class="py-2 inline-block min-w-full sm:px-6 lg:px-8">
+                    <div class="overflow-x-auto">
+                        <table class="min-w-full">
+                            <thead class="border">
+                                {% with th_class="text-sm font-medium text-gray-900 border-r px-6 py-4 text-left" %}
+                                    <tr>
+                                        <th scope="col" class="{{ th_class }}">Name</th>
+                                        <th scope="col" class="{{ th_class }}">Description</th>
+                                        <th scope="col" class="{{ th_class }}">Price</th>
+                                        <th scope="col" class="{{ th_class }}">Slug</th>
+                                        <th scope="col" class="{{ th_class }}">Sku</th>
+                                        <th scope="col" class="{{ th_class }}">Actions</th>
+                                    </tr>
+                                {% endwith %}
+                            </thead>
+                            <tbody>
+                                {% with td_class="px-6 py-4 whitespace-nowrap text-sm font-medium border-r text-gray-900" %}
+                                    {% for product in products_page %}
+                                        <tr class="border">
+                                            <td class="{{ td_class }}">{{ product.name }}</td>
+                                            <td class="{{ td_class }}">{{ product.description }}</td>
+                                            <td class="{{ td_class }}">{{ product.price }}</td>
+                                            <td class="{{ td_class }}">{{ product.slug }}</td>
+                                            <td class="{{ td_class }}">{{ product.sku }}</td>
+                                            <td class="{{ td_class }}">
+                                                {% with href_class="text-blue-600 hover:underline hover:text-blue-500" %}
+                                                    <a class="{{ href_class }}}"
+                                                       href="{% url 'products:product_detail' product.pk %}">View</a>|
+                                                    <a class="{{ href_class }}}"
+                                                       href="{% url 'products:product_update' product.pk %}">Edit</a>|
+                                                    <a class="cursor-pointer {{ href_class }}"
+                                                       hx-target="closest tr"
+                                                       hx-swap="outerHTML"
+                                                       hx-confirm="Are you sure you want to delete {{ product }}?"
+                                                       hx-delete="{% url 'products:product_delete' product.pk %}">
+                                                        Delete
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        {% endwith %}
+                                    {% endfor %}
+                                {% endwith %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% if products_page.paginator.num_pages > 1 %}
+            <div class="flex justify-end py-4">
+                <ul class="flex list-reset border border-grey-light rounded"
+                    hx-target="#table"
+                    hx-swap="outerHTML"
+                    hx-push-url="true">
+                    {% with page_class="cursor-pointer block px-3 py-2 hover:text-white hover:bg-blue-500 border-r border-grey-light" %}
+                        {% if products_page.has_previous %}
+                            <li>
+                                <a class="{{ page_class }}}" hx-get="?page=1">First</a>
+                            </li>
+                            <li>
+                                <a class="{{ page_class }}}"
+                                   hx-get="?page={{ products_page.previous_page_number }}">Previous</a>
+                            </li>
+                        {% endif %}
+                        {% for num in products_page.paginator.page_range %}
+                            {% if products_page.number == num %}
+                                <li>
+                                    <a class="{{ page_class }}}" hx-get="?page={{ num }}">{{ num }}</a>
+                                </li>
+                            {% elif num > products_page.number|add:'-3' and num < products_page.number|add:'3' %}
+                                <li>
+                                    <a class="{{ page_class }}}" hx-get="?page={{ num }}">{{ num }}</a>
+                                </li>
+                            {% endif %}
+                        {% endfor %}
+                        {% if products_page.has_next %}
+                            <li>
+                                <a class="{{ page_class }}"
+                                   hx-get="?page={{ products_page.next_page_number }}">Next</a>
+                            </li>
+                            <li>
+                                <a class="cursor-pointer block px-3 py-2 hover:text-white hover:bg-blue-500"
+                                   hx-get="?page={{ products_page.paginator.num_pages }}">Last</a>
+                            </li>
+                        {% endif %}
+                    {% endwith %}
+                </ul>
+            </div>
+        {% endif %}
+    </div>
+{% endpartialdef %}
+{% endblock %}

falco_cli-0.6.2/demo/templates/products/product_update.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+    <section class="flex justify-between">
+        <h1 class="text-lg font-bold py-4">Update {{ product }}</h1>
+        <a href="{% url 'products:product_list' %}"
+           class="text-blue-600 hover:underline hover:text-blue-500">All Products</a>
+    </section>
+    <form method="post">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <button type="submit"
+                class="cursor-pointer py-2 px-4 bg-blue-600 hover:bg-blue-700 focus:ring-blue-500 focus:ring-offset-blue-200 text-white text-center text-base font-semibold focus:outline-none focus:ring-2 focus:ring-offset-2  rounded-lg">
+            Save
+        </button>
+    </form>
+{% endblock content %}

{falco_cli-0.6.1 → falco_cli-0.6.2}/src/falco/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present Tobi DEGNON <tobidegnon@proton.me>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.6.1"
+__version__ = "0.6.2"

{falco_cli-0.6.1 → falco_cli-0.6.2}/src/falco/commands/__init__.py

@@ -1,7 +1,7 @@
+from .crud import InstallCrudUtils  # noqa
+from .crud import ModelCRUD  # noqa
 from .htmx import Htmx  # noqa
 from .htmx_extension import HtmxExtension  # noqa
-from .install_crud_utils import InstallCrudUtils  # noqa
-from .model_crud import ModelCRUD  # noqa
 from .reset_migrations import ResetMigrations  # noqa
 from .rm_migrations import RmMigrations  # noqa
 from .setup_admin import SetupAdmin  # noqa

falco_cli-0.6.2/src/falco/commands/crud/__init__.py

@@ -0,0 +1,2 @@
+from .install_crud_utils import InstallCrudUtils  # noqa
+from .model_crud import ModelCRUD  # noqa

{falco_cli-0.6.1/src/falco/commands → falco_cli-0.6.2/src/falco/commands/crud}/install_crud_utils.py

@@ -9,10 +9,10 @@ from falco.utils import simple_progress
 from falco.utils import write_falco_config
 from rich import print as rich_print
 
-from .model_crud import extract_python_file_templates
-from .model_crud import get_crud_blueprints_path
-from .model_crud import render_to_string
-from .model_crud import run_python_formatters
+from .utils import extract_python_file_templates
+from .utils import get_crud_blueprints_path
+from .utils import render_to_string
+from .utils import run_python_formatters
 
 
 @cappa.command(help="Install utils necessary for CRUD views.", name="install-crud-utils")

{falco_cli-0.6.1/src/falco/commands → falco_cli-0.6.2/src/falco/commands/crud}/model_crud.py

@@ -1,4 +1,3 @@
-import importlib
 import subprocess
 from pathlib import Path
 from typing import Annotated
@@ -8,18 +7,21 @@ from typing import TypedDict
 import cappa
 import parso
 from falco.utils import get_project_name
+from falco.utils import read_falco_config
 from falco.utils import RICH_ERROR_MARKER
+from falco.utils import RICH_INFO_MARKER
+from falco.utils import RICH_SUCCESS_MARKER
 from falco.utils import run_in_shell
 from falco.utils import simple_progress
-from jinja2 import Template
 from rich import print as rich_print
 
-from . import checks
-
-IMPORT_START_COMMENT = "# IMPORTS:START"
-IMPORT_END_COMMENT = "# IMPORTS:END"
-CODE_START_COMMENT = "# CODE:START"
-CODE_END_COMMENT = "# CODE:END"
+from .. import checks
+from .install_crud_utils import InstallCrudUtils
+from .utils import extract_python_file_templates
+from .utils import get_crud_blueprints_path
+from .utils import render_to_string
+from .utils import run_html_formatters
+from .utils import run_python_formatters
 
 
 class PythonBlueprintContext(TypedDict):
@@ -30,6 +32,7 @@ class PythonBlueprintContext(TypedDict):
     model_verbose_name_plural: str
     model_fields: dict[str, str]
     excluded_fields: list[str]
+    crud_utils_import: str
 
 
 class UrlsForContext(TypedDict):
@@ -45,7 +48,7 @@ class HtmlBlueprintContext(UrlsForContext):
     model_name: str
     model_verbose_name_plural: str
     model_fields: dict[str, str]
-    # a example of the dict: {"Name": "product.name", "Price": "{{product.price}}"}
+    # a example of the dict: {"Name": "{{product.name}}", "Price": "{{product.price}}"}
     fields_verbose_name_with_accessor: dict[str, str]
 
 
@@ -84,12 +87,6 @@ print(root_urlconf)
 """
 
 
-def extract_content_from(text: str, start_comment: str, end_comment: str):
-    start_index = text.find(start_comment) + len(start_comment)
-    end_index = text.find(end_comment)
-    return text[start_index:end_index]
-
-
 def get_urls(model_name_lower: str, urlsafe_model_verbose_name_plural: str) -> str:
     prefix = urlsafe_model_verbose_name_plural
     return f"""
@@ -111,44 +108,6 @@ def get_urls_template_string(app_label: str, model_name_lower: str) -> UrlsForCo
     }
 
 
-def render_to_string(template_content: str, context: dict):
-    return Template(template_content).render(**context)
-
-
-def get_crud_blueprints_path() -> Path:
-    package = importlib.util.find_spec("falco")
-    if package is None:
-        raise cappa.Exit("The falco base install path could not be found.", code=1)
-    return Path(package.submodule_search_locations[0]) / "crud"
-
-
-@simple_progress("Running python formatters")
-def run_python_formatters(filepath: str):
-    autoflake = [
-        "autoflake",
-        "--in-place",
-        "--remove-all-unused-imports",
-        filepath,
-    ]
-    black = ["black", filepath]
-    isort = ["isort", filepath]
-    subprocess.run(autoflake, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
-    subprocess.run(isort, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
-    subprocess.run(black, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
-
-
-@simple_progress("Running html formatters")
-def run_html_formatters(filepath: str):
-    djlint = ["djlint", filepath, "--reformat"]
-    subprocess.run(djlint, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
-
-
-def extract_python_file_templates(file_content: str) -> tuple[str, str]:
-    imports_template = extract_content_from(file_content, IMPORT_START_COMMENT, IMPORT_END_COMMENT)
-    code_template = extract_content_from(file_content, CODE_START_COMMENT, CODE_END_COMMENT)
-    return imports_template, code_template
-
-
 def initial_urls_content(app_label: str, urls_content: str) -> str:
     return f"""
 from django.urls import path
@@ -196,7 +155,10 @@ def register_models_in_admin(app_folder_path: Path, app_label: str, model_name:
         cmd_args.append(model_name)
 
     result = subprocess.run(
-        ["python", "manage.py", "admin_generator", *cmd_args], capture_output=True, text=True, check=False
+        ["python", "manage.py", "admin_generator", *cmd_args],
+        capture_output=True,
+        text=True,
+        check=False,
     )
     if result.returncode != 0:
         msg = result.stderr.split("\n")[-2]
@@ -244,7 +206,12 @@ class ModelCRUD:
     ]
     excluded_fields: Annotated[
         list[str],
-        cappa.Arg(short=True, default=[], long="--exclude", help="Fields to exclude from the form."),
+        cappa.Arg(
+            short=True,
+            default=[],
+            long="--exclude",
+            help="Fields to exclude from the form.",
+        ),
     ]
     only_python: Annotated[
         bool,
@@ -316,6 +283,13 @@ class ModelCRUD:
 
         python_blueprint_context: list[PythonBlueprintContext] = []
         html_blueprint_context: list[HtmlBlueprintContext] = []
+        pyproject_path = Path("pyproject.toml")
+        falco_config = read_falco_config(pyproject_path=pyproject_path) if pyproject_path.exists() else {}
+        install_path, crud_utils_installed = InstallCrudUtils.get_install_path(
+            project_name=project_name,
+            falco_config=falco_config,
+        )
+        crud_utils_import = str(install_path).replace("/", ".")
         for django_model in django_models:
             python_blueprint_context.append(
                 {
@@ -326,8 +300,10 @@ class ModelCRUD:
                     "model_verbose_name_plural": django_model["verbose_name_plural"],
                     "model_fields": django_model["fields"],
                     "excluded_fields": excluded_fields,
+                    "crud_utils_import": crud_utils_import,
                 }
             )
+            model_name_lower = django_model["name"].lower()
             html_blueprint_context.append(
                 {
                     "app_label": app_label,
@@ -335,8 +311,8 @@ class ModelCRUD:
                     "model_verbose_name_plural": django_model["verbose_name_plural"],
                     "model_fields": django_model["fields"],
                     "fields_verbose_name_with_accessor": {
-                        field_verbose_name: "{{" + f"{django_model['name'].lower()}.{field_name}" + "}}"
-                        for field_name, field_verbose_name in django_model["fields"].items()
+                        verbose_name: "{{" + f"{model_name_lower}.{name}" + "}}"
+                        for name, verbose_name in django_model["fields"].items()
                     },
                     **get_urls_template_string(
                         app_label=app_label,
@@ -372,9 +348,9 @@ class ModelCRUD:
         updated_html_files = set()
         if not self.only_python:
             html_blueprints = (
-                list((get_crud_blueprints_path() / "html").iterdir())
-                if not self.blueprints
-                else list(Path(self.blueprints).glob("*.html"))
+                list(Path(self.blueprints).glob("*.html"))
+                if self.blueprints
+                else list((get_crud_blueprints_path() / "html").iterdir())
             )
 
             updated_html_files.update(
@@ -393,11 +369,12 @@ class ModelCRUD:
             run_html_formatters(str(file))
 
         display_names = ", ".join(m.get("name") for m in django_models)
-        rich_print(f"[green]CRUD views generated for: {display_names}[/green]")
-        rich_print(
-            "[blue]If this is your first time running this command, please also execute "
-            "'falco install-crud-utils' to ensure all necessary utilities are installed.[/blue]"
-        )
+        rich_print(f"{RICH_SUCCESS_MARKER}CRUD views generated for: {display_names}[/green]")
+        if not crud_utils_installed:
+            rich_print(
+                f"{RICH_INFO_MARKER}It appears that your CRUD utilities have not been installed yet. "
+                f"Please execute the command 'falco install-crud-utils' to install them."
+            )
 
     @simple_progress("Generating python code")
     def generate_python_code(
@@ -434,7 +411,11 @@ class ModelCRUD:
 
         model_name = contexts[0]["model_name"] if len(contexts) == 1 else None
         updated_files.append(
-            register_models_in_admin(app_folder_path=app_folder_path, app_label=app_label, model_name=model_name)
+            register_models_in_admin(
+                app_folder_path=app_folder_path,
+                app_label=app_label,
+                model_name=model_name,
+            )
         )
         return updated_files
 

falco_cli-0.6.2/src/falco/commands/crud/utils.py

@@ -0,0 +1,57 @@
+import importlib
+import subprocess
+from pathlib import Path
+
+import cappa
+from falco.utils import simple_progress
+from jinja2 import Template
+
+
+IMPORT_START_COMMENT = "# IMPORTS:START"
+IMPORT_END_COMMENT = "# IMPORTS:END"
+CODE_START_COMMENT = "# CODE:START"
+CODE_END_COMMENT = "# CODE:END"
+
+
+def render_to_string(template_content: str, context: dict):
+    return Template(template_content).render(**context)
+
+
+def get_crud_blueprints_path() -> Path:
+    package = importlib.util.find_spec("falco")
+    if package is None:
+        raise cappa.Exit("The falco base install path could not be found.", code=1)
+    return Path(package.submodule_search_locations[0]) / "crud"
+
+
+@simple_progress("Running python formatters")
+def run_python_formatters(filepath: str | Path):
+    autoflake = [
+        "autoflake",
+        "--in-place",
+        "--remove-all-unused-imports",
+        filepath,
+    ]
+    black = ["black", filepath]
+    isort = ["isort", filepath]
+    subprocess.run(autoflake, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
+    subprocess.run(isort, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
+    subprocess.run(black, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
+
+
+@simple_progress("Running html formatters")
+def run_html_formatters(filepath: str | Path):
+    djlint = ["djlint", filepath, "--reformat"]
+    subprocess.run(djlint, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
+
+
+def extract_python_file_templates(file_content: str) -> tuple[str, str]:
+    imports_template = extract_content_from(file_content, IMPORT_START_COMMENT, IMPORT_END_COMMENT)
+    code_template = extract_content_from(file_content, CODE_START_COMMENT, CODE_END_COMMENT)
+    return imports_template, code_template
+
+
+def extract_content_from(text: str, start_comment: str, end_comment: str):
+    start_index = text.find(start_comment) + len(start_comment)
+    end_index = text.find(end_comment)
+    return text[start_index:end_index]

{falco_cli-0.6.1 → falco_cli-0.6.2}/src/falco/commands/start_app.py

@@ -4,7 +4,7 @@ from typing import Annotated
 
 import cappa
 import parso
-from falco.commands.model_crud import run_python_formatters
+from falco.commands.crud.utils import run_python_formatters
 from falco.utils import get_project_name
 from falco.utils import run_in_shell
 from falco.utils import simple_progress

{falco_cli-0.6.1 → falco_cli-0.6.2}/src/falco/commands/start_project.py

@@ -15,6 +15,7 @@ from cookiecutter.exceptions import CookiecutterException
 from cruft import create
 from cruft.exceptions import InvalidCookiecutterRepository
 from falco.commands import InstallCrudUtils
+from falco.commands.crud.utils import run_html_formatters
 from falco.commands.htmx import Htmx
 from falco.utils import clean_project_name
 from falco.utils import is_new_falco_cli_available
@@ -120,6 +121,8 @@ class StartProject:
             InstallCrudUtils()(project_name=self.project_name)
             self.cruft_file_to_falco_config()
 
+        run_html_formatters(project_dir / self.project_name / "templates")
+
         msg = f"{RICH_SUCCESS_MARKER} Project initialized, keep up the good work!\n"
         msg += (
             f"{RICH_INFO_MARKER} If you like the project consider dropping a star at "

{falco_cli-0.6.1 → falco_cli-0.6.2}/src/falco/crud/python/views.py.jinja

@@ -1,9 +1,9 @@
 # IMPORTS:START
-from {{project_name}}.core.utils import paginate_queryset
+from {{crud_utils_import}}.utils import paginate_queryset
 {% if login %}
-from {{project_name}}.core.types import AuthenticatedHttpRequest
+from {{crud_utils_import}}.types import AuthenticatedHttpRequest
 {% else %}
-from {{project_name}}.core.types import HttpRequest
+from {{crud_utils_import}}.types import HttpRequest
 {% endif %}
 
 from django.http import HttpRequest

{falco_cli-0.6.1 → falco_cli-0.6.2}/tests/commands/test_htmx.py

@@ -34,6 +34,7 @@ def test_htmx_download_to_output_file(runner: CommandRunner):
 
 def test_htmx_with_pyproject_toml(runner: CommandRunner):
     pyproject_toml = Path("pyproject.toml")
+    pyproject_toml.touch()
     write_falco_config(pyproject_path=pyproject_toml)
     runner.invoke("htmx")
     assert Path("htmx.min.js").exists()
@@ -43,6 +44,7 @@ def test_htmx_with_pyproject_toml(runner: CommandRunner):
 
 def test_htmx_with_pyproject_toml_custom_folder(runner: CommandRunner):
     pyproject_toml = Path("pyproject.toml")
+    pyproject_toml.touch()
     write_falco_config(pyproject_path=pyproject_toml)
     runner.invoke("htmx", "-o", "static/htmx")
     output = Path("static/htmx/htmx.min.js")
@@ -53,6 +55,7 @@ def test_htmx_with_pyproject_toml_custom_folder(runner: CommandRunner):
 
 def test_htmx_with_pyproject_toml_custom_file(runner: CommandRunner):
     pyproject_toml = Path("pyproject.toml")
+    pyproject_toml.touch()
     write_falco_config(pyproject_path=pyproject_toml)
     runner.invoke("htmx", "-o", "static/htmx/htmx.js")
     output = Path("static/htmx/htmx.js")
@@ -63,6 +66,7 @@ def test_htmx_with_pyproject_toml_custom_file(runner: CommandRunner):
 
 def test_htmx_with_pyproject_toml_custom_file_existing_config(runner: CommandRunner):
     pyproject_toml = Path("pyproject.toml")
+    pyproject_toml.touch()
     write_falco_config(pyproject_path=pyproject_toml, htmx="config/htmx/htmx.js")
     existing_path = Path("config/htmx/htmx.js")
     runner.invoke("htmx")