piccolo 1.0a1__tar.gz → 1.5.0__tar.gz

{piccolo-1.0a1 → piccolo-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.0a1
+Version: 1.5.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend
@@ -16,19 +16,37 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Framework :: AsyncIO
 Classifier: Typing :: Typed
 Classifier: Topic :: Database
 Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: black
+Requires-Dist: colorama>=0.4.0
+Requires-Dist: Jinja2>=2.11.0
+Requires-Dist: targ>=0.3.7
+Requires-Dist: inflection>=0.5.1
+Requires-Dist: typing-extensions>=4.3.0
+Requires-Dist: pydantic[email]==2.*
 Provides-Extra: orjson
+Requires-Dist: orjson>=3.5.1; extra == "orjson"
 Provides-Extra: playground
+Requires-Dist: ipython; extra == "playground"
 Provides-Extra: postgres
+Requires-Dist: asyncpg>=0.21.0; extra == "postgres"
 Provides-Extra: sqlite
+Requires-Dist: aiosqlite>=0.16.0; extra == "sqlite"
 Provides-Extra: uvloop
+Requires-Dist: uvloop>=0.12.0; sys_platform != "win32" and extra == "uvloop"
 Provides-Extra: all
-License-File: LICENSE
+Requires-Dist: orjson>=3.5.1; extra == "all"
+Requires-Dist: ipython; extra == "all"
+Requires-Dist: asyncpg>=0.21.0; extra == "all"
+Requires-Dist: aiosqlite>=0.16.0; extra == "all"
+Requires-Dist: uvloop>=0.12.0; sys_platform != "win32" and extra == "all"
 
 ![Logo](https://raw.githubusercontent.com/piccolo-orm/piccolo/master/docs/logo_hero.png "Piccolo Logo")
 
@@ -126,7 +144,7 @@ Let Piccolo scaffold you an ASGI web app, using Piccolo as the ORM:
 piccolo asgi new
 ```
 
-[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/) and [Litestar](https://litestar.dev/) are currently supported.
+[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/), [Litestar](https://litestar.dev/) and [Esmerald](https://esmerald.dev/) are currently supported.
 
 ## Are you a Django user?
 

{piccolo-1.0a1 → piccolo-1.5.0}/README.md

@@ -94,7 +94,7 @@ Let Piccolo scaffold you an ASGI web app, using Piccolo as the ORM:
 piccolo asgi new
 ```
 
-[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/) and [Litestar](https://litestar.dev/) are currently supported.
+[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/), [Litestar](https://litestar.dev/) and [Esmerald](https://esmerald.dev/) are currently supported.
 
 ## Are you a Django user?
 

piccolo-1.5.0/piccolo/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "1.5.0"

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/asgi/commands/new.py

@@ -10,10 +10,14 @@ from jinja2 import Environment, FileSystemLoader
 
 TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), "templates/app/")
 SERVERS = ["uvicorn", "Hypercorn"]
-ROUTERS = ["starlette", "fastapi", "blacksheep", "litestar"]
 ROUTER_DEPENDENCIES = {
+    "starlette": ["starlette"],
     "fastapi": ["fastapi>=0.100.0"],
+    "blacksheep": ["blacksheep"],
+    "litestar": ["litestar"],
+    "esmerald": ["esmerald"],
 }
+ROUTERS = list(ROUTER_DEPENDENCIES.keys())
 
 
 def print_instruction(message: str):

piccolo-1.5.0/piccolo/apps/asgi/commands/templates/app/_esmerald_app.py.jinja

@@ -0,0 +1,109 @@
+import typing as t
+
+from pathlib import Path
+
+from piccolo.utils.pydantic import create_pydantic_model
+from piccolo.engine import engine_finder
+from piccolo_admin.endpoints import create_admin
+
+from esmerald import (
+    Esmerald,
+    Include,
+    Gateway,
+    JSONResponse,
+    APIView,
+    get,
+    post,
+    put,
+    delete
+)
+from esmerald.config import StaticFilesConfig
+
+from home.endpoints import home
+from home.piccolo_app import APP_CONFIG
+from home.tables import Task
+
+
+async def open_database_connection_pool():
+    try:
+        engine = engine_finder()
+        await engine.start_connection_pool()
+    except Exception:
+        print("Unable to connect to the database")
+
+
+async def close_database_connection_pool():
+    try:
+        engine = engine_finder()
+        await engine.close_connection_pool()
+    except Exception:
+        print("Unable to connect to the database")
+
+
+TaskModelIn: t.Any = create_pydantic_model(
+    table=Task,
+    model_name='TaskModelIn'
+)
+TaskModelOut: t.Any = create_pydantic_model(
+    table=Task,
+    include_default_columns=True,
+    model_name='TaskModelOut'
+)
+
+
+class TaskAPIView(APIView):
+    path: str = "/"
+    tags: str = ["Task"]
+
+    @get("/")
+    async def tasks(self) -> t.List[TaskModelOut]:
+        return await Task.select().order_by(Task.id)
+
+
+    @post('/')
+    async def create_task(self, payload: TaskModelIn) -> TaskModelOut:
+        task = Task(**payload.dict())
+        await task.save()
+        return task.to_dict()
+
+
+    @put('/{task_id}')
+    async def update_task(self, payload: TaskModelIn, task_id: int) -> TaskModelOut:
+        task = await Task.objects().get(Task.id == task_id)
+        if not task:
+            return JSONResponse({}, status_code=404)
+
+        for key, value in payload.dict().items():
+            setattr(task, key, value)
+
+        await task.save()
+
+        return task.to_dict()
+
+
+    @delete('/{task_id}')
+    async def delete_task(self, task_id: int) -> None:
+        task = await Task.objects().get(Task.id == task_id)
+        if not task:
+            return JSONResponse({}, status_code=404)
+
+        await task.remove()
+
+
+app = Esmerald(
+    routes=[
+        Gateway("/", handler=home),
+        Gateway("/tasks", handler=TaskAPIView),
+        Include(
+            "/admin/",
+            create_admin(
+                tables=APP_CONFIG.table_classes,
+                # Required when running under HTTPS:
+                # allowed_hosts=['my_site.com']
+            ),
+        ),
+    ],
+    static_files_config=StaticFilesConfig(path="/static", directory=Path("static")),
+    on_startup=[open_database_connection_pool],
+    on_shutdown=[close_database_connection_pool],
+)

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/asgi/commands/templates/app/app.py.jinja

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

piccolo-1.5.0/piccolo/apps/asgi/commands/templates/app/home/_esmerald_endpoints.py.jinja

@@ -0,0 +1,20 @@
+import os
+
+import jinja2
+from esmerald import Request, Response, get
+from esmerald.responses import HTMLResponse
+
+ENVIRONMENT = jinja2.Environment(
+    loader=jinja2.FileSystemLoader(
+        searchpath=os.path.join(os.path.dirname(__file__), "templates")
+    )
+)
+
+
+@get(path="/", include_in_schema=False)
+def home(request: Request) -> HTMLResponse:
+    template = ENVIRONMENT.get_template("home.html.jinja")
+
+    content = template.render(title="Piccolo + ASGI",)
+
+    return HTMLResponse(content)

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/asgi/commands/templates/app/home/endpoints.py.jinja

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

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/asgi/commands/templates/app/home/templates/home.html.jinja_raw

@@ -56,6 +56,11 @@
                 <li><a href="/admin/">Admin</a></li>
                 <li><a href="/schema/swagger">Swagger API</a></li>
             </ul>
+            <h3>Esmerald</h3>
+            <ul>
+                <li><a href="/admin/">Admin</a></li>
+                <li><a href="/docs/swagger">Swagger API</a></li>
+            </ul>
         </section>
     </div>
 {% endblock content %}

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/asgi/commands/templates/app/requirements.txt.jinja

@@ -2,7 +2,5 @@
 {{ router_dependency }}
 {% endfor -%}
 {{ server }}
-jinja2
-piccolo[postgres]
-piccolo_admin
-requests
+piccolo[postgres]>=1.0.0
+piccolo_admin>=1.0.0

{piccolo-1.0a1 → piccolo-1.5.0}/piccolo/apps/migrations/auto/diffable_table.py

@@ -39,7 +39,6 @@ def compare_dicts(
     output = {}
 
     for key, value in dict_1.items():
-
         dict_2_value = dict_2.get(key, ...)
         if (
             dict_2_value is not ...
@@ -99,7 +98,7 @@ class DiffableTable:
     columns: t.List[Column] = field(default_factory=list)
     previous_class_name: t.Optional[str] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.columns_map: t.Dict[str, Column] = {
             i._meta.name: i for i in self.columns
         }
@@ -129,6 +128,7 @@ class DiffableTable:
                 column_class_name=i.column.__class__.__name__,
                 column_class=i.column.__class__,
                 params=i.column._meta.params,
+                schema=self.schema,
             )
             for i in sorted(
                 {ColumnComparison(column=column) for column in self.columns}
@@ -145,6 +145,7 @@ class DiffableTable:
                 column_name=i.column._meta.name,
                 db_column_name=i.column._meta.db_column_name,
                 tablename=value.tablename,
+                schema=self.schema,
             )
             for i in sorted(
                 {ColumnComparison(column=column) for column in value.columns}
@@ -184,6 +185,7 @@ class DiffableTable:
                         old_params=old_params,
                         column_class=column.__class__,
                         old_column_class=existing_column.__class__,
+                        schema=self.schema,
                     )
                 )