Added share feature

main.py

@@ -1,6 +1,6 @@
 from typing import Annotated, Dict, List, Tuple
 from urllib.parse import urlencode
-from fastapi import FastAPI, Query
+from fastapi import FastAPI, Query, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse
 import pandas as pd
@@ -24,9 +24,16 @@ app.add_middleware(
 app = gr.mount_gradio_app(app, interface, path="/ui")
 
 @app.get("/")
-def read_main():
-    # Redirect to the Gradio UI
-    return RedirectResponse("/ui")
+async def read_main(request: Request):
+    # Get query parameters as dictionary
+    query_params = dict(request.query_params)
+
+    # Create new URL with parameters
+    redirect_url = "/ui"
+    if query_params:
+        redirect_url += "?" + urlencode(query_params)
+
+    return RedirectResponse(redirect_url)
 
 @app.get("/solarpv/")
 def get_lcoe(pv_assumptions: Annotated[SolarPVAssumptions, Query()]):

schema.py

@@ -13,9 +13,9 @@ class SolarPVAssumptions(BaseModel):
             description="Capacity factor as a decimal, e.g., 0.2 for 20%",
         ),
     ] = 0.10
-    capital_expenditure_per_mw: Annotated[
-        float, Field(ge=1e5, le=1e7, title="Capital expenditure per MW ($/MW)")
-    ] = 670_000
+    capital_expenditure_per_kw: Annotated[
+        float, Field(ge=1e2, le=1e4, title="Capital expenditure ($/kW)")
+    ] = 670
     o_m_cost_pct_of_capital_cost: Annotated[
         float,
         Field(
@@ -78,7 +78,7 @@ class SolarPVAssumptions(BaseModel):
             title="Debt Service Coverage Ratio",
             description="Debt service coverage ratio",
         ),
-    ]
+    ] = 1.3
 
     @model_validator(mode="after")
     def check_sum_of_parts(self):
@@ -91,7 +91,7 @@ class SolarPVAssumptions(BaseModel):
     @property
     def capital_cost(self) -> Annotated[float,
                                         Field(title="Capital Cost ($)", description="Total capital cost")]:
-        return self.capacity_mw * self.capital_expenditure_per_mw
+        return self.capacity_mw * self.capital_expenditure_per_kw * 1000
 
     @computed_field
     @property
@@ -105,7 +105,7 @@ class SolarPVAssumptions(BaseModel):
     @computed_field
     @property
     def wacc(self) -> Annotated[Optional[float], Field(title="WACC (%)", description="Weighted average cost of capital")]:
-        if self.debt_pct_of_capital_cost is not None:
+        if self.debt_pct_of_capital_cost is not None and self.equity_pct_of_capital_cost is not None:
             return self.debt_pct_of_capital_cost * self.cost_of_debt + self.equity_pct_of_capital_cost * self.cost_of_equity
 
     @computed_field
@@ -116,6 +116,13 @@ class SolarPVAssumptions(BaseModel):
         if self.debt_pct_of_capital_cost is not None:
             return 1 - self.debt_pct_of_capital_cost
 
+    @model_validator(mode="before")
+    @classmethod
+    def empty_str_to_none(cls, values):
+        if isinstance(values, dict):
+            return {k: (None if v == '' or v == "None" else v) for k, v in values.items()}
+        return values
+
     # @model_validator(mode='after')
     # def check_dcsr_or_debt_pct(self):
     #     """

ui.py

