Skip to content

Commit 15d57a9

Browse files
nickknissennickknissen
authored
Merge pull request #231 from nickknissen/claude/fix-duplicate-scan-intervals-011CUpo18MFz8aA8Do4qxPoV
Remove unused generic scan_interval configuration
2 parents 8b97a2f + f1b2a12 commit 15d57a9

File tree

4 files changed

+26
-31
lines changed

4 files changed

+26
-31
lines changed

‎custom_components/monta/config_flow.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
MontaApiClientError,
1616
)
1717
from .const import (
18-
CONF_SCAN_INTERVAL,
1918
CONF_SCAN_INTERVAL_CHARGE_POINTS,
2019
CONF_SCAN_INTERVAL_WALLET,
2120
CONF_SCAN_INTERVAL_TRANSACTIONS,
22-
DEFAULT_SCAN_INTERVAL,
2321
DEFAULT_SCAN_INTERVAL_CHARGE_POINTS,
2422
DEFAULT_SCAN_INTERVAL_WALLET,
2523
DEFAULT_SCAN_INTERVAL_TRANSACTIONS,
@@ -50,17 +48,6 @@ def build_schema(defaults: dict) -> vol.Schema:
5048
type=selector.TextSelectorType.PASSWORD
5149
),
5250
),
53-
vol.Optional(
54-
CONF_SCAN_INTERVAL,
55-
default=defaults.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL),
56-
): selector.NumberSelector(
57-
selector.NumberSelectorConfig(
58-
min=30,
59-
max=3600,
60-
unit_of_measurement="seconds",
61-
mode=selector.NumberSelectorMode.BOX,
62-
),
63-
),
6451
vol.Optional(
6552
CONF_SCAN_INTERVAL_CHARGE_POINTS,
6653
default=defaults.get(CONF_SCAN_INTERVAL_CHARGE_POINTS, DEFAULT_SCAN_INTERVAL_CHARGE_POINTS),
@@ -198,7 +185,6 @@ async def async_step_init(
198185
data={
199186
CONF_CLIENT_ID: user_input[CONF_CLIENT_ID],
200187
CONF_CLIENT_SECRET: user_input[CONF_CLIENT_SECRET],
201-
CONF_SCAN_INTERVAL: user_input.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL),
202188
CONF_SCAN_INTERVAL_CHARGE_POINTS: user_input.get(CONF_SCAN_INTERVAL_CHARGE_POINTS, DEFAULT_SCAN_INTERVAL_CHARGE_POINTS),
203189
CONF_SCAN_INTERVAL_WALLET: user_input.get(CONF_SCAN_INTERVAL_WALLET, DEFAULT_SCAN_INTERVAL_WALLET),
204190
CONF_SCAN_INTERVAL_TRANSACTIONS: user_input.get(CONF_SCAN_INTERVAL_TRANSACTIONS, DEFAULT_SCAN_INTERVAL_TRANSACTIONS),
@@ -216,10 +202,6 @@ async def async_step_init(
216202
CONF_CLIENT_SECRET,
217203
self.config_entry.data.get(CONF_CLIENT_SECRET),
218204
),
219-
CONF_SCAN_INTERVAL: self.config_entry.options.get(
220-
CONF_SCAN_INTERVAL,
221-
self.config_entry.data.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL),
222-
),
223205
CONF_SCAN_INTERVAL_CHARGE_POINTS: self.config_entry.options.get(
224206
CONF_SCAN_INTERVAL_CHARGE_POINTS,
225207
self.config_entry.data.get(CONF_SCAN_INTERVAL_CHARGE_POINTS, DEFAULT_SCAN_INTERVAL_CHARGE_POINTS),

‎custom_components/monta/const.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
ATTR_WALLET = "wallet"
1515
ATTR_TRANSACTIONS = "transactions"
1616

17-
CONF_SCAN_INTERVAL = "scan_interval"
18-
DEFAULT_SCAN_INTERVAL = 120 # Default to 120 seconds to stay within rate limits
19-
2017
# Separate scan intervals for different data types
2118
CONF_SCAN_INTERVAL_CHARGE_POINTS = "scan_interval_charge_points"
2219
CONF_SCAN_INTERVAL_WALLET = "scan_interval_wallet"

‎custom_components/monta/translations/en.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
"data": {
77
"client_id": "Client id",
88
"client_secret": "client secret",
9-
"scan_interval": "Scan interval (seconds)"
9+
"scan_interval_charge_points": "Charge Points Scan Interval (seconds)",
10+
"scan_interval_wallet": "Wallet Scan Interval (seconds)",
11+
"scan_interval_transactions": "Transactions Scan Interval (seconds)"
1012
},
1113
"data_description": {
12-
"scan_interval": "How often to fetch data from Monta API. Monta has a rate limit of 10 requests per minute. Recommended: 120 seconds or higher for multiple chargers."
14+
"scan_interval_charge_points": "How often to fetch charge point data. Recommended: 120 seconds (Monta has rate limit of 10 requests/min)",
15+
"scan_interval_wallet": "How often to fetch wallet data. Recommended: 600 seconds (10 minutes)",
16+
"scan_interval_transactions": "How often to fetch transaction data. Recommended: 600 seconds (10 minutes)"
1317
}
1418
}
1519
},
@@ -22,16 +26,20 @@
2226
"options": {
2327
"step": {
2428
"init": {
25-
"description": "Configure Monta integration options. You can update your credentials or adjust the scan interval here.",
29+
"description": "Configure Monta integration options. You can update your credentials or adjust the scan intervals here.",
2630
"data": {
2731
"client_id": "Client id",
2832
"client_secret": "Client secret",
29-
"scan_interval": "Scan interval (seconds)"
33+
"scan_interval_charge_points": "Charge Points Scan Interval (seconds)",
34+
"scan_interval_wallet": "Wallet Scan Interval (seconds)",
35+
"scan_interval_transactions": "Transactions Scan Interval (seconds)"
3036
},
3137
"data_description": {
3238
"client_id": "Your Monta API client ID from https://portal2.monta.app/applications",
3339
"client_secret": "Your Monta API client secret from https://portal2.monta.app/applications",
34-
"scan_interval": "How often to fetch data from Monta API. Monta has a rate limit of 10 requests per minute. Recommended: 120 seconds or higher for multiple chargers."
40+
"scan_interval_charge_points": "How often to fetch charge point data. Recommended: 120 seconds (Monta has rate limit of 10 requests/min)",
41+
"scan_interval_wallet": "How often to fetch wallet data. Recommended: 600 seconds (10 minutes)",
42+
"scan_interval_transactions": "How often to fetch transaction data. Recommended: 600 seconds (10 minutes)"
3543
}
3644
}
3745
}

‎custom_components/monta/translations/pt.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
"data": {
77
"client_id": "ID do cliente",
88
"client_secret": "Segredo do cliente",
9-
"scan_interval": "Intervalo de varredura (segundos)"
9+
"scan_interval_charge_points": "Intervalo de Pontos de Carregamento (segundos)",
10+
"scan_interval_wallet": "Intervalo de Carteira (segundos)",
11+
"scan_interval_transactions": "Intervalo de Transações (segundos)"
1012
},
1113
"data_description": {
12-
"scan_interval": "Com que frequência buscar dados da API Monta. A Monta tem um limite de 10 solicitações por minuto. Recomendado: 120 segundos ou mais para vários carregadores."
14+
"scan_interval_charge_points": "Com que frequência buscar dados dos pontos de carregamento. Recomendado: 120 segundos (Monta tem limite de 10 solicitações/min)",
15+
"scan_interval_wallet": "Com que frequência buscar dados da carteira. Recomendado: 600 segundos (10 minutos)",
16+
"scan_interval_transactions": "Com que frequência buscar dados de transações. Recomendado: 600 segundos (10 minutos)"
1317
}
1418
}
1519
},
@@ -22,16 +26,20 @@
2226
"options": {
2327
"step": {
2428
"init": {
25-
"description": "Configurar opções de integração Monta. Você pode atualizar suas credenciais ou ajustar o intervalo de varredura aqui.",
29+
"description": "Configurar opções de integração Monta. Você pode atualizar suas credenciais ou ajustar os intervalos de varredura aqui.",
2630
"data": {
2731
"client_id": "ID do cliente",
2832
"client_secret": "Segredo do cliente",
29-
"scan_interval": "Intervalo de varredura (segundos)"
33+
"scan_interval_charge_points": "Intervalo de Pontos de Carregamento (segundos)",
34+
"scan_interval_wallet": "Intervalo de Carteira (segundos)",
35+
"scan_interval_transactions": "Intervalo de Transações (segundos)"
3036
},
3137
"data_description": {
3238
"client_id": "Seu ID de cliente da API Monta de https://portal2.monta.app/applications",
3339
"client_secret": "Seu segredo de cliente da API Monta de https://portal2.monta.app/applications",
34-
"scan_interval": "Com que frequência buscar dados da API Monta. A Monta tem um limite de 10 solicitações por minuto. Recomendado: 120 segundos ou mais para vários carregadores."
40+
"scan_interval_charge_points": "Com que frequência buscar dados dos pontos de carregamento. Recomendado: 120 segundos (Monta tem limite de 10 solicitações/min)",
41+
"scan_interval_wallet": "Com que frequência buscar dados da carteira. Recomendado: 600 segundos (10 minutos)",
42+
"scan_interval_transactions": "Com que frequência buscar dados de transações. Recomendado: 600 segundos (10 minutos)"
3543
}
3644
}
3745
}

0 commit comments

Comments
 (0)