piccolo 1.4.2__py3-none-any.whl → 1.5.1__py3-none-any.whl

piccolo/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.4.2"
+__VERSION__ = "1.5.1"

piccolo/apps/asgi/commands/new.py

@@ -16,6 +16,7 @@ ROUTER_DEPENDENCIES = {
     "blacksheep": ["blacksheep"],
     "litestar": ["litestar"],
     "esmerald": ["esmerald"],
+    "lilya": ["lilya"],
 }
 ROUTERS = list(ROUTER_DEPENDENCIES.keys())
 

piccolo/apps/asgi/commands/templates/app/_lilya_app.py.jinja

@@ -0,0 +1,45 @@
+from piccolo_admin.endpoints import create_admin
+from piccolo_api.crud.endpoints import PiccoloCRUD
+from piccolo.engine import engine_finder
+from lilya.routing import Path, Include
+from lilya.apps import Lilya
+from lilya.staticfiles import StaticFiles
+
+from home.endpoints import HomeController
+from home.piccolo_app import APP_CONFIG
+from home.tables import Task
+
+
+app = Lilya(
+    routes=[
+        Path("/", HomeController),
+        Include(
+            "/admin/",
+            create_admin(
+                tables=APP_CONFIG.table_classes,
+                # Required when running under HTTPS:
+                # allowed_hosts=['my_site.com']
+            )
+        ),
+        Include("/static/", StaticFiles(directory="static")),
+        Include("/tasks/", PiccoloCRUD(table=Task))
+    ],
+)
+
+
+@app.on_event("on_startup")
+async def open_database_connection_pool():
+    try:
+        engine = engine_finder()
+        await engine.start_connection_pool()
+    except Exception:
+        print("Unable to connect to the database")
+
+
+@app.on_event("on_shutdown")
+async def close_database_connection_pool():
+    try:
+        engine = engine_finder()
+        await engine.close_connection_pool()
+    except Exception:
+        print("Unable to connect to the database")

piccolo/apps/asgi/commands/templates/app/app.py.jinja

@@ -8,4 +8,6 @@
     {% include '_litestar_app.py.jinja' %}
 {% elif router == 'esmerald' %}
     {% include '_esmerald_app.py.jinja' %}
+{% elif router == 'lilya' %}
+    {% include '_lilya_app.py.jinja' %}
 {% endif %}

piccolo/apps/asgi/commands/templates/app/home/_lilya_endpoints.py.jinja

@@ -0,0 +1,21 @@
+import os
+
+import jinja2
+from lilya.controllers import Controller
+from lilya.responses import HTMLResponse
+
+
+ENVIRONMENT = jinja2.Environment(
+    loader=jinja2.FileSystemLoader(
+        searchpath=os.path.join(os.path.dirname(__file__), "templates")
+    )
+)
+
+
+class HomeController(Controller):
+    async def get(self, request):
+        template = ENVIRONMENT.get_template("home.html.jinja")
+
+        content = template.render(title="Piccolo + ASGI",)
+
+        return HTMLResponse(content)

piccolo/apps/asgi/commands/templates/app/home/endpoints.py.jinja

@@ -6,4 +6,6 @@
     {% include '_litestar_endpoints.py.jinja' %}
 {% elif router == 'esmerald' %}
     {% include '_esmerald_endpoints.py.jinja' %}
+{% elif router == 'lilya' %}
+    {% include '_lilya_endpoints.py.jinja' %}
 {% endif %}

piccolo/apps/asgi/commands/templates/app/home/templates/home.html.jinja_raw

@@ -61,6 +61,11 @@
                 <li><a href="/admin/">Admin</a></li>
                 <li><a href="/docs/swagger">Swagger API</a></li>
             </ul>
+            <h3>Lilya</h3>
+            <ul>
+                <li><a href="/admin/">Admin</a></li>
+                <li><a href="/tasks/">JSON endpoint</a></li>
+            </ul>
         </section>
     </div>
 {% endblock content %}

piccolo/apps/migrations/auto/migration_manager.py

@@ -737,9 +737,9 @@ class MigrationManager:
     async def _run_add_tables(self, backwards: bool = False):
         table_classes: t.List[t.Type[Table]] = []
         for add_table in self.add_tables:
