mtcli 3.2.1__tar.gz → 3.3.0.dev0__tar.gz

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mtcli
-Version: 3.2.1
+Version: 3.3.0.dev0
 Summary: Aplicativo CLI para exibir gráficos do MetaTrader 5 em texto acessível ao leitor de telas
 License: GPL-3.0
 Keywords: MetaTrader 5,trading,CLI

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/commands/bars.py

@@ -1,147 +1,147 @@
-"""Exibe o gráfico de barras."""
-
-import click
-
-from mtcli.models.rates_model import RatesModel
-from mtcli.models.bars_model import BarsModel
-from mtcli.views.full_view import FullView
-from mtcli.views.min_view import MinView
-from mtcli.views.ranges_view import RangesView
-from mtcli.views.volumes_view import VolumesView
-from mtcli.views.vars_view import VarsView
-from mtcli.views.rates_view import RatesView
-from mtcli.views.open_view import OpenView
-from mtcli.views.high_view import HighView
-from mtcli.views.low_view import LowView
-from mtcli.views.close_view import CloseView
-from mtcli.conf import (
-    VIEW,
-    PERIOD,
-    BARS,
-    DATE,
-    VOLUME,
-    TIMEFRAMES,
-)
-
-
-@click.command(
-    "bars",
-    help="Mostra o gráfico de candles em texto para o ativo e período especificados.",
-)
-@click.argument("symbol")
-@click.option(
-    "--view",
-    "-v",
-    type=click.Choice(
-        [
-            "ch",
-            "m",
-            "hl",
-            "f",
-            "full",
-            "r",
-            "range",
-            "v",
-            "volume",
-            "va",
-            "percentual",
-            "oh",
-            "ohlc",
-            "o",
-            "open",
-            "h",
-            "high",
-            "l",
-            "low",
-            "c",
-            "close",
-        ],
-        case_sensitive=False,
-    ),
-    default=VIEW,
-    show_default=True,
-    help="Formato de exibicao. Opcoes: minima ou HL - minima; f - completa; r - ranges; v - volumes; va - variações percentuais; oh - OHLC; o - aberturas; h - maximas; l - minimas; c - fechamentos.",
-)
-@click.option(
-    "--period",
-    "-p",
-    type=click.Choice(TIMEFRAMES, case_sensitive=False),
-    default=PERIOD,
-    show_default=True,
-    help="Timeframe das barras.",
-)
-@click.option(
-    "--count",
-    "-c",
-    type=int,
-    default=BARS,
-    show_default=True,
-    help="Numero de barras.",
-)
-@click.option(
-    "--date",
-    "-d",
-    default=DATE,
-    show_default=True,
-    help="Data para intraday, formato AAAA-MM-DD.",
-)
-@click.option(
-    "--numerator",
-    "-n",
-    is_flag=True,
-    default=False,
-    show_default=True,
-    help="Ativa a numeracao das barras.",
-)
-@click.option(
-    "--show-date",
-    "-sd",
-    is_flag=True,
-    default=False,
-    show_default=True,
-    help="Ativa a datacao das barras.",
-)
-@click.option(
-    "--volume",
-    "-vo",
-    type=click.Choice(["tick", "real"], case_sensitive=False),
-    default=VOLUME,
-    show_default=True,
-    help="Tipo de volume.",
-)
-def bars(symbol, view, period, count, date, numerator, show_date, volume):
-    """Exibe o grafico do MetaTrader 5."""
-    period = period.lower()
-    view = view.lower()
-    rates = RatesModel(symbol, period, count).get_data()
-    bars = BarsModel(rates, date).get_bars()
-    views = []
-    if view in ["m", "ch", "hl"]:  # máximas e mínimas
-        views = MinView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["r", "range"]:  # ranges
-        views = RangesView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["oh", "ohlc"]:  # OHLC
-        views = RatesView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["va", "percentual"]:  # variações percentuais
-        views = VarsView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["o", "open"]:  # abertura
-        views = OpenView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["h", "high"]:  # máximas
-        views = HighView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["l", "low"]:  # mínimas
-        views = LowView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["c", "close"]:  # fechamentos
-        views = CloseView(bars, count, period, date, numerator, show_date).views()
-    elif view in ["v", "volume"]:  # volumes
-        views = VolumesView(
-            bars, count, period, date, numerator, show_date, volume
-        ).views()
-    else:  # completo
-        views = FullView(bars, count, period, date, numerator, show_date).views()
-    if views:
-        for view in views:
-            click.echo(view)
-
-
-if __name__ == "__main__":
-    bars()
+"""Exibe o gráfico de barras."""
+
+import click
+
+from mtcli.conf import (
+    BARS,
+    DATE,
+    PERIOD,
+    TIMEFRAMES,
+    VIEW,
+    VOLUME,
+)
+from mtcli.models.bars_model import BarsModel
+from mtcli.models.rates_model import RatesModel
+from mtcli.views.close_view import CloseView
+from mtcli.views.full_view import FullView
+from mtcli.views.high_view import HighView
+from mtcli.views.low_view import LowView
+from mtcli.views.min_view import MinView
+from mtcli.views.open_view import OpenView
+from mtcli.views.ranges_view import RangesView
+from mtcli.views.rates_view import RatesView
+from mtcli.views.vars_view import VarsView
+from mtcli.views.volumes_view import VolumesView
+
+
+@click.command(
+    "bars",
+    help="Mostra o gráfico de candles em texto para o ativo e período especificados.",
+)
+@click.argument("symbol")
+@click.option(
+    "--view",
+    "-v",
+    type=click.Choice(
+        [
+            "ch",
+            "m",
+            "hl",
+            "f",
+            "full",
+            "r",
+            "range",
+            "v",
+            "volume",
+            "va",
+            "percentual",
+            "oh",
+            "ohlc",
+            "o",
+            "open",
+            "h",
+            "high",
+            "l",
+            "low",
+            "c",
+            "close",
+        ],
+        case_sensitive=False,
+    ),
+    default=VIEW,
+    show_default=True,
+    help="Formato de exibicao. Opcoes: minima ou HL - minima; f - completa; r - ranges; v - volumes; va - variações percentuais; oh - OHLC; o - aberturas; h - maximas; l - minimas; c - fechamentos.",
+)
+@click.option(
+    "--period",
+    "-p",
+    type=click.Choice(TIMEFRAMES, case_sensitive=False),
+    default=PERIOD,
+    show_default=True,
+    help="Timeframe das barras.",
+)
+@click.option(
+    "--count",
+    "-c",
+    type=int,
+    default=BARS,
+    show_default=True,
+    help="Numero de barras.",
+)
+@click.option(
+    "--date",
+    "-d",
+    default=DATE,
+    show_default=True,
+    help="Data para intraday, formato AAAA-MM-DD.",
+)
+@click.option(
+    "--numerator",
+    "-n",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="Ativa a numeracao das barras.",
+)
+@click.option(
+    "--show-date",
+    "-sd",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="Ativa a datacao das barras.",
+)
+@click.option(
+    "--volume",
+    "-vo",
+    type=click.Choice(["tick", "real"], case_sensitive=False),
+    default=VOLUME,
+    show_default=True,
+    help="Tipo de volume.",
+)
+def bars(symbol, view, period, count, date, numerator, show_date, volume):
+    """Exibe o grafico do MetaTrader 5."""
+    period = period.lower()
+    view = view.lower()
+    rates = RatesModel(symbol, period, count).get_data()
+    bars = BarsModel(rates, date).get_bars()
+    views = []
+    if view in ["m", "ch", "hl"]:  # máximas e mínimas
+        views = MinView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["r", "range"]:  # ranges
+        views = RangesView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["oh", "ohlc"]:  # OHLC
+        views = RatesView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["va", "percentual"]:  # variações percentuais
+        views = VarsView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["o", "open"]:  # abertura
+        views = OpenView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["h", "high"]:  # máximas
+        views = HighView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["l", "low"]:  # mínimas
+        views = LowView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["c", "close"]:  # fechamentos
+        views = CloseView(bars, count, period, date, numerator, show_date).views()
+    elif view in ["v", "volume"]:  # volumes
+        views = VolumesView(
+            bars, count, period, date, numerator, show_date, volume
+        ).views()
+    else:  # completo
+        views = FullView(bars, count, period, date, numerator, show_date).views()
+    if views:
+        for view in views:
+            click.echo(view)
+
+
+if __name__ == "__main__":
+    bars()

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/commands/conf.py

