Skip to content

Commit

Permalink
Minor naming change
Browse files Browse the repository at this point in the history
  • Loading branch information
henhuy committed Oct 6, 2023
1 parent 4bf54ab commit 749338b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions data_adapter_oemof/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
from oemof.tabular._facade import Facade

from data_adapter_oemof import calculations
from data_adapter_oemof.mappings import Mapper, field_mock
from data_adapter_oemof.mappings import Field, Mapper

logger = logging.getLogger()


class Adapter:
type: str = "adapter"
facade: Facade = None
extra_attributes = (
field_mock(name="name", type=str),
field_mock(name="type", type=str),
extra_fields = (
Field(name="name", type=str),
Field(name="type", type=str),
)

def as_dict(self) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion data_adapter_oemof/build_datapackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def get_foreign_keys(struct: list, mapper: Mapper, components: list) -> list:
{"fields": bus, "reference": {"fields": "name", "resource": "bus"}}
)

for field in mapper.fields_names():
for field in mapper.get_fields():
if (
mapper.is_sequence(field.type)
and field.name in components.columns
Expand Down
12 changes: 6 additions & 6 deletions data_adapter_oemof/mappings.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"tech": "tech",
}

field_mock = collections.namedtuple(typename="field_mock", field_names=["name", "type"])
Field = collections.namedtuple(typename="Field", field_names=["name", "type"])


class MappingError(Exception):
Expand Down Expand Up @@ -44,11 +44,11 @@ def __init__(
self.mapping = mapping
self.bus_map = bus_map

def fields_names(self):
def get_fields(self):
return [
field_mock(name=field.name, type=field.type)
Field(name=field.name, type=field.type)
for field in dataclasses.fields(self.adapter.facade)
] + list(self.adapter.extra_attributes)
] + list(self.adapter.extra_fields)

def map_key(self, key):
"""Use adapter specific mapping if available, otherwise use default
Expand Down Expand Up @@ -152,7 +152,7 @@ def get_busses(self, struct):
:return: dictionary with tabular like Busses
"""
bus_occurrences_in_fields = [
field.name for field in self.fields_names() if "bus" in field.name
field.name for field in self.get_fields() if "bus" in field.name
]
if len(bus_occurrences_in_fields) == 0:
logger.warning(
Expand Down Expand Up @@ -220,7 +220,7 @@ def get_default_mappings(self, struct):

mapped_all_class_fields = {
field.name: value
for field in self.fields_names()
for field in self.get_fields()
if (value := self.get(field.name, field.type)) is not None
}
mapped_all_class_fields.update(self.get_busses(struct))
Expand Down

0 comments on commit 749338b

Please sign in to comment.