Skip to content

Commit 151472f

Browse files
committed
refactor: replace references to APP_SETTINGS_KEY from constants to application_keys
- Updated imports across multiple modules to source APP_SETTINGS_KEY from application_keys instead of constants. - This change improves the organization of application keys and reduces potential circular dependencies.
1 parent 6f590b4 commit 151472f

File tree

64 files changed

+108
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+108
-87
lines changed

services/web/server/src/simcore_service_webserver/activity/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from aiohttp import web
22
from settings_library.prometheus import PrometheusSettings
33

4-
from ..constants import APP_SETTINGS_KEY
4+
from ..application_keys import APP_SETTINGS_KEY
55

66

77
def get_plugin_settings(app: web.Application) -> PrometheusSettings:

services/web/server/src/simcore_service_webserver/announcements/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from aiohttp import web
88

9+
from ..application_keys import APP_SETTINGS_KEY
910
from ..application_setup import ModuleCategory, app_setup_func
10-
from ..constants import APP_SETTINGS_KEY
1111
from ..products.plugin import setup_products
1212
from ..redis import setup_redis
1313
from . import _handlers

services/web/server/src/simcore_service_webserver/api_keys/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from aiohttp import web
44

5+
from ..application_keys import APP_SETTINGS_KEY
56
from ..application_setup import ModuleCategory, app_setup_func
6-
from ..constants import APP_SETTINGS_KEY
77
from ..db.plugin import setup_db
88
from ..products.plugin import setup_products
99
from ..rabbitmq import setup_rabbitmq
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
"""web.AppKey definitions for simcore_service_webserver"""
2+
3+
from typing import TYPE_CHECKING
4+
5+
from aiohttp import web
6+
from servicelib.aiohttp.application_keys import (
7+
APP_AIOPG_ENGINE_KEY,
8+
APP_CLIENT_SESSION_KEY,
9+
APP_CONFIG_KEY,
10+
APP_FIRE_AND_FORGET_TASKS_KEY,
11+
)
12+
13+
if TYPE_CHECKING:
14+
# Application settings key - defined here to avoid circular imports
15+
from .application_settings import ApplicationSettings
16+
17+
APP_SETTINGS_KEY: web.AppKey[ApplicationSettings] = web.AppKey(
18+
"APP_SETTINGS_KEY", ApplicationSettings
19+
)
20+
else:
21+
APP_SETTINGS_KEY: web.AppKey = web.AppKey("APP_SETTINGS_KEY", None)
22+
23+
24+
__all__: tuple[str, ...] = (
25+
"APP_AIOPG_ENGINE_KEY",
26+
"APP_CLIENT_SESSION_KEY",
27+
"APP_CONFIG_KEY",
28+
"APP_FIRE_AND_FORGET_TASKS_KEY",
29+
"APP_SETTINGS_KEY",
30+
)
31+
32+
# nopycln: file

services/web/server/src/simcore_service_webserver/application_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
from settings_library.utils_service import DEFAULT_AIOHTTP_PORT
2929

3030
from ._meta import API_VERSION, API_VTAG, APP_NAME
31+
from .application_keys import APP_SETTINGS_KEY
3132
from .catalog.settings import CatalogSettings
3233
from .collaboration.settings import RealTimeCollaborationSettings
33-
from .constants import APP_SETTINGS_KEY
3434
from .diagnostics.settings import DiagnosticsSettings
3535
from .director_v2.settings import DirectorV2Settings
3636
from .dynamic_scheduler.settings import DynamicSchedulerSettings

services/web/server/src/simcore_service_webserver/application_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import servicelib.aiohttp.application_setup
55

6-
from .constants import APP_SETTINGS_KEY
6+
from .application_keys import APP_SETTINGS_KEY
77

88
# models
99
ModuleCategory: TypeAlias = servicelib.aiohttp.application_setup.ModuleCategory

services/web/server/src/simcore_service_webserver/catalog/settings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
""" catalog's subsystem configuration
1+
"""catalog's subsystem configuration
22
3-
- config-file schema
4-
- settings
3+
- config-file schema
4+
- settings
55
"""
66

77
from aiohttp import web
88
from settings_library.catalog import CatalogSettings
99

10-
from ..constants import APP_SETTINGS_KEY
10+
from ..application_keys import APP_SETTINGS_KEY
1111

1212

1313
def get_plugin_settings(app: web.Application) -> CatalogSettings:

services/web/server/src/simcore_service_webserver/collaboration/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pydantic.fields import Field
88
from settings_library.base import BaseCustomSettings
99

10-
from ..constants import APP_SETTINGS_KEY
10+
from ..application_keys import APP_SETTINGS_KEY
1111

1212

1313
class RealTimeCollaborationSettings(BaseCustomSettings):

services/web/server/src/simcore_service_webserver/constants.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,9 @@
1414

1515
from ._meta import APP_NAME
1616

17-
if TYPE_CHECKING:
18-
# Application settings key - defined here to avoid circular imports
19-
from .application_settings import ApplicationSettings
20-
21-
APP_SETTINGS_KEY: web.AppKey[ApplicationSettings] = web.AppKey(
22-
"APP_SETTINGS_KEY", ApplicationSettings
23-
)
24-
else:
25-
APP_SETTINGS_KEY: web.AppKey = web.AppKey("APP_SETTINGS_KEY", None)
26-
27-
2817
assert APP_CLIENT_SESSION_KEY # nosec
2918
assert APP_CONFIG_KEY # nosec
3019

31-
3220
# Public config per product returned in /config
3321
APP_PUBLIC_CONFIG_PER_PRODUCT: Final[str] = f"{__name__}.APP_PUBLIC_CONFIG_PER_PRODUCT"
3422

services/web/server/src/simcore_service_webserver/conversations/_controller/_conversations_messages_rest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from servicelib.rest_constants import RESPONSE_MODEL_POLICY
3232

3333
from ..._meta import API_VTAG as VTAG
34-
from ...constants import APP_SETTINGS_KEY
34+
from ...application_keys import APP_SETTINGS_KEY
3535
from ...email import email_service
3636
from ...fogbugz.settings import FogbugzSettings
3737
from ...login.decorators import login_required

0 commit comments

Comments
 (0)