@@ -1,7 +1,7 @@
 """Gerencia configurações registradas no mtcli.ini."""
 
-import os
 import click
+
 from mtcli.models.conf_model import ConfModel
 
 

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/commands/logs.py

@@ -1,40 +1,42 @@
-"""Comando logs para exibição dos logs."""
-
-import os
-import click
-from mtcli.logger import setup_logger
-
-
-@click.command("logs", help="Exibe ou limpa os logs de execução do mtcli.")
-@click.option("--clear", is_flag=True, help="Limpa o arquivo de log.")
-@click.option("--tail", default=0, type=int, help="Mostra apenas as últimas N linhas.")
-@click.option("--grep", default="", help="Filtra o log por uma palavra-chave.")
-def logs(clear, tail, grep):
-    """Exibe ou limpa os registros de log do mtcli."""
-    logger = setup_logger()
-    log_file = logger.handlers[0].baseFilename
-
-    if clear:
-        if os.path.exists(log_file):
-            open(log_file, "w", encoding="utf-8").close()
-            click.echo("Log limpo com sucesso.")
-        else:
-            click.echo("Nenhum log para limpar.")
-        return
-
-    if not os.path.exists(log_file):
-        click.echo("Nenhum log encontrado.")
-        return
-
-    with open(log_file, encoding="utf-8", errors="ignore") as f:
-        linhas = f.readlines()
-
-    if tail > 0:
-        linhas = linhas[-tail:]
-    if grep:
-        linhas = [linha for linha in linhas if grep.lower() in linha.lower()]
-
-    if not linhas:
-        click.echo("Nenhuma linha encontrada com os filtros aplicados.")
-    else:
-        click.echo_via_pager("".join(linhas))
+"""Comando logs para exibição dos logs."""
+
+import os
+
+import click
+
+from mtcli.logger import setup_logger
+
+
+@click.command("logs", help="Exibe ou limpa os logs de execução do mtcli.")
+@click.option("--clear", is_flag=True, help="Limpa o arquivo de log.")
+@click.option("--tail", default=0, type=int, help="Mostra apenas as últimas N linhas.")
+@click.option("--grep", default="", help="Filtra o log por uma palavra-chave.")
+def logs(clear, tail, grep):
+    """Exibe ou limpa os registros de log do mtcli."""
+    logger = setup_logger()
+    log_file = logger.handlers[0].baseFilename
+
+    if clear:
+        if os.path.exists(log_file):
+            open(log_file, "w", encoding="utf-8").close()
+            click.echo("Log limpo com sucesso.")
+        else:
+            click.echo("Nenhum log para limpar.")
+        return
+
+    if not os.path.exists(log_file):
+        click.echo("Nenhum log encontrado.")
+        return
+
+    with open(log_file, encoding="utf-8", errors="ignore") as f:
+        linhas = f.readlines()
+
+    if tail > 0:
+        linhas = linhas[-tail:]
+    if grep:
+        linhas = [linha for linha in linhas if grep.lower() in linha.lower()]
+
+    if not linhas:
+        click.echo("Nenhuma linha encontrada com os filtros aplicados.")
+    else:
+        click.echo_via_pager("".join(linhas))

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/conecta.py

