mtcli 3.2.0.dev0__tar.gz → 3.2.0.dev2__tar.gz

{mtcli-3.2.0.dev0 → mtcli-3.2.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mtcli
-Version: 3.2.0.dev0
+Version: 3.2.0.dev2
 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.0.dev0 → mtcli-3.2.0.dev2}/mtcli/commands/bars.py

@@ -1,126 +1,118 @@
-"""Exibe o gráfico de barras."""
-
-import click
-
-from mtcli import conf
-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.logger import setup_logger
-
-
-logger = setup_logger("mtcli")  # Cria o logger
-
-
-@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=conf.view,
-    help="Formato de exibicao, default m. Opcoes: ch ou m - 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(conf.timeframes, case_sensitive=False),
-    default=conf.period,
-    help="Tempo grafico, default D1.",
-)
-@click.option(
-    "--count",
-    "-c",
-    type=int,
-    default=conf.periodos,
-    help="Quantidade de barras, default 20.",
-)
-@click.option(
-    "--date", "-d", default=conf.date, help="Data para intraday, formato AAAA-MM-DD."
-)
-@click.option("--numerator", "-n", is_flag=True, help="Ativa a numeracao das barras.")
-@click.option("--show-date", "-sd", is_flag=True, help="Ativa a datacao das barras.")
-@click.option(
-    "--volume",
-    "-vo",
-    type=click.Choice(["tick", "real"], case_sensitive=False),
-    default=conf.volume,
-    help="Tipo de volume, default tick.",
-)
-def bars(symbol, view, period, count, date, numerator, show_date, volume):
-    """Exibe o grafico do MetaTrader 5."""
-    period = period.lower()
-    view = view.lower()
-    logger.info(
-        f"Iniciando exibição do gráfico MT5: {symbol} view {view} no {period} data {date} numerador {numerator} data {show_date} volume {volume}."
-    )
-    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)
-    logger.info("Exibição do gráfico MT5 finalizada.")
-
-
-if __name__ == "__main__":
-    bars()
+"""Exibe o gráfico de barras."""
+
+import click
+
+from mtcli import conf
+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
+
+
+@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=conf.view,
+    help="Formato de exibicao, default m. Opcoes: ch ou m - 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(conf.timeframes, case_sensitive=False),
+    default=conf.period,
+    help="Tempo grafico, default D1.",
+)
+@click.option(
+    "--count",
+    "-c",
+    type=int,
+    default=conf.periodos,
+    help="Quantidade de barras, default 20.",
+)
+@click.option(
+    "--date", "-d", default=conf.date, help="Data para intraday, formato AAAA-MM-DD."
+)
+@click.option("--numerator", "-n", is_flag=True, help="Ativa a numeracao das barras.")
+@click.option("--show-date", "-sd", is_flag=True, help="Ativa a datacao das barras.")
+@click.option(
+    "--volume",
+    "-vo",
+    type=click.Choice(["tick", "real"], case_sensitive=False),
+    default=conf.volume,
+    help="Tipo de volume, default tick.",
+)
+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.0.dev2/mtcli/conecta.py

@@ -0,0 +1,41 @@
+"""
+Gerencia a conexão direta com o terminal MetaTrader 5.
+Usado internamente pelo contexto mt5_conexao().
+"""
+
+import MetaTrader5 as mt5
+from mtcli.logger import setup_logger
+
+log = setup_logger()
+
+
+def conectar() -> bool:
+    """
+    Inicializa a conexão com o MetaTrader 5.
+
+    Retorna:
+        bool: True se conectado com sucesso, False caso contrário.
+
+    Levanta:
+        ConnectionError: se a inicialização do MT5 falhar.
+    """
+    log.debug("Tentando inicializar conexao com MetaTrader 5...")
+
+    if not mt5.initialize():
+        erro = mt5.last_error()
+        log.error(f"Erro ao conectar ao MetaTrader 5: {erro}")
+        raise ConnectionError(f"Falha ao conectar ao MetaTrader 5: {erro}")
+
+    log.info("Conexao com MetaTrader 5 estabelecida com sucesso.")
+    return True
+
+
+def shutdown():
+    """
+    Encerra a conexão com o MetaTrader 5 de forma segura.
+    """
+    try:
+        mt5.shutdown()
+        log.debug("Conexao com MetaTrader 5 encerrada.")
+    except Exception as e:
+        log.error(f"Erro ao encerrar conexao com MetaTrader 5: {e}")

