fastblocks 0.2.0__tar.gz → 0.2.2__tar.gz

{fastblocks-0.2.0 → fastblocks-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastblocks
-Version: 0.2.0
+Version: 0.2.2
 Summary: Starlette based app for the rapid delivery HTMX/Jinja template blocks
 Keywords: starlette htmx jinja httpx fastapi sqladmin sqlmodel pydantic sqlalchemy redis
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -23,25 +23,24 @@ Requires-Dist: asgi-logger>=0.1.0
 Requires-Dist: brotli-asgi>=1.4.0
 Requires-Dist: secure>=0.3.0
 Requires-Dist: starlette-csrf>=3.0.0
-Requires-Dist: starlette-async-jinja>=1.4.0
-Requires-Dist: cashews>=6.3.0
+Requires-Dist: cashews>=6.4.0
 Requires-Dist: starception>=1.2.1
-Requires-Dist: pydantic>=2.4.0
+Requires-Dist: pydantic>=2.5.3
 Requires-Dist: starlette-decorouter>=1.0.0
 Requires-Dist: pyfiglet>=1.0.2
-Requires-Dist: jinja2-async-environment>=0.3.0
-Requires-Dist: starlette>=0.31.1
-Requires-Dist: acb[cache,requests,secrets,sql,storage]>=0.3.4
-Requires-Dist: uvicorn>=0.23.2
+Requires-Dist: starlette>=0.34.0
+Requires-Dist: uvicorn>=0.25.0
 Requires-Dist: htmlmin>=0.1.12
 Requires-Dist: jsmin>=3.0.1
 Requires-Dist: libsass>=0.22.0
-Requires-Dist: aiohttp>=3.9.0b0
+Requires-Dist: aiohttp>=3.9.1
+Requires-Dist: acb[cache,requests,secrets,sql,storage]>=0.4.2
+Requires-Dist: starlette-async-jinja>=1.4.2
 Requires-Dist: asgi-sitemaps>=1.0.0; extra == "sitemap"
-Requires-Dist: firebase-admin>=6.2.0; extra == "auth"
+Requires-Dist: firebase-admin>=6.3.0; extra == "auth"
 Requires-Dist: beautifulsoup4>=4.12.2; extra == "style"
 Requires-Dist: tinycss2>=1.2.1; extra == "style"
-Requires-Dist: sqladmin>=0.15.2; extra == "admin"
+Requires-Dist: sqladmin>=0.16.0; extra == "admin"
 Provides-Extra: sitemap
 Provides-Extra: auth
 Provides-Extra: style

fastblocks-0.2.2/fastblocks/Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.12
+
+# Copy local code to the container image.
+ENV APP_HOME /app
+WORKDIR $APP_HOME
+COPY . ./
+
+# Install production dependencies.
+RUN pip install --upgrade pipx
+RUN pipx install pdm
+RUN pdm install
+
+uvicorn --port $PORT --host 0.0.0.0 main:app

fastblocks-0.2.2/fastblocks/actions/__init__.py

@@ -0,0 +1,9 @@
+from acb.actions import compress
+from acb.actions import encode
+from acb.actions import hash
+from acb.actions import register_actions
+from fastblocks.actions import minify
+
+__all__: list[str] = ["encode", "hash", "compress", "minify"]
+
+register_actions()

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/actions/minify.py

@@ -5,16 +5,16 @@ from jsmin import jsmin as min_js
 
 class Minify:
     @staticmethod
-    def js(js: str):
+    def js(js: str) -> str:
         return min_js(js)
 
     @staticmethod
-    def html(html: str):
+    def html(html: str) -> str:
         return min_html(html)
 
     @staticmethod
-    def scss(css: str):
-        return sass.compile(string=css, output_style="compressed")
+    def scss(css: str) -> str:
+        return sass.compile(string=css, output_style="compressed")  # type: ignore
 
 
 minify = Minify()

fastblocks-0.2.2/fastblocks/adapters/__init__.py

@@ -0,0 +1,12 @@
+from acb.adapters import cache
+from acb.adapters import logger
+from acb.adapters import register_adapters
+from acb.adapters import requests
+from acb.adapters import secrets
+from acb.adapters import sql
+from acb.adapters import storage
+from . import app
+
+__all__: list[str] = ["logger", "cache", "secrets", "storage", "requests", "sql", "app"]
+
+register_adapters()

fastblocks-0.2.2/fastblocks/adapters/admin/__init__.py

@@ -0,0 +1,3 @@
+from acb.adapters import load_adapter
+
+Admin = load_adapter()

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/adapters/admin/sqladmin.py

@@ -2,7 +2,7 @@ import typing as t
 from typing import override
 
 from acb.adapters.logger import Logger
-from acb.adapters.models import Models
+from acb.adapters.sql import SqlModels
 from acb.adapters.storage import Storage
 from acb.config import Config
 from acb.config import Settings
@@ -25,7 +25,7 @@ from ..templates import Templates
 
 
 class AdminSettings(Settings):
-    requires: list[str] = ["app", "storage", "sql", "auth"]
+    requires: t.Optional[list[str]] = ["app", "storage", "sql", "auth"]
     title: str = "Fastblocks Dashboard"
     roles: t.Optional[list[str]] = ["admin", "owner", "contributor", "viewer"]
 
@@ -41,20 +41,17 @@ class Admin(SqlAdmin):
         super().__init__(app, **kwargs)
 
     @depends.inject
-    async def init(self, models: Models = depends()) -> None:  # type: ignore
+    async def init(self, models: SqlModels = depends()) -> None:  # type: ignore
         ...
 
-    @depends.inject
-    def init_templating_engine(
-        self, templates: Templates = depends()  # type: ignore
-    ) -> AsyncJinja2Templates:
-        tmpls = templates.admin
-        tmpls.env.globals["min"] = min
-        tmpls.env.globals["zip"] = zip
-        tmpls.env.globals["admin"] = self
-        tmpls.env.globals["is_list"] = lambda x: isinstance(x, list)  # type: ignore
-        tmpls.env.globals["get_object_identifier"] = get_object_identifier
-        return tmpls
+    @override
+    def init_templating_engine(self) -> AsyncJinja2Templates:  # type: ignore
+        self.templates.env.globals["min"] = min
+        self.templates.env.globals["zip"] = zip
+        self.templates.env.globals["admin"] = self
+        self.templates.env.globals["is_list"] = lambda x: isinstance(x, list)  # type: ignore
+        self.templates.globals["get_object_identifier"] = get_object_identifier
+        return self.templates
 
     @override
     async def login(self, request: Request) -> (RedirectResponse | Response):

fastblocks-0.2.2/fastblocks/adapters/app/__init__.py

@@ -0,0 +1,3 @@
+from acb.adapters import load_adapter
+
+App = load_adapter()

fastblocks-0.2.0/fastblocks/adapters/app/main.py → fastblocks-0.2.2/fastblocks/adapters/app/admin.py

@@ -2,33 +2,27 @@ from contextlib import asynccontextmanager
 from time import time
 
 from acb import adapter_registry
-from acb import register_package
 from acb.adapters.cache import Cache
 from acb.adapters.logger import Logger
-from acb.adapters.models import Models
+from acb.adapters.sql import SqlModels
 from acb.adapters.sql import Sql
 from acb.config import Config
 from acb.depends import depends
-from fastblocks.routing import router_registry
-
 from fastblocks.adapters.admin import Admin
 from fastblocks.adapters.auth import Auth
 from fastblocks.adapters.templates import Templates
-from middleware import middlewares
-from sqlalchemy.exc import IntegrityError
 from fastblocks.applications import FastBlocks
+from fastblocks.routing import router_registry
+from middleware import middlewares
 from ._base import AppBase
 from ._base import AppBaseSettings
 
-register_package()
-
 main_start = time()
 
 
 class AppSettings(AppBaseSettings):
     style: str = "bulma"
     theme: str = "light"
-    wtf_csrf_time_limit: int = 172_800
     media_types: list[str] = ["image", "video", "audio"]
     video_exts: list[str] = [".webm", ".m4v", ".mp4"]
     image_exts: list[str] = [".jpeg", ".jpg", ".png", ".webp"]
@@ -50,6 +44,7 @@ class AppSettings(AppBaseSettings):
         danger="exclamation-circle",
         warning="exclamation-triangle",
     )
+    wtf_csrf_time_limit: int = 172_800
 
 
 class App(FastBlocks, AppBase):
@@ -74,7 +69,7 @@ class App(FastBlocks, AppBase):
         self,
         config: Config = depends(),  # type: ignore
         logger: Logger = depends(),  # type: ignore
-        models: Models = depends(),  # type: ignore
+        models: SqlModels = depends(),  # type: ignore
         cache: Cache = depends(),  # type: ignore
         sql: Sql = depends(),  # type: ignore
         auth: Auth = depends(),  # type: ignore
@@ -82,15 +77,15 @@ class App(FastBlocks, AppBase):
     ):
         logger.info("Application starting...")
         if next(a for a in adapter_registry.get() if a.name == "admin" and a.installed):
-            try:
-                logger.info("Creating admin superuser...")
-                await models.create_user(
-                    gmail=config.admin.gmail,
-                    email=config.admin.email,
-                    role="admin",
-                )
-            except IntegrityError:
-                logger.debug("Admin superuser exists")
+            # try:
+            #     logger.info("Creating admin superuser...")
+            #     await models.create_user(
+            #         gmail=config.admin.gmail,
+            #         email=config.admin.email,
+            #         role="admin",
+            #     )
+            # except IntegrityError:
+            #     logger.debug("Admin superuser exists")
             admin.__init__(
                 app=self,
                 engine=sql.engine,

fastblocks-0.2.2/fastblocks/adapters/app/main.py

@@ -0,0 +1,70 @@
+from contextlib import asynccontextmanager
+from time import time
+
+from acb.adapters.cache import Cache
+from acb.adapters.logger import Logger
+from acb.adapters.storage import Storage
+from acb.config import Config
+from acb.depends import depends
+from fastblocks.adapters.templates import Templates
+from fastblocks.applications import FastBlocks
+from fastblocks.routing import router_registry
+from middleware import middlewares
+from ._base import AppBase
+from ._base import AppBaseSettings
+
+main_start = time()
+
+
+class AppSettings(AppBaseSettings):
+    style: str = "bulma"
+    theme: str = "light"
+
+
+class App(FastBlocks, AppBase):
+    config: Config = depends()  # type: ignore
+    templates: Templates = depends()  # type: ignore
+
+    def __init__(self) -> None:
+        super().__init__(
+            debug=self.config.debug.app,
+            middleware=middlewares(),
+            lifespan=self.lifespan,
+        )
+        self.templates = self.templates.app
+
+    async def init(self) -> None:
+        for router in router_registry.get():
+            super().routes.append(router)
+
+    @depends.inject
+    @asynccontextmanager
+    async def lifespan(
+        self,
+        logger: Logger = depends(),  # type: ignore
+        cache: Cache = depends(),  # type: ignore
+        storage: Storage = depends(),  # type: ignore
+    ):
+        logger.info("Application starting...")
+
+        async def post_startup() -> None:
+            if not self.config.deployed:
+                from aioconsole import aprint
+                from pyfiglet import Figlet  # type: ignore
+
+                fig = Figlet(font="slant", width=90, justify="center")
+                await aprint(f"\n\n{fig.renderText(self.config.app.name.upper())}\n")
+            if not self.config.debug.production and self.config.app.deployed:
+                logger.info("Entering production mode...")
+
+        await post_startup()
+        main_start_time = time() - main_start
+        logger.info(f"App started in {main_start_time} s")
+        yield
+        await cache.close()
+        logger.error("Application shut down")
+
+
+depends.set(App)
+
+app = depends.get(App)

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/adapters/auth/__init__.py

@@ -1,14 +1,13 @@
-from acb.config import load_adapter
+from acb.adapters import load_adapter
 from ._model import UserModel
 from ._base import current_user
 
 
 __all__: list[str] = [
     "Auth",
-    "AuthSettings",
     "UserModel",
     "current_user",
 ]
 
 
-Auth, AuthSettings = load_adapter()
+Auth = load_adapter()

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/adapters/auth/_model.py

@@ -1,6 +1,6 @@
 import typing as t
 
-from acb.adapters.models._sql_model import SqlModel
+from acb.adapters.sql import SqlModel
 from sqlmodel import Field  # type: ignore
 
 from pydantic import EmailStr

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/adapters/auth/firebase.py

@@ -155,4 +155,4 @@ class Auth(AuthBase):
         return await current_user.get().is_authenticated(request)
 
 
-depends.set(Auth, Auth())
+depends.set(Auth)

fastblocks-0.2.2/fastblocks/adapters/fonts/__init__.py

@@ -0,0 +1,3 @@
+from acb.adapters import load_adapter
+
+Fonts = load_adapter()

fastblocks-0.2.2/fastblocks/adapters/style/cirrus.py

@@ -0,0 +1 @@
+# cirrus-ui style placeholder

fastblocks-0.2.2/fastblocks/adapters/templates/__init__.py

@@ -0,0 +1,3 @@
+from acb.adapters import load_adapter
+
+Templates = load_adapter()

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/adapters/templates/jinja.py

@@ -9,7 +9,7 @@ from re import search
 
 from jinja_partials import register_starlette_extensions  # type: ignore
 
-from acb import adapters_path
+# from acb import adapters_path
 from acb import base_path
 from acb.adapters.cache import Cache
 from acb.adapters.logger import Logger
@@ -259,7 +259,7 @@ class TemplatesSettings(TemplatesBaseSettings):
     requires: t.Optional[list[str]] = ["cache", "storage"]
     app: t.Optional[EnvTemplatePaths] = EnvTemplatePaths(root=base_path)
     admin: t.Optional[EnvTemplatePaths] = EnvTemplatePaths(
-        root=adapters_path / "admin" / "_templates"
+        root=base_path.parent / "admin" / "_templates"
     )
     loader: t.Optional[str] = None
     extensions: list[Extension] = []

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/applications.py

@@ -1,13 +1,10 @@
 import typing as t
-from pathlib import Path
 from platform import system
 
-from acb import register_package
-from acb.adapters.logger._base import ExternalLogger
 from acb.adapters.logger import Logger
+from acb.adapters.logger._base import ExternalLogger
 from acb.config import Config
 from acb.depends import depends
-
 from asgi_htmx import HtmxRequest as Request
 from starception import add_link_template
 from starception import install_error_handler
@@ -20,8 +17,6 @@ from starlette.responses import Response
 from starlette.types import ASGIApp
 from .middleware import middlewares
 
-register_package()
-
 match system():
     case "Windows":
         add_link_template("pycharm", "pycharm64.exe --line {lineno} {path}")
@@ -39,7 +34,6 @@ class FastBlocks(Starlette):
 
     def __init__(self, **kwargs: t.Any) -> None:
         super().__init__(**kwargs)
-        register_package(Path.cwd())
         set_editor("pycharm")
         install_error_handler()
         loggers = ["uvicorn", "uvicorn.access", "uvicorn.error"]

{fastblocks-0.2.0 → fastblocks-0.2.2}/fastblocks/routing.py

@@ -4,8 +4,6 @@ from contextvars import ContextVar
 
 from acb.config import Config
 from acb.depends import depends
-
-
 from fastblocks.adapters.templates import Templates
 
 

{fastblocks-0.2.0 → fastblocks-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastblocks"
-version = "0.2.0"
+version = "0.2.2"
 description = "Starlette based app for the rapid delivery HTMX/Jinja template blocks"
 authors = [
     { name = "lesleslie", email = "les@wedgwoodwebworks.com" },
@@ -41,20 +41,19 @@ dependencies = [
     "brotli-asgi>=1.4.0",
     "secure>=0.3.0",
     "starlette-csrf>=3.0.0",
-    "starlette-async-jinja>=1.4.0",
-    "cashews>=6.3.0",
+    "cashews>=6.4.0",
     "starception>=1.2.1",
-    "pydantic>=2.4.0",
+    "pydantic>=2.5.3",
     "starlette-decorouter>=1.0.0",
     "pyfiglet>=1.0.2",
-    "jinja2-async-environment>=0.3.0",
-    "starlette>=0.31.1",
-    "acb[cache,requests,secrets,sql,storage]>=0.3.4",
-    "uvicorn>=0.23.2",
+    "starlette>=0.34.0",
+    "uvicorn>=0.25.0",
     "htmlmin>=0.1.12",
     "jsmin>=3.0.1",
     "libsass>=0.22.0",
-    "aiohttp>=3.9.0b0",
+    "aiohttp>=3.9.1",
+    "acb[cache,requests,secrets,sql,storage]>=0.4.2",
+    "starlette-async-jinja>=1.4.2",
 ]
 
 [project.optional-dependencies]
@@ -62,14 +61,14 @@ sitemap = [
     "asgi-sitemaps>=1.0.0",
 ]
 auth = [
-    "firebase-admin>=6.2.0",
+    "firebase-admin>=6.3.0",
 ]
 style = [
     "beautifulsoup4>=4.12.2",
     "tinycss2>=1.2.1",
 ]
 admin = [
-    "sqladmin>=0.15.2",
+    "sqladmin>=0.16.0",
 ]
 
 [project.license]
@@ -83,7 +82,7 @@ config = [
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "crackerjack>=0.7.4",
+    "crackerjack>=0.7.19",
 ]
 
 [tool.ruff]
@@ -114,13 +113,14 @@ paths = [
 deps-file = "pyproject.toml"
 exclude-deps = [
     "pytest",
-    "pyfiglet",
-    "aiohttp",
+    "pdm-bump",
     "pre-commit",
-    "starlette-decorouter",
     "libsass",
-    "pdm-bump",
+    "pdm",
     "autotyping",
+    "aiohttp",
+    "starlette-decorouter",
+    "pyfiglet",
 ]
 
 [tool.refurb]
@@ -131,10 +131,10 @@ target = [
     "fastblocks",
 ]
 skips = [
+    "B404",
     "B403",
-    "B113",
     "B603",
-    "B404",
+    "B113",
 ]
 
 [tool.pyright]
@@ -156,6 +156,11 @@ reportPrivateUsage = "warning"
 pythonVersion = "3.12"
 pythonPlatform = "Darwin"
 
+[tool.codespell]
+skip = "*/data/*"
+quiet-level = 3
+ignore-words-list = "crate,uptodate"
+
 [build-system]
 requires = [
     "pdm-backend",

fastblocks-0.2.0/fastblocks/adapters/admin/__init__.py

@@ -1,3 +0,0 @@
-from acb import load_adapter
-
-Admin = load_adapter()

fastblocks-0.2.0/fastblocks/adapters/app/__init__.py

@@ -1,3 +0,0 @@
-from acb import load_adapter
-
-App = load_adapter()

fastblocks-0.2.0/fastblocks/adapters/fonts/__init__.py

@@ -1,3 +0,0 @@
-from acb import load_adapter
-
-Fonts = load_adapter()

fastblocks-0.2.0/fastblocks/adapters/templates/__init__.py

@@ -1,3 +0,0 @@
-from acb import load_adapter
-
-Templates = load_adapter()