chellow 1722367388.0.0__py3-none-any.whl → 1723449410.0.0__py3-none-any.whl

chellow/e/bill_parsers/edf_export_xlsx.py

@@ -0,0 +1,217 @@
+from datetime import datetime as Datetime
+from decimal import Decimal, InvalidOperation
+
+from dateutil.relativedelta import relativedelta
+
+from openpyxl import load_workbook
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.utils import HH, ct_datetime, parse_mpan_core, to_ct, to_utc
+
+
+def get_cell(sheet, col, row):
+    try:
+        coordinates = f"{col}{row}"
+        return sheet[coordinates]
+    except IndexError:
+        raise BadRequest(f"Can't find the cell {coordinates} on sheet {sheet}.")
+
+
+def get_date(sheet, col, row):
+    cell = get_cell(sheet, col, row)
+    val = cell.value
+    if not isinstance(val, Datetime):
+        raise BadRequest(
+            f"Problem reading {val} (of type {type(val)}) as a timestamp at "
+            f"{cell.coordinate}."
+        )
+    return val
+
+
+def get_str(sheet, col, row):
+    return get_cell(sheet, col, row).value.strip()
+
+
+def get_dec(sheet, col, row):
+    cell = get_cell(sheet, col, row)
+    try:
+        return Decimal(str(cell.value))
+    except InvalidOperation as e:
+        raise BadRequest(f"Problem parsing the number at {cell.coordinate}. {e}")
+
+
+def get_int(sheet, col, row):
+    return int(get_cell(sheet, col, row).value)
+
+
+ELEM_LOOKUP = {
+    "Capacity": {
+        "name": "duos-availability",
+        "gbp": "duos-availability-gbp",
+        "units": "duos-availability-kva",
+        "rate": "duos-availability-rate",
+    },
+    "Fixed Charge": {
+        "name": "duos-fixed",
+        "gbp": "duos-fixed-gbp",
+        "units": "duos-fixed-days",
+        "rate": "duos-fixed-rate",
+    },
+    "Unit Rate Zero": None,
+    "Excess Reactive Power": {
+        "name": "duos-reactive",
+        "gbp": "duos-reactive-gbp",
+        "units": "duos-reactive-kvarh",
+        "rate": "duos-reactive-gbp-per-kvarh",
+    },
+    "Unit Rate Amber": {
+        "name": "duos-amber",
+        "gbp": "duos-amber-gbp",
+        "units": "duos-amber-kwh",
+        "rate": "duos-amber-gbp-per-kwh",
+    },
+    "Unit Rate Green": {
+        "name": "duos-green",
+        "gbp": "duos-green-gbp",
+        "units": "duos-green-kwh",
+        "rate": "duos-green-gbp-per-kwh",
+    },
+    "Unit Rate Red": {
+        "name": "duos-red",
+        "gbp": "duos-red-gbp",
+        "units": "duos-red-kwh",
+        "rate": "duos-red-gbp-per-kwh",
+    },
+}
+
+
+def _make_raw_bills(book):
+    bills = []
+    sheet = book.worksheets[0]
+    issue_date_raw = get_date(sheet, "H", 24)
+    issue_date = to_utc(
+        ct_datetime(issue_date_raw.year, issue_date_raw.month, issue_date_raw.day)
+    )
+
+    mpan_core = parse_mpan_core(str(get_int(sheet, "D", 25)))
+    start_date_str = get_str(sheet, "D", 22)
+    start_date_ct = to_ct(Datetime.strptime(start_date_str, "%d-%b-%Y"))
+    start_date = to_utc(start_date_ct)
+    finish_date_str = get_str(sheet, "F", 22)
+    finish_date_ct = to_ct(Datetime.strptime(finish_date_str, "%d-%b-%Y"))
+    finish_date = to_utc(finish_date_ct + relativedelta(hours=23, minutes=30))
+    net = round(get_dec(sheet, "H", 33), 2)
+    kwh = get_dec(sheet, "D", 33)
+
+    breakdown = {
+        "ssp-kwh": kwh,
+        "ssp-gbp": net,
+    }
+
+    bills.append(
+        {
+            "bill_type_code": "N",
+            "kwh": kwh,
+            "vat": Decimal("0.00"),
+            "net": net,
+            "gross": net,
+            "reads": [],
+            "breakdown": breakdown,
+            "account": mpan_core,
+            "issue_date": issue_date,
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "mpan_core": mpan_core,
+            "reference": "_".join(
+                (
+                    to_ct(start_date).strftime("%Y%m%d"),
+                    to_ct(finish_date).strftime("%Y%m%d"),
+                    to_ct(issue_date).strftime("%Y%m%d"),
+                    mpan_core,
+                    "ssp",
+                )
+            ),
+        }
+    )
+    sheet = book.worksheets[3]
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        start_date_str = get_str(sheet, "B", row)
+        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
+        start_date = to_utc(start_date_ct)
+        finish_date = to_utc(start_date_ct + relativedelta(months=1) - HH)
+
+        element_desc = get_str(sheet, "D", row).strip()
+        units = get_dec(sheet, "E", row)
+        rate = get_dec(sheet, "F", row)
+        net = round(get_dec(sheet, "G", row), 2)
+
+        titles = ELEM_LOOKUP[element_desc]
+        if titles is None:
+            continue
+
+        breakdown = {
+            titles["gbp"]: net,
+            titles["units"]: units,
+            titles["rate"]: [rate],
+        }
+
+        bills.append(
+            {
+                "bill_type_code": "N",
+                "kwh": Decimal(0),
+                "vat": Decimal("0.00"),
+                "net": net,
+                "gross": net,
+                "reads": [],
+                "breakdown": breakdown,
+                "account": mpan_core,
+                "issue_date": issue_date,
+                "start_date": start_date,
+                "finish_date": finish_date,
+                "mpan_core": mpan_core,
+                "reference": "_".join(
+                    (
+                        to_ct(start_date).strftime("%Y%m%d"),
+                        to_ct(finish_date).strftime("%Y%m%d"),
+                        to_ct(issue_date).strftime("%Y%m%d"),
+                        mpan_core,
+                        titles["name"],
+                    )
+                ),
+            }
+        )
+    return bills
+
+
+class Parser:
+    def __init__(self, f):
+        self.book = load_workbook(f, data_only=True)
+
+        self.last_line = None
+        self._line_number = None
+        self._title_line = None
+
+    @property
+    def line_number(self):
+        return None if self._line_number is None else self._line_number + 1
+
+    def _set_last_line(self, i, line):
+        self._line_number = i
+        self.last_line = line
+        if i == 0:
+            self._title_line = line
+        return line
+
+    def make_raw_bills(self):
+        row = bills = None
+        try:
+            bills = _make_raw_bills(self.book)
+        except BadRequest as e:
+            raise BadRequest(f"Row number: {row} {e.description}")
+
+        return bills