@@ -4,6 +4,7 @@ Usado internamente pelo contexto mt5_conexao().
 """
 
 import MetaTrader5 as mt5
+
 from mtcli.logger import setup_logger
 
 log = setup_logger()

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/conf.py

@@ -1,101 +1,102 @@
-import os
-import MetaTrader5 as mt5
-from mtcli.conecta import conectar, shutdown
-from mtcli.models.conf_model import ConfModel
-
-
-config = ConfModel("mtcli.ini").carregar()
-
-section = "DEFAULT"
-symbol = os.getenv("SYMBOL", config[section].get("symbol", fallback="WIN$N"))
-digitos = int(os.getenv("DIGITOS", config[section].getint("digitos", fallback=2)))
-PERIOD = period = os.getenv("PERIOD", config[section].get("period", fallback="D1"))
-BARS = periodos = count = int(
-    os.getenv("COUNT", config[section].getint("count", fallback=999))
-)
-VIEW = view = os.getenv("VIEW", config[section].get("view", fallback="ch"))
-VOLUME = volume = os.getenv("VOLUME", config[section].get("volume", fallback="tick"))
-DATE = date = os.getenv("DATE", config[section].get("date", fallback=""))
-
-lateral = os.getenv("LATERAL", config[section].get("lateral", fallback="doji"))
-alta = os.getenv("ALTA", config[section].get("alta", fallback="verde"))
-baixa = os.getenv("BAIXA", config[section].get("baixa", fallback="vermelho"))
-rompimento_alta = os.getenv(
-    "ROMPIMENTO_ALTA", config[section].get("rompimento_alta", fallback="c")
-)
-rompimento_baixa = os.getenv(
-    "ROMPIMENTO_BAIXA", config[section].get("rompimento_baixa", fallback="v")
-)
-percentual_rompimento = int(
-    os.getenv(
-        "PERCENTUAL_ROMPIMENTO",
-        config[section].getint("percentual_rompimento", fallback=50),
-    )
-)
-percentual_doji = int(
-    os.getenv("PERCENTUAL_DOJI", config[section].getint("percentual_doji", fallback=10))
-)
-up_bar = os.getenv("UP_BAR", config[section].get("up_bar", fallback="asc"))
-down_bar = os.getenv("DOWN_BAR", config[section].get("down_bar", fallback="desc"))
-inside_bar = os.getenv("INSIDE_BAR", config[section].get("inside_bar", fallback="ib"))
-outside_bar = os.getenv(
-    "OUTSIDE_BAR", config[section].get("outside_bar", fallback="ob")
-)
-sombra_superior = os.getenv(
-    "SOMBRA_SUPERIOR", config[section].get("sombra_superior", fallback="top")
-)
-sombra_inferior = os.getenv(
-    "SOMBRA_INFERIOR", config[section].get("sombra_inferior", fallback="bottom")
-)
-data_source = dados = os.getenv("DADOS", config[section].get("dados", fallback="mt5"))
-csv_path = mt5_pasta = os.getenv(
-    "MT5_PASTA", config[section].get("mt5_pasta", fallback="")
-)
-
-
-def get_data_source():
-    from mtcli.data import CsvDataSource, MT5DataSource
-
-    if data_source.lower() == "csv":
-        return CsvDataSource()
-    elif data_source.lower() == "mt5":
-        return MT5DataSource()
-    else:
-        raise ValueError(f"Fonte de dados desconhecida: {data_source}")
-
-
-if not csv_path:
-    conectar()
-    terminal_info = mt5.terminal_info()
-    if terminal_info is None:
-        raise RuntimeError("Não foi possível obter as informações do terminal.")
-
-    csv_path = terminal_info.data_path + "/MQL5/Files"
-    shutdown()
-
-csv_path = csv_path.replace("\\", "/")
-csv_path += "/"
-
-TIMEFRAMES = timeframes = [
-    "mn1",
-    "w1",
-    "d1",
-    "h12",
-    "h8",
-    "h6",
-    "h4",
-    "h3",
-    "h2",
-    "h1",
-    "m30",
-    "m20",
-    "m15",
-    "m12",
-    "m10",
-    "m6",
-    "m5",
-    "m4",
-    "m3",
-    "m2",
-    "m1",
-]
+import os
+
+import MetaTrader5 as mt5
+
+from mtcli.conecta import conectar, shutdown
+from mtcli.models.conf_model import ConfModel
+
+config = ConfModel("mtcli.ini").carregar()
+
+section = "DEFAULT"
+symbol = os.getenv("SYMBOL", config[section].get("symbol", fallback="WIN$N"))
+digitos = int(os.getenv("DIGITOS", config[section].getint("digitos", fallback=2)))
+PERIOD = period = os.getenv("PERIOD", config[section].get("period", fallback="D1"))
+BARS = periodos = count = int(
+    os.getenv("COUNT", config[section].getint("count", fallback=999))
+)
+VIEW = view = os.getenv("VIEW", config[section].get("view", fallback="ch"))
+VOLUME = volume = os.getenv("VOLUME", config[section].get("volume", fallback="tick"))
+DATE = date = os.getenv("DATE", config[section].get("date", fallback=""))
+
+lateral = os.getenv("LATERAL", config[section].get("lateral", fallback="doji"))
+alta = os.getenv("ALTA", config[section].get("alta", fallback="verde"))
+baixa = os.getenv("BAIXA", config[section].get("baixa", fallback="vermelho"))
+rompimento_alta = os.getenv(
+    "ROMPIMENTO_ALTA", config[section].get("rompimento_alta", fallback="c")
+)
+rompimento_baixa = os.getenv(
+    "ROMPIMENTO_BAIXA", config[section].get("rompimento_baixa", fallback="v")
+)
+percentual_rompimento = int(
+    os.getenv(
+        "PERCENTUAL_ROMPIMENTO",
+        config[section].getint("percentual_rompimento", fallback=50),
+    )
+)
+percentual_doji = int(
+    os.getenv("PERCENTUAL_DOJI", config[section].getint("percentual_doji", fallback=10))
+)
+up_bar = os.getenv("UP_BAR", config[section].get("up_bar", fallback="asc"))
+down_bar = os.getenv("DOWN_BAR", config[section].get("down_bar", fallback="desc"))
+inside_bar = os.getenv("INSIDE_BAR", config[section].get("inside_bar", fallback="ib"))
+outside_bar = os.getenv(
+    "OUTSIDE_BAR", config[section].get("outside_bar", fallback="ob")
+)
+sombra_superior = os.getenv(
+    "SOMBRA_SUPERIOR", config[section].get("sombra_superior", fallback="top")
+)
+sombra_inferior = os.getenv(
+    "SOMBRA_INFERIOR", config[section].get("sombra_inferior", fallback="bottom")
+)
+data_source = dados = os.getenv("DADOS", config[section].get("dados", fallback="mt5"))
+csv_path = mt5_pasta = os.getenv(
+    "MT5_PASTA", config[section].get("mt5_pasta", fallback="")
+)
+
+
+def get_data_source():
+    from mtcli.data import CsvDataSource, MT5DataSource
+
+    if data_source.lower() == "csv":
+        return CsvDataSource()
+    elif data_source.lower() == "mt5":
+        return MT5DataSource()
+    else:
+        raise ValueError(f"Fonte de dados desconhecida: {data_source}")
+
+
+if not csv_path:
+    conectar()
+    terminal_info = mt5.terminal_info()
+    if terminal_info is None:
+        raise RuntimeError("Não foi possível obter as informações do terminal.")
+
+    csv_path = terminal_info.data_path + "/MQL5/Files"
+    shutdown()
+
+csv_path = csv_path.replace("\\", "/")
+csv_path += "/"
+
+TIMEFRAMES = timeframes = [
+    "mn1",
+    "w1",
+    "d1",
+    "h12",
+    "h8",
+    "h6",
+    "h4",
+    "h3",
+    "h2",
+    "h1",
+    "m30",
+    "m20",
+    "m15",
+    "m12",
+    "m10",
+    "m6",
+    "m5",
+    "m4",
+    "m3",
+    "m2",
+    "m1",
+]

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/data/mt5.py

@@ -1,7 +1,5 @@
 """Módulo fonte de dados via API do MetaTrader 5."""
 
-from datetime import datetime
-
 import MetaTrader5 as mt5
 
 from mtcli.logger import setup_logger

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/logger.py

@@ -1,45 +1,47 @@
-import logging
-from logging.handlers import RotatingFileHandler
-import os
-
-LOG_DIR = os.path.join(os.path.expanduser("~"), ".mtcli")
-os.makedirs(LOG_DIR, exist_ok=True)
-LOG_FILE = os.path.join(LOG_DIR, "mtcli.log")
-
-
-def setup_logger(name: str = "mtcli") -> logging.Logger:
-    """Configura logger rotativo com saída em arquivo e console.
-
-    - Escreve logs em ~/.mtcli/mtcli.log (máx. 2 MB, 3 backups).
-    - Mostra logs também no console (stdout), capturáveis via pytest/caplog.
-    - Evita duplicar handlers.
-    """
-
-    logger = logging.getLogger(name)
-    logger.setLevel(logging.DEBUG)
-
-    formatter = logging.Formatter(
-        "%(asctime)s | %(levelname)-8s | %(name)s | %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
-    )
-
-    # === File handler rotativo ===
-    if not any(isinstance(h, RotatingFileHandler) for h in logger.handlers):
-        file_handler = RotatingFileHandler(LOG_FILE, maxBytes=2_000_000, backupCount=3)
-        file_handler.setFormatter(formatter)
-        logger.addHandler(file_handler)
-
-    # === Stream handler (console) ===
-    if not any(isinstance(h, logging.StreamHandler) for h in logger.handlers):
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-        logger.addHandler(console_handler)
-
-    # Permite que pytest caplog capture logs
-    logger.propagate = True
-
-    return logger
-
-
-# Inicializa logger padrão
-log = setup_logger()
+import logging
+from logging.handlers import RotatingFileHandler
+import os
+
+
+base_dir = os.getenv("APPDATA", os.path.expanduser("~"))
+LOG_DIR = os.path.join(base_dir, "mtcli", "logs")
+os.makedirs(LOG_DIR, exist_ok=True)
+LOG_FILE = os.path.join(LOG_DIR, "mtcli.log")
+
+
+def setup_logger(name: str = "mtcli") -> logging.Logger:
+    """Configura logger rotativo com saída em arquivo e console.
+
+    - Escreve logs em ~/.mtcli/mtcli.log (máx. 2 MB, 3 backups).
+    - Mostra logs também no console (stdout), capturáveis via pytest/caplog.
+    - Evita duplicar handlers.
+    """
+
+    logger = logging.getLogger(name)
+    logger.setLevel(logging.DEBUG)
+
+    formatter = logging.Formatter(
+        "%(asctime)s | %(levelname)-8s | %(name)s | %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
+
+    # === File handler rotativo ===
+    if not any(isinstance(h, RotatingFileHandler) for h in logger.handlers):
+        file_handler = RotatingFileHandler(LOG_FILE, maxBytes=2_000_000, backupCount=3)
+        file_handler.setFormatter(formatter)
+        logger.addHandler(file_handler)
+
+    # === Stream handler (console) ===
+    if not any(isinstance(h, logging.StreamHandler) for h in logger.handlers):
+        console_handler = logging.StreamHandler()
+        console_handler.setFormatter(formatter)
+        logger.addHandler(console_handler)
+
+    # Permite que pytest caplog capture logs
+    logger.propagate = True
+
+    return logger
+
+
+# Inicializa logger padrão
+log = setup_logger()

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/models/conf_model.py

@@ -1,8 +1,8 @@
 """Modelo de configurações."""
 
-import os
 import configparser
 from configparser import MissingSectionHeaderError
+import os
 
 
 class ConfigFormatError(Exception):
@@ -10,7 +10,6 @@ class ConfigFormatError(Exception):
 
 
 class ConfModel:
-
     def __init__(self, configuracoes):
         self.CONFIG_PATH = os.path.abspath(configuracoes)
 

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/models/signals_model.py

@@ -1,7 +1,5 @@
 """Lê os sinais gráficos nas barras."""
 
-from mtcli import conf
-
 
 class SignalsModel:
     """Lê sinais das barras."""

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/mt5_context.py

@@ -4,8 +4,9 @@ Fornece o contexto 'mt5_conexao' para uso seguro em blocos with.
 """
 
 from contextlib import contextmanager
