Update utils.py

utils.py

@@ -299,36 +299,93 @@ def generate_portfolio(
 
     allocation = []
 
-    remaining_cash = budget * weights[-1]
+    cash = budget * weights[-1]
 
+    # Initial purchase
     for stock, weight in zip(ALL_STOCKS, weights[:-1]):
 
-        target_amount = budget * weight
+        target = budget * weight
 
         price = latest_prices[stock]
 
-        shares = int(target_amount // price)
+        shares = int(target // price)
 
         invested = shares * price
 
-        remaining_cash += target_amount - invested
+        cash += target - invested
 
         allocation.append({
 
             "Stock": stock,
-            "Price (₹)": round(price, 2),
+            "Price (₹)": round(price,2),
+            "Target": target,
             "Shares": shares,
-            "Investment (₹)": round(invested, 2),
-            "Weight (%)": invested / budget * 100
+            "Investment (₹)": invested
 
         })
 
     allocation = pd.DataFrame(allocation)
 
+    # ---------------------------------------------------
+    # Redistribute remaining cash
+    # ---------------------------------------------------
+
+    while True:
+
+        affordable = allocation[
+            allocation["Price (₹)"] <= cash
+        ]
+
+        if affordable.empty:
+            break
+
+        # Remaining amount needed to reach target
+        affordable = affordable.copy()
+
+        affordable["Gap"] = (
+            affordable["Target"] -
+            affordable["Investment (₹)"]
+        )
+
+        affordable = affordable.sort_values(
+            "Gap",
+            ascending=False
+        )
+
+        bought = False
+
+        for idx in affordable.index:
+
+            price = allocation.loc[idx, "Price (₹)"]
+
+            if price <= cash:
+
+                allocation.loc[idx, "Shares"] += 1
+
+                allocation.loc[idx, "Investment (₹)"] += price
+
+                cash -= price
+
+                bought = True
+
+                break
+
+        if not bought:
+            break
+
     allocation = allocation[
         allocation["Shares"] > 0
     ]
 
+    allocation["Weight (%)"] = (
+        allocation["Investment (₹)"] /
+        budget
+    ) * 100
+
+    allocation = allocation.drop(
+        columns="Target"
+    )
+
     allocation = allocation.sort_values(
         "Investment (₹)",
         ascending=False
@@ -339,7 +396,7 @@ def generate_portfolio(
         inplace=True
     )
 
-    return allocation, remaining_cash
+    return allocation, round(cash,2)
 
 
 # =====================================================