chellow/e/computer.py

@@ -63,8 +63,8 @@ cons_types = ["construction", "commissioning", "operation"]
 lec_cats = list(
     (f"{v}-kwh", f"hist-{v}-kwh")
     for v in [
-        "import-net",
-        "export-net",
+        "import-grid",
+        "export-grid",
         "import-gen",
         "export-gen",
         "import-3rd-party",
@@ -265,9 +265,9 @@ def displaced_era(
         era = site_era.era
         source_code = era.supply.source.code
         if site_era.is_physical and (
-            source_code in ("gen", "gen-net")
+            source_code in ("gen", "gen-grid")
             or (
-                source_code == "net"
+                source_code == "grid"
                 and sess.query(Channel)
                 .filter(
                     Channel.era == era,
@@ -280,7 +280,7 @@ def displaced_era(
         ):
             has_displaced = True
 
-        if source_code in ("net", "gen-net") and era.imp_mpan_core is not None:
+        if source_code in ("grid", "gen-grid") and era.imp_mpan_core is not None:
             eras[
                 "_".join(
                     (
@@ -482,8 +482,8 @@ def datum_range(sess, caches, years_back, start_date, finish_date):
                         "exp-msp-kvar": 0,
                         "msp-kw": 0,
                         "msp-kwh": 0,
-                        "hist-import-net-kvarh": 0,
-                        "hist-export-net-kvarh": 0,
+                        "hist-import-grid-kvarh": 0,
+                        "hist-export-grid-kvarh": 0,
                         "anti-msp-kwh": 0,
                         "anti-msp-kw": 0,
                         "imp-msp-kvarh": 0,
@@ -740,8 +740,8 @@ class SiteSource(DataSource):
         hist_map = {}
 
         for hist_date in hh_range(self.caches, self.history_start, self.history_finish):
-            export_net_kwh = 0
-            import_net_kwh = 0
+            export_grid_kwh = 0
+            import_grid_kwh = 0
             export_gen_kwh = 0
             import_gen_kwh = 0
             import_3rd_party_kwh = 0
@@ -749,16 +749,16 @@ class SiteSource(DataSource):
             export_3rd_party_kwh = 0
             while hh_start_date == hist_date:
                 statuses.add(status)
-                if not imp_related and source_code in ("net", "gen-net"):
-                    export_net_kwh += hh_value
-                if imp_related and source_code in ("net", "gen-net"):
-                    import_net_kwh += hh_value
+                if not imp_related and source_code in ("grid", "gen-grid"):
+                    export_grid_kwh += hh_value
+                if imp_related and source_code in ("grid", "gen-grid"):
+                    import_grid_kwh += hh_value
                 if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-net"
+                    not imp_related and source_code == "gen-grid"
                 ):
                     import_gen_kwh += hh_value
                 if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-net"
+                    imp_related and source_code == "gen-grid"
                 ):
                     export_gen_kwh += hh_value
                 if (imp_related and source_code == "3rd-party") or (
@@ -781,8 +781,8 @@ class SiteSource(DataSource):
 
             hh_values = {
                 "status": status,
-                "hist-import-net-kwh": import_net_kwh,
-                "hist-export-net-kwh": export_net_kwh,
+                "hist-import-grid-kwh": import_grid_kwh,
+                "hist-export-grid-kwh": export_grid_kwh,
                 "hist-import-gen-kwh": import_gen_kwh,
                 "hist-export-gen-kwh": export_gen_kwh,
                 "hist-import-3rd-party-kwh": import_3rd_party_kwh,
@@ -794,7 +794,7 @@ class SiteSource(DataSource):
             hh_values["hist-kwh"] = hh_values["hist-used-gen-msp-kwh"] = (
                 hh_values["hist-import-gen-kwh"]
                 - hh_values["hist-export-gen-kwh"]
-                - hh_values["hist-export-net-kwh"]
+                - hh_values["hist-export-grid-kwh"]
             )
 
             hh_values["msp-kwh"] = hh_values["used-gen-msp-kwh"] = hh_values[
@@ -805,12 +805,12 @@ class SiteSource(DataSource):
 
             hh_values["hist-used-kwh"] = (
                 hh_values["hist-used-gen-msp-kwh"]
-                + hh_values["hist-import-net-kwh"]
+                + hh_values["hist-import-grid-kwh"]
                 + hh_values["hist-used-3rd-party-kwh"]
             )
 
             hh_values["used-kwh"] = hh_values["hist-used-kwh"]
-            hh_values["import-net-kwh"] = hh_values["hist-import-net-kwh"]
+            hh_values["import-grid-kwh"] = hh_values["hist-import-grid-kwh"]
             hh_values["msp-kw"] = hh_values["used-gen-msp-kw"] = (
                 hh_values["used-gen-msp-kwh"] * 2
             )
@@ -835,8 +835,8 @@ class SiteSource(DataSource):
             for hh in self.hh_data:
                 try:
                     delt_hh = self.deltas["hhs"][hh["start-date"]]
-                    hh["import-net-kwh"] = delt_hh["import-net-kwh"]
-                    hh["export-net-kwh"] = delt_hh["export-net-kwh"]
+                    hh["import-grid-kwh"] = delt_hh["import-grid-kwh"]
+                    hh["export-grid-kwh"] = delt_hh["export-grid-kwh"]
                     hh["import-gen-kwh"] = delt_hh["import-gen-kwh"]
                     hh["msp-kwh"] = delt_hh["msp-kwh"]
                     hh["used-kwh"] = delt_hh["used-kwh"]

chellow/e/scenario.py

@@ -89,14 +89,14 @@ def make_site_deltas(
     delts = site_deltas["supply_deltas"] = {}
     for is_import in (True, False):
         delts[is_import] = {}
-        for src in ("gen", "net", "gen-net", "3rd-party", "3rd-party-reverse", "sub"):
+        for src in ("gen", "grid", "gen-grid", "3rd-party", "3rd-party-reverse", "sub"):
             delts[is_import][src] = {"site": {}}
 
     earliest_delta = to_utc(Datetime.max)
     latest_delta = to_utc(Datetime.min)
 
     found_hh = False
-    for typ in ("used", "generated", "parasitic", "gen_net"):
+    for typ in ("used", "generated", "parasitic", "gen_grid"):
         hh_str = site_scenario_hh.get(typ, "")
         hh_data = site_scenario_hh[typ] = {}
         for row in csv.reader(StringIO(hh_str)):
@@ -129,7 +129,7 @@ def make_site_deltas(
     scenario_used = site_scenario_hh["used"]
     scenario_generated = site_scenario_hh["generated"]
     scenario_parasitic = site_scenario_hh["parasitic"]
-    scenario_gen_net = site_scenario_hh["gen_net"]
+    scenario_gen_grid = site_scenario_hh["gen_grid"]
 
     earliest_delta_ct = to_ct(earliest_delta)
     for month_start, month_finish in c_months_u(
@@ -170,7 +170,7 @@ def make_site_deltas(
 
             for hh in ss.hh_data:
                 sdatum = hh_map[hh["start-date"]]
-                sdatum["import-net-kwh"] += hh["msp-kwh"]
+                sdatum["import-grid-kwh"] += hh["msp-kwh"]
                 sdatum["used-kwh"] += hh["msp-kwh"]
 
         for era in (
@@ -185,7 +185,7 @@ def make_site_deltas(
                 Era.imp_mpan_core != null(),
                 Era.start_date <= chunk_finish,
                 or_(Era.finish_date == null(), Era.finish_date >= chunk_start),
-                Source.code == "gen-net",
+                Source.code == "gen-grid",
             )
         ):
             if supply_ids is not None and era.supply_id not in supply_ids:
@@ -201,65 +201,65 @@ def make_site_deltas(
             for hh in ss.hh_data:
                 sdatum = hh_map[hh["start-date"]]
                 try:
-                    sdatum["gen-net-kwh"] += hh["msp-kwh"]
+                    sdatum["gen-grid-kwh"] += hh["msp-kwh"]
                 except KeyError:
-                    sdatum["gen-net-kwh"] = hh["msp-kwh"]
+                    sdatum["gen-grid-kwh"] = hh["msp-kwh"]
 
         for hh_start, hh in hh_map.items():
             if hh_start in scenario_used:
                 used_delt = scenario_used[hh_start] - hh["used-kwh"]
-                imp_net_delt = 0
-                exp_net_delt = 0
+                imp_grid_delt = 0
+                exp_grid_delt = 0
 
                 if used_delt < 0:
-                    diff = hh["import-net-kwh"] + used_delt
+                    diff = hh["import-grid-kwh"] + used_delt
                     if diff < 0:
-                        imp_net_delt -= hh["import-net-kwh"]
-                        exp_net_delt -= diff
+                        imp_grid_delt -= hh["import-grid-kwh"]
+                        exp_grid_delt -= diff
                     else:
-                        imp_net_delt += used_delt
+                        imp_grid_delt += used_delt
                 else:
-                    diff = hh["export-net-kwh"] - used_delt
+                    diff = hh["export-grid-kwh"] - used_delt
                     if diff < 0:
-                        exp_net_delt -= hh["export-net-kwh"]
-                        imp_net_delt -= diff
+                        exp_grid_delt -= hh["export-grid-kwh"]
+                        imp_grid_delt -= diff
                     else:
-                        exp_net_delt -= used_delt
+                        exp_grid_delt -= used_delt
 
                 try:
-                    delts[False]["net"]["site"][hh_start] += exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] += exp_grid_delt
                 except KeyError:
-                    delts[False]["net"]["site"][hh_start] = exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] = exp_grid_delt
 
                 try:
-                    delts[True]["net"]["site"][hh_start] += imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] += imp_grid_delt
                 except KeyError:
-                    delts[True]["net"]["site"][hh_start] = imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] = imp_grid_delt
 
-                hh["import-net-kwh"] += imp_net_delt
-                hh["export-net-kwh"] += exp_net_delt
+                hh["import-grid-kwh"] += imp_grid_delt
+                hh["export-grid-kwh"] += exp_grid_delt
                 hh["used-kwh"] += used_delt
-                hh["msp-kwh"] -= exp_net_delt
+                hh["msp-kwh"] -= exp_grid_delt
 
             if hh_start in scenario_generated:
                 imp_gen_delt = scenario_generated[hh_start] - hh["import-gen-kwh"]
-                imp_net_delt = 0
-                exp_net_delt = 0
+                imp_grid_delt = 0
+                exp_grid_delt = 0
 
                 if imp_gen_delt < 0:
-                    diff = hh["export-net-kwh"] + imp_gen_delt
+                    diff = hh["export-grid-kwh"] + imp_gen_delt
                     if diff < 0:
-                        exp_net_delt -= hh["export-net-kwh"]
-                        imp_net_delt -= diff
+                        exp_grid_delt -= hh["export-grid-kwh"]
+                        imp_grid_delt -= diff
                     else:
-                        exp_net_delt += imp_gen_delt
+                        exp_grid_delt += imp_gen_delt
                 else:
-                    diff = hh["import-net-kwh"] - imp_gen_delt
+                    diff = hh["import-grid-kwh"] - imp_gen_delt
                     if diff < 0:
-                        imp_net_delt -= hh["import-net-kwh"]
-                        exp_net_delt -= diff
+                        imp_grid_delt -= hh["import-grid-kwh"]
+                        exp_grid_delt -= diff
                     else:
-                        imp_net_delt -= imp_gen_delt
+                        imp_grid_delt -= imp_gen_delt
 
                 try:
                     delts[True]["gen"]["site"][hh_start] += imp_gen_delt
@@ -267,39 +267,39 @@ def make_site_deltas(
                     delts[True]["gen"]["site"][hh_start] = imp_gen_delt
 
                 try:
-                    delts[False]["net"]["site"][hh_start] += exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] += exp_grid_delt
                 except KeyError:
-                    delts[False]["net"]["site"][hh_start] = exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] = exp_grid_delt
 
                 try:
-                    delts[True]["net"]["site"][hh_start] += imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] += imp_grid_delt
                 except KeyError:
-                    delts[True]["net"]["site"][hh_start] = imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] = imp_grid_delt
 
-                hh["import-net-kwh"] += imp_net_delt
-                hh["export-net-kwh"] += exp_net_delt
+                hh["import-grid-kwh"] += imp_grid_delt
+                hh["export-grid-kwh"] += exp_grid_delt
                 hh["import-gen-kwh"] += imp_gen_delt
-                hh["msp-kwh"] -= imp_net_delt
+                hh["msp-kwh"] -= imp_grid_delt
 
             if hh_start in scenario_parasitic:
                 exp_gen_delt = scenario_parasitic[hh_start] - hh["export-gen-kwh"]
-                imp_net_delt = 0
-                exp_net_delt = 0
+                imp_grid_delt = 0
+                exp_grid_delt = 0
 
                 if exp_gen_delt < 0:
-                    diff = hh["import-net-kwh"] + exp_gen_delt
+                    diff = hh["import-grid-kwh"] + exp_gen_delt
                     if diff < 0:
-                        imp_net_delt -= hh["import-net-kwh"]
-                        exp_net_delt -= diff
+                        imp_grid_delt -= hh["import-grid-kwh"]
+                        exp_grid_delt -= diff
                     else:
-                        imp_net_delt += exp_gen_delt
+                        imp_grid_delt += exp_gen_delt
                 else:
-                    diff = hh["export-net-kwh"] - exp_gen_delt
+                    diff = hh["export-grid-kwh"] - exp_gen_delt
                     if diff < 0:
-                        exp_net_delt -= hh["export-net-kwh"]
-                        imp_net_delt -= diff
+                        exp_grid_delt -= hh["export-grid-kwh"]
+                        imp_grid_delt -= diff
                     else:
-                        exp_net_delt -= exp_gen_delt
+                        exp_grid_delt -= exp_gen_delt
 
                 try:
                     delts[False]["gen"]["site"][hh_start] += imp_gen_delt
@@ -307,34 +307,34 @@ def make_site_deltas(
                     delts[False]["gen"]["site"][hh_start] = exp_gen_delt
 
                 try:
-                    delts[False]["net"]["site"][hh_start] += exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] += exp_grid_delt
                 except KeyError:
-                    delts[False]["net"]["site"][hh_start] = exp_net_delt
+                    delts[False]["grid"]["site"][hh_start] = exp_grid_delt
 
                 try:
-                    delts[True]["net"]["site"][hh_start] += imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] += imp_grid_delt
                 except KeyError:
-                    delts[True]["net"]["site"][hh_start] = imp_net_delt
+                    delts[True]["grid"]["site"][hh_start] = imp_grid_delt
 
-                hh["import-net-kwh"] += imp_net_delt
-                hh["export-net-kwh"] += exp_net_delt
+                hh["import-grid-kwh"] += imp_grid_delt
+                hh["export-grid-kwh"] += exp_grid_delt
                 hh["export-gen-kwh"] += exp_gen_delt
-                hh["msp-kwh"] -= imp_net_delt
+                hh["msp-kwh"] -= imp_grid_delt
 
-            if hh_start in scenario_gen_net:
-                gen_net_delt = scenario_gen_net[hh_start] - hh["gen-net-kwh"]
+            if hh_start in scenario_gen_grid:
+                gen_grid_delt = scenario_gen_grid[hh_start] - hh["gen-grid-kwh"]
 
                 try:
-                    delts[False]["gen-net"]["site"][hh_start] += gen_net_delt
+                    delts[False]["gen-grid"]["site"][hh_start] += gen_grid_delt
                 except KeyError:
-                    delts[False]["gen-net"]["site"][hh_start] = gen_net_delt
+                    delts[False]["gen-grid"]["site"][hh_start] = gen_grid_delt
 
-                hh["import-gen-kwh"] += gen_net_delt
-                hh["export-net-kwh"] += gen_net_delt
+                hh["import-gen-kwh"] += gen_grid_delt
+                hh["export-grid-kwh"] += gen_grid_delt
 
             site_deltas["hhs"][hh_start] = hh
 
-    sup_deltas = site_deltas["supply_deltas"][False]["net"]["site"]
+    sup_deltas = site_deltas["supply_deltas"][False]["grid"]["site"]
     if all(v == 0 for v in sup_deltas.values()):
         sup_deltas.clear()
 
@@ -569,10 +569,10 @@ def make_calcs(
 
             calcs.append(("0", imp_ss_name, exp_ss_name, imp_ss, exp_ss))
 
-        # Check if exp net deltas haven't been consumed
-        sup_deltas = site_deltas["supply_deltas"][False]["net"]
+        # Check if exp grid deltas haven't been consumed
+        sup_deltas = site_deltas["supply_deltas"][False]["grid"]
         if len(list(t for t in sup_deltas["site"] if ss_start <= t <= ss_finish)) > 0:
-            ss_name = site.code + "_extra_net_export"
+            ss_name = site.code + "_extra_grid_export"
             ss = SupplySource(
                 sess,
                 ss_start,

chellow/e/views.py

@@ -4168,16 +4168,16 @@ def em_hh_data_get(site_id):
                 sup_hh[prefix + "kwh"] = datum.value
                 sup_hh[prefix + "status"] = datum.status
 
-                if not imp_related and source_code in ("net", "gen-net"):
+                if not imp_related and source_code in ("grid", "gen-grid"):
                     hh_dict["export_kwh"] += hh_float_value
-                if imp_related and source_code in ("net", "gen-net"):
+                if imp_related and source_code in ("grid", "gen-grid"):
                     hh_dict["import_kwh"] += hh_float_value
                 if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-net"
+                    not imp_related and source_code == "gen-grid"
                 ):
                     hh_dict["generated_kwh"] += hh_float_value
                 if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-net"
+                    imp_related and source_code == "gen-grid"
                 ):
                     hh_dict["parasitic_kwh"] += hh_float_value
                 if (imp_related and source_code == "3rd-party") or (
@@ -4213,9 +4213,9 @@ def site_energy_management_months_get(site_id):
     site = Site.get_by_id(g.sess, site_id)
 
     typs = (
-        "imp_net",
+        "imp_grid",
         "imp_3p",
-        "exp_net",
+        "exp_grid",
         "exp_3p",
         "used",
         "displaced",
@@ -4332,7 +4332,7 @@ def site_add_e_supply_form_get(site_id):
         sources = g.sess.scalars(select(Source).order_by(Source.code))
         source_id = req_int_none("source_id")
         if source_id is None:
-            source = Source.get_by_code(g.sess, "net")
+            source = Source.get_by_code(g.sess, "grid")
         else:
             source = Source.get_by_id(g.sess, source_id)
         generator_types = g.sess.query(GeneratorType).order_by(GeneratorType.code)
@@ -5894,7 +5894,7 @@ def supply_edit_post(supply_id):
             source_id = req_int("source_id")
             gsp_group_id = req_int("gsp_group_id")
             source = Source.get_by_id(g.sess, source_id)
-            if source.code in ("gen", "gen-net"):
+            if source.code in ("gen", "gen-grid"):
                 generator_type_id = req_int("generator_type_id")
                 generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
             else: