Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ModelChainResult.__repr__ #1236

Merged
merged 12 commits into from Jun 23, 2023
4 changes: 4 additions & 0 deletions docs/sphinx/source/whatsnew/v0.10.0.rst
Expand Up @@ -28,6 +28,8 @@ Enhancements
~~~~~~~~~~~~
* Added `map_variables` parameter to :py:func:`pvlib.iotools.read_srml`
and :py:func:`pvlib.iotools.read_srml_month_from_solardat` (:pull:`1773`)
* Improved `ModelChainResult.__repr__` (:pull:`1236`)


Bug fixes
~~~~~~~~~
Expand All @@ -52,3 +54,5 @@ Contributors
~~~~~~~~~~~~
* Taos Transue (:ghuser:`reepoi`)
* Adam R. Jensen (:ghuser:`AdamRJensen`)
* Cliff Hansen (:ghuser:`cwhanse`)

66 changes: 55 additions & 11 deletions pvlib/modelchain.py
Expand Up @@ -254,6 +254,33 @@
return surface_tilt, surface_azimuth


def _getmcattr(self, attr):
"""
Helper for __repr__ methods, needed to avoid recursion in property
lookups
"""
out = getattr(self, attr)
try:
out = out.__name__
except AttributeError:
pass
return out


def _mcr_repr(obj):
'''
Helper for ModelChainResult.__repr__
'''
if isinstance(obj, tuple):
return "Tuple (" + ", ".join([_mcr_repr(o) for o in obj]) + ")"
if isinstance(obj, pd.DataFrame):
return "DataFrame ({} rows x {} columns)".format(*obj.shape)
if isinstance(obj, pd.Series):
return "Series (length {})".format(len(obj))
# scalar, None, other?
return repr(obj)


# Type for fields that vary between arrays
T = TypeVar('T')

Expand Down Expand Up @@ -385,6 +412,33 @@
value = self._result_type(value)
super().__setattr__(key, value)

def __repr__(self):
mc_attrs = dir(self)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using dir sorts the list of attributes alphabetically instead of conceptually. Not necessarily a downside.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, once I saw the alphabetized list my thought was "that's easier to use"


def _head(obj):
try:
return obj[:3]
except:

Check warning on line 421 in pvlib/modelchain.py

View check run for this annotation

Codecov / codecov/patch

pvlib/modelchain.py#L420-L421

Added lines #L420 - L421 were not covered by tests
return obj

if type(self.dc) is tuple:

Check warning on line 424 in pvlib/modelchain.py

View check run for this annotation

Codecov / codecov/patch

pvlib/modelchain.py#L424

Added line #L424 was not covered by tests
num_arrays = len(self.dc)
else:
num_arrays = 1
kandersolar marked this conversation as resolved.
Show resolved Hide resolved

desc1 = ('=== ModelChainResult === \n')
desc2 = (f'Number of Arrays: {num_arrays} \n')
attr = 'times'
desc3 = ('times (first 3)\n' +
f'{_head(_getmcattr(self, attr))}' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
f'{_head(_getmcattr(self, attr))}' +
f'{self.times[:3]}' +

Seems like this should be fine as long as it's safe to assume self.times is a DatetimeIndex

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't work if times is a DatetimeStamp. Maybe that can't happen, idk.

'\n')
lines = []
for attr in mc_attrs:
if not (attr.startswith('_') or attr=='times'):
lines.append(f' {attr}: ' + _mcr_repr(getattr(self, attr)))
desc4 = '\n'.join(lines)
return (desc1 + desc2 + desc3 + desc4)


class ModelChain:
"""
Expand Down Expand Up @@ -678,18 +732,8 @@
'airmass_model', 'dc_model', 'ac_model', 'aoi_model',
'spectral_model', 'temperature_model', 'losses_model'
]

def getmcattr(self, attr):
"""needed to avoid recursion in property lookups"""
out = getattr(self, attr)
try:
out = out.__name__
except AttributeError:
pass
return out

return ('ModelChain: \n ' + '\n '.join(
f'{attr}: {getmcattr(self, attr)}' for attr in attrs))
f'{attr}: {_getmcattr(self, attr)}' for attr in attrs))

@property
def dc_model(self):
Expand Down
33 changes: 33 additions & 0 deletions pvlib/tests/test_modelchain.py
Expand Up @@ -2063,3 +2063,36 @@ def test__irrad_for_celltemp():
assert len(poa) == 2
assert_series_equal(poa[0], effect_irrad)
assert_series_equal(poa[1], effect_irrad)


def test_ModelChain___repr__(sapm_dc_snl_ac_system, location):

mc = ModelChain(sapm_dc_snl_ac_system, location,
name='my mc')

expected = '\n'.join([
'ModelChain: ',
' name: my mc',
' clearsky_model: ineichen',
' transposition_model: haydavies',
' solar_position_method: nrel_numpy',
' airmass_model: kastenyoung1989',
' dc_model: sapm',
' ac_model: sandia_inverter',
' aoi_model: sapm_aoi_loss',
' spectral_model: sapm_spectral_loss',
' temperature_model: sapm_temp',
' losses_model: no_extra_losses'
])

assert mc.__repr__() == expected


def test_ModelChainResult___repr__(sapm_dc_snl_ac_system, location, weather):
mc = ModelChain(sapm_dc_snl_ac_system, location)
mc.run_model(weather)
mcres = mc.results.__repr__()
mc_attrs = dir(mc.results)
mc_attrs = [a for a in mc_attrs if not a.startswith('_')]
assert all([a in mcres for a in mc_attrs])