Standardize repr strings

src/easydynamics/analysis/analysis.py

@@ -818,3 +818,11 @@
     #############
     # Dunder methods
     #############
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r}, '
+            f'n_analyses={len(self._analysis_list)})'
+        )

src/easydynamics/analysis/analysis1d.py

@@ -814,3 +814,11 @@
                 'Q': self.Q[self.Q_index],
             },
         )
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r}, '
+            f'Q_index={self._Q_index})'
+        )

src/easydynamics/analysis/analysis_base.py

@@ -654,6 +654,7 @@ def __repr__(self) -> str:
             A string representation of the Analysis.
         """
         return (
-            f'{self.__class__.__name__} (display_name={self.display_name}, '
-            f'unique_name={self.unique_name})'
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r})'
         )

src/easydynamics/analysis/fit_binding.py

@@ -327,9 +327,10 @@ def __repr__(self) -> str:
             A string representation of the FitBinding.
         """
         return (
-            f'FitBinding(parameter_name={self.parameter_name},\n '
-            f'model={self.model.display_name},\n '
-            f'modes={self.modes},\n '
-            f'display_name={self.display_name},\n '
-            f'unique_name={self.unique_name})'
+            f'{self.__class__.__name__}('
+            f'parameter_name={self.parameter_name!r},\n'
+            f'    model={self.model.display_name!r},\n'
+            f'    modes={self.modes},\n'
+            f'    display_name={self.display_name!r},\n'
+            f'    unique_name={self.unique_name!r})'
         )

src/easydynamics/analysis/parameter_analysis.py

@@ -556,10 +556,9 @@ def __repr__(self) -> str:
 
         return (
             f'{cls}(\n'
-            f'display_name={self.display_name},\n'
-            f'unique_name={self.unique_name},\n'
-            f'n_parameters={n_params},\n'
-            f'parameter_names={param_names},\n'
-            f'bindings={binding_info}\n'
-            f')'
+            f'    display_name={self.display_name!r},\n'
+            f'    unique_name={self.unique_name!r},\n'
+            f'    n_parameters={n_params},\n'
+            f'    parameter_names={param_names},\n'
+            f'    bindings={binding_info})'
         )

src/easydynamics/convolution/analytical_convolution.py

@@ -485,3 +485,12 @@
         return area * voigt_profile(
             self.energy_with_offset.values - center, gaussian_width, lorentzian_width
         )
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self._unit}, '
+            f'energy_len={len(self.energy)})'
+        )

src/easydynamics/convolution/convolution.py

@@ -303,3 +303,13 @@ def __setattr__(self, name: str, value: any) -> None:
         # avoid issues during __init__
         if getattr(self, '_reactions_enabled', False) and name in self._invalidate_plan_on_change:
             self.convolution_settings.convolution_plan_is_valid = False
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self.unit}, '
+            f'energy_len={len(self.energy)}, '
+            f'temperature={self.temperature})'
+        )

src/easydynamics/convolution/numerical_convolution.py

@@ -84,3 +84,13 @@
             )
 
         return convolved
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, '
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self.unit}, '
+            f'energy_len={len(self.energy)}, '
+            f'temperature={self.temperature})'
+        )

src/easydynamics/convolution/numerical_convolution_base.py

