nikdoof/leggen
1
1
Fork 0
mirror of https://github.com/elisiariocouto/leggen.git synced 2025-12-13 11:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): Remove aliases for configuration keys that were disabling telegram notifications in some cases.

Browse Source
This commit is contained in:
Elisiário Couto
2025-09-18 11:09:43 +01:00
parent b7da446fa5
commit 61442a598f
8 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -146,8 +146,8 @@ enabled = true
# Optional: Transaction filters for notifications # Optional: Transaction filters for notifications
[filters] [filters]
case-insensitive = ["salary", "utility"] case_insensitive = ["salary", "utility"]
case-sensitive = ["SpecificStore"] case_sensitive = ["SpecificStore"]
``` ```
## 📖 Usage ## 📖 Usage

10
config.example.toml
View File

@@ -9,7 +9,7 @@ sqlite = true
# Optional: Background sync scheduling # Optional: Background sync scheduling
[scheduler.sync] [scheduler.sync]
enabled = true enabled = true
hour = 3 # 3 AM hour = 3 # 3 AM
minute = 0 minute = 0
# cron = "0 3 * * *" # Alternative: use cron expression # cron = "0 3 * * *" # Alternative: use cron expression
@@ -20,11 +20,11 @@ enabled = true
# Optional: Telegram notifications # Optional: Telegram notifications
[notifications.telegram] [notifications.telegram]
api-key = "your-bot-token" token = "your-bot-token"
chat-id = 12345 chat_id = 12345
enabled = true enabled = true
# Optional: Transaction filters for notifications # Optional: Transaction filters for notifications
[filters] [filters]
case-insensitive = ["salary", "utility"] case_insensitive = ["salary", "utility"]
case-sensitive = ["SpecificStore"] case_sensitive = ["SpecificStore"]

26
leggen/api/routes/notifications.py
View File

@@ -37,15 +37,15 @@ async def get_notification_settings() -> APIResponse:
if discord_config.get("webhook") if discord_config.get("webhook")
else None, else None,
telegram=TelegramConfig( telegram=TelegramConfig(
token="***" if telegram_config.get("api-key") else "", token="***" if telegram_config.get("token") else "",
chat_id=telegram_config.get("chat-id", 0), chat_id=telegram_config.get("chat_id", 0),
enabled=telegram_config.get("enabled", True), enabled=telegram_config.get("enabled", True),
) )
if telegram_config.get("api-key") if telegram_config.get("token")
else None, else None,
filters=NotificationFilters( filters=NotificationFilters(
case_insensitive=filters_config.get("case-insensitive", []), case_insensitive=filters_config.get("case_insensitive", []),
case_sensitive=filters_config.get("case-sensitive"), case_sensitive=filters_config.get("case_sensitive"),
), ),
) )
@@ -77,17 +77,17 @@ async def update_notification_settings(settings: NotificationSettings) -> APIRes
if settings.telegram: if settings.telegram:
notifications_config["telegram"] = { notifications_config["telegram"] = {
"api-key": settings.telegram.token, "token": settings.telegram.token,
"chat-id": settings.telegram.chat_id, "chat_id": settings.telegram.chat_id,
"enabled": settings.telegram.enabled, "enabled": settings.telegram.enabled,
} }
# Update filters config # Update filters config
filters_config: Dict[str, Any] = {} filters_config: Dict[str, Any] = {}
if settings.filters.case_insensitive: if settings.filters.case_insensitive:
filters_config["case-insensitive"] = settings.filters.case_insensitive filters_config["case_insensitive"] = settings.filters.case_insensitive
if settings.filters.case_sensitive: if settings.filters.case_sensitive:
filters_config["case-sensitive"] = settings.filters.case_sensitive filters_config["case_sensitive"] = settings.filters.case_sensitive
# Save to config # Save to config
if notifications_config: if notifications_config:
@@ -153,12 +153,12 @@ async def get_notification_services() -> APIResponse:
"telegram": { "telegram": {
"name": "Telegram", "name": "Telegram",
"enabled": bool( "enabled": bool(
notifications_config.get("telegram", {}).get("api-key") notifications_config.get("telegram", {}).get("token")
and notifications_config.get("telegram", {}).get("chat-id") and notifications_config.get("telegram", {}).get("chat_id")
), ),
"configured": bool( "configured": bool(
notifications_config.get("telegram", {}).get("api-key") notifications_config.get("telegram", {}).get("token")
and notifications_config.get("telegram", {}).get("chat-id") and notifications_config.get("telegram", {}).get("chat_id")
), ),
"active": notifications_config.get("telegram", {}).get("enabled", True), "active": notifications_config.get("telegram", {}).get("enabled", True),
}, },

15
leggen/models/config.py
View File

@@ -22,8 +22,8 @@ class DiscordNotificationConfig(BaseModel):
class TelegramNotificationConfig(BaseModel): class TelegramNotificationConfig(BaseModel):
token: str = Field(..., alias="api-key", description="Telegram bot token") token: str = Field(..., description="Telegram bot token")
chat_id: int = Field(..., alias="chat-id", description="Telegram chat ID") chat_id: int = Field(..., description="Telegram chat ID")
enabled: bool = Field(default=True, description="Enable Telegram notifications") enabled: bool = Field(default=True, description="Enable Telegram notifications")
@@ -33,12 +33,8 @@ class NotificationConfig(BaseModel):
class FilterConfig(BaseModel): class FilterConfig(BaseModel):
case_insensitive: Optional[List[str]] = Field( case_insensitive: Optional[List[str]] = Field(default_factory=list)
default_factory=list, alias="case-insensitive" case_sensitive: Optional[List[str]] = Field(default_factory=list)
)
case_sensitive: Optional[List[str]] = Field(
default_factory=list, alias="case-sensitive"
)
class SyncScheduleConfig(BaseModel): class SyncScheduleConfig(BaseModel):
@@ -60,6 +56,3 @@ class Config(BaseModel):
notifications: Optional[NotificationConfig] = None notifications: Optional[NotificationConfig] = None
filters: Optional[FilterConfig] = None filters: Optional[FilterConfig] = None
scheduler: SchedulerConfig = Field(default_factory=SchedulerConfig) scheduler: SchedulerConfig = Field(default_factory=SchedulerConfig)
class Config:
validate_by_name = True

