fix error

Author: bymoye

frameworks/Python/blacksheep/app-socketify.py

@@ -53,12 +53,11 @@ def load_fortunes_template():
 app.on_start += setup_db
 app.on_stop += shutdown_db
 
-def get_num_queries(request):
+def get_num_queries(queries):
     try:
-        value = request.query.get('queries')
-        if value is None:
+        if queries is None:
             return 1
-        query_count = int(value[0])
+        query_count = int(queries)
     except (KeyError, IndexError, ValueError):
         return 1
     return min(max(query_count, 1), 500)
@@ -78,9 +77,9 @@ async def single_db_query_test(request):
             number = await cursor.fetchone()
     return bs.json({'id': row_id, 'randomNumber': number[1]})
 
-@bs.get('/queries')
-async def multiple_db_queries_test(request):
-    num_queries = get_num_queries(request)
+@bs.get('/queries/{queries}')
+async def multiple_db_queries_test(request, queries):
+    num_queries = get_num_queries(queries)
     row_ids = random.sample(range(1, 10000), num_queries)
     worlds = []
     async with db_pool.connection() as db_conn:
@@ -102,9 +101,9 @@ async def fortunes_test(request):
     data = fortune_template.render(fortunes=fortunes)
     return bs.html(data)
 
-@bs.get('/updates')
-async def db_updates_test(request):
-    num_queries = get_num_queries(request)
+@bs.get('/updates/{queries}')
+async def db_updates_test(request,queries):
+    num_queries = get_num_queries(queries)
     updates = list(zip(
         random.sample(range(1, 10000), num_queries),
         sorted(random.sample(range(1, 10000), num_queries))
@@ -123,6 +122,7 @@ async def plaintext_test(request):
     return bs.Response(200, content=bs.Content(b"text/plain", b'Hello, World!'))
 
 if platform.python_implementation() == 'PyPy':
+    import logging
     from socketify import ASGI
     workers = int(multiprocessing.cpu_count())
     if os.environ.get('TRAVIS') == 'true':

frameworks/Python/blacksheep/benchmark_config.json

@@ -52,8 +52,8 @@
       "fortune_url": "/fortunes",
       "plaintext_url": "/plaintext",
       "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "update_url": "/updates?queries=",
+      "query_url": "/queries/",
+      "update_url": "/updates/",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Micro",

frameworks/Python/blacksheep/blacksheep.dockerfile

@@ -13,4 +13,4 @@ RUN pip3 install -r /blacksheep/requirements-uvicorn.txt -q
 ENV GUNICORN=1
 EXPOSE 8080
 
-CMD gunicorn app:app -k uvicorn.workers.UvicornWorker -c blacksheep_conf.py
+CMD gunicorn app:app -k uvicorn_worker.UvicornWorker -c blacksheep_conf.py

frameworks/Python/blacksheep/config.toml

@@ -41,8 +41,8 @@ versus = "None"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
+urls.query = "/queries/"
+urls.update = "/updates/"
 urls.fortune = "/fortunes"
 approach = "Realistic"
 classification = "Platform"

frameworks/Python/blacksheep/requirements-uvicorn.txt

@@ -1,5 +1,6 @@
 uvloop==0.21.0
-uvicorn==0.34.1
+uvicorn==0.34.2
+uvicorn-worker
 httptools==0.6.4
 gunicorn==23.0.0
 msgspec==0.19.0