Upgrade to Microdot 2 (#8663)

Author: miguelgrinberg

frameworks/Python/microdot/README.md

@@ -8,20 +8,13 @@ Also note that there is additional information provided in the [Python README](.
 
 ### Test Source Code
 
-* [JSON](app_sync.py#L60)
-* [JSON-async](app_async.py#L60)
-* [PLAINTEXT](app_sync.py#L102)
-* [PLAINTEXT-async](app_async.py#L102)
-* [DB](app_sync.py#L65)
-* [DB-async](app_async.py#L65)
-* [QUERY](app_sync.py#L73)
-* [QUERY-async](app_async.py#L83)
-* [CACHED QUERY](app_sync.py#L112)
-* [CACHED_QUERY-async](app_async.py#L112)
-* [UPDATE](app_sync.py#L89)
-* [UPDATE-async](app_async.py#L89)
-* [FORTUNES](app_sync.py#L80)
-* [FORTUNES-async](app_async.py#L80)
+* [JSON](app.py#L60)
+* [PLAINTEXT](app.py#L102)
+* [DB](app.py#L65)
+* [QUERY](app.py#L73)
+* [CACHED QUERY](app.py#L112)
+* [UPDATE](app.py#L89)
+* [FORTUNES](app.py#L80)
 
 ## Resources
 

frameworks/Python/microdot/app_async.py renamed to frameworks/Python/microdot/app.py

@@ -1,42 +1,42 @@
 #!/usr/bin/env python
-from datetime import datetime
 import os
 from random import randint, sample
 
-from alchemical.aio import Alchemical
-import sqlalchemy as sqla
+from alchemical.aio import Alchemical, Model
+import sqlalchemy.orm as so
 from asyncache import cached
 from cachetools.keys import hashkey
 
-from microdot_asgi import Microdot
-from microdot_jinja import render_template
+from microdot.asgi import Microdot
+from microdot.jinja import Template
 
 app = Microdot()
-db = Alchemical(os.environ['DATABASE_URL'])
+Template.initialize('templates', enable_async=True)
+db = Alchemical(os.environ.get('DATABASE_URL', 'sqlite:///'))
 
 
-class World(db.Model):
+class World(Model):
     __tablename__ = "world"
-    id = sqla.Column(sqla.Integer, primary_key=True)
-    randomnumber = sqla.Column(sqla.Integer)
+    id: so.Mapped[int] = so.mapped_column(primary_key=True)
+    randomnumber: so.Mapped[int]
 
     def to_dict(self):
         return {"id": self.id, "randomNumber": self.randomnumber}
 
 
-class CachedWorld(db.Model):
+class CachedWorld(Model):
     __tablename__ = "cachedworld"
-    id = sqla.Column(sqla.Integer, primary_key=True)
-    randomnumber = sqla.Column(sqla.Integer)
+    id: so.Mapped[int] = so.mapped_column(primary_key=True)
+    randomnumber: so.Mapped[int]
 
     def to_dict(self):
         return {"id": self.id, "randomNumber": self.randomnumber}
 
 
-class Fortune(db.Model):
+class Fortune(Model):
     __tablename__ = "fortune"
-    id = sqla.Column(sqla.Integer, primary_key=True)
-    message = sqla.Column(sqla.String)
+    id: so.Mapped[int] = so.mapped_column(primary_key=True)
+    message: so.Mapped[str]
 
 
 def get_num_queries(request, name="queries"):
@@ -81,7 +81,10 @@ async def test_fortunes(request):
         fortunes = list(await session.scalars(Fortune.select()))
     fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
     fortunes.sort(key=lambda f: f.message)
-    return render_template("fortunes.html", fortunes=fortunes), {'Content-Type': 'text/html; charset=utf-8'}
+    return (
+        await Template("fortunes.html").render_async(fortunes=fortunes),
+        {'Content-Type': 'text/html; charset=utf-8'},
+    )
 
 
 @app.route("/updates")

frameworks/Python/microdot/app_async_raw.py renamed to frameworks/Python/microdot/app_raw.py

@@ -1,21 +1,23 @@
 #!/usr/bin/env python
-from datetime import datetime
 import os
 from random import randint, sample
 
 import asyncpg
 from asyncache import cached
 from cachetools.keys import hashkey
 
-from microdot_asgi import Microdot
-from microdot_jinja import render_template
+from microdot.asgi import Microdot
+from microdot.jinja import Template
 
 app = Microdot()
+Template.initialize('templates', enable_async=True)
+
 get_world_sql = 'SELECT id, randomnumber FROM world WHERE id = $1'
 update_world_sql = 'UPDATE world SET randomnumber = $1 WHERE id = $2'
 fortune_sql = 'SELECT * FROM fortune'
 db = None
 
+
 async def asgi(scope, receive, send):
     if scope['type'] == 'lifespan':
         while True:
@@ -81,7 +83,10 @@ async def test_fortunes(request):
         fortunes = list(await conn.fetch(fortune_sql))
     fortunes.append((0, "Additional fortune added at request time."))
     fortunes.sort(key=lambda f: f[1])
-    return render_template("fortunes_raw.html", fortunes=fortunes), {'Content-Type': 'text/html; charset=utf-8'}
+    return (
+        await Template("fortunes_raw.html").render_async(fortunes=fortunes),
+        {'Content-Type': 'text/html; charset=utf-8'},
+    )
 
 
 @app.route("/updates")