HydPy 6.3.dev1__tar.gz → 6.3.dev2__tar.gz

{hydpy-6.3.dev1 → hydpy-6.3.dev2/HydPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HydPy
-Version: 6.3.dev1
+Version: 6.3.dev2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/HydPy.egg-info/SOURCES.txt

@@ -854,6 +854,7 @@ hydpy/tests/plugin/__init__.py
 hydpy/tests/plugin/check_method_hook.py
 hydpy/tests/plugin/check_prepare_model_hook.py
 hydpy/tests/plugin/check_series_hook.py
+hydpy/tests/plugin/check_shape_hook.py
 hydpy/tests/plugin/check_submodeladder_hooks.py
 hydpy/tests/plugin/check_subvariables_hook1.py
 hydpy/tests/plugin/check_subvariables_hook2.py

{hydpy-6.3.dev1/HydPy.egg-info → hydpy-6.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HydPy
-Version: 6.3.dev1
+Version: 6.3.dev2
 Summary: A framework for the development and application of hydrological models.
 Home-page: https://github.com/hydpy-dev/hydpy
 Author: HydPy Developers

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/appveyor.yml

@@ -1,5 +1,5 @@
 
-version: 6.3dev1.{build}
+version: 6.3dev2.{build}
 
 image: Visual Studio 2019
 

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/__init__.py

@@ -116,7 +116,7 @@ from hydpy.exe.replacetools import xml_replace
 from hydpy.exe.servertools import await_server, start_server
 from hydpy.exe.xmltools import XMLInterface, run_simulation, xml_validate
 
-__version__ = "6.3dev1"
+__version__ = "6.3dev2"
 
 pub.options = optiontools.Options()
 pub.indexer = indextools.Indexer()
@@ -250,31 +250,8 @@ __all__ = [
 sequence2alias: dict[sequencetools.InOutSequenceTypes, str] = {}
 
 if config.USEAUTODOC:
-    with warnings.catch_warnings():
-        warnings.filterwarnings(action="ignore", category=FutureWarning)
-        from hydpy import auxs
-        from hydpy import core
-        from hydpy import cythons
-        from hydpy import exe
-        from hydpy import interfaces
-        from hydpy.core import autodoctools
+    from hydpy.core import autodoctools
 
-        substituter = autodoctools.prepare_mainsubstituter()
-        for subpackage in (auxs, core, cythons, interfaces, exe):
-            subpackagepath = subpackage.__path__[0]
-            for filename in sorted(os.listdir(subpackagepath)):
-                if filename.endswith(".py") and not filename.startswith("_"):
-                    module = importlib.import_module(
-                        f"{subpackage.__name__}.{filename[:-3]}"
-                    )
-                    autodoctools.autodoc_module(module)
-        modelpath: str = models.__path__[0]
-        for filename in sorted(os.listdir(modelpath)):
-            path = os.path.join(modelpath, filename)
-            if os.path.isdir(path) and not filename.startswith("_"):
-                module = importlib.import_module(f"{models.__name__}.{filename}")
-                autodoctools.autodoc_basemodel(module)
-        for filename in sorted(os.listdir(modelpath)):
-            if filename.endswith(".py") and not filename.startswith("_"):
-                module = importlib.import_module(f"{models.__name__}.{filename[:-3]}")
-                autodoctools.autodoc_applicationmodel(module)
+    substituter: autodoctools.Substituter
+
+    autodoctools.autodoc_complete()

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/auxs/interptools.py

@@ -214,7 +214,7 @@ dy1/dx3   dy2/dx3
 class BaseInterpolator(_Labeled):
     """Base class for |SimpleInterpolator| and |SeasonalInterpolator|."""
 
-    NDIM = 0
+    NDIM: Final[Literal[0]] = 0
     TIME = None
     SPAN = (None, None)
 
@@ -306,7 +306,7 @@ class SimpleInterpolator(BaseInterpolator):
     >>> mock.assert_called_with(**kwargs)
     """
 
-    TYPE = "interputils.SimpleInterpolator"
+    TYPE: Final = "interputils.SimpleInterpolator"
 
     _algorithm: InterpAlgorithm | None
 
@@ -331,6 +331,11 @@ class SimpleInterpolator(BaseInterpolator):
         self.__simpleinterpolator = interputils.SimpleInterpolator(algorithm)
         setattr(self.fastaccess, self.name, self.__simpleinterpolator)
 
+    @property
+    def shape(self) -> ShapeHookGet:
+        """This property exists for type consistency; we might remove it later."""
+        return ()
+
     @property
     def algorithm(self) -> InterpAlgorithm:
         """The handled interpolation algorithm.
@@ -691,7 +696,7 @@ error occurred: Value `1` of type `int` has been given, but an object of type \
     AttributeError: 'SeasonalInterpolator' object has no attribute 'temp'
     """
 
-    TYPE = "interputils.SeasonalInterpolator"
+    TYPE: Final = "interputils.SeasonalInterpolator"
 
     nmb_algorithms: int
 
@@ -912,7 +917,7 @@ interpolation algorithm object, but for parameter `seasonalinterpolator` of elem
                 ratios[tdx, idx_0] = 1.0 - ratios[tdx, idx_1]
 
     @property
-    def shape(self) -> tuple[int, int]:
+    def shape(self) -> ShapeHookGet:
         """The shape of array |SeasonalInterpolator.ratios|."""
         shape = self.ratios.shape
         return int(shape[0]), int(shape[1])

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/auxs/networktools.py

@@ -11,6 +11,8 @@ from hydpy.core import objecttools
 from hydpy.core import selectiontools
 from hydpy.core.typingtools import *
 
+_Tree: TypeAlias = dict[str, "_Tree"]
+
 
 class RiverBasinNumber(str):
     """A single river basin number (Gewässerkennzahl) based on a `guideline of the
@@ -68,7 +70,7 @@ basin number.
     False
     """
 
-    def __new__(cls, value: int | str):
+    def __new__(cls, value: int | str) -> RiverBasinNumber:
         try:
             # PyCharm bug, see https://stackoverflow.com/questions/49465166/
             # noinspection PyArgumentList
@@ -234,9 +236,9 @@ class RiverBasinNumbers(tuple):
         return obj
 
     @property
-    def _tree(self):
+    def _tree(self) -> _Tree:
         if vars(self)["_tree"] is None:
-            tree = {}
+            tree: _Tree = {}
             for rbn in self:
                 subtree = tree
                 for digit in rbn:
@@ -274,7 +276,7 @@ class RiverBasinNumbers(tuple):
             except KeyError:
                 return RiverBasinNumbers(())
 
-        def _walk(number_: str, tree_: dict[str, dict], numbers: set) -> set:
+        def _walk(number_: str, tree_: _Tree, numbers: set) -> set:
             if tree_:
                 numbers.remove(number_)
                 for digit_, subtree in tree_.items():

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/autodoctools.py

@@ -1277,6 +1277,32 @@ def autodoc_tuple2doc(module: types.ModuleType) -> None:
                     member.__doc__ = doc + "\n".join(l for l in lst)
 
 
+def autodoc_complete() -> None:
+    """Add substituters to all relevant modules."""
+    with warnings.catch_warnings():
+        warnings.filterwarnings(action="ignore", category=FutureWarning)
+
+        hydpy.substituter = prepare_mainsubstituter()
+        for subpackage in (auxs, core, cythons, interfaces, exe):
+            subpackagepath = subpackage.__path__[0]
+            for filename in sorted(os.listdir(subpackagepath)):
+                if filename.endswith(".py") and not filename.startswith("_"):
+                    module = importlib.import_module(
+                        f"{subpackage.__name__}.{filename[:-3]}"
+                    )
+                    autodoc_module(module)
+        modelpath: str = models.__path__[0]
+        for filename in sorted(os.listdir(modelpath)):
+            path = os.path.join(modelpath, filename)
+            if os.path.isdir(path) and not filename.startswith("_"):
+                module = importlib.import_module(f"{models.__name__}.{filename}")
+                autodoc_basemodel(module)
+        for filename in sorted(os.listdir(modelpath)):
+            if filename.endswith(".py") and not filename.startswith("_"):
+                module = importlib.import_module(f"{models.__name__}.{filename[:-3]}")
+                autodoc_applicationmodel(module)
+
+
 def _make_cssstyle(
     *,
     marginleft: str | None = None,

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/parametertools.py

@@ -116,11 +116,12 @@ def _warn_trim_kwarg(
 class IntConstant(int):
     """Class for |int| objects with individual docstrings."""
 
-    def __new__(cls, value):
+    def __new__(cls, value) -> Self:
         const = int.__new__(cls, value)
         const.__doc__ = None
-        frame = inspect.currentframe().f_back
-        const.__module__ = frame.f_locals.get("__name__")
+        assert (frame := inspect.currentframe()) is not None
+        assert (frame := frame.f_back) is not None
+        const.__module__ = frame.f_locals["__name__"]
         return const
 
 
@@ -2963,7 +2964,7 @@ broadcast input array from shape (2,) into shape (366,3)
         return tuple(toy for toy, _ in self._toy2values_unprotected)
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         .. testsetup::
@@ -3025,7 +3026,7 @@ first.  However, in complete HydPy projects this stepsize is indirectly defined
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]) -> None:
+    def shape(self, shape: ShapeHookSet) -> None:
         if isinstance(shape, tuple):
             shape_ = list(shape)
         else:
@@ -4008,7 +4009,6 @@ given, but is not.
     floodplainwidth(left=3.0, right=4.0)
     """
 
-    NDIM: Final[Literal[1]] = 1
     SHAPE = (2,)
     strict_valuehandling: bool = False
 
@@ -4891,7 +4891,8 @@ keyword argument, it must be `callback`, and you need to pass a callback functio
     def value(self):
         """The fixed value or the value last updated by the callback function."""
         if self._has_callback:
-            self.callback(self.subpars.pars.model)
+            assert (callback := self.callback) is not None
+            callback(self.subpars.pars.model)
             self._valueready = True
         return super().value
 

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/sequencetools.py

@@ -2076,7 +2076,7 @@ during a simulation run is not supported but tried for sequence `t` of element \
         self.__hydpy__set_fastaccessattribute__("array", values)
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         When setting a new |IOSequence.shape| of an |IOSequence| object, one
@@ -2088,7 +2088,7 @@ during a simulation run is not supported but tried for sequence `t` of element \
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]):
+    def shape(self, shape: ShapeHookSet) -> None:
         proxy = super(__class__, type(self))  # type: ignore[name-defined]
         proxy.shape.fset(self, shape)  # type: ignore[attr-defined]
         if self.ramflag:
@@ -3324,7 +3324,7 @@ class DependentSequence(OutputSequence):
             self.__hydpy__set_fastaccessattribute__("sum", value)
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         |FactorSequence| and |FluxSequence| objects come with some additional
@@ -3357,7 +3357,7 @@ class DependentSequence(OutputSequence):
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]) -> None:
+    def shape(self, shape: ShapeHookSet) -> None:
         proxy = super(__class__, type(self))  # type: ignore[name-defined]
         proxy.shape.fset(self, shape)  # type: ignore[attr-defined]
         if self.NDIM and self.NUMERIC:
@@ -3594,7 +3594,7 @@ not broadcast input array from shape (3,) into shape (2,)
             setattr(self.fastaccess_old, self.name, 0.0)
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         |StateSequence| objects come with some additional `fastaccess` attributes,
@@ -3626,7 +3626,7 @@ not broadcast input array from shape (3,) into shape (2,)
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]):
+    def shape(self, shape: ShapeHookSet) -> None:
         from hydpy.core import modeltools  # pylint: disable=import-outside-toplevel
 
         proxy = super(__class__, type(self))  # type: ignore[name-defined]
@@ -3735,7 +3735,7 @@ class LogSequenceFixed(LogSequence):
         self.shape = (self.SHAPE,)
 
     @property
-    def shape(self):
+    def shape(self) -> ShapeHookGet:
         """Sequences derived from |LogSequenceFixed| initialise themselves with a
         predefined shape.
 
@@ -3762,13 +3762,14 @@ changed, but this was attempted for element `?`.
         return super().shape
 
     @shape.setter
-    def shape(self, shape):
+    def shape(self, shape: ShapeHookSet) -> None:
         if exceptiontools.attrready(self, "shape"):
             raise AttributeError(
                 f"The shape of sequence `{self.name}` cannot be changed, but this was "
                 f"attempted for element `{objecttools.devicename(self)}`."
             )
-        super(__class__, type(self)).shape.fset(self, shape)
+        prop = super(__class__, type(self)).shape  # type: ignore[name-defined]
+        prop.fset(self, shape)  # type: ignore[attr-defined]
 
 
 class AideSequence(ModelSequence):
@@ -3790,7 +3791,7 @@ class AideSequence(ModelSequence):
 class LinkSequence(BaseLinkInputSequence):
     """Base class for link sequences of |Model| objects.
 
-    |LinkSequence| objects do not only handle values themselves but also point to the
+    |LinkSequence| objects not only handle values themselves but also point to the
     values handled by |NodeSequence| objects, using the functionalities provided by the
     Cython module |pointerutils|.  Multiple |LinkSequence| objects of different
     application models can query and modify the same |NodeSequence| values, allowing
@@ -3905,7 +3906,7 @@ class LinkSequence(BaseLinkInputSequence):
             pass
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         Property |LinkSequence.shape| of class |LinkSequence| works similarly to the
@@ -3978,7 +3979,7 @@ requested, but not prepared yet via `set_pointer`.
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]):
+    def shape(self, shape: ShapeHookSet) -> None:
         try:
             old_shape = exceptiontools.getattr_(self, "shape", None)
             proxy = super(__class__, type(self))  # type: ignore[name-defined]
@@ -3999,6 +4000,21 @@ requested, but not prepared yet via `set_pointer`.
         object."""
         return self.fastaccess.get_pointervalue(self.name)
 
+    def prepare_series(
+        self,
+        allocate_ram: bool | None = True,
+        read_jit: bool | None = False,
+        write_jit: bool | None = False,
+    ) -> None:
+        """Apply the general behaviour implemented by class |IOSequence|, but stay
+        silent if the shape is not ready (which is normal in case of unused optional
+        connections).
+        """
+        if (self.NDIM == 0) or self._shapeready:
+            super().prepare_series(
+                allocate_ram=allocate_ram, read_jit=read_jit, write_jit=write_jit
+            )
+
 
 class InletSequence(LinkSequence):
     """Base class for inlet link sequences of |Model| objects."""

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/testtools.py

@@ -1214,7 +1214,7 @@ for further information.
         self.open = builtins.open
 
     def __enter__(self):
-        builtins.open = _Open
+        builtins.open = _Open  # type: ignore[assignment]
         return self
 
     def __exit__(self, exception, message, traceback_) -> None:
@@ -1380,7 +1380,7 @@ def make_abc_testable(abstract: type[T_inv]) -> type[T_inv]:
 
 
 @contextlib.contextmanager
-def mock_datetime_now(testdatetime):
+def mock_datetime_now(testdatetime: datetime.datetime) -> Iterator[None]:
     """Let class method |datetime.datetime.now| of class |datetime.datetime|
     of module |datetime| return the given date for testing purposes within
     a "with-block".
@@ -1424,14 +1424,25 @@ but for the given `datetime` object it is `999` instead.
 
     class _DateTime(datetime.datetime):
         @classmethod
-        def now(cls, tz=None):  # pylint: disable=unused-argument
-            return testdatetime
+        def now(
+            cls, tz: datetime.tzinfo | None = None
+        ) -> Self:  # pylint: disable=unused-argument
+            return cls(
+                year=testdatetime.year,
+                month=testdatetime.month,
+                day=testdatetime.day,
+                hour=testdatetime.hour,
+                minute=testdatetime.minute,
+                second=testdatetime.second,
+                microsecond=testdatetime.microsecond,
+                tzinfo=tz,
+            )
 
     try:
-        datetime.datetime = _DateTime
+        datetime.datetime = _DateTime  # type: ignore[misc]
         yield
     finally:
-        datetime.datetime = _datetime
+        datetime.datetime = _datetime  # type: ignore[misc]
 
 
 class NumericalDifferentiator:

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/typingtools.py

@@ -150,6 +150,8 @@ TypeINIT: TypeAlias = int | float | bool | None
 TypeTIME: TypeAlias = bool | None
 TypeNUMERIC: TypeAlias = bool
 
+ShapeHookGet: TypeAlias = tuple[int, ...]
+ShapeHookSet: TypeAlias = int | tuple[int, ...]
 TrimHook: TypeAlias = Union[
     float, VectorInputFloat, MatrixInputFloat, TensorInputFloat, None
 ]
@@ -321,6 +323,8 @@ __all__ = [
     "P_",
     "ParamSpec",
     "Protocol",
+    "ShapeHookGet",
+    "ShapeHookSet",
     "Self",
     "SeriesAggregationType",
     "SeriesConventionType",

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/core/variabletools.py

@@ -1341,7 +1341,7 @@ occurred: could not broadcast input array from shape (2,) into shape (2,3)
         self.value = values
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the actual lengths of all dimensions.
 
         Note that setting a new |Variable.shape| results in a loss of
@@ -1488,7 +1488,7 @@ as `var` can only be `()`, but `(2,)` is given.
         return ()
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]) -> None:
+    def shape(self, shape: ShapeHookSet) -> None:
         self._valueready = False
         self._shapeready = False
         initvalue, initflag = self.initinfo
@@ -1941,8 +1941,8 @@ has been determined, which is not a submask of `Soil([ True,  True, False])`.
             return mask(self, **kwargs)
         return mask
 
-    def __deepcopy__(self, memo):
-        new = type(self)(None)
+    def __deepcopy__(self, memo) -> Self:
+        new = type(self)(None)  # type: ignore[arg-type]
         for key, value in vars(self).items():
             if key not in self._NOT_DEEPCOPYABLE_MEMBERS:
                 setattr(new, key, copy.deepcopy(value, memo))
@@ -2244,6 +2244,7 @@ has been determined, which is not a submask of `Soil([ True,  True, False])`.
 class MixinFixedShape:
     """Mixin class for defining variables with a fixed shape."""
 
+    NDIM: Final[Literal[1]] = 1
     SHAPE: tuple[int, ...]
     name: str
 
@@ -2252,7 +2253,7 @@ class MixinFixedShape:
         self.shape = self.SHAPE
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """Variables that mix in |MixinFixedShape| are generally initialised with a
         fixed shape.
 
@@ -2281,7 +2282,7 @@ this was attempted for element `?`.
         return super().shape  # type: ignore[misc]
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]) -> None:
+    def shape(self, shape: ShapeHookSet) -> None:
         oldshape = exceptiontools.getattr_(self, "shape", None)
         if oldshape is None:
             proxy = super(__class__, type(self))  # type: ignore[name-defined]

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/cythons/modelutils.py

@@ -288,8 +288,8 @@ import types
 
 # ...third party modules
 import numpy
-from numpy import inf  # pylint: disable=unused-import
-from numpy import nan  # pylint: disable=unused-import
+from numpy import inf as _inf
+from numpy import nan as _nan
 import setuptools
 
 import hydpy
@@ -3206,3 +3206,7 @@ def isinf(double: float) -> float:
     call(123.4)
     """
     return numpy.isinf(double)
+
+
+inf: Final = _inf
+nan: Final = _nan

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/docs/sphinx/conf.py

@@ -201,7 +201,7 @@ copyright = f"2013-{datetime.datetime.now().year}, HydPy Developers"
 # The short X.Y version.
 version = "6.3"
 # The full version, including alpha/beta/rc tags.
-release = "6.3dev1"
+release = "6.3dev2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/models/evap/evap_logs.py

@@ -58,7 +58,7 @@ class LoggedPotentialEvapotranspiration(sequencetools.LogSequence):
     NDIM: Final[Literal[2]] = 2
 
     @property
-    def shape(self) -> tuple[int, ...]:
+    def shape(self) -> ShapeHookGet:
         """A tuple containing the lengths of all dimensions.
 
         |LoggedPotentialEvapotranspiration| is generally initialised with a length of
@@ -73,7 +73,7 @@ class LoggedPotentialEvapotranspiration(sequencetools.LogSequence):
         return super().shape
 
     @shape.setter
-    def shape(self, shape: int | tuple[int, ...]) -> None:
+    def shape(self, shape: ShapeHookSet) -> None:
         prop = super(__class__, type(self)).shape  # type: ignore[name-defined]
         prop.fset(self, (1, shape))  # type: ignore[attr-defined]
 

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/models/exch/exch_factors.py

@@ -12,7 +12,6 @@ class WaterLevels(variabletools.MixinFixedShape, sequencetools.FactorSequence):
     the value of the |LoggedWaterLevels| of the previous simulation step.
     """
 
-    NDIM: Final[Literal[1]] = 1
     SHAPE = (2,)
 
 

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/models/musk/musk_control.py

@@ -271,7 +271,6 @@ with value `1.0` needed to be trimmed to `0.0`.
     0.5, 0.5, 0.0
     """
 
-    NDIM: Final[Literal[1]] = 1
     TYPE: Final = float
     SHAPE = (3,)
     KEYWORDS = {

{hydpy-6.3.dev1 → hydpy-6.3.dev2}/hydpy/mypy_plugin.py

@@ -6,7 +6,7 @@ potential problems in situations where HydPy relies on runtime behaviour that is
 from configparser import ConfigParser
 from os.path import join, split
 from pickle import load
-from typing import Callable, Final
+from typing import Callable, cast, Final
 from warnings import warn
 
 from mypy.checker import TypeChecker
@@ -29,6 +29,7 @@ from mypy.types import (
     LiteralType,
     Instance,
     NoneType,
+    TupleType,
     Type,
     TypeAliasType,
     TypeOfAny,
@@ -118,8 +119,9 @@ MODEL_MAP: dict[str, dict[str, tuple[str, str]]]
 VAR_MAP_1: dict[str, dict[str, dict[str, tuple[str, str]]]]
 VAR_MAP_2: dict[str, tuple[str, str, str]]
 VAR_INFO: dict[str, tuple[int, type[float]]]
+VAR_SHAPE: set[str]
 with open(join(DIRPATH, "conf", "mypy_plugin_data.pickle"), "rb") as file_:
-    MODEL_MAP, VAR_MAP_1, VAR_MAP_2, VAR_INFO = load(file_)
+    MODEL_MAP, VAR_MAP_1, VAR_MAP_2, VAR_INFO, VAR_SHAPE = load(file_)
 
 
 def prepare_model_hook(context: FunctionContext) -> Type:
@@ -162,7 +164,7 @@ def submodeladder_call_hook(context: MethodContext) -> Type:
     """
     if (
         isinstance(api := context.api, TypeChecker)
-        and (len(arg_types := context.arg_types) == 2)
+        and (len(arg_types := context.arg_types) >= 2)
         and (len(arg_types[0]) == 1)
         and isinstance(arg_type := get_proper_type(arg_types[0][0]), Instance)
         and isinstance(literal := arg_type.last_known_value, LiteralType)
@@ -488,6 +490,34 @@ def series_hook(context: AttributeContext) -> Type:
     return _get_values_or_series(context=context, series=True)
 
 
+def shape_hook(context: AttributeContext) -> Type:
+    """
+    `VariableX.shape -> tuple[int, ...]`
+    `VariableY.shape -> tuple[int, ...]`
+    -->
+    `VariableX.shape -> tuple[int]`
+    `VariableY.shape -> tuple[int, int]`
+
+    `VariableX.shape <- int | tuple[int, ...]
+    `VariableY.shape <- int | tuple[int, ...]
+    -->
+    `VariableX.shape <- int, tuple[int]
+    `VariableY.shape <- tuple[int, int]
+    """
+    default = context.default_attr_type
+    ndim_type = _get_ndim_and_type(context)
+    if (ndim_type is None) or not isinstance(api := context.api, TypeChecker):
+        return default
+    int_inst = api.named_type("builtins.int")
+    tuple_type = TupleType(
+        cast(list[Type], ndim_type[0] * [int_inst]),
+        fallback=api.named_type("builtins.tuple"),
+    )
+    if (ndim_type[0] == 1) and context.is_lvalue:
+        return UnionType([int_inst, tuple_type])
+    return tuple_type
+
+
 class MypyPlugin(Plugin):
     """Mypy plugin for HydPy."""
 
@@ -552,6 +582,8 @@ class MypyPlugin(Plugin):
         """Hooks for refining attribute types."""
         if fullname in VALUES:
             return values_hook
+        if fullname in VAR_SHAPE:
+            return shape_hook
         if fullname in SERIES:
             return series_hook
         if fullname in VARS1: