Applying new structure

Author: tarsil

.pre-commit-config.yaml

@@ -4,14 +4,15 @@ default_language_version:
   python: python3.10
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: check-toml
       - id: check-yaml
         args:
           - --unsafe
       - id: end-of-file-fixer
+      - id: debug-statements
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.37.3
@@ -21,29 +22,15 @@ repos:
           - --py3-plus
           - --keep-runtime-typing
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.254
+    rev: v0.3.0
     hooks:
       - id: ruff
         args: ["--fix", "--line-length=99"]
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 24.3.0
     hooks:
       - id: black
         args: ["--line-length=99"]
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
-        args: ["--project=esmerald_admin", "--line-length=99"]
-      - id: isort
-        name: isort (cython)
-        types: [cython]
-        args: ["--project=esmerald_admin", "--line-length=99"]
-      - id: isort
-        name: isort (pyi)
-        types: [pyi]
-        args: ["--project=esmerald_admin", "--line-length=99"]
 ci:
   autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
   autoupdate_commit_msg: ⬆ [pre-commit.ci] pre-commit autoupdate

esmerald_admin/application.py

@@ -1,8 +1,11 @@
-from typing import Optional, Sequence
+from typing import Awaitable, Optional, Sequence, Union
 
 from esmerald import Esmerald, HTTPException, Request, status
 from esmerald.exceptions import ImproperlyConfigured
 from lilya.middleware import Middleware
+from lilya.responses import Response
+from lilya.routing import Include, Path
+from lilya.staticfiles import StaticFiles
 from sqladmin import Admin as SQLAdmin  # noqa
 from sqladmin import ModelView as SQLAModelView  # noqa
 from sqladmin._types import ENGINE_TYPE
@@ -61,12 +64,58 @@ def __init__(
             base_url=base_url,
             title=title,
             logo_url=logo_url,
-            middlewares=middlewares,  # type: ignore
-            debug=debug,
             templates_dir=templates_dir,
+            middlewares=middlewares,  # type: ignore
             authentication_backend=authentication_backend,
         )
 
+        statics = StaticFiles(packages=["sqladmin"])
+
+        async def http_exception(
+            request: Request, exc: Exception
+        ) -> Union[Response, Awaitable[Response]]:
+            assert isinstance(exc, HTTPException)
+            context = {
+                "status_code": exc.status_code,
+                "message": exc.detail,
+            }
+            return await self.templates.TemplateResponse(  # type: ignore
+                request, "error.html", context, status_code=exc.status_code  # type: ignore
+            )
+
+        routes = [
+            Include("/statics", app=statics, name="statics"),
+            Path("/", handler=self.index, name="index"),
+            Path("/{identity}/list", handler=self.list, name="list"),
+            Path("/{identity}/details/{pk:path}", handler=self.details, name="details"),
+            Path(
+                "/{identity}/delete",
+                handler=self.delete,
+                name="delete",
+                methods=["DELETE"],
+            ),
+            Path(
+                "/{identity}/create",
+                handler=self.create,
+                name="create",
+                methods=["GET", "POST"],
+            ),
+            Path(
+                "/{identity}/edit/{pk:path}",
+                handler=self.edit,
+                name="edit",
+                methods=["GET", "POST"],
+            ),
+            Path("/{identity}/export/{export_type}", handler=self.export, name="export"),
+            Path("/{identity}/ajax/lookup", handler=self.ajax_lookup, name="ajax_lookup"),
+            Path("/login", handler=self.login, name="login", methods=["GET", "POST"]),
+            Path("/logout", handler=self.logout, name="logout", methods=["GET"]),
+        ]
+
+        self.admin.router.routes = routes  # type: ignore
+        self.admin.exception_handlers = {HTTPException: http_exception}
+        self.admin.debug = debug
+        self.app.include(base_url, app=self.admin, name="admin")
         self.app.router.activate()  # type: ignore
 
     def _find_model_view(self, identity: str) -> ModelView:

pyproject.toml

@@ -103,19 +103,10 @@ disallow_untyped_defs = true
 ignore_missing_imports = true
 no_implicit_optional = true
 
-[tool.ruff]
-select = [
-    "E", # pycodestyle errors
-    "W", # pycodestyle warnings
-    "F", # pyflakes
-    "C", # flake8-comprehensions
-    "B", # flake8-bugbear
-]
-ignore = [
-    "E501", # line too long, handled by black
-    "B008", # do not perform function calls in argument defaults
-    "C901", # too complex
-]
+[tool.ruff.lint]
+select = ["E", "W", "F", "C", "B", "I"]
+ignore = ["E501", "B008", "C901", "B026"]
+
 
 [[tool.mypy.overrides]]
 module = "esmerald_admin.tests.*"

scripts/check

@@ -12,7 +12,7 @@ export MAIN="esmerald_admin"
 
 set -x
 
-${PREFIX}mypy $MAIN
+${PREFIX}mypy check $MAIN
 ${PREFIX}ruff $SOURCE_FILES --line-length 99
 ${PREFIX}black $SOURCE_FILES --check --diff --check --line-length 99
 ${PREFIX}isort $SOURCE_FILES --check --diff --project=esmerald_admin --line-length 99

scripts/lint

@@ -10,7 +10,7 @@ fi
 export SOURCE_FILES="esmerald_admin tests"
 set -x
 
-${PREFIX}ruff $SOURCE_FILES --fix --line-length 99
+${PREFIX}ruff check $SOURCE_FILES --fix --line-length 99
 ${PREFIX}black $SOURCE_FILES --line-length 99
 ${PREFIX}isort $SOURCE_FILES --project=esmerald_admin --line-length 99
 ${PREFIX}mypy esmerald_admin