chellow 1723041465.0.0__tar.gz → 1723449410.0.0__tar.gz

{chellow-1723041465.0.0 → chellow-1723449410.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1723041465.0.0
+Version: 1723449410.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1723449410.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1723449410.0.0"

{chellow-1723041465.0.0 → chellow-1723449410.0.0}/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-1723041465.0.0 → chellow-1723449410.0.0}/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-1723041465.0.0 → chellow-1723449410.0.0}/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:

{chellow-1723041465.0.0 → chellow-1723449410.0.0}/chellow/models.py

@@ -456,7 +456,7 @@ class Source(Base, PersistentClass):
     def get_by_code(sess, code):
         source = sess.query(Source).filter_by(code=code.strip()).first()
         if source is None:
-            raise BadRequest("There's no source with the code '" + code + "'")
+            raise BadRequest(f"There's no source with the code '{code}'")
         return source
 
     __tablename__ = "source"
@@ -1780,8 +1780,8 @@ class Site(Base, PersistentClass):
     def hh_data(self, sess, start_date, finish_date, exclude_virtual=False):
         cache = {}
         keys = {
-            "net": {True: ["imp_net"], False: ["exp_net"]},
-            "gen-net": {True: ["imp_net", "exp_gen"], False: ["exp_net", "imp_gen"]},
+            "grid": {True: ["imp_grid"], False: ["exp_grid"]},
+            "gen-grid": {True: ["imp_grid", "exp_gen"], False: ["exp_grid", "imp_gen"]},
             "gen": {True: ["imp_gen"], False: ["exp_gen"]},
             "3rd-party": {True: ["imp_3p"], False: ["exp_3p"]},
             "3rd-party-reverse": {True: ["exp_3p"], False: ["imp_3p"]},
@@ -1829,8 +1829,8 @@ class Site(Base, PersistentClass):
         for hh_start in hh_range(cache, start_date, finish_date):
             dd = {
                 "start_date": hh_start,
-                "imp_net": 0,
-                "exp_net": 0,
+                "imp_grid": 0,
+                "exp_grid": 0,
                 "imp_gen": 0,
                 "exp_gen": 0,
                 "imp_3p": 0,
@@ -1844,8 +1844,8 @@ class Site(Base, PersistentClass):
                     db_data, (None, None, None, None)
                 )
 
-            dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_net"]
-            dd["used"] = dd["displaced"] + dd["imp_net"] + dd["imp_3p"] - dd["exp_3p"]
+            dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_grid"]
+            dd["used"] = dd["displaced"] + dd["imp_grid"] + dd["imp_3p"] - dd["exp_3p"]
 
         return data
 
@@ -4223,15 +4223,15 @@ class Supply(Base, PersistentClass):
 
         self.name = name
         self.source = source
-        if source.code in ("gen", "gen-net") and generator_type is None:
+        if source.code in ("gen", "gen-grid") and generator_type is None:
             raise BadRequest(
-                "If the source is 'gen' or 'gen-net', there must be a generator type."
+                "If the source is 'gen' or 'gen-grid', there must be a generator type."
             )
 
-        if source.code == "net" and dno.dno_code == "99":
-            raise BadRequest("A network supply can't have a DNO code  of 99.")
+        if source.code == "grid" and dno.dno_code == "99":
+            raise BadRequest("A grid supply can't have a DNO code  of 99.")
 
-        if source.code in ("gen", "gen-net"):
+        if source.code in ("gen", "gen-grid"):
             self.generator_type = generator_type
         else:
             self.generator_type = None
@@ -4746,7 +4746,7 @@ class Report(Base, PersistentClass):
 
 
 class SiteGroup:
-    EXPORT_NET_GT_IMPORT_GEN = "Export to net > import from generators."
+    EXPORT_GRID_GT_IMPORT_GEN = "Export to grid > import from generators."
     EXPORT_GEN_GT_IMPORT = "Export to generators > import."
     EXPORT_3P_GT_IMPORT = "Export to 3rd party > import."
 
@@ -4759,8 +4759,8 @@ class SiteGroup:
     def hh_data(self, sess):
         caches = {}
         keys = {
-            "net": {True: ["imp_net"], False: ["exp_net"]},
-            "gen-net": {True: ["imp_net", "exp_gen"], False: ["exp_net", "imp_gen"]},
+            "grid": {True: ["imp_grid"], False: ["exp_grid"]},
+            "gen-grid": {True: ["imp_grid", "exp_gen"], False: ["exp_grid", "imp_gen"]},
             "gen": {True: ["imp_gen"], False: ["exp_gen"]},
             "3rd-party": {True: ["imp_3p"], False: ["exp_3p"]},
             "3rd-party-reverse": {True: ["exp_3p"], False: ["imp_3p"]},
@@ -4770,8 +4770,8 @@ class SiteGroup:
             hh_start: {
                 "start_date": hh_start,
                 "status": "A",
-                "imp_net": 0,
-                "exp_net": 0,
+                "imp_grid": 0,
+                "exp_grid": 0,
                 "imp_gen": 0,
                 "exp_gen": 0,
                 "imp_3p": 0,
@@ -4828,9 +4828,9 @@ class SiteGroup:
                     if dd["status"] == "A":
                         dd["status"] = "E"
 
-                dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_net"]
+                dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_grid"]
                 dd["used"] = (
-                    dd["displaced"] + dd["imp_net"] + dd["imp_3p"] - dd["exp_3p"]
+                    dd["displaced"] + dd["imp_grid"] + dd["imp_3p"] - dd["exp_3p"]
                 )
 
         return data.values()
@@ -4856,7 +4856,7 @@ class SiteGroup:
         for hh in self.hh_data(sess):
             hh_start_date = hh["start_date"]
 
-            if hh["exp_net"] > hh["imp_gen"] and hh["status"] == "A":
+            if hh["exp_grid"] > hh["imp_gen"] and hh["status"] == "A":
                 if snag_1_start is None:
                     snag_1_start = hh_start_date
 
@@ -4865,7 +4865,7 @@ class SiteGroup:
                 if resolve_1_start is not None:
                     self.delete_snag(
                         sess,
-                        SiteGroup.EXPORT_NET_GT_IMPORT_GEN,
+                        SiteGroup.EXPORT_GROSS_GT_IMPORT_GEN,
                         resolve_1_start,
                         resolve_1_finish,
                     )
@@ -4879,13 +4879,13 @@ class SiteGroup:
                 if snag_1_start is not None:
                     self.add_snag(
                         sess,
-                        SiteGroup.EXPORT_NET_GT_IMPORT_GEN,
+                        SiteGroup.EXPORT_GRID_GT_IMPORT_GEN,
                         snag_1_start,
                         snag_1_finish,
                     )
                     snag_1_start = None
 
-            if hh["exp_gen"] > hh["imp_net"] + hh["imp_gen"] and hh["status"] == "A":
+            if hh["exp_gen"] > hh["imp_grid"] + hh["imp_gen"] and hh["status"] == "A":
                 if snag_2_start is None:
                     snag_2_start = hh_start_date
 
@@ -4915,7 +4915,7 @@ class SiteGroup:
                     snag_2_start = None
 
             if (
-                hh["exp_3p"] > hh["imp_net"] + hh["imp_gen"] + hh["imp_3p"]
+                hh["exp_3p"] > hh["imp_grid"] + hh["imp_gen"] + hh["imp_3p"]
                 and hh["status"] == "A"
             ):
                 if snag_3_start is None:
@@ -4948,13 +4948,13 @@ class SiteGroup:
 
         if snag_1_start is not None:
             self.add_snag(
-                sess, SiteGroup.EXPORT_NET_GT_IMPORT_GEN, snag_1_start, snag_1_finish
+                sess, SiteGroup.EXPORT_GRID_GT_IMPORT_GEN, snag_1_start, snag_1_finish
             )
 
         if resolve_1_start is not None:
             self.delete_snag(
                 sess,
-                SiteGroup.EXPORT_NET_GT_IMPORT_GEN,
+                SiteGroup.EXPORT_GRID_GT_IMPORT_GEN,
                 resolve_1_start,
                 resolve_1_finish,
             )
@@ -6556,9 +6556,9 @@ def insert_comms(sess):
 
 def insert_sources(sess):
     for code, desc in (
-        ("net", "Public distribution system."),
+        ("grid", "Public grid."),
         ("sub", "Sub meter"),
-        ("gen-net", "Generator connected directly to network."),
+        ("gen-grid", "Generator connected directly to the grid."),
         ("gen", "Generator."),
         ("3rd-party", "Third party supply."),
         ("3rd-party-reverse", "Third party supply with import going out of the site."),
@@ -7502,6 +7502,17 @@ def db_upgrade_48_to_49(sess, root_path):
         sess.flush()
 
 
+def db_upgrade_49_to_50(sess, root_path):
+    source = Source.get_by_code(sess, "net")
+    source.code = "grid"
+    source.name = "Public grid."
+    sess.flush()
+    source = Source.get_by_code(sess, "gen-net")
+    source.code = "gen-grid"
+    source.name = "Generator connected directly to the grid."
+    sess.flush()
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7536,6 +7547,7 @@ upgrade_funcs.extend(
         db_upgrade_46_to_47,
         db_upgrade_47_to_48,
         db_upgrade_48_to_49,
+        db_upgrade_49_to_50,
     ]
 )