From 7586bda3ba03b44f6407fb9668d431b324621120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Thu, 23 Mar 2023 00:18:17 +0100 Subject: [PATCH 01/12] Update fastapi dependency pins --- requirements/app/base.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index 515e53d5d5e7b..c13a14d2d1edf 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -12,15 +12,16 @@ beautifulsoup4>=4.8.0, <4.11.2 inquirer>=2.10.0, <=3.1.2 psutil<5.9.5 click<=8.1.3 + fastapi<0.89.0 # strict; TODO: broken serializations +starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette +pydantic>=1.2.0,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic dateutils<=0.6.12 Jinja2<=3.1.2 -pydantic<=1.10.4 PyYAML<=6.0 requests<2.28.3 rich >=12.3.0, <=13.0.1 -starlette<0.24.0 urllib3<=1.26.13 uvicorn<=0.17.6 websocket-client<1.5.2 From 9c54cda00ca6a86f542dd77b8cb5ab8433ab112a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Thu, 23 Mar 2023 02:30:54 +0100 Subject: [PATCH 02/12] Apply suggestions from code review --- requirements/app/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index c13a14d2d1edf..d878477120027 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -13,9 +13,9 @@ inquirer>=2.10.0, <=3.1.2 psutil<5.9.5 click<=8.1.3 -fastapi<0.89.0 # strict; TODO: broken serializations +fastapi>=0.65.1,<0.89.0 # strict; TODO: broken serializations starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette -pydantic>=1.2.0,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic +pydantic>=1.6.2,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic dateutils<=0.6.12 Jinja2<=3.1.2 From e47cb27eac061cea73e0331da1768db5702277c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Thu, 23 Mar 2023 02:38:16 +0100 Subject: [PATCH 03/12] Update test.txt --- requirements/app/test.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/app/test.txt b/requirements/app/test.txt index bceacd41ea4f5..cae9fa90b81be 100644 --- a/requirements/app/test.txt +++ b/requirements/app/test.txt @@ -11,5 +11,4 @@ trio<0.22.0 pympler psutil setuptools<65.7.0 -sqlmodel requests-mock From 59918ffc6c2cfd8b5509df48ca84b67ad264bc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Thu, 23 Mar 2023 03:04:01 +0100 Subject: [PATCH 04/12] Update requirements/app/base.txt --- requirements/app/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index d878477120027..6b8f56968a8bf 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -14,6 +14,7 @@ psutil<5.9.5 click<=8.1.3 fastapi>=0.65.1,<0.89.0 # strict; TODO: broken serializations +fastapi[all]>=0.65.1,<0.89.0 # strict; lightning-cloud specifies all, and pip dependency resolution has issues with it starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette pydantic>=1.6.2,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic From 6a64bc10b0fe09a828d1f62f4d44d85c5c89d27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Thu, 23 Mar 2023 03:12:58 +0100 Subject: [PATCH 05/12] Revert "Update requirements/app/base.txt" This reverts commit 59918ffc6c2cfd8b5509df48ca84b67ad264bc30. --- requirements/app/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index 6b8f56968a8bf..d878477120027 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -14,7 +14,6 @@ psutil<5.9.5 click<=8.1.3 fastapi>=0.65.1,<0.89.0 # strict; TODO: broken serializations -fastapi[all]>=0.65.1,<0.89.0 # strict; lightning-cloud specifies all, and pip dependency resolution has issues with it starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette pydantic>=1.6.2,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic From 017ea227d222303e29b1ab6bfdbea807b2862d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 16:40:03 +0200 Subject: [PATCH 06/12] cloud update --- requirements/app/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index d878477120027..5b2b2c04bf480 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -1,4 +1,4 @@ -lightning-cloud>=0.5.31 +lightning-cloud>=0.5.33 packaging typing-extensions>=4.0.0, <=4.4.0 deepdiff>=5.7.0, <6.2.4 From 2d263b7b01575feb1dcf5db55c2ecf2df25a7675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 16:47:58 +0200 Subject: [PATCH 07/12] Bad merge --- requirements/app/test.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/app/test.txt b/requirements/app/test.txt index 95925b0f38a9b..e37fa5f96c4c7 100644 --- a/requirements/app/test.txt +++ b/requirements/app/test.txt @@ -11,5 +11,4 @@ trio<0.22.0 pympler psutil setuptools<67.7.0 -sqlmodel requests-mock From 0d0fe88751f937a02827c8d92d0c4aa50df156ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 17:06:26 +0200 Subject: [PATCH 08/12] fastapi 0.69.0 which pins starlette 0.15.0 --- requirements/app/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index 5b2b2c04bf480..f4cd6948735fa 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -13,7 +13,7 @@ inquirer>=2.10.0, <=3.1.2 psutil<5.9.5 click<=8.1.3 -fastapi>=0.65.1,<0.89.0 # strict; TODO: broken serializations +fastapi>=0.69.0,<0.89.0 # strict; TODO: broken serializations starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette pydantic>=1.6.2,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic From 397c734ab6fceed6c245f5f02dc5e9726b0c94f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 17:19:55 +0200 Subject: [PATCH 09/12] https://github.com/pydantic/pydantic/issues/1985 --- requirements/app/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index f4cd6948735fa..bf3fec9ba8d4f 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -15,7 +15,7 @@ click<=8.1.3 fastapi>=0.69.0,<0.89.0 # strict; TODO: broken serializations starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette -pydantic>=1.6.2,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic +pydantic>=1.7,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic dateutils<=0.6.12 Jinja2<=3.1.2 From 174d125d6f38dce5bd354cd8319b6a2b0dd9aea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 17:33:03 +0200 Subject: [PATCH 10/12] Avoid CVE: https://github.com/tiangolo/fastapi/pull/3213 --- requirements/app/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app/base.txt b/requirements/app/base.txt index bf3fec9ba8d4f..9905c377db536 100644 --- a/requirements/app/base.txt +++ b/requirements/app/base.txt @@ -15,7 +15,7 @@ click<=8.1.3 fastapi>=0.69.0,<0.89.0 # strict; TODO: broken serializations starlette # https://fastapi.tiangolo.com/deployment/versions/#about-starlette -pydantic>=1.7,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic +pydantic>=1.7.4,<2.0.0 # https://fastapi.tiangolo.com/deployment/versions/#about-pydantic dateutils<=0.6.12 Jinja2<=3.1.2 From 516f6ec046dc205f2c1eefe4d850fcaf979d2bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 17:52:36 +0200 Subject: [PATCH 11/12] Strict trio --- requirements/app/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app/test.txt b/requirements/app/test.txt index e37fa5f96c4c7..c6204418062b1 100644 --- a/requirements/app/test.txt +++ b/requirements/app/test.txt @@ -7,7 +7,7 @@ pytest-doctestplus>=0.9.0 pytest-asyncio==0.20.3 playwright==1.30.0 httpx -trio<0.22.0 +trio<0.22.0 # strict https://github.com/python-trio/trio/pull/2213 pympler psutil setuptools<67.7.0 From 6409cb8d8007614c8532ea27acc1a1230768b82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Tue, 11 Apr 2023 19:31:13 +0200 Subject: [PATCH 12/12] Skip windows test --- tests/tests_app/components/serve/test_model_inference_api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests_app/components/serve/test_model_inference_api.py b/tests/tests_app/components/serve/test_model_inference_api.py index cf33ce7601809..0b0353a234d76 100644 --- a/tests/tests_app/components/serve/test_model_inference_api.py +++ b/tests/tests_app/components/serve/test_model_inference_api.py @@ -6,6 +6,7 @@ import pytest from lightning.app.components.serve import serve +from lightning.app.testing.helpers import _RunIf from lightning.app.utilities.imports import _is_numpy_available, _is_torch_available from lightning.app.utilities.network import _configure_session, find_free_network_port from tests_app import _PROJECT_ROOT @@ -33,6 +34,9 @@ def target_fn(port, workers): @pytest.mark.skipif(not (_is_torch_available() and _is_numpy_available()), reason="Missing torch and numpy") @pytest.mark.parametrize("workers", [0]) +# avoid the error: Failed to establish a new connection: [WinError 10061] No connection could be made because the +# target machine actively refused it +@_RunIf(skip_windows=True) def test_model_inference_api(workers): port = find_free_network_port()