{mtcli-3.2.0.dev0 → mtcli-3.2.0.dev2}/mtcli/data/mt5.py

@@ -5,11 +5,11 @@ from datetime import datetime
 import MetaTrader5 as mt5
 
 from mtcli.logger import setup_logger
-from mtcli.conecta import conectar, shutdown
+from mtcli.mt5_context import mt5_conexao
 
 from .base import DataSourceBase
 
-logger = setup_logger()
+log = setup_logger()
 
 
 class MT5DataSource(DataSourceBase):
@@ -18,8 +18,8 @@ class MT5DataSource(DataSourceBase):
     def get_data(self, symbol, period, count=100):
         """Retorna uma lista de lista de cotações do MetaTrader."""
         period = period.upper()
-        logger.info(
-            f"Iniciando coleta de dados via API MT5: {symbol} no período {period}."
+        log.info(
+            f"Iniciando coleta de dados via API MT5: {symbol} no timeframe {period}"
         )
         tf_map = {
             "M1": mt5.TIMEFRAME_M1,
@@ -46,12 +46,9 @@ class MT5DataSource(DataSourceBase):
         }
 
         if period.upper() not in tf_map:
-            logger.error(f"Timeframe inválido: {period}.")
+            log.error(f"Timeframe inválido: {period}.")
             raise ValueError(f"Timeframe '{period}' inválido.")
 
-        conectar()
-
-        # Verifica corretoras B3 e aplica tratamento a symbol
         corretoras_b3 = [
             "clear",
             "xp",
@@ -61,21 +58,22 @@ class MT5DataSource(DataSourceBase):
             "btg",
             "toro",
         ]
-        for corretora in corretoras_b3:
-            symbol = (
-                symbol.upper()
-                if corretora in mt5.account_info().company.lower()
-                else symbol
+
+        with mt5_conexao():
+            for corretora in corretoras_b3:
+                symbol = (
+                    symbol.upper()
+                    if corretora in mt5.account_info().company.lower()
+                    else symbol
+                )
+            log.info(
+                f"Finalizada verificacao da corretora para tratar symbol: {symbol}."
             )
-        logger.info(
-            f"Finalizada verificação da corretora para tratar symbol: {symbol}."
-        )
 
-        rates = mt5.copy_rates_from_pos(symbol, tf_map[period], 0, count)
-        shutdown()
+            rates = mt5.copy_rates_from_pos(symbol, tf_map[period], 0, count)
 
         if rates is None:
-            logger.warning("Nenum dado retornado da API MT5.")
+            log.warning("Nenum dado retornado da API MT5.")
             raise ValueError("Nenhum dado retornado da API MT5.")
 
         result = []
@@ -95,5 +93,5 @@ class MT5DataSource(DataSourceBase):
                 ]
             )
 
-        logger.info("Coleta de dados via API MT5 finalizada.")
+        log.info("Coleta de dados via API MT5 finalizada.")
         return result

{mtcli-3.2.0.dev0 → mtcli-3.2.0.dev2}/mtcli/mt5_context.py

@@ -19,7 +19,7 @@ def mt5_conexao():
     - Loga falhas e garante fechamento seguro.
     """
     try:
-        log.debug("Inicializando conexão com MetaTrader 5...")
+        log.debug("Inicializando conexao com MetaTrader 5...")
         conectar()
         yield
     except Exception as e:
@@ -28,6 +28,6 @@ def mt5_conexao():
     finally:
         try:
             shutdown()
-            log.debug("Conexão com MetaTrader 5 encerrada.")
+            log.debug("Conexao com MetaTrader 5 encerrada.")
         except Exception as e:
-            log.error(f"Erro ao encerrar conexão MT5: {e}")
+            log.error(f"Erro ao encerrar conexao MT5: {e}")

{mtcli-3.2.0.dev0 → mtcli-3.2.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mtcli"
-version = "3.2.0-dev0"
+version = "3.2.0-dev2"
 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"}

mtcli-3.2.0.dev0/mtcli/conecta.py

@@ -1,18 +0,0 @@
-"""Módulo de conexão com o MetaTrader 5."""
-
-import MetaTrader5 as mt5
-from mtcli.logger import setup_logger
-
-logger = setup_logger()
-
-
-def conectar():
-    if not mt5.initialize():
-        click.echo(f"❌ Erro ao conectar ao MT5: {mt5.last_error()}")
-        logger.error(f"Erro ao conectar ao MT5: {mt5.last_error()}")
-        exit()
-    return True
-
-
-def shutdown():
-    mt5.shutdown()