@@ -64,13 +64,13 @@ def __init__(
              The settings for the convolution. If None, default settings will be used.
         temperature : Parameter | Numeric | None, default=None
             The temperature to use for detailed balance correction.
-        temperature_unit : str | sc.Unit, default='K'
+        temperature_unit : str | sc.Unit, default="K"
             The unit of the temperature parameter.
         detailed_balance_settings : DetailedBalanceSettings | None, default=None
             The settings for detailed balance. If None, default settings will be used.
-        unit : str | sc.Unit, default='meV'
+        unit : str | sc.Unit, default="meV"
             The unit of the energy.
-        display_name : str | None, default='MyConvolution'
+        display_name : str | None, default="MyConvolution"
             Display name of the model.
         unique_name : str | None, default=None
             Unique name of the model. If None, a unique name will be generated.
@@ -437,12 +437,12 @@ def __repr__(self) -> str:
         """
         return (
             f'{self.__class__.__name__}('
-            f'energy=array of shape {self.energy.values.shape},\n '
-            f'sample_components={self.sample_components!r}, \n'
-            f'resolution_components={self.resolution_components!r},\n '
-            f'unit={self.unit}, '
-            f'upsample_factor={self.upsample_factor}, '
-            f'extension_factor={self.extension_factor}, '
-            f'temperature={self.temperature}, '
-            f'detailed_balance={self.detailed_balance_settings!r})'
+            f'    energy=array of shape {self.energy.values.shape},\n'
+            f'    sample_components={self.sample_components!r},\n'
+            f'    resolution_components={self.resolution_components!r},\n'
+            f'    unit={self.unit}, '
+            f'    upsample_factor={self.upsample_factor}, '
+            f'    extension_factor={self.extension_factor}, '
+            f'    temperature={self.temperature}, '
+            f'    detailed_balance={self.detailed_balance_settings!r})'
         )

src/easydynamics/sample_model/background_model.py

@@ -46,3 +46,12 @@ def __init__(
             components=components,
             Q=Q,
         )
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self.unit}, '
+            f'Q_len={None if self._Q is None else len(self._Q)}, '
+            f'components={self.components})'
+        )

src/easydynamics/sample_model/component_collection.py

@@ -376,8 +376,9 @@ def __repr__(self) -> str:
         comp_names = ', '.join(c.name for c in self) or 'No components'
 
         return (
-            f"ComponentCollection(name='{self.name}', unit='{self.unit}', \n"
-            f'Components: {comp_names})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, unit={self.unit},\n'
+            f'    components=[{comp_names}])'
         )
 
     def to_dict(self) -> dict:

src/easydynamics/sample_model/components/damped_harmonic_oscillator.py

@@ -221,9 +221,10 @@ def __repr__(self) -> str:
             A string representation of the Damped Harmonic Oscillator.
         """
         return (
-            f'DampedHarmonicOscillator(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self._unit},\n '
-            f'    area = {self.area},\n '
-            f'    center = {self.center},\n '
-            f'    width = {self.width})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self._unit},\n'
+            f'    area={self.area},\n'
+            f'    center={self.center},\n'
+            f'    width={self.width})'
         )

src/easydynamics/sample_model/components/delta_function.py

@@ -200,8 +200,9 @@ def __repr__(self) -> str:
         """
 
         return (
-            f'DeltaFunction(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self.unit},\n'
-            f'    area = {self.area},\n'
-            f'    center = {self.center})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self.unit},\n'
+            f'    area={self.area},\n'
+            f'    center={self.center})'
         )

src/easydynamics/sample_model/components/exponential.py

@@ -273,9 +273,10 @@ def __repr__(self) -> str:
         """
 
         return (
-            f'Exponential(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self._unit},\n '
-            f'    amplitude = {self.amplitude},\n '
-            f'    center = {self.center},\n '
-            f'    rate = {self.rate})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self._unit},\n'
+            f'    amplitude={self.amplitude},\n'
+            f'    center={self.center},\n'
+            f'    rate={self.rate})'
         )

src/easydynamics/sample_model/components/expression_component.py

@@ -370,8 +370,9 @@ def __repr__(self) -> str:
         """
         param_str = ', '.join(f'{k}={v.value}' for k, v in self._parameters.items())
         return (
-            f'ExpressionComponent(name={self.name}, display_name={self.display_name}, '
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
             f'unit={self._unit},\n'
-            f"    expr='{self._expression_str}',\n"
-            f'    parameters={{ {param_str} }} )'
+            f'    expr={self._expression_str!r},\n'
+            f'    parameters={{{param_str}}})'
         )

src/easydynamics/sample_model/components/gaussian.py

@@ -229,9 +229,10 @@ def __repr__(self) -> str:
         """
 
         return (
-            f'Gaussian(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self._unit},\n'
-            f'    area = {self.area},\n'
-            f'    center = {self.center},\n'
-            f'    width = {self.width})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self._unit},\n'
+            f'    area={self.area},\n'
+            f'    center={self.center},\n'
+            f'    width={self.width})'
         )

src/easydynamics/sample_model/components/lorentzian.py

@@ -220,9 +220,10 @@ def __repr__(self) -> str:
             A string representation of the Lorentzian.
         """
         return (
-            f'Lorentzian(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self._unit},\n'
-            f'    area = {self.area},\n'
-            f'    center = {self.center},\n'
-            f'    width = {self.width})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self._unit},\n'
+            f'    area={self.area},\n'
+            f'    center={self.center},\n'
+            f'    width={self.width})'
         )

src/easydynamics/sample_model/components/model_component.py

@@ -232,4 +232,4 @@ def __repr__(self) -> str:
             A string representation of the ModelComponent.
         """
 
-        return f'{self.__class__.__name__}(unique_name={self.unique_name}, unit={self._unit})'
+        return f'{self.__class__.__name__}(unique_name={self.unique_name!r}, unit={self._unit})'

src/easydynamics/sample_model/components/polynomial.py

@@ -272,7 +272,8 @@ def __repr__(self) -> str:
 
         coeffs_str = ', '.join(f'{param.name}={param.value}' for param in self._coefficients)
         return (
-            f'Polynomial(name = {self.name}, display_name = {self.display_name}, '
-            f'unit = {self._unit},\n'
-            f'    coefficients = [{coeffs_str}])'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self._unit},\n'
+            f'    coefficients=[{coeffs_str}])'
         )

src/easydynamics/sample_model/components/voigt.py