8
leggen/notifications/telegram.py
View File

@@ -29,8 +29,8 @@ def escape_markdown(text: str) -> str:
def send_expire_notification(ctx: click.Context, notification: dict): def send_expire_notification(ctx: click.Context, notification: dict):
token = ctx.obj["notifications"]["telegram"]["api-key"] token = ctx.obj["notifications"]["telegram"]["token"]
chat_id = ctx.obj["notifications"]["telegram"]["chat-id"] chat_id = ctx.obj["notifications"]["telegram"]["chat_id"]
bot_url = f"https://api.telegram.org/bot{token}/sendMessage" bot_url = f"https://api.telegram.org/bot{token}/sendMessage"
info("Sending expiration notification to Telegram") info("Sending expiration notification to Telegram")
message = "*💲 [Leggen](https://github.com/elisiariocouto/leggen)*\n" message = "*💲 [Leggen](https://github.com/elisiariocouto/leggen)*\n"
@@ -54,8 +54,8 @@ def send_expire_notification(ctx: click.Context, notification: dict):
def send_transaction_message(ctx: click.Context, transactions: list): def send_transaction_message(ctx: click.Context, transactions: list):
token = ctx.obj["notifications"]["telegram"]["api-key"] token = ctx.obj["notifications"]["telegram"]["token"]
chat_id = ctx.obj["notifications"]["telegram"]["chat-id"] chat_id = ctx.obj["notifications"]["telegram"]["chat_id"]
bot_url = f"https://api.telegram.org/bot{token}/sendMessage" bot_url = f"https://api.telegram.org/bot{token}/sendMessage"
info(f"Got {len(transactions)} new transactions, sending message to Telegram") info(f"Got {len(transactions)} new transactions, sending message to Telegram")
message = "*💲 [Leggen](https://github.com/elisiariocouto/leggen)*\n" message = "*💲 [Leggen](https://github.com/elisiariocouto/leggen)*\n"

16
leggen/services/notification_service.py
View File

@@ -63,8 +63,8 @@ class NotificationService:
) -> List[Dict[str, Any]]: ) -> List[Dict[str, Any]]:
"""Filter transactions based on notification criteria""" """Filter transactions based on notification criteria"""
matching = [] matching = []
filters_case_insensitive = self.filters_config.get("case-insensitive", []) filters_case_insensitive = self.filters_config.get("case_insensitive", [])
filters_case_sensitive = self.filters_config.get("case-sensitive", []) filters_case_sensitive = self.filters_config.get("case_sensitive", [])
for transaction in transactions: for transaction in transactions:
description = transaction.get("description", "") description = transaction.get("description", "")
@@ -159,8 +159,8 @@ class NotificationService:
ctx.obj = { ctx.obj = {
"notifications": { "notifications": {
"telegram": { "telegram": {
"api-key": telegram_config.get("token"), "token": telegram_config.get("token"),
"chat-id": telegram_config.get("chat_id"), "chat_id": telegram_config.get("chat_id"),
} }
} }
} }
@@ -219,8 +219,8 @@ class NotificationService:
ctx.obj = { ctx.obj = {
"notifications": { "notifications": {
"telegram": { "telegram": {
"api-key": telegram_config.get("token"), "token": telegram_config.get("token"),
"chat-id": telegram_config.get("chat_id"), "chat_id": telegram_config.get("chat_id"),
} }
} }
} }
@@ -277,8 +277,8 @@ class NotificationService:
ctx.obj = { ctx.obj = {
"notifications": { "notifications": {
"telegram": { "telegram": {
"api-key": telegram_config.get("token"), "token": telegram_config.get("token"),
"chat-id": telegram_config.get("chat_id"), "chat_id": telegram_config.get("chat_id"),
} }
} }
} }

2
leggen/utils/notifications.py
View File

@@ -29,7 +29,7 @@ def send_notification(ctx: click.Context, transactions: list):
warning("No filters are enabled, skipping notifications") warning("No filters are enabled, skipping notifications")
return return
filters_case_insensitive = ctx.obj.get("filters", {}).get("case-insensitive", {}) filters_case_insensitive = ctx.obj.get("filters", {}).get("case_insensitive", {})
# Add transaction to the list of transactions to be sent as a notification # Add transaction to the list of transactions to be sent as a notification
notification_transactions = [] notification_transactions = []

10
tests/unit/test_config.py
View File

@@ -216,8 +216,8 @@ class TestConfig:
"""Test filters configuration access.""" """Test filters configuration access."""
custom_config = { custom_config = {
"filters": { "filters": {
"case-insensitive": ["salary", "utility"], "case_insensitive": ["salary", "utility"],
"case-sensitive": ["SpecificStore"], "case_sensitive": ["SpecificStore"],
} }
} }
@@ -225,6 +225,6 @@ class TestConfig:
config._config = custom_config config._config = custom_config
filters = config.filters_config filters = config.filters_config
assert "salary" in filters["case-insensitive"] assert "salary" in filters["case_insensitive"]
assert "utility" in filters["case-insensitive"] assert "utility" in filters["case_insensitive"]
assert "SpecificStore" in filters["case-sensitive"] assert "SpecificStore" in filters["case_sensitive"]