-from mtcli.logger import setup_logger
+
 from mtcli.conecta import conectar, shutdown
+from mtcli.logger import setup_logger
 
 log = setup_logger()
 

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/plugins/media_movel/models/model_media_movel.py

@@ -1,25 +1,22 @@
-"""Modulo da classe model da media movel."""
-
-from .. import conf
-
-
-class MediaMovelModel:
-
-    def __init__(self, closes, periodos=14):
-        self.closes = [float(c) for c in closes]
-        self.periodos = periodos
-
-    def calcula_sma(self):
-        return [
-            sum(self.closes[i - self.periodos + 1 : i + 1]) / self.periodos
-            for i in range(self.periodos - 1, len(self.closes))
-        ]
-
-    def calcula_ema(self):
-        ema = []
-        k = 2 / (self.periodos + 1)
-        sma = sum(self.closes[: self.periodos]) / self.periodos
-        ema.append(sma)
-        for price in self.closes[self.periodos :]:
-            ema.append(price * k + ema[-1] * (1 - k))
-        return ema
+"""Modulo da classe model da media movel."""
+
+
+class MediaMovelModel:
+    def __init__(self, closes, periodos=14):
+        self.closes = [float(c) for c in closes]
+        self.periodos = periodos
+
+    def calcula_sma(self):
+        return [
+            sum(self.closes[i - self.periodos + 1 : i + 1]) / self.periodos
+            for i in range(self.periodos - 1, len(self.closes))
+        ]
+
+    def calcula_ema(self):
+        ema = []
+        k = 2 / (self.periodos + 1)
+        sma = sum(self.closes[: self.periodos]) / self.periodos
+        ema.append(sma)
+        for price in self.closes[self.periodos :]:
+            ema.append(price * k + ema[-1] * (1 - k))
+        return ema

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/plugins/range_medio/command.py

@@ -3,6 +3,7 @@
 import click
 
 from mtcli.models.rates_model import RatesModel
+
 from . import conf
 from .models.average_range_model import AverageRangeModel
 

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/close_view.py

@@ -31,7 +31,7 @@ class CloseView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = f"{prefixo}" f"{bar.close:.{conf.digitos}f}" f"{sufixo}"
+            linha = f"{prefixo}{bar.close:.{conf.digitos}f}{sufixo}"
             views.append(linha)
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/high_view.py

@@ -31,7 +31,7 @@ class HighView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = f"{prefixo}" f"{bar.high:.{conf.digitos}f}" f"{sufixo}"
+            linha = f"{prefixo}{bar.high:.{conf.digitos}f}{sufixo}"
             views.append(linha)
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/low_view.py

@@ -31,7 +31,7 @@ class LowView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = f"{prefixo}" f"{bar.low:.{conf.digitos}f}" f"{sufixo}"
+            linha = f"{prefixo}{bar.low:.{conf.digitos}f}{sufixo}"
             views.append(linha)
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/open_view.py

@@ -31,7 +31,7 @@ class OpenView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = f"{prefixo}" f"{bar.open:.{conf.digitos}f}" f"{sufixo}"
+            linha = f"{prefixo}{bar.open:.{conf.digitos}f}{sufixo}"
             views.append(linha)
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/ranges_view.py

@@ -34,9 +34,7 @@ class RangesView:
                 sufixo = f" {data}"
 
             linha = (
-                f"{prefixo}{sequencia} "
-                f"{bar.trend} {bar.range:.{conf.digitos}f}"
-                f"{sufixo}"
+                f"{prefixo}{sequencia} {bar.trend} {bar.range:.{conf.digitos}f}{sufixo}"
             )
             views.append(linha.upper())
 

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/vars_view.py

@@ -1,6 +1,5 @@
 """Módulo da classe da view de variações percentuais."""
 
-from mtcli import conf
 from mtcli.models.chart_model import ChartModel
 
 
@@ -41,13 +40,7 @@ class VarsView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = (
-                f"{prefixo}"
-                f"{var_max:.2f}% "
-                f"{var_min:.2f}% "
-                f"{var_fech:.2f}%"
-                f"{sufixo}"
-            )
+            linha = f"{prefixo}{var_max:.2f}% {var_min:.2f}% {var_fech:.2f}%{sufixo}"
             views.append(linha.upper())
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/mtcli/views/volumes_view.py

@@ -1,6 +1,5 @@
 """Módulo da classe da view de volumes."""
 
-from mtcli import conf
 from mtcli.models.chart_model import ChartModel
 
 
@@ -46,7 +45,7 @@ class VolumesView:
                 data = bar.date if self.period in {"d1", "w1", "mn1"} else bar.time
                 sufixo = f" {data}"
 