-            add_columns: t.List[
-                AddColumnClass
-            ] = self.add_columns.for_table_class_name(add_table.class_name)
+            add_columns: t.List[AddColumnClass] = (
+                self.add_columns.for_table_class_name(add_table.class_name)
+            )
             _Table: t.Type[Table] = create_table_class(
                 class_name=add_table.class_name,
                 class_kwargs={
@@ -792,9 +792,9 @@ class MigrationManager:
                 if table_class_name in [i.class_name for i in self.add_tables]:
                     continue  # No need to add columns to new tables
 
-                add_columns: t.List[
-                    AddColumnClass
-                ] = self.add_columns.for_table_class_name(table_class_name)
+                add_columns: t.List[AddColumnClass] = (
+                    self.add_columns.for_table_class_name(table_class_name)
+                )
 
                 ###############################################################
                 # Define the table, with the columns, so the metaclass
@@ -838,9 +838,9 @@ class MigrationManager:
                         else:
                             primary_key = existing_table._meta.primary_key
 
-                            table_class_members[
-                                primary_key._meta.name
-                            ] = primary_key
+                            table_class_members[primary_key._meta.name] = (
+                                primary_key
+                            )
 
                         break
 

piccolo/apps/migrations/auto/serialisation.py

@@ -25,8 +25,7 @@ from .serialisation_legacy import deserialise_legacy_params
 
 class CanConflictWithGlobalNames(abc.ABC):
     @abc.abstractmethod
-    def warn_if_is_conflicting_with_global_name(self):
-        ...
+    def warn_if_is_conflicting_with_global_name(self): ...
 
 
 class UniqueGlobalNamesMeta(type):
@@ -237,8 +236,7 @@ class Import(CanConflictWithGlobalNames):
 
 class Definition(CanConflictWithGlobalNames, abc.ABC):
     @abc.abstractmethod
-    def __repr__(self):
-        ...
+    def __repr__(self): ...
 
     ###########################################################################
     # To allow sorting:

piccolo/apps/migrations/commands/backwards.py

@@ -31,9 +31,9 @@ class BackwardsMigrationManager(BaseMigrationManager):
         super().__init__()
 
     async def run_migrations_backwards(self, app_config: AppConfig):
-        migration_modules: t.Dict[
-            str, MigrationModule
-        ] = self.get_migration_modules(app_config.migrations_folder_path)
+        migration_modules: t.Dict[str, MigrationModule] = (
+            self.get_migration_modules(app_config.migrations_folder_path)
+        )
 
         ran_migration_ids = await Migration.get_migrations_which_ran(
             app_name=self.app_name
@@ -78,9 +78,11 @@ class BackwardsMigrationManager(BaseMigrationManager):
         _continue = (
             "y"
             if self.auto_agree
-            else input(f"Reverse {n} migration{'s' if n != 1 else ''}? [y/N] ")
+            else input(
+                f"Reverse {n} migration{'s' if n != 1 else ''}? [y/N] "
+            ).lower()
         )
-        if _continue in "yY":
+        if _continue == "y":
             for migration_id in reversed_migration_ids:
                 migration_module = migration_modules[migration_id]
                 response = await migration_module.forwards()
@@ -131,10 +133,10 @@ async def run_backwards(
                 "apps:\n"
                 f"{', '.join(names)}\n"
                 "Are you sure you want to continue? [y/N] "
-            )
+            ).lower()
         )
 
-        if _continue not in "yY":
+        if _continue != "y":
             return MigrationResult(success=False, message="user cancelled")
         for _app_name in sorted_app_names:
             print_heading(_app_name)

piccolo/apps/migrations/commands/base.py

@@ -88,9 +88,9 @@ class BaseMigrationManager(Finder):
 
         migrations_folder = app_config.migrations_folder_path
 
-        migration_modules: t.Dict[
-            str, MigrationModule
-        ] = self.get_migration_modules(migrations_folder)
+        migration_modules: t.Dict[str, MigrationModule] = (
+            self.get_migration_modules(migrations_folder)
+        )
 
         migration_ids = sorted(migration_modules.keys())
 

piccolo/apps/migrations/commands/forwards.py

@@ -32,9 +32,9 @@ class ForwardsMigrationManager(BaseMigrationManager):
             app_name=app_config.app_name
         )
 
-        migration_modules: t.Dict[
-            str, MigrationModule
-        ] = self.get_migration_modules(app_config.migrations_folder_path)
+        migration_modules: t.Dict[str, MigrationModule] = (
+            self.get_migration_modules(app_config.migrations_folder_path)
+        )
 
         ids = self.get_migration_ids(migration_modules)
         n = len(ids)

piccolo/apps/playground/commands/run.py

@@ -2,6 +2,7 @@
 Populates a database with an example schema and data, and launches a shell
 for interacting with the data using Piccolo.
 """
+
 import datetime
 import sys
 import typing as t

piccolo/apps/user/tables.py

@@ -1,6 +1,7 @@
 """
 A User model, used for authentication.
 """
+
 from __future__ import annotations
 
 import datetime

piccolo/columns/base.py

@@ -887,9 +887,11 @@ class Column(Selectable):
             return (
                 "'{"
                 + ", ".join(
-                    f'"{i}"'
-                    if isinstance(i, str)
-                    else str(self.get_sql_value(i))
+                    (
+                        f'"{i}"'
+                        if isinstance(i, str)
+                        else str(self.get_sql_value(i))
+                    )
                     for i in value
                 )
             ) + "}'"