mtcli 2.6.0__tar.gz → 2.7.0.dev0__tar.gz

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mtcli
-Version: 2.6.0
+Version: 2.7.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-2.6.0 → mtcli-2.7.0.dev0}/mtcli/__init__.py

@@ -1 +1 @@
-"""Aplicativo de linha de comando para exibir graficos do MetaTrader 5 em texto."""
+"""Aplicativo de linha de comando para exibir graficos do MetaTrader 5 em texto."""

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/commands/bars.py

@@ -3,7 +3,8 @@
 import click
 
 from mtcli import conf
-from mtcli.models import model_bars, model_rates
+from mtcli.models.rates_model import RatesModel
+from mtcli.models.bars_model import BarsModel
 from mtcli.views import (
     view_close,
     view_full,
@@ -21,7 +22,10 @@ from mtcli.logger import setup_logger
 logger = setup_logger("mtcli")  # Cria o logger
 
 
-@click.command()
+@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",
@@ -88,8 +92,8 @@ def bars(symbol, view, period, count, date, numerator, show_date, volume):
     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 = model_rates.RatesModel(symbol, period, count).lista
-    bars = model_bars.BarsModel(rates, date).lista
+    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 = view_min.MinView(

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/commands/conf.py

@@ -7,7 +7,10 @@ from mtcli.conecta import conectar, shutdown
 from mtcli.models.model_conf import ConfModel
 
 
-@click.command()
+@click.command(
+    "conf",
+    help="Gerencia as configurações salvas no arquivo mtcli.ini (adicionar, editar, listar).",
+)
 @click.option("--list", "list_", is_flag=True, help="Lista todas as configurações.")
 @click.option("--set", "set_", nargs=2, help="Define o valor de uma configuração.")
 @click.option("--get", help="Exibe o valor de uma configuração.")

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/commands/logs.py

@@ -5,7 +5,7 @@ import click
 from mtcli.logger import setup_logger
 
 
-@click.command("logs")
+@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.")

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/conf.py

@@ -1,104 +1,104 @@
-"""Gerencia configurações registradas no mtcli.ini."""
-
-import os
-import click
-import MetaTrader5 as mt5
-from mtcli.conecta import conectar, shutdown
-from mtcli.models.model_conf 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 = os.getenv("PERIOD", config[section].get("period", fallback="D1"))
-periodos = count = int(
-    os.getenv("COUNT", config[section].getint("count", fallback=999))
-)
-view = os.getenv("VIEW", config[section].get("view", fallback="ch"))
-volume = os.getenv("VOLUME", config[section].get("volume", fallback="tick"))
-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 = [
-    "mn1",
-    "w1",
-    "d1",
-    "h12",
-    "h8",
-    "h6",
-    "h4",
-    "h3",
-    "h2",
-    "h1",
-    "m30",
-    "m20",
-    "m15",
-    "m12",
-    "m10",
-    "m6",
-    "m5",
-    "m4",
-    "m3",
-    "m2",
-    "m1",
-]
+"""Gerencia configurações registradas no mtcli.ini."""
+
+import os
+import click
+import MetaTrader5 as mt5
+from mtcli.conecta import conectar, shutdown
+from mtcli.models.model_conf 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 = os.getenv("PERIOD", config[section].get("period", fallback="D1"))
+periodos = count = int(
+    os.getenv("COUNT", config[section].getint("count", fallback=999))
+)
+view = os.getenv("VIEW", config[section].get("view", fallback="ch"))
+volume = os.getenv("VOLUME", config[section].get("volume", fallback="tick"))
+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 = [
+    "mn1",
+    "w1",
+    "d1",
+    "h12",
+    "h8",
+    "h6",
+    "h4",
+    "h3",
+    "h2",
+    "h1",
+    "m30",
+    "m20",
+    "m15",
+    "m12",
+    "m10",
+    "m6",
+    "m5",
+    "m4",
+    "m3",
+    "m2",
+    "m1",
+]

mtcli-2.6.0/mtcli/models/model_bars.py → mtcli-2.7.0.dev0/mtcli/models/bars_model.py

@@ -1,6 +1,6 @@
 """Módulo da classe model da lista de barras."""
 
-from mtcli.models import model_bar
+from mtcli.models.bar_model import BarModel
 
 
 class BarsModel:
@@ -10,13 +10,13 @@ class BarsModel:
         """Model da lista de barras."""
         self.rates = rates
         self.date = date
-        self.lista = self.__lista()
+        # self.lista = self.__lista()
 
-    def __lista(self):
+    def get_bars(self):
         """Gera a lista das barras."""
         lista = []
         for rate in self.rates:
-            bar = model_bar.BarModel(rate)
+            bar = BarModel(rate)
             if (
                 self.date and str(bar.date) != self.date
             ):  # filtra por data para intraday

mtcli-2.6.0/mtcli/models/model_rates.py → mtcli-2.7.0.dev0/mtcli/models/rates_model.py

@@ -17,9 +17,8 @@ class RatesModel:
         self.end = end
         self.limit = limit
         self.source = conf.get_data_source()
-        self.lista = self.__get_data()
 
-    def __get_data(self):
+    def get_data(self):
         """Obtém a lista das cotações com filtros opcionais."""
         data = self.source.get_data(self.symbol, self.period, self.count)
 

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/mt.py

@@ -8,7 +8,7 @@ except ImportError:
     from importlib_metadata import entry_points  # Para Python < 3.8
 
 
-@click.group()
+@click.group(context_settings={"max_content_width": 120})
 @click.version_option(package_name="mtcli")
 def mt():
     """Exibe o grafico do MetaTrader 5 em texto."""

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugin.py

@@ -1,9 +1,9 @@
-from mtcli.commands.bars import bars
-from mtcli.commands.conf import conf
-from mtcli.commands.logs import logs
-
-
-def register(cli):
-    cli.add_command(bars)
-    cli.add_command(conf)
-    cli.add_command(logs)
+from mtcli.commands.bars import bars
+from mtcli.commands.conf import conf
+from mtcli.commands.logs import logs
+
+
+def register(cli):
+    cli.add_command(bars)
+    cli.add_command(conf)
+    cli.add_command(logs)

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugins/media_movel/command.py

@@ -5,7 +5,7 @@ from datetime import datetime
 import click
 
 from mtcli.logger import setup_logger
-from mtcli.models.model_rates import RatesModel
+from mtcli.models.rates_model import RatesModel
 
 from . import conf
 from .models.model_media_movel import MediaMovelModel
@@ -13,7 +13,9 @@ from .models.model_media_movel import MediaMovelModel
 logger = setup_logger()
 
 
-@click.command()
+@click.command(
+    "mm", help="Calcula a média móvel (SMA ou EMA) para o ativo e período especificado."
+)
 @click.argument("symbol")
 @click.option(
     "--period",
@@ -56,7 +58,7 @@ def mm(symbol, period, periodos, tipo, limit, inicio, fim):
         f"Iniciando cálculo da média móvel: ativo {symbol} período {period} períodos {periodos} tipo {tipo} limite {limit}"
     )
 
-    rates = RatesModel(symbol, period).lista
+    rates = RatesModel(symbol, period).get_data()
     closes = [r[4] for r in rates]
     datas = [r[0] for r in rates]
 

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugins/range_medio/__init__.py

@@ -1,3 +1,2 @@
 from . import command, conf
 from .command import rm
-from .models import model_average_range

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugins/range_medio/command.py

@@ -2,13 +2,14 @@
 
 import click
 
-from mtcli.models import model_rates
-
+from mtcli.models.rates_model import RatesModel
 from . import conf
-from .models import model_average_range
+from .models.average_range_model import AverageRangeModel
 
 
-@click.command()
+@click.command(
+    "rm", help="Calcula o range médio de preços do ativo em um determinado período."
+)
 @click.argument("symbol")
 @click.option(
     "--period",
@@ -22,9 +23,8 @@ from .models import model_average_range
 )
 def rm(symbol, period, periodos):
     """Calcula o range medio do ativo symbol."""
-    rates = model_rates.RatesModel(symbol, period).lista
-    rm = model_average_range.AverageRangeModel(rates, periodos)
-    rm = rm.average()
+    rates = RatesModel(symbol, period).get_data()
+    rm = AverageRangeModel(rates, periodos).average()
     click.echo(rm)
 
 

mtcli-2.6.0/mtcli/plugins/range_medio/models/model_average_range.py → mtcli-2.7.0.dev0/mtcli/plugins/range_medio/models/average_range_model.py

@@ -1,7 +1,7 @@
 """Módulo da classe model para range médio."""
 
 from mtcli import conf
-from mtcli.models import model_bar
+from mtcli.models.bar_model import BarModel
 
 
 class AverageRangeModel:
@@ -11,15 +11,13 @@ class AverageRangeModel:
         """Model do range médio."""
         self.rates = rates
         self.count = count
-        self.list = self.__list()
+        self.ranges = self.get_ranges()
 
-    #         self.ar = self.__ar()
-
-    def __list(self):
+    def get_ranges(self):
         """Lista de ranges."""
         lista = []
         for rate in self.rates:
-            bar = model_bar.BarModel(rate)
+            bar = BarModel(rate)
             if bar.open == bar.high and bar.high == bar.low and bar.low == bar.close:
                 continue  # elimina doji de 4 preços
             lista.append(bar.high - bar.low)
@@ -27,5 +25,5 @@ class AverageRangeModel:
 
     def average(self):
         """Calcula o range médio."""
-        ranges = self.list[-self.count :]
+        ranges = self.ranges[-self.count :]
         return round(sum(ranges) / len(ranges), conf.digitos)

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugins/volume_medio/command.py

@@ -2,13 +2,16 @@
 
 import click
 
-from mtcli.models import model_rates
+from mtcli.models.rates_model import RatesModel
 
 from . import conf
 from .models import model_average_volume
 
 
-@click.command()
+@click.command(
+    "vm",
+    help="Calcula o volume médio (em ticks ou financeiro) do ativo em determinado período.",
+)
 @click.argument("symbol")
 @click.option(
     "--period",
@@ -29,7 +32,7 @@ from .models import model_average_volume
 )
 def vm(symbol, period, periodos, tipo):
     """Calcula o volume médio (tick ou real) do ativo symbol."""
-    rates = model_rates.RatesModel(symbol, period).lista
+    rates = RatesModel(symbol, period).get_data()
     vm = model_average_volume.AverageVolumeModel(rates, periodos, tipo)
     vm = vm.average()
     click.echo(vm)

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/mtcli/plugins/volume_medio/models/model_average_volume.py

@@ -1,7 +1,7 @@
 """Módulo da classe model para volume médio."""
 
 from mtcli import conf
-from mtcli.models import model_bar
+from mtcli.models.bar_model import BarModel
 
 
 class AverageVolumeModel:
@@ -12,13 +12,13 @@ class AverageVolumeModel:
         self.rates = rates
         self.count = count
         self.type = type
-        self.list = self.__list()
+        self.volumes = self.__get_volumes()
 
-    def __list(self):
+    def __get_volumes(self):
         """Lista dos volumes."""
         list = []
         for rate in self.rates:
-            bar = model_bar.BarModel(rate)
+            bar = BarModel(rate)
             if self.type == "tick":
                 list.append(bar.volume)
             if self.type == "real":
@@ -27,5 +27,5 @@ class AverageVolumeModel:
 
     def average(self):
         """Calcula o volume médio."""
-        volumes = self.list[-self.count :]
+        volumes = self.volumes[-self.count :]
         return round(sum(volumes) / len(volumes), conf.digitos)

{mtcli-2.6.0 → mtcli-2.7.0.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mtcli"
-version = "2.6.0"
+version = "2.7.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"}

mtcli-2.6.0/mtcli/plugins/range_medio/models/__init__.py

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