Made improvements

app.py

@@ -30,10 +30,10 @@ st.write("Note: Cryptocurrencies (BTC, ETH, SOL, DOGE) are highly volatile and s
 st.sidebar.header("Investment Parameters")
 currency = st.sidebar.selectbox("Display Currency", ["USD", "SGD"], index=0)
 initial_investment = st.sidebar.number_input(f"Initial Investment Amount ({currency})", min_value=1000, value=10000, step=1000)
-start_date = st.sidebar.date_input("Start Date", value=datetime.now() - timedelta(days=365*10))
+start_date = st.sidebar.date_input("Start Date", value=datetime.now() - timedelta(days=365*25))
 user_end_date = st.sidebar.date_input("End Date", value=datetime.now())
 fd_rate = st.sidebar.number_input("Fixed Deposit Rate (%)", min_value=0.0, value=2.9, step=0.1) / 100
-use_log_scale = st.sidebar.checkbox("Use Log Scale", value=False)
+use_log_scale = st.sidebar.checkbox("Use Log Scale", value=True)
 
 # Asset selection
 selected_assets = st.sidebar.multiselect(
@@ -61,7 +61,14 @@ selected_assets = st.sidebar.multiselect(
         "Solana",
         "Dogecoin",
     ],
-    default=["Fixed Deposit", "Microsoft", "Google", "Nvidia"]
+    default=[
+        "Fixed Deposit", 
+        "Gold", 
+        "US Treasury Bonds", "SGS Bonds", 
+        "S&P 500", "Dow Jones", "NASDAQ Composite", #"NASDAQ Large Cap", "NASDAQ 100",
+        "Microsoft", "Google", "Nvidia",
+        "Bitcoin"  
+        ]
 )
 
 # Today's date for reference
@@ -73,8 +80,8 @@ currency_symbol = "$" if currency == "USD" else "S$"
 # Create a dictionary of tickers for yfinance
 tickers = {
     "Gold": "GC=F",
-    "SGS Bonds": "^TNX",
-    "US Treasury Bonds": "^TNX",
+    "SGS Bonds": "A35.SI",  # Nikko AM SGD Investment Grade Corporate Bond ETF
+    "US Treasury Bonds": "TLT",  # iShares 20+ Year Treasury Bond ETF
     "NASDAQ Composite": "^IXIC",
     "NASDAQ Large Cap": "^NDX",
     "NASDAQ 100": "^NDX",
@@ -204,6 +211,26 @@ for asset in selected_assets:
     else:
         st.write(f"{asset}: N/A")
 
+# Calculate and display yearly return statistics
+st.subheader("Yearly Return Statistics")
+for asset in selected_assets:
+    valid_series = returns_data[asset].dropna()
+    if len(valid_series) > 1:
+        # Resample to yearly data
+        yearly_data = valid_series.resample('Y').first()
+        
+        # Calculate yearly returns
+        yearly_returns = yearly_data.pct_change().dropna()
+        
+        # Count positive and negative years
+        positive_years = (yearly_returns > 0).sum()
+        total_years = len(yearly_returns)
+        positive_percentage = (positive_years / total_years) * 100
+        
+        st.write(f"{asset}: {positive_years} out of {total_years} years ({positive_percentage:.1f}%) had positive returns")
+    else:
+        st.write(f"{asset}: Insufficient data for yearly analysis")
+
 # Show warnings for data availability
 for asset in selected_assets:
     if asset in actual_start_dates and pd.Timestamp(actual_start_dates[asset]).date() > start_date:

notebooks/scratchpad.ipynb

@@ -9,37 +9,128 @@
     "import yfinance as yf"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Stocks"
+   ]
+  },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 22,
    "metadata": {},
    "outputs": [
     {
-     "name": "stdout",
+     "name": "stderr",
      "output_type": "stream",
      "text": [
-      "YF.download() has changed argument auto_adjust default to True\n"
+      "[*********************100%***********************]  1 of 1 completed\n"
      ]
     },
+    {
+     "data": {
+      "text/plain": [
+       "Date\n",
+       "2012-05-18     38.050667\n",
+       "2012-05-21     33.870369\n",
+       "2012-05-22     30.854580\n",
+       "2012-05-23     31.849892\n",
+       "2012-05-24     32.875061\n",
+       "                 ...    \n",
+       "2020-01-03    207.691162\n",
+       "2020-01-06    211.602722\n",
+       "2020-01-07    212.060562\n",
+       "2020-01-08    214.210419\n",
+       "2020-01-09    217.275986\n",
+       "Name: META, Length: 1923, dtype: float64"
+      ]
+     },
+     "execution_count": 22,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "ticker = \"META\"\n",
+    "start_date = \"2010-01-01\"\n",
+    "end_date = \"2020-01-10\"\n",
+    "\n",
+    "data = yf.download(ticker, start=start_date, end=end_date)  # [\"Close\"][ticker]\n",
+    "data[\"Close\"][ticker]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 9,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "(1923,)"
+      ]
+     },
+     "execution_count": 9,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "data[\"Close\"][ticker].shape"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Gold"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 23,
+   "metadata": {},
+   "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
       "[*********************100%***********************]  1 of 1 completed\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "Date\n",
