Add journey test for gevent+wsgi usage, add back litestar test

Author: tsmith023

journey_tests/gunicorn/app.py journey_tests/gunicorn/asgi.pyjourney_tests/gunicorn/app.py renamed to journey_tests/gunicorn/asgi.py

@@ -0,0 +1,22 @@
+from typing import List
+
+from flask import Flask, g
+
+from journey_tests.journeys import SyncJourneys
+
+app = Flask(__name__)
+
+
+def get_sync_client() -> SyncJourneys:
+    if "sync" not in g:
+        g.sync = SyncJourneys.use()
+    return g.sync
+
+
+@app.route("/sync-in-sync")
+def sync() -> List[dict]:
+    return get_sync_client().simple()
+
+
+if __name__ == "__main__":
+    app.run(debug=False, host="0.0.0.0")

journey_tests/gunicorn/wsgi.py

@@ -1,7 +1,7 @@
-from typing import List
+from typing import List, cast
 
 from weaviate import WeaviateAsyncClient, WeaviateClient, connect_to_local, use_async_with_local
-from weaviate.classes.config import Configure, DataType, Property
+from weaviate.classes.config import DataType, Property
 
 
 class SyncJourneys:
@@ -25,14 +25,13 @@ def simple(self) -> List[dict]:
                 Property(name="name", data_type=DataType.TEXT),
                 Property(name="age", data_type=DataType.INT),
             ],
-            vectorizer_config=Configure.Vectorizer.text2vec_contextionary(),
         )
         with collection.batch.dynamic() as batch:
             for i in range(1000):
                 batch.add_object({"name": f"Person {i}", "age": i})
         res = collection.query.fetch_objects(limit=100)
         self.__client.collections.delete(name)
-        return [obj.properties for obj in res.objects]
+        return [cast(dict, obj.properties) for obj in res.objects]
 
 
 class AsyncJourneys:
@@ -58,9 +57,8 @@ async def simple(self) -> List[dict]:
                 Property(name="name", data_type=DataType.TEXT),
                 Property(name="age", data_type=DataType.INT),
             ],
-            vectorizer_config=Configure.Vectorizer.text2vec_contextionary(),
         )
         await collection.data.insert_many([{"name": f"Person {i}", "age": i} for i in range(100)])
         res = await collection.query.fetch_objects(limit=1000)
         await self.__client.collections.delete(name)
-        return [obj.properties for obj in res.objects]
+        return [cast(dict, obj.properties) for obj in res.objects]

journey_tests/journeys.py

@@ -32,11 +32,23 @@ function wait(){
 }
 
 pytest ./journey_tests
+
 pip install gunicorn
 pip install uvicorn
-nohup gunicorn --bind=0.0.0.0:8000 --workers=2 --worker-class "uvicorn.workers.UvicornWorker" --preload journey_tests.gunicorn.app:app &
+
+nohup gunicorn --bind=0.0.0.0:8000 --workers=2 --worker-class "uvicorn.workers.UvicornWorker" --preload journey_tests.gunicorn.asgi:app &
 echo $! > gunicorn_pid.txt
 wait "http://localhost:8000"
+
 pytest ./journey_tests/gunicorn/test.py
 kill -9 $(cat gunicorn_pid.txt)
 rm gunicorn_pid.txt
+
+nohup gunicorn --bind=0.0.0.0:8000 --workers=2 --worker-class "gevent" --preload journey_tests.gunicorn.wsgi:app &
+echo $! > gunicorn_pid.txt
+wait "http://localhost:8000"
+
+pytest ./journey_tests/gunicorn/test.py
+kill -9 $(cat gunicorn_pid.txt)
+rm gunicorn_pid.txt
+

journey_tests/run.sh

@@ -1,3 +1,5 @@
+from typing import List
+
 from flask import Flask, g
 
 from journey_tests.journeys import AsyncJourneys, SyncJourneys
@@ -18,17 +20,17 @@ async def get_async_client() -> AsyncJourneys:
 
 
 @app.route("/sync-in-sync")
-def sync() -> dict:
+def sync() -> List[dict]:
     return get_sync_client().simple()
 
 
 @app.route("/sync-in-async")
-async def sync_() -> dict:
+async def sync_() -> List[dict]:
     return get_sync_client().simple()
 
 
 @app.route("/async-in-async")
-async def async_() -> dict:
+async def async_() -> List[dict]:
     return await (await get_async_client()).simple()
 
 