-            linha = f"{prefixo}{sequencia} {sequencia_volume} {volume}" f"{sufixo}"
+            linha = f"{prefixo}{sequencia} {sequencia_volume} {volume}{sufixo}"
             views.append(linha.upper())
 
         return views

{mtcli-3.2.1 → mtcli-3.3.0.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mtcli"
-version = "3.2.1"
+version = "3.3.0.dev0"
 description = "Aplicativo CLI para exibir gráficos do MetaTrader 5 em texto acessível ao leitor de telas"
 authors = [
     {name = "Valmir França da Silva",email = "vfranca3@gmail.com"}
@@ -58,7 +58,32 @@ pymdown-extensions = "^10.16.1"
 pytest = "^8.4.2"
 pytest-env = "^1.1.5"
 pytest-cov = "^6.3.0"
-black = "^25.1.0"
-isort = "^6.0.1"
 pydocstyle = "^6.3.0"
+ruff = "^0.14.1"
+pytest-mock = "^3.15.1"
 
+[tool.ruff]
+line-length = 88
+target-version = "py311"
+
+[tool.ruff.lint]
+select = [
+  "E",    # Estilo
+  "F",    # Lógica
+  "B",    # Boas práticas
+  "I",    # Imports
+  "UP",   # Upgrade
+  "N",    # Naming
+]
+ignore = ["E501"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["mtcli"]
+combine-as-imports = true
+force-sort-within-sections = true
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+line-ending = "auto"
+skip-magic-trailing-comma = false

mtcli-3.2.1/mtcli/plugins/agressao/__init__.py

@@ -1,4 +0,0 @@
-from . import command, conf
-from .command import sa
-from .models import model_agressao
-from .views import view_agressao

mtcli-3.2.1/mtcli/plugins/agressao/command.py

@@ -1,45 +0,0 @@
-"""Exibe o saldo agressor."""
-
-import click
-
-from mtcli.models import model_bars, model_rates
-
-from . import conf
-from .models import model_agressao
-from .views import view_agressao
-
-
-@click.command()
-@click.argument("symbol")
-@click.option(
-    "--period",
-    "-p",
-    type=click.Choice(conf.timeframes, case_sensitive=False),
-    default="d1",
-    help="Tempo grafico, default D1.",
-)
-@click.option(
-    "--count", "-c", type=int, default=20, help="Quantidade de barras, default 20."
-)
-@click.option(
-    "--volume",
-    "-vo",
-    type=click.Choice(["tick", "real"], case_sensitive=False),
-    default="tick",
-    help="Tipo de volume, default tick.",
-)
-def sa(symbol, period, count, volume):
-    """Exibe o saldo da agressão."""
-    period = period.lower()
-    rates = model_rates.RatesModel(symbol, period)
-    rates = rates.lista
-    bars = model_bars.BarsModel(rates)
-    bars = bars.lista
-    agressao = model_agressao.AgressaoModel(bars, volume, count)
-    saldo_agressao = agressao.get_saldo()
-    view = view_agressao.AgressaoView(saldo_agressao)
-    click.echo(view.view())
-
-
-if __name__ == "__main__":
-    sa()

mtcli-3.2.1/mtcli/plugins/agressao/models/__init__.py

@@ -1 +0,0 @@
-from . import model_agressao

mtcli-3.2.1/mtcli/plugins/agressao/models/model_agressao.py

@@ -1,39 +0,0 @@
-"""Módulo da classe model para saldo da agressão."""
-
-from mtcli import conf
-
-
-class AgressaoModel:
-    """Classe model do saldo da agressao."""
-
-    def __init__(self, bars, type="tick", count=5):
-        """Construtor do saldo da agressão."""
-        self.bars = bars[-count:]
-        self.type = type
-        self.count = count
-        self.volume_comprador = self.__get_volume_comprador()
-        self.volume_vendedor = self.__get_volume_vendedor()
-
-    def __get_volume_comprador(self):
-        """Obtem o volume comprador."""
-        volume = 0
-        for bar in self.bars:
-            if (bar.trend == conf.alta and bar.body > 50) or bar.bottom > 50:
-                volume += bar.volume if self.type == "tick" else bar.volume_real
-        return volume
-
-    def __get_volume_vendedor(self):
-        """Obtem o volume vendedor."""
-        volume = 0
-        for bar in self.bars:
-            if (bar.trend == conf.baixa and bar.body > 50) or bar.top > 50:
-                volume += bar.volume if self.type == "tick" else bar.volume_real
-        return volume
-
-    def get_saldo(self):
-        """Calcula o saldo da agressão."""
-        return (
-            self.volume_comprador,
-            self.volume_vendedor,
-            self.volume_comprador - self.volume_vendedor,
-        )

mtcli-3.2.1/mtcli/plugins/agressao/views/__init__.py

@@ -1 +0,0 @@
-from . import view_agressao

mtcli-3.2.1/mtcli/plugins/agressao/views/view_agressao.py

@@ -1,15 +0,0 @@
-"""Módulo da classe da view saldo da agressão."""
-
-from mtcli import conf
-
-
-class AgressaoView:
-    """Classe da view do saldo da agressao."""
-
-    def __init__(self, saldo_agressao):
-        """Construtor da view saldo da agressao."""
-        self.agressao = saldo_agressao
-
-    def view(self):
-        """View do saldo da agressão."""
-        return "%i %i %i" % (self.agressao[0], self.agressao[1], self.agressao[2])

mtcli-3.2.1/mtcli/plugins/volume_medio/conf.py

@@ -1 +0,0 @@
-from mtcli.conf import *