From b200edfbe6ffc76431187824a17610e9804f3239 Mon Sep 17 00:00:00 2001
From: Colin Delahunty <72827203+colin99d@users.noreply.github.com>
Date: Sat, 12 Mar 2022 16:32:34 -0500
Subject: [PATCH] Improve Dupont and Fraud Commands (#1477)

* Added charting and export

* Fixed issue

* Fixed import error
---
 .../stocks/fundamental_analysis/av_view.py    | 51 +++++++++++++++++--
 .../fundamental_analysis/fa_controller.py     | 11 +++-
 .../fundamental_analysis/dupont/_index.md     |  1 +
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/gamestonk_terminal/stocks/fundamental_analysis/av_view.py b/gamestonk_terminal/stocks/fundamental_analysis/av_view.py
index 28fc6b91f9e..847406b5d17 100644
--- a/gamestonk_terminal/stocks/fundamental_analysis/av_view.py
+++ b/gamestonk_terminal/stocks/fundamental_analysis/av_view.py
@@ -3,9 +3,17 @@ __docformat__ = "numpy"
 
 import logging
 import os
+from typing import List, Optional
 
+from matplotlib import pyplot as plt
+from gamestonk_terminal.config_terminal import theme
+from gamestonk_terminal.config_plot import PLOT_DPI
 from gamestonk_terminal.decorators import check_api_key, log_start_end
-from gamestonk_terminal.helper_funcs import export_data, print_rich_table
+from gamestonk_terminal.helper_funcs import (
+    export_data,
+    print_rich_table,
+    plot_autoscale,
+)
 from gamestonk_terminal.rich_config import console
 from gamestonk_terminal.stocks.fundamental_analysis import av_model
 
@@ -199,12 +207,14 @@ def display_earnings(
 
 @log_start_end(log=logger)
 @check_api_key(["API_KEY_ALPHAVANTAGE"])
-def display_fraud(ticker: str, help_text: bool = False):
+def display_fraud(ticker: str, export: str = "", help_text: bool = False):
     """Fraud indicators for given ticker
     Parameters
     ----------
     ticker : str
         Fundamental analysis ticker symbol
+    export : str
+        Whether to export the dupont breakdown
     help_text : bool
         Whether to show help text
     """
@@ -231,22 +241,55 @@ A mckee less than 0.5 indicates a high risk of fraud.
 
     if help_text:
         console.print(help_message)
+    export_data(export, os.path.dirname(os.path.abspath(__file__)), "dupont", df)
 
 
 @log_start_end(log=logger)
 @check_api_key(["API_KEY_ALPHAVANTAGE"])
-def display_dupont(ticker: str):
+def display_dupont(
+    ticker: str,
+    raw: bool = False,
+    export: str = "",
+    external_axes: Optional[List[plt.Axes]] = None,
+):
     """Shows the extended dupont ratio
 
     Parameters
     ----------
     ticker : str
         Fundamental analysis ticker symbol
+    raw : str
+        Show raw data instead of a graph
+    export : bool
+        Whether to export the dupont breakdown
+    external_axes : Optional[List[plt.Axes]], optional
+        External axes (1 axis is expected in the list), by default None
     """
     df = av_model.get_dupont(ticker)
     if df.empty:
         console.print("[red]Invalid response from AlphaVantage[/red]\n")
-    else:
+        return
+    if raw:
         print_rich_table(
             df, headers=list(df.columns), show_index=True, title="Extended Dupont"
         )
+        return
+    if not external_axes:
+        _, ax = plt.subplots(figsize=plot_autoscale(), dpi=PLOT_DPI)
+    else:
+        if len(external_axes) != 1:
+            logger.error("Expected list of one axis item.")
+            console.print("[red]Expected list of one axis item./n[/red]")
+            return
+        (ax,) = external_axes
+
+    colors = theme.get_colors()
+    df.transpose().plot(kind="line", ax=ax, color=colors)
+    ax.set_title("Extended Dupont by Year")
+    theme.style_primary_axis(ax)
+
+    if not external_axes:
+        theme.visualize_output()
+
+    console.print("")
+    export_data(export, os.path.dirname(os.path.abspath(__file__)), "dupont", df)
diff --git a/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py b/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py
index 77d764c5e75..6dba561560f 100644
--- a/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py
+++ b/gamestonk_terminal/stocks/fundamental_analysis/fa_controller.py
@@ -752,11 +752,20 @@ Ticker: [/param] {self.ticker} [cmds]
             prog="dupont",
             description="The extended dupont deconstructs return on equity to allow investors to understand it better",
         )
+        parser.add_argument(
+            "--raw",
+            action="store_true",
+            default=False,
+            dest="raw",
+            help="Print raw data.",
+        )
         ns_parser = parse_known_args_and_warn(
             parser, other_args, EXPORT_ONLY_RAW_DATA_ALLOWED
         )
         if ns_parser:
-            av_view.display_dupont(self.ticker)
+            av_view.display_dupont(
+                self.ticker, raw=ns_parser.raw, export=ns_parser.export
+            )
 
     @log_start_end(log=logger)
     def call_dcf(self, other_args: List[str]):
diff --git a/website/content/terminal/stocks/fundamental_analysis/dupont/_index.md b/website/content/terminal/stocks/fundamental_analysis/dupont/_index.md
index dc72cb1b273..25260866ebe 100644
--- a/website/content/terminal/stocks/fundamental_analysis/dupont/_index.md
+++ b/website/content/terminal/stocks/fundamental_analysis/dupont/_index.md
@@ -6,5 +6,6 @@ The dupont ratio is a breakdown of the various components of return on equity. T
 ```
 optional arguments:
   -h, --help            show this help message
+  --raw                 show raw data instead of a graph
   --export {csv,json,xlsx}
                         Export raw data into csv, json, xlsx