journey_tests/test_flask.py

@@ -1,64 +1,65 @@
-# litestart not yet supported by 3.13
-# from contextlib import asynccontextmanager
-#
-# from litestar import Litestar, get
-# from litestar.datastructures import State
-# from litestar.testing import TestClient
-#
-# from journey_tests.journeys import AsyncJourneys, SyncJourneys
-#
-# class MyState(State):
-#     sync: SyncJourneys
-#     async_: AsyncJourneys
-#
-#
-# @asynccontextmanager
-# async def lifespan(app: Litestar):
-#     sync = SyncJourneys.use()
-#     async_ = await AsyncJourneys.use()
-#     app.state.sync = sync
-#     app.state.async_ = async_
-#     try:
-#         yield
-#     finally:
-#         sync.close()
-#         await async_.close()
-#
-#
-# @get("/sync-in-sync", sync_to_thread=True)
-# def sync_in_sync(state: MyState) -> dict:
-#     return state.sync.simple()
-#
-#
-# @get("/sync-in-async", sync_to_thread=True)
-# async def sync_in_async(state: MyState) -> dict:
-#     return state.sync.simple()
-#
-#
-# @get("/async-in-async")
-# async def async_in_async(state: MyState) -> dict:
-#     return await state.async_.simple()
-#
-#
-# app = Litestar(route_handlers=[sync_in_sync, sync_in_async, async_in_async], lifespan=[lifespan])
-#
-#
-# def test_sync_in_sync() -> None:
-#     with TestClient(app=app) as client:
-#         res = client.get("/sync-in-sync")
-#         assert res.status_code == 200
-#         assert len(res.json()) == 100
-#
-#
-# def test_sync_in_async() -> None:
-#     with TestClient(app=app) as client:
-#         res = client.get("/sync-in-async")
-#         assert res.status_code == 200
-#         assert len(res.json()) == 100
-#
-#
-# def test_async_in_async() -> None:
-#     with TestClient(app=app) as client:
-#         res = client.get("/async-in-async")
-#         assert res.status_code == 200
-#         assert len(res.json()) == 100
+from contextlib import asynccontextmanager
+from typing import List
+
+from litestar import Litestar, get
+from litestar.datastructures import State
+from litestar.testing import TestClient
+
+from journey_tests.journeys import AsyncJourneys, SyncJourneys
+
+
+class MyState(State):
+    sync: SyncJourneys
+    async_: AsyncJourneys
+
+
+@asynccontextmanager
+async def lifespan(app: Litestar):
+    sync = SyncJourneys.use()
+    async_ = await AsyncJourneys.use()
+    app.state.sync = sync
+    app.state.async_ = async_
+    try:
+        yield
+    finally:
+        sync.close()
+        await async_.close()
+
+
+@get("/sync-in-sync", sync_to_thread=True)
+def sync_in_sync(state: MyState) -> List[dict]:
+    return state.sync.simple()
+
+
+@get("/sync-in-async", sync_to_thread=True)
+async def sync_in_async(state: MyState) -> List[dict]:
+    return state.sync.simple()
+
+
+@get("/async-in-async")
+async def async_in_async(state: MyState) -> List[dict]:
+    return await state.async_.simple()
+
+
+app = Litestar(route_handlers=[sync_in_sync, sync_in_async, async_in_async], lifespan=[lifespan])
+
+
+def test_sync_in_sync() -> None:
+    with TestClient(app=app) as client:
+        res = client.get("/sync-in-sync")
+        assert res.status_code == 200
+        assert len(res.json()) == 100
+
+
+def test_sync_in_async() -> None:
+    with TestClient(app=app) as client:
+        res = client.get("/sync-in-async")
+        assert res.status_code == 200
+        assert len(res.json()) == 100
+
+
+def test_async_in_async() -> None:
+    with TestClient(app=app) as client:
+        res = client.get("/async-in-async")
+        assert res.status_code == 200
+        assert len(res.json()) == 100

journey_tests/test_litestar.py

@@ -33,7 +33,7 @@ polars>=0.20.26,<1.18.0
 
 fastapi>=0.111.0,<1.0.0
 flask[async]>=2.0.0,<4.0.0
-# litestar>=2.13.0,<3.0.0 does not support python 3.13 yet - reenable when it does
+litestar>=2.14.0,<3.0.0
 
 mypy==1.14.1
 mypy-extensions==1.0.0