@@ -26,7 +26,7 @@ def process_inputs(
         assumptions = SolarPVAssumptions(
             capacity_mw=capacity_mw,
             capacity_factor=capacity_factor,
-            capital_expenditure_per_mw=capital_expenditure_per_kw*1000,
+            capital_expenditure_per_kw=capital_expenditure_per_kw,
             o_m_cost_pct_of_capital_cost=o_m_cost_pct_of_capital_cost,
             debt_pct_of_capital_cost=debt_pct_of_capital_cost if financing_mode == "Manual Debt/Equity Split" else None,
             cost_of_debt=cost_of_debt,
@@ -65,28 +65,66 @@ def process_inputs(
 def update_equity_from_debt(debt_pct):
     return 1 - debt_pct
 
+def get_params(request: gr.Request) -> Dict:
+    params = SolarPVAssumptions.model_validate(dict(request.query_params))
+    return {capacity_mw: params.capacity_mw,
+            capacity_factor: params.capacity_factor,
+            capital_expenditure_per_kw: params.capital_expenditure_per_kw,
+            o_m_cost_pct_of_capital_cost: params.o_m_cost_pct_of_capital_cost,
+            cost_of_debt: params.cost_of_debt,
+            cost_of_equity: params.cost_of_equity,
+            tax_rate: params.tax_rate,
+            project_lifetime_years: params.project_lifetime_years,
+            dcsr: params.dcsr,
+            }
+
+def get_share_url(
+    capacity_mw,
+    capacity_factor,
+    capital_expenditure_per_kw,
+    o_m_cost_pct_of_capital_cost,
+    cost_of_debt,
+    cost_of_equity,
+    tax_rate,
+    project_lifetime_years,
+    dcsr,
+    financing_mode,
+    request: gr.Request
+):
+    params = {
+        "capacity_mw": capacity_mw,
+        "capacity_factor": capacity_factor,
+        "capital_expenditure_per_kw": capital_expenditure_per_kw,
+        "o_m_cost_pct_of_capital_cost": o_m_cost_pct_of_capital_cost,
+        "cost_of_debt": cost_of_debt,
+        "cost_of_equity": cost_of_equity,
+        "tax_rate": tax_rate,
+        "project_lifetime_years": project_lifetime_years,
+        "dcsr": dcsr,
+    }
+    base_url = "/ui?"  # Replace with actual base URL
+    return gr.Button(link=base_url + urlencode(params))
+
 with gr.Blocks() as interface:
     with gr.Row():
         gr.Markdown("# Solar PV Project Cashflow Model")
+        share_url = gr.Button(icon="share.svg", value="", size="sm", variant="secondary")
     with gr.Row():
         with gr.Column():
             with gr.Row():
                 capacity_mw = gr.Slider(
-                    value=30,
                     minimum=1,
                     maximum=1000,
                     step=10,
                     label="Capacity (MW)",
                 )
                 capacity_factor = gr.Slider(
-                    value=0.10,
                     label="Capacity factor (%)",
                     minimum=0,
                     maximum=0.6,
                     step=0.01,
                 )
                 project_lifetime_years = gr.Slider(
-                    value=25,
                     label="Project Lifetime (years)",
                     minimum=5,
                     maximum=50,
@@ -94,14 +132,12 @@ with gr.Blocks() as interface:
                 )
             with gr.Row():
                 capital_expenditure_per_kw = gr.Slider(
-                    value=670,
                     label="Capital expenditure ($/kW)",
                     minimum=1e2,
                     maximum=1e3,
                     step=10,
                 )
                 o_m_cost_pct_of_capital_cost = gr.Slider(
-                    value=0.02,
                     label="O&M as % of total cost (%)",
                     minimum=0,
                     maximum=0.5,
@@ -109,22 +145,20 @@ with gr.Blocks() as interface:
                 )
             with gr.Row():
                 cost_of_debt = gr.Slider(
-                    value=0.05, label="Cost of Debt (%)", minimum=0, maximum=0.5, step=0.01
+                    label="Cost of Debt (%)", minimum=0, maximum=0.5, step=0.01
                 )
                 cost_of_equity = gr.Slider(
-                    value=0.10,
                     label="Cost of Equity (%)",
                     minimum=0,
                     maximum=0.5,
                     step=0.01,
                 )
                 tax_rate = gr.Slider(
-                    value=0.30, label="Tax Rate (%)", minimum=0, maximum=0.5, step=0.01
+                    label="Tax Rate (%)", minimum=0, maximum=0.5, step=0.01
                 )
             with gr.Row():
                 with gr.Row():
                     debt_pct_of_capital_cost = gr.Slider(
-                        value=0.8,
                         label="Debt Percentage (%)",
                         minimum=0,
                         maximum=1,
@@ -133,14 +167,12 @@ with gr.Blocks() as interface:
                         interactive=False,
                     )
                     equity_pct_of_capital_cost = gr.Number(
-                        value=0.2,
                         label="Equity Percentage (%)",
                         visible=True,
                         interactive=False,
                         precision=2
                     )
                     dcsr = gr.Slider(
-                        value=1.3,
                         label="Debt Service Coverage Ratio",
                         minimum=1,
                         maximum=2,
@@ -158,6 +190,7 @@ with gr.Blocks() as interface:
     with gr.Row():
         model_output = gr.Matrix(headers=None, max_height=800)
 
+
     # Set up event handlers for all inputs
     input_components = [
         capacity_mw,
@@ -177,14 +210,39 @@ with gr.Blocks() as interface:
             fn=process_inputs,
             inputs=input_components + [financing_mode],
             outputs=[json_output, line_chart,  debt_pct_of_capital_cost, equity_pct_of_capital_cost, model_output],
+            trigger_mode="always_last"
         )
 
-    # Run the model on first load
+    json_output.change(
+        fn=get_share_url,
+        inputs=[
+            capacity_mw,
+            capacity_factor,
+            capital_expenditure_per_kw,
+            o_m_cost_pct_of_capital_cost,
+            cost_of_debt,
+            cost_of_equity,
+            tax_rate,
+            project_lifetime_years,
+            dcsr,
+            financing_mode
+        ],
+        outputs=share_url,
+        trigger_mode="always_last"
+    )
+
     interface.load(
-        process_inputs,
-        inputs=input_components + [financing_mode],
-        outputs=[json_output, line_chart,  debt_pct_of_capital_cost, equity_pct_of_capital_cost, model_output],
+        get_params,
+        None,
+        input_components,
+        trigger_mode="always_last"
     )
+    # # Run the model on first load
+    # interface.load(
+    #     process_inputs,
+    #     inputs=input_components + [financing_mode],
+    #     outputs=[json_output, line_chart,  debt_pct_of_capital_cost, equity_pct_of_capital_cost, model_output],
+    # )
 
     def toggle_financing_inputs(choice):
         if choice == "Target DSCR":