quantmod 0.0.6__tar.gz → 0.0.7__tar.gz

{quantmod-0.0.6 → quantmod-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: quantmod
-Version: 0.0.6
+Version: 0.0.7
 Summary: Quantmod Python Package
 Home-page: https://kannansingaravelu.com/
 Author: Kannan Singaravelu
@@ -21,14 +21,16 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: joblib
 Requires-Dist: matplotlib
+Requires-Dist: nbformat>=5.10.4
 Requires-Dist: numpy>=2.0.2
 Requires-Dist: pandas>=2.2.2
+Requires-Dist: plotly>=6.1.2
 Requires-Dist: pydantic>=2.8.2
 Requires-Dist: scipy>=1.13.1
 Requires-Dist: sqlalchemy>=2.0.38
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: urllib3==1.26.15
-Requires-Dist: yfinance>=0.2.43
+Requires-Dist: yfinance==0.2.58
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod/__init__.py

@@ -28,6 +28,7 @@ from quantmod import derivatives, indicators, markets, models, timeseries, datas
 
 __all__ = [
     "hello",
+    "charts",
     "derivatives",
     "indicators",
     "markets",

{quantmod-0.0.6/quantmod/datasets/data → quantmod-0.0.7/quantmod/charts}/__init__.py

@@ -14,4 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+#
+
+# Import plotlytools to enable the monkey-patching of pandas objects
+from . import plotting

quantmod-0.0.7/quantmod/charts/plotting.py

@@ -0,0 +1,463 @@
+"""
+quantmod.charts.plotting
+
+Interactive Plotting Utilities for Quantmod
+
+Usage Notes:
+- In **Jupyter notebooks**, interactive plots display inline automatically when you call `df.iplot(...)`.
+- In **Python scripts**, interactive plots open in your default web browser. For best results, set:
+    import plotly.io as pio
+    pio.renderers.default = "browser"
+    fig = df.iplot(...)
+    fig.show()
+- In **headless environments** (e.g., servers), save plots to HTML files:
+    fig = df.iplot(...)
+    fig.write_html("plot.html")
+    print("Plot saved to plot.html. Open this file in your browser to view the plot.")
+
+Available Chart Types:
+- "line": Line chart
+- "scatter": Scatter plot
+- "ohlc": OHLC (Open-High-Low-Close) chart
+- "candlestick": Candlestick chart
+- "subplots": Multiple line charts as subplots
+- "histogram": Histogram of daily returns
+- "bar": Bar chart
+- "heatmap": Heatmap
+- "box": Box plot
+- "pie": Pie chart
+- "treemap": Treemap chart
+- "overlay": Overlay multiple series with secondary y-axis
+- "normalized": Normalized line chart (base=100)
+
+"""
+
+import pandas as pd
+import plotly.graph_objects as go
+import plotly.express.colors as pc
+from plotly.subplots import make_subplots
+import plotly.io as pio
+from .themes import THEMES, COLOR_SCALES, create_template
+
+# Set global Plotly theme and dimensions
+# pio.templates["pearl"] = create_pearl_template()
+# pio.templates.default = "pearl"
+# DEFAULT_THEME = "pearl"
+
+# Register all available themes
+for theme_name in THEMES.keys():
+    pio.templates[theme_name] = create_template(theme_name)
+
+# Set default template
+pio.templates.default = "pearl"
+
+DEFAULT_THEME = "pearl"
+DEFAULT_WIDTH = 1000
+DEFAULT_HEIGHT = 600
+
+
+# Main plot dispatcher
+def _iplot(self, kind="line", **kwargs):
+    if kind == "normalized":
+        return _plot_normalized(self, **kwargs)
+    if kind == "overlay":
+        return _plot_overlay(self, **kwargs)
+    if isinstance(self, pd.Series):
+        df = self.to_frame()
+    else:
+        df = self.copy()
+
+    # Create a lowercase column mapping
+    colmap = {col.lower(): col for col in df.columns}
+
+    if kind == "line":
+        fig = _plot_line(df, **kwargs)
+    elif kind == "scatter":
+        fig = _plot_scatter(df, **kwargs)
+    elif kind == "ohlc":
+        fig = _plot_ohlc(df, colmap, **kwargs)
+    elif kind == "candlestick":
+        fig = _plot_candlestick(df, colmap, **kwargs)
+    elif kind == "subplots":
+        fig = _plot_subplots(df, **kwargs)
+    elif kind == "histogram":
+        fig = _plot_histogram(df, **kwargs)
+    elif kind == "bar":
+        fig = _plot_bar(df, **kwargs)
+    elif kind == "heatmap":
+        fig = _plot_heatmap(df, **kwargs)
+    elif kind == "box":
+        fig = _plot_box(df, **kwargs)
+    elif kind == "pie":
+        fig = _plot_pie(df, **kwargs)
+    elif kind == "treemap":
+        fig = _plot_treemap(df, **kwargs)
+    else:
+        raise ValueError(f"Plot type '{kind}' not supported.")
+
+    return fig
+
+
+def _get_colors(theme_name):
+    """Get colors for the specified theme - FIXED"""
+    colorscale_name = THEMES.get(theme_name, {}).get("colorscale", "original")
+    colors = COLOR_SCALES.get(colorscale_name, COLOR_SCALES["original"])
+    return colors
+
+
+def _plot_line(df, x=None, y=None, **kwargs):
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    trace_kwargs = {}
+    if "color" in kwargs:
+        trace_kwargs["line"] = {"color": kwargs.pop("color")}
+    else:
+        # Use theme colors if no specific color provided
+        trace_kwargs["line"] = {"color": colors[0]}
+
+    for k in ["line", "name", "hoverinfo", "opacity"]:
+        if k in kwargs:
+            if k == "line" and "line" in trace_kwargs:
+                trace_kwargs["line"].update(kwargs.pop(k))
+            else:
+                trace_kwargs[k] = kwargs.pop(k)
+
+    x_data = df.index if x is None else df[x]
+    y_data = df[y] if isinstance(y, str) else df.iloc[:, 0]
+
+    fig = go.Figure(
+        go.Scatter(x=x_data, y=y_data, mode="lines", name="", **trace_kwargs)
+    )
+    _update_layout(fig, kwargs, default_title="Stock Prices", yaxis_title="")
+    return fig
+
+
+def _plot_scatter(df, x=None, y=None, **kwargs):
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    trace_kwargs = {}
+    if "color" in kwargs:
+        trace_kwargs["marker"] = {"color": kwargs.pop("color")}
+    else:
+        trace_kwargs["marker"] = {"color": colors[0]}
+
+    for k in ["marker", "line", "name", "hoverinfo", "opacity"]:
+        if k in kwargs:
+            if k == "marker" and "marker" in trace_kwargs:
+                trace_kwargs["marker"].update(kwargs.pop(k))
+            else:
+                trace_kwargs[k] = kwargs.pop(k)
+
+    x_data = df.index if x is None else df[x]
+    y_data = df[y] if isinstance(y, str) else df.iloc[:, 0]
+
+    fig = go.Figure(
+        go.Scatter(x=x_data, y=y_data, mode="markers", name="", **trace_kwargs)
+    )
+    _update_layout(fig, kwargs, default_title="Scatter Plot", yaxis_title="")
+    return fig
+
+
+def _plot_ohlc(df, colmap, **kwargs):
+    # df = df[-30:] if len(df) > 30 else df
+    fig = go.Figure(
+        go.Ohlc(
+            x=df.index,
+            open=df[colmap.get("open")],
+            high=df[colmap.get("high")],
+            low=df[colmap.get("low")],
+            close=df[colmap.get("close")],
+            name="",
+        )
+    )
+    _update_layout(fig, kwargs, default_title="OHLC Chart", yaxis_title="")
+    return fig
+
+
+def _plot_candlestick(df, colmap, **kwargs):
+    # df = df[-30:] if len(df) > 30 else df
+    fig = go.Figure(
+        go.Candlestick(
+            x=df.index,
+            open=df[colmap.get("open")],
+            high=df[colmap.get("high")],
+            low=df[colmap.get("low")],
+            close=df[colmap.get("close")],
+            name="",
+        )
+    )
+    _update_layout(fig, kwargs, default_title="Candlestick Chart", yaxis_title="")
+    return fig
+
+
+def _plot_subplots(df, cols=None, **kwargs):
+    ncols = kwargs.pop("ncols", 2)
+    shared_yaxes = kwargs.pop("shared_yaxes", False)
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    cols = df.columns if cols is None else cols
+    n = len(cols)
+    rows = (n - 1) // ncols + 1
+    fig = make_subplots(rows=rows, cols=ncols, shared_yaxes=shared_yaxes)
+
+    for i, col in enumerate(cols):
+        r, c = divmod(i, ncols)
+        fig.add_trace(
+            go.Scatter(
+                x=df.index,
+                y=df[col],
+                mode="lines",
+                name=col,
+                line=dict(color=colors[i % len(colors)]),
+            ),
+            row=r + 1,
+            col=c + 1,
+        )
+    _update_layout(fig, kwargs, default_title="Subplots", yaxis_title="")
+    return fig
+
+
+def _plot_histogram(df, columns=None, **kwargs):
+    overlap = kwargs.pop("overlap", True)
+    ncols = kwargs.pop("ncols", 2)
+    shared_yaxes = kwargs.pop("shared_yaxes", False)
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    columns = df.columns if columns is None else columns
+
+    if overlap:
+        fig = go.Figure()
+        for i, col in enumerate(columns):
+            fig.add_trace(
+                go.Histogram(
+                    x=df[col] * 100,
+                    nbinsx=kwargs.get("nbinsx", 50),
+                    name=col,
+                    opacity=0.75,
+                    marker_color=colors[i % len(colors)],
+                )
+            )
+    else:
+        rows = (len(columns) - 1) // ncols + 1
+        fig = make_subplots(rows=rows, cols=ncols, shared_yaxes=shared_yaxes)
+        for i, col in enumerate(columns):
+            r, c = divmod(i, ncols)
+            fig.add_trace(
+                go.Histogram(
+                    x=df[col] * 100,
+                    nbinsx=kwargs.get("nbinsx", 50),
+                    name=col,
+                    opacity=0.75,
+                    marker_color=colors[i % len(colors)],
+                ),
+                row=r + 1,
+                col=c + 1,
+            )
+
+    _update_layout(
+        fig,
+        kwargs,
+        default_title="Histogram of Daily Returns",
+        xaxis_title="",
+        yaxis_title="Frequency",
+    )
+    return fig
+
+
+def _plot_bar(df, x=None, y=None, scale=False, **kwargs):
+    if scale:
+        df = df * 100
+
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = kwargs.pop("colors", _get_colors(theme_name))
+    fig = go.Figure()
+
+    if df.shape[0] == 1:  # single-row DataFrame
+        y_vals = df.iloc[0] if y is None else df[y]
+        x_vals = df.columns if x is None else x
+        for i, (xi, yi) in enumerate(zip(x_vals, y_vals)):
+            fig.add_trace(
+                go.Bar(
+                    x=[xi], y=[yi], name=str(xi), marker_color=colors[i % len(colors)]
+                )
+            )
+    else:  # multi-row DataFrame — use index as x, columns as series
+        columns_to_plot = (
+            df.columns if y is None else ([y] if isinstance(y, str) else y)
+        )
+        for i, col in enumerate(columns_to_plot):
+            fig.add_trace(
+                go.Bar(
+                    x=df.index,
+                    y=df[col],
+                    name=col,
+                    marker_color=colors[i % len(colors)],
+                )
+            )
+
+    _update_layout(fig, kwargs, default_title="Bar Chart", yaxis_title="")
+    return fig
+
+
+def _plot_heatmap(df, matrix=False, **kwargs):
+    colorscale = kwargs.pop("colorscale", "Viridis")
+    if matrix:
+        cols = df.columns
+        n = len(cols)
+        rows = (n - 1) // 2 + 1
+        fig = make_subplots(rows=rows, cols=2)
+        for i, col in enumerate(cols):
+            r, c = divmod(i, 2)
+            fig.add_trace(
+                go.Heatmap(
+                    z=df[[col]].values, x=[col], y=df.index, colorscale=colorscale
+                ),
+                row=r + 1,
+                col=c + 1,
+            )
+    else:
+        fig = go.Figure(
+            data=go.Heatmap(
+                z=df.values, x=df.columns, y=df.index, colorscale=colorscale
+            )
+        )
+    _update_layout(fig, kwargs, default_title="Heatmap", xaxis_title="", yaxis_title="")
+    return fig
+
+
+def _plot_box(df, columns=None, **kwargs):
+    columns = df.columns if columns is None else columns
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    fig = go.Figure()
+    for i, col in enumerate(columns):
+        fig.add_trace(go.Box(y=df[col], name=col, marker_color=colors[i % len(colors)]))
+    _update_layout(
+        fig, kwargs, default_title="Box Plot", xaxis_title="", yaxis_title=""
+    )
+    return fig
+
+
+def _plot_pie(df, names=None, values=None, **kwargs):
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    names_data = df.index if names is None else df[names]
+    values_data = df.iloc[:, 0] if values is None else df[values]
+
+    fig = go.Figure(
+        data=[
+            go.Pie(
+                labels=names_data,
+                values=values_data,
+                marker_colors=colors[: len(names_data)],
+            )
+        ]
+    )
+    _update_layout(fig, kwargs, default_title="Pie Chart")
+    return fig
+
+
+def _plot_overlay(df, secondary_y=None, **kwargs):
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    fig = make_subplots(specs=[[{"secondary_y": True}]])
+    cols = df.columns
+    for i, col in enumerate(cols):
+        fig.add_trace(
+            go.Scatter(
+                x=df.index,
+                y=df[col],
+                mode="lines",
+                name=col,
+                line=dict(color=colors[i % len(colors)]),
+            ),
+            secondary_y=(col == secondary_y),
+        )
+    _update_layout(fig, kwargs, default_title="Overlay Chart", yaxis_title="")
+    return fig
+
+
+def _plot_normalized(df, **kwargs):
+    theme_name = kwargs.get("theme", DEFAULT_THEME)
+    colors = _get_colors(theme_name)
+
+    norm_df = (df / df.iloc[0]) * 100
+    fig = go.Figure()
+    for i, col in enumerate(norm_df.columns):
+        fig.add_trace(
+            go.Scatter(
+                x=norm_df.index,
+                y=norm_df[col],
+                mode="lines",
+                name=col,
+                line=dict(color=colors[i % len(colors)]),
+            )
+        )
+    _update_layout(
+        fig,
+        kwargs,
+        default_title="Normalized Prices",
+        yaxis_title="Normalized (Base = 100)",
+    )
+    return fig
+
+
+def _plot_treemap(df, path=None, values=None, labels=None, parents=None, **kwargs):
+    if path is not None:
+        df = df.copy()
+        for p in path:
+            if p not in df.columns:
+                raise ValueError(f"Column '{p}' not in DataFrame")
+        labels = df[path[-1]]
+        parents = df[path[-2]] if len(path) > 1 else [""] * len(df)
+        values = df[values or df.columns[0]]
+    elif labels is not None and parents is not None and values is not None:
+        labels = df[labels] if isinstance(labels, str) else labels
+        parents = df[parents] if isinstance(parents, str) else parents
+        values = df[values] if isinstance(values, str) else values
+    else:
+        raise ValueError(
+            "Must provide either 'path' or all of 'labels', 'parents', and 'values'"
+        )
+
+    fig = go.Figure(
+        go.Treemap(
+            labels=labels,
+            parents=parents,
+            values=values,
+            hoverinfo="label+value+percent parent",
+            marker=dict(colors=_get_colors(DEFAULT_THEME)),
+        )
+    )
+
+    _update_layout(fig, kwargs, default_title="Treemap")
+    return fig
+
+
+def _update_layout(fig, user_kwargs, default_title="", xaxis_title="", yaxis_title=""):
+    theme_name = user_kwargs.pop("theme", DEFAULT_THEME)
+    theme_layout = THEMES.get(theme_name, {}).get("layout", {})
+
+    layout_defaults = dict(
+        title=default_title,
+        xaxis_title=xaxis_title,
+        yaxis_title=yaxis_title,
+        width=user_kwargs.pop("width", DEFAULT_WIDTH),
+        height=user_kwargs.pop("height", DEFAULT_HEIGHT),
+        showlegend=user_kwargs.pop("showlegend", False),
+    )
+    layout_defaults.update(theme_layout)
+    layout_defaults.update(user_kwargs)  # allow override
+    fig.update_layout(**layout_defaults)
+
+
+# Attach iplot method to both DataFrame and Series
+pd.DataFrame.iplot = _iplot
+pd.Series.iplot = _iplot

quantmod-0.0.7/quantmod/charts/themes.py

@@ -0,0 +1,142 @@
+import plotly.graph_objects as go
+
+THEMES = {
+    "pearl": {
+        "colorscale": "original",
+        "linewidth": 1.3,
+        "bargap": 0.01,
+        "layout": {
+            "legend": {"bgcolor": "#F5F6F9", "font": {"color": "#4D5663"}},
+            "paper_bgcolor": "#F5F6F9",
+            "plot_bgcolor": "#F5F6F9",
+            "title": {"font": {"color": "#4D5663"}, "x": 0.5},
+            "yaxis": {
+                "tickfont": {"color": "#4D5663"},
+                "gridcolor": "#E1E5ED",
+                "title": {"font": {"color": "#4D5663"}},
+                "zerolinecolor": "#E1E5ED",
+                "showgrid": True,
+            },
+            "xaxis": {
+                "tickfont": {"color": "#4D5663"},
+                "gridcolor": "#E1E5ED",
+                "title": {"font": {"color": "#4D5663"}},
+                "zerolinecolor": "#E1E5ED",
+                "showgrid": True,
+            },
+        },
+        "annotations": {"fontcolor": "#4D5663", "arrowcolor": "#9499A3"},
+        "3d": {
+            "scene": {
+                "yaxis": {
+                    "gridcolor": "#9499A3",
+                    "zerolinecolor": "#9499A3",
+                    "title": {"font": {"color": "#4D5663"}},
+                },
+                "xaxis": {
+                    "gridcolor": "#9499A3",
+                    "zerolinecolor": "#9499A3",
+                    "title": {"font": {"color": "#4D5663"}},
+                },
+                "zaxis": {
+                    "gridcolor": "#9499A3",
+                    "zerolinecolor": "#9499A3",
+                    "title": {"font": {"color": "#4D5663"}},
+                },
+            }
+        },
+    },
+    "henanigans": {
+        "colorscale": "original",
+        "linewidth": 1.3,
+        "bargap": 0.01,
+        "layout": {
+            "legend": {"bgcolor": "#242424", "font": {"color": "#F4F4F4"}},
+            "paper_bgcolor": "#242424",
+            "plot_bgcolor": "#242424",
+            "title": {"font": {"color": "#F4F4F4"}, "x": 0.5},
+            "yaxis": {
+                "tickfont": {"color": "#A4A4A4"},
+                "gridcolor": "#343434",
+                "title": {"font": {"color": "#A4A4A4"}},
+                "zerolinecolor": "#444444",
+                "showgrid": True,
+            },
+            "xaxis": {
+                "tickfont": {"color": "#A4A4A4"},
+                "gridcolor": "#343434",
+                "title": {"font": {"color": "#A4A4A4"}},
+                "zerolinecolor": "#444444",
+                "showgrid": True,
+            },
+        },
+        "annotations": {"fontcolor": "#EBB483", "arrowcolor": "#EBB483"},
+        "3d": {
+            "scene": {
+                "yaxis": {
+                    "gridcolor": "#343434",
+                    "zerolinecolor": "#343434",
+                    "title": {"font": {"color": "#A4A4A4"}},
+                },
+                "xaxis": {
+                    "gridcolor": "#343434",
+                    "zerolinecolor": "#343434",
+                    "title": {"font": {"color": "#A4A4A4"}},
+                },
+                "zaxis": {
+                    "gridcolor": "#343434",
+                    "zerolinecolor": "#343434",
+                    "title": {"font": {"color": "#A4A4A4"}},
+                },
+            }
+        },
+    },
+}
+
+# Custom color scales
+COLOR_SCALES = {
+    "original": [
+        "#FF6B35",
+        "#004E89",
+        "#00A896",
+        "#7209B7",
+        "#E63946",
+        "#2A9D8F",
+        "#F4A261",
+        "#6A994E",
+        "#FA8072",
+        "#87CEEB",
+    ]
+}
+
+
+# Create pearl template
+def create_pearl_template():
+    """Create a proper Plotly template from the theme configuration"""
+    theme_config = THEMES["pearl"]["layout"]
+
+    template = go.layout.Template(layout=go.Layout(**theme_config))
+
+    return template
+
+
+# Create henanigans template
+def create_henanigans_template():
+    """Create a proper Plotly template from the theme configuration"""
+    theme_config = THEMES["henanigans"]["layout"]
+
+    template = go.layout.Template(layout=go.Layout(**theme_config))
+
+    return template
+
+
+# Function to create any template
+def create_template(theme_name):
+    """Create a template for any theme"""
+    if theme_name not in THEMES:
+        raise ValueError(f"Theme '{theme_name}' not found in THEMES")
+
+    theme_config = THEMES[theme_name]["layout"]
+    template = go.layout.Template(layout=go.Layout(**theme_config))
+
+    return template

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod/datasets/dataloader.py

@@ -1,10 +1,14 @@
 import pandas as pd
 from quantmod.utils import convert_date_format
-import importlib.resources as pkg_resources
+
+# import importlib.resources as pkg_resources
+from importlib.resources import files
 from . import data
 
 
-def fetch_historical_data(symbol: str, start_date: str=None, end_date: str=None) -> pd.DataFrame:
+def fetch_historical_data(
+    symbol: str, start_date: str = None, end_date: str = None
+) -> pd.DataFrame:
     """
     Load historical data for a given symbol
 
@@ -26,15 +30,19 @@ def fetch_historical_data(symbol: str, start_date: str=None, end_date: str=None)
     ------
     ValueError
         If the symbol is invalid or the start date is greater than the end date
-        If the start date is less than the first date in the dataset or the end date is greater than the last date in the dataset   
+        If the start date is less than the first date in the dataset or the end date is greater than the last date in the dataset
         If the start date is greater than the last date in the dataset or the end date is less than the first date in the dataset
     """
 
+    # def read_csv_file(filename):
+    #     with pkg_resources.path(data, filename) as file_path:
+    #         return pd.read_csv(file_path)
+
     def read_csv_file(filename):
-        with pkg_resources.path(data, filename) as file_path:
-            return pd.read_csv(file_path)
+        with files(data).joinpath(filename).open("r") as f:
+            return pd.read_csv(f)
 
-    if symbol.lower() == "spx":    
+    if symbol.lower() == "spx":
         df = read_csv_file("spx.csv")
         # df = pd.read_csv("./data/spx.csv")
     elif symbol.lower() == "nifty":
@@ -42,24 +50,23 @@ def fetch_historical_data(symbol: str, start_date: str=None, end_date: str=None)
         # df = pd.read_csv("./data/nifty50.csv")
     else:
         raise ValueError("Invalid symbol. Only SPX & NIFTY is supported")
-    
+
     df = df.rename(columns=str.lower)
-    df = convert_date_format(df, 'date')
+    df = convert_date_format(df, "date")
 
     if start_date is None or end_date is None:
         return df
 
     elif start_date > end_date:
         raise ValueError("Start date should be less than or equal to end date")
-    
+
     elif start_date < df.date.iloc[0] or end_date < df.date.iloc[0]:
         raise ValueError(f"Date should be greater than or equal to {df.date.iloc[0]}")
-    
+
     elif start_date > df.date.iloc[-1] or end_date > df.date.iloc[-1]:
         raise ValueError(f"Date should be less than or equal to {df.date.iloc[-1]}")
-    
+
     else:
         # Use query method for filtering based on date range
         query_str = f"date >= '{start_date}' and date <= '{end_date}'"
         return df.query(query_str)
-    

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod/derivatives/nse.py

@@ -47,7 +47,13 @@ if mode == "local":
             # print(output)
         except ValueError:
             s = requests.Session()
-            output = s.get("http://nseindia.com", headers=headers)
+            try:
+                output = s.get("http://nseindia.com/option-chain", headers=headers)
+                output = s.get(payload, headers=headers).json()
+            except ValueError:
+                output = s.get("https://www.nseindia.com", headers=headers)
+                output = output.json()
+            # output = s.get("https://www.nseindia.com/option-chain", headers=headers) # replaced http://nseindia.com with https://www.nseindia.com/option-chain
             output = s.get(payload, headers=headers).json()
         return output
 

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod/risk/varbacktest.py

@@ -73,7 +73,7 @@ class VaRAnalyzer:
             data["shifted_returns"].rolling(window=self.window_forward).sum()
         )
         data["shifted_forward_returns"] = data["forward_returns"].shift(
-            -self.window_forward + 1
+            -self.window_forward + 2
         )
 
         # Identify breaches
@@ -121,4 +121,5 @@ class VaRAnalyzer:
             ["Conditional Probability of Breaches", conditional_probability * 100],
         ]
 
+        # return data
         return tabulate(table, headers=header, floatfmt=(".2f"))

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod/timeseries/performance.py

@@ -18,7 +18,7 @@ def periodReturn(
 
     Returns
     -------
-    pd.DataFrame | pd.Series
+    pd.Series
         resampled dataframe series of log returns
     """
 
@@ -27,7 +27,10 @@ def periodReturn(
         raise ValueError("Input must be a pandas DataFrame or Series")
 
     # Initialize variable to hold log returns
-    temp = pd.Series(dtype=float)
+    if isinstance(data, pd.DataFrame):
+        temp = pd.DataFrame(dtype=float)
+    else:
+        temp = pd.Series(dtype=float)
 
     if period is None:
         temp = np.log(data).diff()
@@ -92,11 +95,18 @@ def annualReturn(data: pd.DataFrame | pd.Series) -> pd.DataFrame | pd.Series:
     return periodReturn(data, period="A")
 
 
-def allReturn(data: pd.DataFrame | pd.Series) -> pd.DataFrame | pd.Series:
+def allReturn(data: pd.Series) -> pd.Series:
     """Calculates annual returns for the specified inputs."""
     return periodReturn(data, period="all")
 
 
+def rollingReturn(
+    data: pd.DataFrame | pd.Series, window: int = 10
+) -> pd.DataFrame | pd.Series:
+    """Calculates rolling returns for the specified inputs."""
+    return dailyReturn(data).rolling(window).sum()
+
+
 def cagr(returns: pd.Series, intra_period: int = 1, is_log: bool = False) -> float:
     """
     Compounded Annual Growth Rate (CAGR) is the annual rate of return
@@ -127,12 +137,12 @@ def cagr(returns: pd.Series, intra_period: int = 1, is_log: bool = False) -> flo
     if is_log:
         cumulative_returns = np.exp(returns.sum())  # for log returns
         years = len(returns) / (252 * intra_period)
-        return (cumulative_returns[-1]) ** (1 / years) - 1
+        return (cumulative_returns.iloc[-1]) ** (1 / years) - 1
     else:
         cumulative_returns = (1 + returns).cumprod()  # for simple returns
 
     years = len(returns) / (252 * intra_period)
-    return (cumulative_returns[-1]) ** (1 / years) - 1
+    return (cumulative_returns.iloc[-1]) ** (1 / years) - 1
 
 
 def volatility(returns: pd.Series, intra_period: int = 1) -> float:

quantmod-0.0.7/quantmod/version.py

@@ -0,0 +1 @@
+version = "0.0.7"

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: quantmod
-Version: 0.0.6
+Version: 0.0.7
 Summary: Quantmod Python Package
 Home-page: https://kannansingaravelu.com/
 Author: Kannan Singaravelu
@@ -21,14 +21,16 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: joblib
 Requires-Dist: matplotlib
+Requires-Dist: nbformat>=5.10.4
 Requires-Dist: numpy>=2.0.2
 Requires-Dist: pandas>=2.2.2
+Requires-Dist: plotly>=6.1.2
 Requires-Dist: pydantic>=2.8.2
 Requires-Dist: scipy>=1.13.1
 Requires-Dist: sqlalchemy>=2.0.38
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: urllib3==1.26.15
-Requires-Dist: yfinance>=0.2.43
+Requires-Dist: yfinance==0.2.58
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod.egg-info/SOURCES.txt

@@ -14,9 +14,11 @@ quantmod.egg-info/entry_points.txt
 quantmod.egg-info/not-zip-safe
 quantmod.egg-info/requires.txt
 quantmod.egg-info/top_level.txt
+quantmod/charts/__init__.py
+quantmod/charts/plotting.py
+quantmod/charts/themes.py
 quantmod/datasets/__init__.py
 quantmod/datasets/dataloader.py
-quantmod/datasets/data/__init__.py
 quantmod/datasets/data/nifty50.csv
 quantmod/datasets/data/spx.csv
 quantmod/derivatives/__init__.py

{quantmod-0.0.6 → quantmod-0.0.7}/quantmod.egg-info/requires.txt

@@ -1,10 +1,12 @@
 joblib
 matplotlib
+nbformat>=5.10.4
 numpy>=2.0.2
 pandas>=2.2.2
+plotly>=6.1.2
 pydantic>=2.8.2
 scipy>=1.13.1
 sqlalchemy>=2.0.38
 tabulate>=0.9.0
 urllib3==1.26.15
-yfinance>=0.2.43
+yfinance==0.2.58

quantmod-0.0.6/quantmod/version.py

@@ -1 +0,0 @@
-version = "0.0.6"