Skip to content

Commit 01176ec

Browse files
committed
Refactor application type handling in configuration
- Updated the application type references in `main.py` and `validation.py` to use the `ApplicationType` enum for improved clarity and consistency. - Changed the `NULL` value to `NONE` in the `ApplicationType` enum to better reflect its purpose. - Adjusted related logic in the `NullApplicationConfig` and validation methods to align with the updated enum values.
1 parent 906c761 commit 01176ec

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

app/config/validation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ApplicationType(str, Enum):
1616
SLACK = "slack"
1717
MATTERMOST = "mattermost"
1818
TELEGRAM = "telegram"
19-
NULL = "none"
19+
NONE = "none"
2020

2121

2222
class ChainType(str, Enum):
@@ -284,7 +284,7 @@ class TelegramApplicationConfig(BaseApplicationConfig):
284284

285285
class NullApplicationConfig(BaseApplicationConfig):
286286
"""Null application configuration for UI-only mode"""
287-
type: Literal[ApplicationType.NULL] = Field(ApplicationType.NULL, description="Application type")
287+
type: Literal[ApplicationType.NONE] = Field(ApplicationType.NONE, description="Application type")
288288
channels: Optional[Dict[str, Any]] = Field(default_factory=dict, description="Channel definitions (not used)")
289289
users: Optional[Dict[str, Any]] = Field(default_factory=dict, description="User definitions (not used)")
290290
admin_users: List[str] = Field(default_factory=list, description="Admin users (not used)")
@@ -452,7 +452,7 @@ def validate_route_channel_exists(self):
452452
"""Validate that route channels exist in application channels"""
453453

454454
def validate_route_channels(route_config):
455-
if route_config.channel not in self.application.channels and self.application.type != ApplicationType.NULL:
455+
if route_config.channel not in self.application.channels and self.application.type != ApplicationType.NONE:
456456
raise ValueError(f"Route channel '{route_config.channel}' not found in application channels")
457457

458458
if route_config.routes:

main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from fastapi.staticfiles import StaticFiles
1212
from fastapi.templating import Jinja2Templates
1313

14+
from app.config.validation import ApplicationType
1415
from app.im.channel_manager import ChannelManager
1516
from app.im.helpers import get_application
1617
from app.incident.incidents import Incidents
@@ -80,7 +81,7 @@ async def lifespan(fastapi_app: FastAPI):
8081
route = generate_route(route_dict)
8182

8283
channel_manager = ChannelManager()
83-
if config.application.type == 'none':
84+
if config.application.type == ApplicationType.NONE:
8485
if not config.application.channels or 'default' not in config.application.channels:
8586
config.application.channels = {'default': {'id': 'default'}}
8687
channels = channel_manager.initialize(['default'], config.application.channels, 'default')

0 commit comments

Comments
 (0)