domainiac 3.0.0__py3-none-any.whl → 4.0.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. domainiac/managers/plant_manager.py +7 -7
  2. {domainiac-3.0.0.dist-info → domainiac-4.0.0.dist-info}/METADATA +1 -1
  3. {domainiac-3.0.0.dist-info → domainiac-4.0.0.dist-info}/RECORD +4 -4
  4. {domainiac-3.0.0.dist-info → domainiac-4.0.0.dist-info}/WHEEL +0 -0
domainiac/managers/plant_manager.py CHANGED
@@ -52,9 +52,9 @@ class PlantManager(MasterdataManager):
52
52
  df_plant = self.get_data(
53
53
  "masterdataPlant", filters=filters, columns=plant_columns
54
54
  )
55
- df_psrt = self._get_power_system_resource_type()
56
- df = df_psrt.merge(
57
- df_plant, on=["plant_id"], how="inner", validate="m:1"
55
+ df_psr = self._get_power_system_resource()
56
+ df = df_plant.merge(
57
+ df_psr, on=["plant_id"], how="left", validate="m:1"
58
58
  ).drop_duplicates()
59
59
 
60
60
  df = df[columns]
@@ -117,22 +117,22 @@ class PlantManager(MasterdataManager):
117
117
 
118
118
  return df
119
119
 
120
- def _get_power_system_resource_type(self) -> pd.DataFrame:
120
+ def _get_power_system_resource(self) -> pd.DataFrame:
121
121
 
122
122
  df_unit = self.unit_manager.get_units(columns=["masterdata_gsrn"])
123
123
 
124
- df_power_system_resource_map = self.db.query("masterdataAggregatedUnit")[
124
+ df_psr_mapping = self.db.query("masterdataAggregatedUnit")[
125
125
  ["unit_gsrn", "net_component_id"]
126
126
  ]
127
127
 
128
128
  df_unit = df_unit[["masterdata_gsrn", "plant_id"]]
129
129
 
130
130
  df = pd.merge(
131
- df_power_system_resource_map,
131
+ df_psr_mapping,
132
132
  df_unit,
133
133
  left_on="unit_gsrn",
134
134
  right_on="masterdata_gsrn",
135
- how="inner",
135
+ how="left",
136
136
  validate="1:m",
137
137
  )[["net_component_id", "plant_id"]]
138
138
 
{domainiac-3.0.0.dist-info → domainiac-4.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: domainiac
3
- Version: 3.0.0
3
+ Version: 4.0.0
4
4
  Summary: Package for working with Energinet data, but with specialized functions used for Enigma.
5
5
  Author: Team Enigma
6
6
  Author-email: gridop-enigma@energinet.dk
{domainiac-3.0.0.dist-info → domainiac-4.0.0.dist-info}/RECORD RENAMED
@@ -3,7 +3,7 @@ domainiac/managers/__init__.py,sha256=x7NZxFAuJig2TZGJ71niwMyPyDvxjaiE647BJQU0qD
3
3
  domainiac/managers/masterdata_manager.py,sha256=H-Dk-dvZZ3bqgV66Xf1V4GQnQWprzLqSKdfD1MPLQgo,2223
4
4
  domainiac/managers/metering_manager.py,sha256=NXGHuNjWiAUE08fGIPAfvwbzlKESbKaO5uyxLNyZKC0,995
5
5
  domainiac/managers/nwp_manager.py,sha256=qGr4c1ZbUnVRmhX_LmjaobBKN6BBXUn5bbYVKa_5lo4,9921
6
- domainiac/managers/plant_manager.py,sha256=1ERNgzoAQB_eo59YkllWIOVycej8Uj7dD7q-ApMc16g,4349
6
+ domainiac/managers/plant_manager.py,sha256=5NJA8nxx-gTgAXXeVJHK9knwEL-_SiZnQa1tIePVP2g,4307
7
7
  domainiac/managers/resource_manager.py,sha256=QMkNcrgyXLLlkCR9kg4-nFjTaYHtlsldex-b_8lAmO0,3730
8
8
  domainiac/managers/unit_manager.py,sha256=DYF-AiBHzUGZJE5XlTLcszvgIQkSzZs_s9o35l4bkVk,1219
9
9
  domainiac/modeling/__init__.py,sha256=Ac5feYZ9gVLayU1Cb1ACqOyDrmvcxoOvZuUkOeXVKf8,101
@@ -11,6 +11,6 @@ domainiac/modeling/nwp.py,sha256=PolrBdQn8W-e1M0_pefvmLn2mr4HT0NqlYlkyCV0dds,438
11
11
  domainiac/modeling/plant.py,sha256=48KEcfiMk90fOAzOeI5qtf1FcGvpyBNIRmN2zvx9CLc,1699
12
12
  domainiac/wrappers/__init__.py,sha256=vZOw9maXgVoAvudZqioD-GTPkgPI6fm7_CUELQcR_-g,43
13
13
  domainiac/wrappers/cache_wrapper.py,sha256=jDg-Lt_y-YzItyP-74tGULOxb07s_CcutmOHP1Ie00Q,355
14
- domainiac-3.0.0.dist-info/METADATA,sha256=0wXM-wqAeJf5SaLVpGkF3bO-BssyqBMMT2THwx8VKHA,510
15
- domainiac-3.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
16
- domainiac-3.0.0.dist-info/RECORD,,
14
+ domainiac-4.0.0.dist-info/METADATA,sha256=ayM8aSuYDSjgE1KM4GrCURc52_gMu60J_HCFSA65p-E,510
15
+ domainiac-4.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
16
+ domainiac-4.0.0.dist-info/RECORD,,