+       "2010-01-04    1117.699951\n",
+       "2010-01-05    1118.099976\n",
+       "2010-01-06    1135.900024\n",
+       "2010-01-07    1133.099976\n",
+       "2010-01-08    1138.199951\n",
+       "                 ...     \n",
+       "2020-01-03    1549.199951\n",
+       "2020-01-06    1566.199951\n",
+       "2020-01-07    1571.800049\n",
+       "2020-01-08    1557.400024\n",
+       "2020-01-09    1551.699951\n",
+       "Name: GC=F, Length: 2519, dtype: float64"
+      ]
+     },
+     "execution_count": 23,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
-    "ticker = \"META\"\n",
-    "start_date = \"2010-01-01\"\n",
-    "end_date = \"2020-01-10\"\n",
-    "\n",
-    "data = yf.download(ticker, start=start_date, end=end_date)  # [\"Close\"][ticker]"
+    "ticker = \"GC=F\"\n",
+    "data = yf.download(ticker, start=start_date, end=end_date)\n",
+    "data[\"Close\"][ticker]"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -55,31 +146,21 @@
        "        vertical-align: top;\n",
        "    }\n",
        "\n",
-       "    .dataframe thead tr th {\n",
-       "        text-align: left;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead tr:last-of-type th {\n",
+       "    .dataframe thead th {\n",
        "        text-align: right;\n",
        "    }\n",
        "</style>\n",
        "<table border=\"1\" class=\"dataframe\">\n",
        "  <thead>\n",
-       "    <tr>\n",
-       "      <th>Price</th>\n",
-       "      <th>Close</th>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>Open</th>\n",
        "      <th>High</th>\n",
        "      <th>Low</th>\n",
-       "      <th>Open</th>\n",
+       "      <th>Close</th>\n",
        "      <th>Volume</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>Ticker</th>\n",
-       "      <th>META</th>\n",
-       "      <th>META</th>\n",
-       "      <th>META</th>\n",
-       "      <th>META</th>\n",
-       "      <th>META</th>\n",
+       "      <th>Dividends</th>\n",
+       "      <th>Stock Splits</th>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Date</th>\n",
@@ -88,136 +169,125 @@
        "      <th></th>\n",
        "      <th></th>\n",
        "      <th></th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>2012-05-18</th>\n",
-       "      <td>38.050663</td>\n",
-       "      <td>44.788905</td>\n",
-       "      <td>37.821742</td>\n",
-       "      <td>41.852743</td>\n",
+       "      <th>2012-05-18 00:00:00-04:00</th>\n",
+       "      <td>41.852747</td>\n",
+       "      <td>44.788910</td>\n",
+       "      <td>37.821746</td>\n",
+       "      <td>38.050667</td>\n",
        "      <td>573576400</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>2012-05-21</th>\n",
-       "      <td>33.870365</td>\n",
+       "      <th>2012-05-21 00:00:00-04:00</th>\n",
+       "      <td>36.358638</td>\n",
        "      <td>36.488029</td>\n",
        "      <td>32.845198</td>\n",
-       "      <td>36.358638</td>\n",
+       "      <td>33.870365</td>\n",
        "      <td>168192700</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>2012-05-22</th>\n",
-       "      <td>30.854582</td>\n",
+       "      <th>2012-05-22 00:00:00-04:00</th>\n",
+       "      <td>32.457030</td>\n",
        "      <td>33.432433</td>\n",
        "      <td>30.794864</td>\n",
-       "      <td>32.457030</td>\n",
+       "      <td>30.854582</td>\n",
        "      <td>101786600</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>2012-05-23</th>\n",
-       "      <td>31.849892</td>\n",
+       "      <th>2012-05-23 00:00:00-04:00</th>\n",
+       "      <td>31.222848</td>\n",
        "      <td>32.347546</td>\n",
        "      <td>31.212894</td>\n",
-       "      <td>31.222848</td>\n",
+       "      <td>31.849892</td>\n",
        "      <td>73600000</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>2012-05-24</th>\n",
-       "      <td>32.875057</td>\n",
+       "      <th>2012-05-24 00:00:00-04:00</th>\n",
+       "      <td>32.795434</td>\n",
        "      <td>33.054213</td>\n",
        "      <td>31.620969</td>\n",
-       "      <td>32.795434</td>\n",
+       "      <td>32.875057</td>\n",
        "      <td>50237200</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>...</th>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2020-01-03</th>\n",
-       "      <td>207.691132</td>\n",
-       "      <td>209.413012</td>\n",
-       "      <td>205.979199</td>\n",
-       "      <td>206.237989</td>\n",
-       "      <td>11188400</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2020-01-06</th>\n",
-       "      <td>211.602707</td>\n",
-       "      <td>211.781855</td>\n",
-       "      <td>205.551226</td>\n",
-       "      <td>205.730374</td>\n",
-       "      <td>17058900</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2020-01-07</th>\n",
-       "      <td>212.060547</td>\n",
-       "      <td>213.573421</td>\n",
-       "      <td>210.756694</td>\n",
-       "      <td>211.821682</td>\n",
-       "      <td>14912400</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2020-01-08</th>\n",
-       "      <td>214.210419</td>\n",
-       "      <td>215.225638</td>\n",
-       "      <td>211.612661</td>\n",
-       "      <td>212.000831</td>\n",
-       "      <td>13475000</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2020-01-09</th>\n",
-       "      <td>217.275986</td>\n",
-       "      <td>217.355612</td>\n",
-       "      <td>215.265457</td>\n",
-       "      <td>216.519541</td>\n",
-       "      <td>12642800</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>1923 rows × 5 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
-       "Price            Close        High         Low        Open     Volume\n",
-       "Ticker            META        META        META        META       META\n",
-       "Date                                                                 \n",
-       "2012-05-18   38.050663   44.788905   37.821742   41.852743  573576400\n",
-       "2012-05-21   33.870365   36.488029   32.845198   36.358638  168192700\n",
-       "2012-05-22   30.854582   33.432433   30.794864   32.457030  101786600\n",
-       "2012-05-23   31.849892   32.347546   31.212894   31.222848   73600000\n",
-       "2012-05-24   32.875057   33.054213   31.620969   32.795434   50237200\n",
-       "...                ...         ...         ...         ...        ...\n",
-       "2020-01-03  207.691132  209.413012  205.979199  206.237989   11188400\n",
-       "2020-01-06  211.602707  211.781855  205.551226  205.730374   17058900\n",
-       "2020-01-07  212.060547  213.573421  210.756694  211.821682   14912400\n",
-       "2020-01-08  214.210419  215.225638  211.612661  212.000831   13475000\n",
-       "2020-01-09  217.275986  217.355612  215.265457  216.519541   12642800\n",
+       "                                Open       High        Low      Close  \\\n",
+       "Date                                                                    \n",
+       "2012-05-18 00:00:00-04:00  41.852747  44.788910  37.821746  38.050667   \n",
+       "2012-05-21 00:00:00-04:00  36.358638  36.488029  32.845198  33.870365   \n",
+       "2012-05-22 00:00:00-04:00  32.457030  33.432433  30.794864  30.854582   \n",
+       "2012-05-23 00:00:00-04:00  31.222848  32.347546  31.212894  31.849892   \n",
+       "2012-05-24 00:00:00-04:00  32.795434  33.054213  31.620969  32.875057   \n",
        "\n",
-       "[1923 rows x 5 columns]"
+       "                              Volume  Dividends  Stock Splits  \n",
+       "Date                                                           \n",
+       "2012-05-18 00:00:00-04:00  573576400        0.0           0.0  \n",
+       "2012-05-21 00:00:00-04:00  168192700        0.0           0.0  \n",
+       "2012-05-22 00:00:00-04:00  101786600        0.0           0.0  \n",
+       "2012-05-23 00:00:00-04:00   73600000        0.0           0.0  \n",
+       "2012-05-24 00:00:00-04:00   50237200        0.0           0.0  "
       ]
      },
-     "execution_count": 3,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "data"
+    "# Get data for Gold futures\n",
+    "gold = yf.Ticker(\"GC=F\")\n",
+    "\n",
+    "# Get historical data (e.g., for the last month)\n",
+    "gold_data = gold.history(period=\"1000mo\")\n",
+    "\n",
+    "# Print the data\n",
+    "(gold_data.head())"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 15,
    "metadata": {},
-   "outputs": [],
-   "source": []
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "(6185,)"
+      ]
+     },
+     "execution_count": 15,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "gold_data[\"Close\"].shape"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## "
+   ]
   }
  ],
  "metadata": {

utils/yfinance_utils.py

@@ -1,6 +1,8 @@
 import yfinance as yf
 import pandas as pd
+from functools import lru_cache
 
+@lru_cache(maxsize=64)  # Cache up to 64 different ticker/date combinations
 def fetch_yfinance_daily(ticker, start_date, end_date):
     try:
         data = yf.download(ticker, start=start_date, end=end_date)