@@ -265,9 +265,10 @@ def __repr__(self) -> str:
         """
 
         return (
-            f'Voigt(name = {self.name}, display_name = {self.display_name}, unit = {self._unit},\n'
-            f'    area = {self.area},\n'
-            f'    center = {self.center},\n'
-            f'    gaussian_width = {self.gaussian_width},\n'
-            f'    lorentzian_width = {self.lorentzian_width})'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, unit={self._unit},\n'
+            f'    area={self.area},\n'
+            f'    center={self.center},\n'
+            f'    gaussian_width={self.gaussian_width},\n'
+            f'    lorentzian_width={self.lorentzian_width})'
         )

src/easydynamics/sample_model/diffusion_model/brownian_translational_diffusion.py

@@ -380,8 +380,8 @@ def __repr__(self) -> str:
             String representation of the BrownianTranslationalDiffusion model.
         """
         return (
-            f'BrownianTranslationalDiffusion(name={self.name}, '
-            f'display_name={self.display_name}, \n'
-            f'    diffusion_coefficient={self.diffusion_coefficient}, \n'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r},\n'
+            f'    diffusion_coefficient={self.diffusion_coefficient},\n'
             f'    scale={self.scale})'
         )

src/easydynamics/sample_model/diffusion_model/delta_lorentz.py

@@ -1072,10 +1072,10 @@ def __repr__(self) -> str:
             String representation of the DeltaLorentz model.
         """
         return (
-            f'DeltaLorentz(display_name={self.display_name},'
-            f'unit={self.unit}, \n'
-            f'    mean_u_squared={self.mean_u_squared}, \n'
-            f'    A_0={self.A_0}, A_1={self.A_1}, \n'
-            f'    lorentzian_width={self.lorentzian_width}, \n'
+            f'{self.__class__.__name__}('
+            f'display_name={self.display_name!r}, unit={self.unit},\n'
+            f'    mean_u_squared={self.mean_u_squared},\n'
+            f'    A_0={self.A_0}, A_1={self.A_1},\n'
+            f'    lorentzian_width={self.lorentzian_width},\n'
             f'    scale={self.scale})'
         )

src/easydynamics/sample_model/diffusion_model/diffusion_model_base.py

@@ -538,7 +538,8 @@ def __repr__(self) -> str:
             String representation of the DiffusionModel.
         """
         return (
-            f'{self.__class__.__name__}(name={self.name}, display_name={self.display_name}, '
-            f'unit={self.unit}), \n'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r}, '
+            f'unit={self.unit},\n'
             f'    scale={self.scale})'
         )

src/easydynamics/sample_model/diffusion_model/jump_translational_diffusion.py

@@ -453,7 +453,8 @@ def __repr__(self) -> str:
             String representation of the JumpTranslationalDiffusion model.
         """
         return (
-            f'JumpTranslationalDiffusion(name={self.name}, display_name={self.display_name},\n '
-            f'    diffusion_coefficient={self.diffusion_coefficient}, \n'
+            f'{self.__class__.__name__}('
+            f'name={self.name!r}, display_name={self.display_name!r},\n'
+            f'    diffusion_coefficient={self.diffusion_coefficient},\n'
             f'    scale={self.scale})'
         )

src/easydynamics/sample_model/instrument_model.py

@@ -581,6 +581,5 @@ def __repr__(self) -> str:
             f'unit={self.unit}, '
             f'Q_len={None if self._Q is None else len(self._Q)}, '
             f'resolution_model={self._resolution_model!r}, '
-            f'background_model={self._background_model!r}'
-            f')'
+            f'background_model={self._background_model!r})'
         )

src/easydynamics/sample_model/model_base.py

@@ -428,6 +428,9 @@ def __repr__(self) -> str:
             A string representation of the ModelBase.
         """
         return (
-            f'{self.__class__.__name__}(unique_name={self.unique_name}, '
-            f'unit={self.unit}), Q = {self.Q}, components = {self.components}'
+            f'{self.__class__.__name__}('
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self.unit}, '
+            f'Q={self.Q}, '
+            f'components={self.components})'
         )

src/easydynamics/sample_model/resolution_model.py

@@ -142,3 +142,12 @@ def from_sample_model(
             resolution_model.fix_all_parameters()
 
         return resolution_model
+
+    def __repr__(self) -> str:
+        return (
+            f'{self.__class__.__name__}('
+            f'unique_name={self.unique_name!r}, '
+            f'unit={self.unit}, '
+            f'Q_len={None if self._Q is None else len(self._Q)}, '
+            f'components={self.components})'
+        )

src/easydynamics/sample_model/sample_model.py

@@ -562,9 +562,10 @@ def __repr__(self) -> str:
         """
 
         return (
-            f'{self.__class__.__name__}(unique_name={self.unique_name}, unit={self.unit}), '
-            f'Q = {self.Q}, \n '
-            f'components = {self.components}, diffusion_models = {self.diffusion_models}, '
-            f'temperature = {self.temperature}, '
-            f'detailed_balance_settings = {self.detailed_balance_settings}'
+            f'{self.__class__.__name__}('
+            f'unique_name={self.unique_name!r}, unit={self.unit},\n'
+            f'    Q={self.Q},\n'
+            f'    components={self.components}, diffusion_models={self.diffusion_models},\n'
+            f'    temperature={self.temperature},\n'
+            f'    detailed_balance_settings={self.detailed_balance_settings})'
         )