Skip to content

Commit 318aba2

Browse files
committed
@pcrespov review: renamed init_app to create_app repo-wide
1 parent 273f83e commit 318aba2

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

services/api-server/src/simcore_service_api_server/core/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def _label_title_and_version(settings: ApplicationSettings, title: str, version:
4848
return title, version
4949

5050

51-
def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
51+
def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
5252
if settings is None:
5353
settings = ApplicationSettings.create_from_envs()
5454
_logger.info(

services/api-server/src/simcore_service_api_server/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from common_library.json_serialization import json_dumps
77
from fastapi import FastAPI
88
from servicelib.fastapi.logging_lifespan import setup_logging_shutdown_event
9-
from simcore_service_api_server.core.application import init_app
9+
from simcore_service_api_server.core.application import create_app
1010
from simcore_service_api_server.core.settings import ApplicationSettings
1111

1212
_logger = logging.getLogger(__name__)
@@ -33,6 +33,6 @@ def app_factory() -> FastAPI:
3333
"Application settings: %s",
3434
json_dumps(app_settings, indent=2, sort_keys=True),
3535
)
36-
app = init_app(settings=app_settings)
36+
app = create_app(settings=app_settings)
3737
app.add_event_handler("shutdown", logging_shutdown_event)
3838
return app

services/api-server/tests/unit/_with_db/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from simcore_postgres_database.models.products import products
3535
from simcore_postgres_database.models.users import users
3636
from simcore_service_api_server.clients.postgres import get_engine
37-
from simcore_service_api_server.core.application import init_app
37+
from simcore_service_api_server.core.application import create_app
3838
from simcore_service_api_server.core.settings import PostgresSettings
3939
from sqlalchemy.ext.asyncio import AsyncEngine
4040

@@ -187,7 +187,7 @@ def app(app_environment: EnvVarsDict, migrated_db: None) -> FastAPI:
187187
- it uses default environ as pg
188188
- db is started and initialized
189189
"""
190-
return init_app()
190+
return create_app()
191191

192192

193193
@pytest.fixture

services/api-server/tests/unit/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
from pytest_simcore.simcore_webserver_projects_rest_api import GET_PROJECT
5555
from requests.auth import HTTPBasicAuth
5656
from respx import MockRouter
57-
from simcore_service_api_server.core.application import init_app
57+
from simcore_service_api_server.core.application import create_app
5858
from simcore_service_api_server.core.settings import ApplicationSettings
5959
from simcore_service_api_server.repository.api_keys import UserAndProductTuple
6060
from simcore_service_api_server.services_http.solver_job_outputs import ResultsTypes
@@ -131,7 +131,7 @@ def app(
131131

132132
patch_lrt_response_urls()
133133

134-
return init_app()
134+
return create_app()
135135

136136

137137
MAX_TIME_FOR_APP_TO_STARTUP = 10

services/director-v2/src/simcore_service_director_v2/core/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def create_base_app(
154154
return app
155155

156156

157-
def init_app( # noqa: C901, PLR0912
157+
def create_app( # noqa: C901, PLR0912
158158
settings: AppSettings | None = None,
159159
) -> FastAPI:
160160
app = create_base_app(settings)

services/director-v2/src/simcore_service_director_v2/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import logging
44

55
from fastapi import FastAPI
6-
from simcore_service_director_v2.core.application import init_app
6+
from simcore_service_director_v2.core.application import create_app
77

88
_logger = logging.getLogger(__name__)
99

1010

1111
def app_factory() -> FastAPI:
12-
return init_app()
12+
return create_app()

services/director-v2/tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from pytest_simcore.helpers.typing_env import EnvVarsDict
3333
from servicelib.rabbitmq import RabbitMQRPCClient
3434
from settings_library.rabbit import RabbitSettings
35-
from simcore_service_director_v2.core.application import init_app
35+
from simcore_service_director_v2.core.application import create_app
3636
from simcore_service_director_v2.core.settings import AppSettings
3737
from starlette.testclient import ASGI3App, TestClient
3838

@@ -202,7 +202,7 @@ def mock_env(
202202
@pytest.fixture()
203203
async def initialized_app(mock_env: EnvVarsDict) -> AsyncIterable[FastAPI]:
204204
settings = AppSettings.create_from_envs()
205-
app = init_app(settings)
205+
app = create_app(settings)
206206
print("Application settings\n", settings.model_dump_json(indent=2))
207207
async with LifespanManager(app):
208208
yield app
@@ -213,7 +213,7 @@ async def client(mock_env: EnvVarsDict) -> AsyncIterator[TestClient]:
213213
# NOTE: this way we ensure the events are run in the application
214214
# since it starts the app on a test server
215215
settings = AppSettings.create_from_envs()
216-
app = init_app(settings)
216+
app = create_app(settings)
217217
# NOTE: we cannot use the initialized_app fixture here as the TestClient also creates it
218218
print("Application settings\n", settings.model_dump_json(indent=2))
219219
with TestClient(app, raise_server_exceptions=True) as test_client:

services/director-v2/tests/integration/02/test_dynamic_services_routes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
)
3737
from settings_library.rabbit import RabbitSettings
3838
from settings_library.redis import RedisSettings
39-
from simcore_service_director_v2.core.application import init_app
39+
from simcore_service_director_v2.core.application import create_app
4040
from simcore_service_director_v2.core.settings import AppSettings
4141
from tenacity.asyncio import AsyncRetrying
4242
from tenacity.retry import retry_if_exception_type
@@ -197,7 +197,7 @@ async def director_v2_client(
197197

198198
settings = AppSettings.create_from_envs()
199199

200-
app = init_app(settings)
200+
app = create_app(settings)
201201

202202
async with TestClient(app) as client:
203203
yield client

services/director-v2/tests/unit/test_modules_dask_clients_pool.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
)
2323
from pytest_mock.plugin import MockerFixture
2424
from pytest_simcore.helpers.typing_env import EnvVarsDict
25-
from simcore_service_director_v2.core.application import init_app
25+
from simcore_service_director_v2.core.application import create_app
2626
from simcore_service_director_v2.core.errors import (
2727
ConfigurationError,
2828
DaskClientAcquisisitonError,
@@ -54,7 +54,7 @@ def test_dask_clients_pool_missing_raises_configuration_error(
5454
):
5555
monkeypatch.setenv("COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED", "0")
5656
settings = AppSettings.create_from_envs()
57-
app = init_app(settings)
57+
app = create_app(settings)
5858

5959
with TestClient(app, raise_server_exceptions=True): # noqa: SIM117
6060
with pytest.raises(ConfigurationError):
@@ -70,7 +70,7 @@ def test_dask_clients_pool_properly_setup_and_deleted(
7070
)
7171
mocked_dask_clients_pool.create.return_value = mocked_dask_clients_pool
7272
settings = AppSettings.create_from_envs()
73-
app = init_app(settings)
73+
app = create_app(settings)
7474

7575
with TestClient(app, raise_server_exceptions=True):
7676
mocked_dask_clients_pool.create.assert_called_once()

0 commit comments

Comments
 (0)