Update client to consider timeouts better

.gitignore

@@ -1,6 +1,7 @@
 __pycache__/
 .vscode
 venv/
+venv*
 venv-pypy/
 .pytest_cache
 .idea

benchmarks/dockerize/aiohttp/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/aiohttp/requirements.txt

@@ -1,7 +1,6 @@
 aiohttp
 gunicorn
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
-msgpack
-redis
+msgpack

benchmarks/dockerize/aiohttp/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/dockerize/aiozmq/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/aiozmq/requirements.txt

@@ -1,9 +1,8 @@
 aiozmq
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
 msgpack
 aiohttp
 gunicorn
-redis
 sanic

benchmarks/dockerize/aiozmq/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/dockerize/blacksheep/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/blacksheep/requirements.txt

@@ -1,7 +1,6 @@
 blacksheep
 uvicorn
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
-msgpack
-redis
+msgpack

benchmarks/dockerize/blacksheep/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/dockerize/fast_api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/fast_api/requirements.txt

@@ -1,8 +1,7 @@
 fastapi
 uvicorn
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
 msgpack
-aiohttp
-redis
+aiohttp

benchmarks/dockerize/fast_api/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/dockerize/sanic/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/sanic/requirements.txt

@@ -1,7 +1,6 @@
 sanic
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
 msgpack
-aiohttp
-redis
+aiohttp

benchmarks/dockerize/sanic/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/dockerize/zero/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY . .
 RUN pip install -r requirements.txt

benchmarks/dockerize/zero/requirements.txt

@@ -1,10 +1,9 @@
 zeroapi
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
 aiohttp
 gunicorn
-redis
 sanic
 msgpack
 uvicorn

benchmarks/dockerize/zero/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/local/zero/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt

benchmarks/local/zero/requirements.txt

@@ -1,11 +1,10 @@
 pyzmq
 msgspec
 PyJWT
-aioredis
+redis>=4.2.0rc1
 uvloop
 aiohttp
 gunicorn
-redis
 sanic
 msgpack
 blacksheep

benchmarks/local/zero/shared.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import aioredis
 import msgpack
 import redis
+from redis import asyncio as aioredis
 
 
 @dataclass

benchmarks/others/requirements.txt

@@ -7,7 +7,6 @@ httpx
 fastapi
 sanic
 PyJWT
-redis
-aioredis @ git+https://github.com/aio-libs/aioredis@ff5a8fe068ebda837d14c3b3777a6182e610854a
+redis>=4.2.0rc1
 uvloop
 pydantic

tests/concurrency/rps_async.py

@@ -19,11 +19,11 @@ async def task(semaphore, items):
 
 
 async def process_tasks(items_chunk):
-    conc = 8
+    conc = 16
     semaphore = asyncio.BoundedSemaphore(conc)
     tasks = [task(semaphore, items) for items in items_chunk]
     await asyncio.gather(*tasks)
-    await async_client.close()
+    async_client.close()
 
 
 def run_chunk(items_chunk):

tests/concurrency/single_req_async.py

@@ -0,0 +1,26 @@
+import asyncio
+
+from zero import AsyncZeroClient, ZeroClient
+
+client = ZeroClient("localhost", 5559)
+async_client = AsyncZeroClient("localhost", 5559)
+
+# Create a semaphore outside of the task function
+semaphore = asyncio.BoundedSemaphore(32)
+
+
+async def task(sleep_time, i):
+    # Use the semaphore as an async context manager to limit concurrency
+    async with semaphore:
+        res = await async_client.call("sleep", sleep_time)
+        assert res == f"slept for {sleep_time} msecs"
+        print(res, i)
+
+
+async def main():
+    tasks = [task(200, i) for i in range(500)]
+    await asyncio.gather(*tasks)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

tests/concurrency/single_req_sync.py

@@ -0,0 +1,9 @@
+from zero import ZeroClient
+
+client = ZeroClient("localhost", 5559)
+
+if __name__ == "__main__":
+    for i in range(50):
+        res = client.call("sleep", 200)
+        assert res == "slept for 200 msecs"
+        print(res)

tests/concurrency/sleep_test_async.py

@@ -1,18 +1,9 @@
 import asyncio
 import random
 import time
-from contextlib import contextmanager
 
 from zero import AsyncZeroClient
 
-
-@contextmanager
-def get_client():
-    client = AsyncZeroClient("localhost", 5559)
-    yield client
-    client.close()
-
-
 async_client = AsyncZeroClient("localhost", 5559)
 
 
@@ -25,7 +16,7 @@ async def task(semaphore, sleep_time):
 
 
 async def test():
-    conc = 10
+    conc = 32
     semaphore = asyncio.BoundedSemaphore(conc)
 
     sleep_times = []

tests/concurrency/sleep_test_sync.py

@@ -20,7 +20,7 @@ def get_and_print(msg):
     resp = func(msg)
     if resp != f"slept for {msg} msecs":
         print(f"expected: slept for {msg} msecs, got: {resp}")
-    print(resp)
+    # print(resp)
 
 
 if __name__ == "__main__":