distopf 1.0.2__tar.gz → 1.1.0.dev0__tar.gz

{distopf-1.0.2 → distopf-1.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distopf
-Version: 1.0.2
+Version: 1.1.0.dev0
 Summary: A package for solving unbalanced three-phase distribution system optimal power flow problems.
 Author: Abodh Poudyal
 Author-email: Nathan Gray <nathan.gray@pnnl.gov>, Rabayet Sadnan <rabayet.sadnan@pnnl.gov>
@@ -179,6 +179,36 @@ result = case.run_opf(wrapper="matrix_bess", objective="loss")
 #### Solver Requirements
 - **IPOPT**: Install via `conda install -c conda-forge ipopt`. On Ubuntu, `apt-get install coinor-libipopt-dev` only installs headers and shared libraries; it does not provide the `ipopt` executable that Pyomo's `SolverFactory("ipopt")` expects.
 
+### Optimization Objectives
+
+DistOPF supports multiple optimization objectives for distribution system OPF:
+
+| Objective | String | Supported Wrappers | Description |
+|-----------|--------|-------------------|-------------|
+| **Loss Minimization** | `"loss"`, `"loss_min"` | All | Minimize distribution losses (most common) |
+| **Substation Power** | `"substation"`, `"substation_power"` | Pyomo, Matrix | Minimize power imported from substation |
+| **Voltage Deviation** | `"voltage_deviation"` | Pyomo | Minimize deviations from nominal voltage (1.0 p.u.) |
+| **Generation Curtailment** | `"curtail"`, `"curtail_min"`, `"curtailment"` | Pyomo | Minimize DER curtailment |
+| **Cost Minimization** | `"cost"`, `"cost_min"` | Pyomo (LinDistFlow, BranchFlow) | Minimize energy procurement cost from swing bus |
+
+#### Cost Minimization with Price Data
+
+To use cost minimization, add an hourly `price` column to the case schedules (in $/MWh):
+
+```python
+import pandas as pd
+import distopf as opf
+
+case = opf.create_case(opf.CASES_DIR / "csv" / "ieee123_30der")
+
+# Add hourly electricity prices
+case.schedules['price'] = [38, 35, 34, 32, 30, 32, 38, 45, 52, 58, 62, 65, 
+                            68, 65, 62, 58, 55, 60, 75, 82, 78, 65, 50, 42]
+
+# Run OPF minimizing energy cost
+result = case.run_opf(objective="cost")
+print(f"Total energy cost: ${result.objective_value:.2f}")
+```
 
 ### Result Fields
 

{distopf-1.0.2 → distopf-1.1.0.dev0}/README.md

@@ -155,6 +155,36 @@ result = case.run_opf(wrapper="matrix_bess", objective="loss")
 #### Solver Requirements
 - **IPOPT**: Install via `conda install -c conda-forge ipopt`. On Ubuntu, `apt-get install coinor-libipopt-dev` only installs headers and shared libraries; it does not provide the `ipopt` executable that Pyomo's `SolverFactory("ipopt")` expects.
 
+### Optimization Objectives
+
+DistOPF supports multiple optimization objectives for distribution system OPF:
+
+| Objective | String | Supported Wrappers | Description |
+|-----------|--------|-------------------|-------------|
+| **Loss Minimization** | `"loss"`, `"loss_min"` | All | Minimize distribution losses (most common) |
+| **Substation Power** | `"substation"`, `"substation_power"` | Pyomo, Matrix | Minimize power imported from substation |
+| **Voltage Deviation** | `"voltage_deviation"` | Pyomo | Minimize deviations from nominal voltage (1.0 p.u.) |
+| **Generation Curtailment** | `"curtail"`, `"curtail_min"`, `"curtailment"` | Pyomo | Minimize DER curtailment |
+| **Cost Minimization** | `"cost"`, `"cost_min"` | Pyomo (LinDistFlow, BranchFlow) | Minimize energy procurement cost from swing bus |
+
+#### Cost Minimization with Price Data
+
+To use cost minimization, add an hourly `price` column to the case schedules (in $/MWh):
+
+```python
+import pandas as pd
+import distopf as opf
+
+case = opf.create_case(opf.CASES_DIR / "csv" / "ieee123_30der")
+
+# Add hourly electricity prices
+case.schedules['price'] = [38, 35, 34, 32, 30, 32, 38, 45, 52, 58, 62, 65, 
+                            68, 65, 62, 58, 55, 60, 75, 82, 78, 65, 50, 42]
+
+# Run OPF minimizing energy cost
+result = case.run_opf(objective="cost")
+print(f"Total energy cost: ${result.objective_value:.2f}")
+```
 
 ### Result Fields
 

{distopf-1.0.2 → distopf-1.1.0.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "distopf"
-version = "1.0.2"
+version = "1.1.0.dev0"
 description = "A package for solving unbalanced three-phase distribution system optimal power flow problems."
 readme = "README.md"
 authors = [

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/plot.py

@@ -179,12 +179,22 @@ def voltage_differences(v1: pd.DataFrame, v2: pd.DataFrame, t=None) -> go.Figure
     return fig
 
 
-def plot_power_flows(s: pd.DataFrame, t=None) -> go.Figure:
+def plot_power_flows(
+    p: pd.DataFrame,
+    q: pd.DataFrame,
+    t: int = None,
+) -> go.Figure:
     """
     Plot the active and reactive power flowing into each bus on each phase.
+
     Parameters
     ----------
-    s : pd.DataFrame
+    p : pd.DataFrame
+        Active power flows with columns ``fb``, ``tb``, ``from_name``,
+        ``to_name``, optionally ``t``, and phase columns ``a``, ``b``, ``c``
+        (and optionally ``s1``, ``s2`` for triplex lines) containing real floats.
+    q : pd.DataFrame
+        Reactive power flows with the same structure as ``p``.
     t : int or None
         Time step to plot. Defaults to 0 when a ``t`` column is present.
 
@@ -192,39 +202,95 @@ def plot_power_flows(s: pd.DataFrame, t=None) -> go.Figure:
     -------
     fig : Plotly figure object
     """
-    s = _choose_t(s, t)
-    s = s.melt(
-        ignore_index=True,
-        id_vars=["fb", "tb", "from_name", "to_name"],
-        var_name="phase",
-        value_name="s",
+    p = _choose_t(p, t)
+    q = _choose_t(q, t)
+
+    id_vars = ["fb", "tb", "from_name", "to_name"]
+    phase_cols = [c for c in ["a", "b", "c", "s1", "s2"] if c in p.columns]
+
+    p_long = p[id_vars + phase_cols].melt(
+        id_vars=id_vars, var_name="phase", value_name="power"
     )
-    s["p"] = s.s.apply(lambda x: x.real)
-    s["q"] = s.s.apply(lambda x: x.imag)
-    del s["s"]
-    s = s.melt(
-        ignore_index=True,
-        id_vars=["fb", "tb", "from_name", "to_name", "phase"],
-        var_name="part",
-        value_name="power",
+    p_long["part"] = "p"
+
+    q_long = q[id_vars + phase_cols].melt(
+        id_vars=id_vars, var_name="phase", value_name="power"
     )
+    q_long["part"] = "q"
+
+    df = pd.concat([p_long, q_long], ignore_index=True)
+
     fig = px.bar(
-        s,
+        df,
         x="to_name",
         y="power",
         facet_col="phase",
         facet_row="part",
         color="phase",
+        category_orders={"phase": phase_cols, "part": ["q", "p"]},
         labels={"to_name": "To-Bus Name"},
     )
     fig.for_each_annotation(lambda a: a.update(text=a.text.split("=")[-1].upper()))
-    fig.update_layout(
-        yaxis4_title="Active Power (p.u.)",
-        yaxis_title="Reactive Power (p.u.)",
-    )
+
+    # In plotly, facet_row places the first category on the BOTTOM row.
+    # With category_orders={"part": ["q", "p"]}, bottom row = q, top row = p.
+    # yaxis1..N correspond to the bottom row (q); yaxis(N+1)..2N to top row (p).
+    n_phases = len(phase_cols)
+    p_first_axis = n_phases + 1  # first p-row yaxis index
+    layout_updates = {
+        "yaxis_title": "Reactive Power (p.u.)",
+        f"yaxis{p_first_axis}_title": "Active Power (p.u.)",
+    }
+    fig.update_layout(**layout_updates)
     return fig
 
 
+# def plot_power_flows(s: pd.DataFrame, t=None) -> go.Figure:
+#     """
+#     Plot the active and reactive power flowing into each bus on each phase.
+#     Parameters
+#     ----------
+#     s : pd.DataFrame
+#     t : int or None
+#         Time step to plot. Defaults to 0 when a ``t`` column is present.
+
+#     Returns
+#     -------
+#     fig : Plotly figure object
+#     """
+#     s = _choose_t(s, t)
+#     s = s.melt(
+#         ignore_index=True,
+#         id_vars=["fb", "tb", "from_name", "to_name"],
+#         var_name="phase",
+#         value_name="s",
+#     )
+#     s["p"] = s.s.apply(lambda x: x.real)
+#     s["q"] = s.s.apply(lambda x: x.imag)
+#     del s["s"]
+#     s = s.melt(
+#         ignore_index=True,
+#         id_vars=["fb", "tb", "from_name", "to_name", "phase"],
+#         var_name="part",
+#         value_name="power",
+#     )
+#     fig = px.bar(
+#         s,
+#         x="to_name",
+#         y="power",
+#         facet_col="phase",
+#         facet_row="part",
+#         color="phase",
+#         labels={"to_name": "To-Bus Name"},
+#     )
+#     fig.for_each_annotation(lambda a: a.update(text=a.text.split("=")[-1].upper()))
+#     fig.update_layout(
+#         yaxis4_title="Active Power (p.u.)",
+#         yaxis_title="Reactive Power (p.u.)",
+#     )
+#     return fig
+
+
 def plot_gens(p_gens: pd.DataFrame, q_gens: pd.DataFrame, t=None) -> go.Figure:
     """
     Plot the active and reactive power flowing into each bus on each phase.
@@ -716,7 +782,9 @@ def plot_voltage_vs_distance(
                     )
 
     for col_idx in range(1, len(phases) + 1):
-        fig.update_xaxes(title_text="Distance from Source Bus (hops)", row=1, col=col_idx)
+        fig.update_xaxes(
+            title_text="Distance from Source Bus (hops)", row=1, col=col_idx
+        )
     fig.update_yaxes(title_text="Voltage (pu)", row=1, col=1)
     fig.update_layout(title_text=title, hovermode="closest")
 
@@ -906,7 +974,9 @@ def plot_line_flow_vs_distance(
                     )
 
     for col_idx in range(1, len(phases) + 1):
-        fig.update_xaxes(title_text="Distance from Source Bus (hops)", row=1, col=col_idx)
+        fig.update_xaxes(
+            title_text="Distance from Source Bus (hops)", row=1, col=col_idx
+        )
     fig.update_yaxes(
         title_text=f"{flow_name} (kW)" if "Power" in flow_name else f"{flow_name}",
         row=1,
@@ -1082,8 +1152,13 @@ def _process_branch_data(branch_data, bus_data, _s, phase_list, edge_scale, edge
         branch_data["s_a"] = _s.a
         branch_data["s_b"] = _s.b
         branch_data["s_c"] = _s.c
-        branch_data["p_abs"] = np.abs(np.real(_s.loc[:, phase_list].sum(axis=1)))
-        branch_data["q_abs"] = np.abs(np.imag(_s.loc[:, phase_list].sum(axis=1)))
+        p_complex = _s.loc[:, phase_list].sum(axis=1)
+        # branch_data["p_abs"] = np.abs(np.real(_s.loc[:, phase_list].sum(axis=1)))
+        # branch_data["q_abs"] = np.abs(np.imag(_s.loc[:, phase_list].sum(axis=1)))
+        branch_data["p_abs"] = p_complex.map(lambda z: abs(z.real))
+        branch_data["q_abs"] = p_complex.map(lambda z: abs(z.imag))
+        branch_data["p_direction"] = p_complex.map(lambda z: np.sign(z.real + 1e-6))
+        branch_data["q_direction"] = p_complex.map(lambda z: np.sign(z.imag + 1e-6))
         branch_data["p_norm"] = (
             branch_data["p_abs"].to_numpy() / branch_data["p_abs"].max() * edge_scale
             + edge_min
@@ -1092,12 +1167,12 @@ def _process_branch_data(branch_data, bus_data, _s, phase_list, edge_scale, edge
             branch_data["q_abs"].to_numpy() / branch_data["q_abs"].max() * edge_scale
             + edge_min
         )
-        branch_data["p_direction"] = np.sign(
-            np.real(_s.loc[:, phase_list].sum(axis=1)) + 1e-6
-        )
-        branch_data["q_direction"] = np.sign(
-            np.imag(_s.loc[:, phase_list].sum(axis=1)) + 1e-6
-        )
+        # branch_data["p_direction"] = np.sign(
+        #     np.real(_s.loc[:, phase_list].sum(axis=1)) + 1e-6
+        # )
+        # branch_data["q_direction"] = np.sign(
+        #     np.imag(_s.loc[:, phase_list].sum(axis=1)) + 1e-6
+        # )
     return branch_data
 
 

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/pyomo_models/__init__.py

@@ -74,6 +74,7 @@ from distopf.pyomo_models.objectives import (
     loss_objective_rule,
     create_penalized_objective,
     set_objective,
+    cost_minimization_rule,
 )
 
 # Solver
@@ -121,6 +122,7 @@ __all__ = [
     "loss_objective_rule",
     "create_penalized_objective",
     "set_objective",
+    "cost_minimization_rule",
     # Solver
     "solve",
 ]

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/pyomo_models/lindist.py

@@ -559,6 +559,21 @@ def _create_branch_thermal_parameters(m: pyo.ConcreteModel, case: Case) -> None:
         )
 
 
+def _create_price_parameters(m: pyo.ConcreteModel, case: Case) -> None:
+    """Create electricity price parameters from schedules."""
+    price_data = {}
+    if "price" in case.schedules.columns:
+        for t in m.time_set:
+            price_data[t] = case.schedules.at[t, "price"]
+
+    m.price = pyo.Param(
+        m.time_set,
+        initialize=price_data,
+        default=0.0,
+        doc="Hourly electricity price ($/MWh)",
+    )
+
+
 def _create_parameters(m: pyo.ConcreteModel, case: Case) -> None:
     """
     Create all parameters for the Pyomo model including impedances, loads,
@@ -573,7 +588,7 @@ def _create_parameters(m: pyo.ConcreteModel, case: Case) -> None:
     _create_v_limit_parameters(m, case)
     _create_battery_parameters(m, case)
     _create_branch_thermal_parameters(m, case)
-
+    _create_price_parameters(m, case)
 
 def create_lindist_model(
     case: Case,

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/pyomo_models/nl_branchflow.py

@@ -37,7 +37,7 @@ def _parse_phases(phases_str: str) -> list[str]:
     >>> _parse_phases("s1")
     ['s1']
     """
-    return re.findall(r'[A-Za-z]\d|.', phases_str)
+    return re.findall(r"[A-Za-z]\d|.", phases_str)
 
 
 def _create_phase_tuples(df: pd.DataFrame, id_col: str = "id") -> list[tuple[int, str]]:
@@ -85,7 +85,9 @@ def _create_sets(m: pyo.ConcreteModel, case: Case) -> None:
     m.branch_phase_pair_set = pyo.Set(
         initialize=[
             (int(fb), int(tb), ph1 + ph2)
-            for fb, tb, phs in case.branch_data.loc[:, ["fb", "tb", "phases"]].to_numpy()
+            for fb, tb, phs in case.branch_data.loc[
+                :, ["fb", "tb", "phases"]
+            ].to_numpy()
             for ph1, ph2 in combinations_with_replacement(sorted(_parse_phases(phs)), 2)
         ]
     )
@@ -101,7 +103,9 @@ def _create_sets(m: pyo.ConcreteModel, case: Case) -> None:
     m.branch_angle_phase_pair_set = pyo.Set(
         initialize=[
             (int(fb), int(tb), ph1 + ph2)
-            for fb, tb, phs in case.branch_data.loc[:, ["fb", "tb", "phases"]].to_numpy()
+            for fb, tb, phs in case.branch_data.loc[
+                :, ["fb", "tb", "phases"]
+            ].to_numpy()
             for ph1, ph2 in product(_parse_phases(phs), repeat=2)
             if tb not in m.swing_bus_set
         ]
@@ -579,7 +583,24 @@ def _create_branch_thermal_parameters(m: pyo.ConcreteModel, case: Case) -> None:
 
 
 def _create_angle_parameters(m: pyo.ConcreteModel, case: Case) -> None:
-    m.d = pyo.Param(m.branch_angle_phase_pair_set, initialize=0, mutable=True, domain=pyo.Any)
+    m.d = pyo.Param(
+        m.branch_angle_phase_pair_set, initialize=0, mutable=True, domain=pyo.Any
+    )
+
+
+def _create_price_parameters(m: pyo.ConcreteModel, case: Case) -> None:
+    """Create electricity price parameters from schedules."""
+    price_data = {}
+    if "price" in case.schedules.columns:
+        for t in m.time_set:
+            price_data[t] = case.schedules.at[t, "price"]
+
+    m.price = pyo.Param(
+        m.time_set,
+        initialize=price_data,
+        default=0.0,
+        doc="Hourly electricity price ($/MWh)",
+    )
 
 
 def _create_parameters(m: pyo.ConcreteModel, case: Case) -> None:
@@ -597,6 +618,7 @@ def _create_parameters(m: pyo.ConcreteModel, case: Case) -> None:
     _create_battery_parameters(m, case)
     _create_branch_thermal_parameters(m, case)
     _create_angle_parameters(m, case)
+    _create_price_parameters(m, case)
 
 
 def create_nl_branchflow_model(

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/pyomo_models/objectives.py

@@ -108,6 +108,16 @@ def generation_curtailment_objective_rule(model: LindistModelProtocol):
     return total_curtailment
 
 
+def cost_minimization_rule(m):
+    """Minimize energy procurement cost from swing bus."""
+    total_cost = 0
+    for fb, tb, ph in m.branch_phase_set:
+        for t in m.time_set:
+            if fb in m.swing_bus_set:
+                total_cost += m.p_flow[fb, tb, ph, t] * m.price[t] * m.delta_t
+    return total_cost
+
+
 # ============ Penalty Functions for Soft Constraints ==================================
 # ======================================================================================
 #

{distopf-1.0.2 → distopf-1.1.0.dev0}/src/distopf/wrappers/pyomo_wrapper.py

@@ -396,6 +396,7 @@ class PyomoWrapper(Wrapper):
             substation_power_objective_rule,
             voltage_deviation_objective_rule,
             generation_curtailment_objective_rule,
+            cost_minimization_rule,
         )
 
         if objective is None:
@@ -415,6 +416,8 @@ class PyomoWrapper(Wrapper):
             "curtail": generation_curtailment_objective_rule,
             "curtail_min": generation_curtailment_objective_rule,
             "curtailment": generation_curtailment_objective_rule,
+            "cost": cost_minimization_rule,
+            "cost_min": cost_minimization_rule,
         }
 
         if obj_lower in objective_map:

{distopf-1.0.2 → distopf-1.1.0.dev0}/uv.lock

@@ -420,7 +420,7 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 dependencies = [
-    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
+    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/66/54/eb9bfc647b19f2009dd5c7f5ec51c4e6ca831725f1aea7a993034f483147/contourpy-1.3.2.tar.gz", hash = "sha256:b6945942715a034c671b7fc54f9588126b0b8bf23db2696e3ca8328f3ff0ab54", size = 13466130, upload-time = "2025-04-15T17:47:53.79Z" }
 wheels = [
@@ -492,7 +492,7 @@ resolution-markers = [
     "python_full_version == '3.11.*'",
 ]
 dependencies = [
-    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
+    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" }
 wheels = [
@@ -763,7 +763,7 @@ wheels = [
 
 [[package]]
 name = "distopf"
-version = "1.0.2"
+version = "1.1.0.dev0"
 source = { editable = "." }
 dependencies = [
     { name = "altdss", extra = ["all"] },
@@ -919,7 +919,7 @@ name = "exceptiongroup"
 version = "1.3.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749, upload-time = "2025-05-10T17:42:51.123Z" }
 wheels = [
@@ -1233,17 +1233,17 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 dependencies = [
-    { name = "colorama", marker = "python_full_version < '3.11' and sys_platform == 'win32'" },
-    { name = "decorator", marker = "python_full_version < '3.11'" },
-    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
-    { name = "jedi", marker = "python_full_version < '3.11'" },
-    { name = "matplotlib-inline", marker = "python_full_version < '3.11'" },
-    { name = "pexpect", marker = "python_full_version < '3.11' and sys_platform != 'emscripten' and sys_platform != 'win32'" },
-    { name = "prompt-toolkit", marker = "python_full_version < '3.11'" },
-    { name = "pygments", marker = "python_full_version < '3.11'" },
-    { name = "stack-data", marker = "python_full_version < '3.11'" },
-    { name = "traitlets", marker = "python_full_version < '3.11'" },
-    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "decorator" },
+    { name = "exceptiongroup" },
+    { name = "jedi" },
+    { name = "matplotlib-inline" },
+    { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" },
+    { name = "prompt-toolkit" },
+    { name = "pygments" },
+    { name = "stack-data" },
+    { name = "traitlets" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/85/31/10ac88f3357fc276dc8a64e8880c82e80e7459326ae1d0a211b40abf6665/ipython-8.37.0.tar.gz", hash = "sha256:ca815841e1a41a1e6b73a0b08f3038af9b2252564d01fc405356d34033012216", size = 5606088, upload-time = "2025-05-31T16:39:09.613Z" }
 wheels = [
@@ -1260,17 +1260,17 @@ resolution-markers = [
     "python_full_version == '3.11.*'",
 ]
 dependencies = [
-    { name = "colorama", marker = "python_full_version >= '3.11' and sys_platform == 'win32'" },
-    { name = "decorator", marker = "python_full_version >= '3.11'" },
-    { name = "ipython-pygments-lexers", marker = "python_full_version >= '3.11'" },
-    { name = "jedi", marker = "python_full_version >= '3.11'" },
-    { name = "matplotlib-inline", marker = "python_full_version >= '3.11'" },
-    { name = "pexpect", marker = "python_full_version >= '3.11' and sys_platform != 'emscripten' and sys_platform != 'win32'" },
-    { name = "prompt-toolkit", marker = "python_full_version >= '3.11'" },
-    { name = "pygments", marker = "python_full_version >= '3.11'" },
-    { name = "stack-data", marker = "python_full_version >= '3.11'" },
-    { name = "traitlets", marker = "python_full_version >= '3.11'" },
-    { name = "typing-extensions", marker = "python_full_version == '3.11.*'" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "decorator" },
+    { name = "ipython-pygments-lexers" },
+    { name = "jedi" },
+    { name = "matplotlib-inline" },
+    { name = "pexpect", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" },
+    { name = "prompt-toolkit" },
+    { name = "pygments" },
+    { name = "stack-data" },
+    { name = "traitlets" },
+    { name = "typing-extensions", marker = "python_full_version < '3.12'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/6e/71/a86262bf5a68bf211bcc71fe302af7e05f18a2852fdc610a854d20d085e6/ipython-9.5.0.tar.gz", hash = "sha256:129c44b941fe6d9b82d36fc7a7c18127ddb1d6f02f78f867f402e2e3adde3113", size = 4389137, upload-time = "2025-08-29T12:15:21.519Z" }
 wheels = [
@@ -1282,7 +1282,7 @@ name = "ipython-pygments-lexers"
 version = "1.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "pygments", marker = "python_full_version >= '3.11'" },
+    { name = "pygments" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/ef/4c/5dd1d8af08107f88c7f741ead7a40854b8ac24ddf9ae850afbcf698aa552/ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81", size = 8393, upload-time = "2025-01-17T11:24:34.505Z" }
 wheels = [
@@ -2441,7 +2441,7 @@ name = "numpy-typing-compat"
 version = "20250818.2.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
+    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/c9/e3/1a29f174c1e09a2bf111d37a41afceea1b501371abb39e73170ca31a7599/numpy_typing_compat-20250818.2.3.tar.gz", hash = "sha256:72e83d535b635d668ba7315e43ae80be1469a6faea6fc96d312516f39b3d8fa5", size = 4974, upload-time = "2025-08-18T23:46:42.968Z" }
 wheels = [
@@ -2479,7 +2479,7 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/88/3c/9d59b0167458b839273ad0c4fc5f62f787058d8f5aed7f71294963a99471/optype-0.9.3.tar.gz", hash = "sha256:5f09d74127d316053b26971ce441a4df01f3a01943601d3712dd6f34cdfbaf48", size = 96143, upload-time = "2025-03-31T17:00:08.392Z" }
 wheels = [
@@ -2496,7 +2496,7 @@ resolution-markers = [
     "python_full_version == '3.11.*'",
 ]
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version >= '3.11' and python_full_version < '3.13'" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/20/7f/daa32a35b2a6a564a79723da49c0ddc464c462e67a906fc2b66a0d64f28e/optype-0.13.4.tar.gz", hash = "sha256:131d8e0f1c12d8095d553e26b54598597133830983233a6a2208886e7a388432", size = 99547, upload-time = "2025-08-19T19:52:44.242Z" }
 wheels = [
@@ -2505,8 +2505,8 @@ wheels = [
 
 [package.optional-dependencies]
 numpy = [
-    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
-    { name = "numpy-typing-compat", marker = "python_full_version >= '3.11'" },
+    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
+    { name = "numpy-typing-compat" },
 ]
 
 [[package]]
@@ -3498,7 +3498,7 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 dependencies = [
-    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
+    { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/0f/37/6964b830433e654ec7485e45a00fc9a27cf868d622838f6b6d9c5ec0d532/scipy-1.15.3.tar.gz", hash = "sha256:eae3cf522bc7df64b42cad3925c876e1b0b6c35c1337c93e12c0f366f55b0eaf", size = 59419214, upload-time = "2025-05-08T16:13:05.955Z" }
 wheels = [
@@ -3559,7 +3559,7 @@ resolution-markers = [
     "python_full_version == '3.11.*'",
 ]
 dependencies = [
-    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
+    { name = "numpy", version = "2.3.3", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/f5/4a/b927028464795439faec8eaf0b03b011005c487bb2d07409f28bf30879c4/scipy-1.16.1.tar.gz", hash = "sha256:44c76f9e8b6e8e488a586190ab38016e4ed2f8a038af7cd3defa903c0a2238b3", size = 30580861, upload-time = "2025-07-27T16:33:30.834Z" }
 wheels = [
@@ -3627,7 +3627,7 @@ resolution-markers = [
     "python_full_version < '3.11'",
 ]
 dependencies = [
-    { name = "optype", version = "0.9.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
+    { name = "optype", version = "0.9.3", source = { registry = "https://pypi.org/simple" } },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/0b/5f/35c43bd7d412add4adcd68475702571b2489b50c40b6564f808b2355e452/scipy_stubs-1.15.3.0.tar.gz", hash = "sha256:e8f76c9887461cf9424c1e2ad78ea5dac71dd4cbb383dc85f91adfe8f74d1e17", size = 275699, upload-time = "2025-05-08T16:58:35.139Z" }
 wheels = [
@@ -3644,7 +3644,7 @@ resolution-markers = [
     "python_full_version == '3.11.*'",
 ]
 dependencies = [
-    { name = "optype", version = "0.13.4", source = { registry = "https://pypi.org/simple" }, extra = ["numpy"], marker = "python_full_version >= '3.11'" },
+    { name = "optype", version = "0.13.4", source = { registry = "https://pypi.org/simple" }, extra = ["numpy"] },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/ab/7e/978c7cad40405cb927d065c31bfaefbc09b4f6cf1ce97e4af6625b1935ab/scipy_stubs-1.16.1.1.tar.gz", hash = "sha256:5b36fdcc1a66cc530c08917fa7c7499ec7a607487735419c677742dcf25803fb", size = 347578, upload-time = "2025-08-21T00:57:31.306Z" }
 wheels = [