Type-hint all __init__s

pelicun/assessment.py

@@ -89,7 +89,7 @@ class Assessment:
         'loss',
     ]
 
-    def __init__(self, config_options: dict[str, Any] | None = None) -> None:
+    def __init__(self, config_options: dict[str, Any] | None = None):
         """
         Initializes an Assessment object.
 

pelicun/auto.py

@@ -48,6 +48,7 @@
 
 """
 
+from __future__ import annotations
 import sys
 import importlib
 from pathlib import Path

pelicun/base.py

@@ -67,6 +67,8 @@
 """
 
 from __future__ import annotations
+from typing import Any
+from typing import TYPE_CHECKING
 from collections.abc import Callable
 import os
 import sys
@@ -84,6 +86,9 @@
 from colorama import Style
 from pelicun.warnings import PelicunWarning
 
+if TYPE_CHECKING:
+    from pelicun.assessment import Assessment
+
 
 colorama.init()
 # set printing options
@@ -164,7 +169,11 @@ class Options:
 
     """
 
-    def __init__(self, user_config_options, assessment=None):
+    def __init__(
+        self,
+        user_config_options: dict[str, Any] | None,
+        assessment: Assessment | None = None,
+    ):
         """
         Initializes an Options object.
 
@@ -275,7 +284,9 @@ class Logger:
 
     """
 
-    def __init__(self, verbose, log_show_ms, log_file, print_log):
+    def __init__(
+        self, verbose: bool, log_show_ms: bool, log_file: str | None, print_log: bool
+    ):
         """
         Initializes a Logger object.
 
@@ -312,8 +323,8 @@ def __init__(self, verbose, log_show_ms, log_file, print_log):
                 raise
 
         self.print_log = str2bool(print_log)
-        self.warning_stack = []
-        self.emitted = set()
+        self.warning_stack: list[str] = []
+        self.emitted: set[str] = set()
         self.reset_log_strings()
         control_warnings()
 

pelicun/db.py

@@ -2107,7 +2107,7 @@ def create_Hazus_HU_fragility_db(
         'damage_DB_SimCenter_Hazus_HU_bldg_template.json'
     ),
     target_meta_file: str = 'damage_DB_SimCenter_Hazus_HU_bldg.json',
-) -> None:
+):
     """
     Create a database metadata file for the HAZUS Hurricane fragilities.
 

pelicun/file_io.py

@@ -54,6 +54,7 @@
 
 """
 
+from __future__ import annotations
 from pathlib import Path
 import numpy as np
 import pandas as pd

pelicun/model/__init__.py

@@ -41,6 +41,7 @@
 
 # flake8: noqa
 
+from __future__ import annotations
 from pelicun.model.pelicun_model import PelicunModel
 from pelicun.model.demand_model import DemandModel
 from pelicun.model.asset_model import AssetModel

pelicun/model/asset_model.py

@@ -49,6 +49,8 @@
 
 """
 
+from __future__ import annotations
+from typing import TYPE_CHECKING
 from itertools import product
 import numpy as np
 import pandas as pd
@@ -57,6 +59,8 @@
 from pelicun import uq
 from pelicun import file_io
 
+if TYPE_CHECKING:
+    from pelicun.assessment import Assessment
 
 idx = base.idx
 
@@ -72,7 +76,7 @@ class AssetModel(PelicunModel):
 
     __slots__ = ['cmp_marginal_params', 'cmp_units', 'cmp_sample', '_cmp_RVs']
 
-    def __init__(self, assessment):
+    def __init__(self, assessment: Assessment):
         super().__init__(assessment)
 
         self.cmp_marginal_params = None

pelicun/model/damage_model.py

@@ -75,7 +75,7 @@ class DamageModel(PelicunModel):
 
     __slots__ = ['ds_model', 'missing_components']
 
-    def __init__(self, assessment: Assessment) -> None:
+    def __init__(self, assessment: Assessment):
         super().__init__(assessment)
 
         self.ds_model: DamageModel_DS = DamageModel_DS(assessment)
@@ -417,7 +417,7 @@ class DamageModel_Base(PelicunModel):
 
     __slots__ = ['damage_params', 'sample']
 
-    def __init__(self, assessment):
+    def __init__(self, assessment: Assessment):
         super().__init__(assessment)
 
         self.damage_params = None
@@ -629,7 +629,7 @@ class DamageModel_DS(DamageModel_Base):
 
     __slots__ = ['ds_sample']
 
-    def __init__(self, assessment):
+    def __init__(self, assessment: Assessment):
         super().__init__(assessment)
         self.ds_sample = None
 

pelicun/model/demand_model.py

@@ -49,13 +49,17 @@
 
 """
 
+from __future__ import annotations
+from typing import TYPE_CHECKING
 import numpy as np
 import pandas as pd
 from pelicun.model.pelicun_model import PelicunModel
 from pelicun import base
 from pelicun import uq
 from pelicun import file_io
 
+if TYPE_CHECKING:
+    from pelicun.assessment import Assessment
 
 idx = base.idx
 
@@ -103,7 +107,7 @@ class DemandModel(PelicunModel):
         'sample',
     ]
 
-    def __init__(self, assessment):
+    def __init__(self, assessment: Assessment):
         super().__init__(assessment)
 
         self.marginal_params = None

pelicun/model/loss_model.py

@@ -83,7 +83,7 @@ def __init__(
         self,
         assessment: Assessment,
         decision_variables: list[str] = ['Carbon', 'Cost', 'Energy', 'Time'],
-    ) -> None:
+    ):
         """
         Initializes LossModel objects.
 
@@ -763,7 +763,7 @@ class RepairModel_Base(PelicunModel):
 
     __slots__ = ['loss_params', 'sample', 'consequence']
 
-    def __init__(self, assessment):
+    def __init__(self, assessment: Assessment):
         """
         Initializes RepairModel_Base objects.
 

pelicun/model/pelicun_model.py

@@ -70,7 +70,7 @@ class PelicunModel:
 
     __slots__ = ['_asmnt', 'log']
 
-    def __init__(self, assessment: Assessment) -> None:
+    def __init__(self, assessment: Assessment):
         # link the PelicunModel object to its Assessment object
         self._asmnt: Assessment = assessment
 

pelicun/resources/auto/Hazus_Earthquake_IM.py

@@ -36,6 +36,7 @@
 #
 # Contributors:
 # Adam Zsarnóczay
+from __future__ import annotations
 import json
 import pandas as pd
 import pelicun

pelicun/resources/auto/Hazus_Earthquake_Story.py

@@ -37,6 +37,7 @@
 # Contributors:
 # Adam Zsarnóczay
 
+from __future__ import annotations
 import pandas as pd
 
 ap_DesignLevel = {1940: 'LC', 1975: 'MC', 2100: 'HC'}

pelicun/tests/code_repetition_checker.py

@@ -43,6 +43,7 @@
 Python test files.
 """
 
+from __future__ import annotations
 from glob2 import glob  # type: ignore
 
 # pylint: disable=missing-any-param-doc

pelicun/tests/compatibility/PRJ-3411v5/pelicun_Example01.py

@@ -9,6 +9,7 @@
 
 """
 
+from __future__ import annotations
 import numpy as np
 import pandas as pd
 from pelicun.base import convert_to_MultiIndex

pelicun/tests/model/test_asset_model.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the asset model of pelicun.
 """
 
+from __future__ import annotations
 import tempfile
 from copy import deepcopy
 import pytest

pelicun/tests/model/test_damage_model.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the damage model of pelicun.
 """
 
+from __future__ import annotations
 from copy import deepcopy
 import warnings
 import pytest

pelicun/tests/model/test_demand_model.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the demand model of pelicun.
 """
 
+from __future__ import annotations
 import os
 import tempfile
 import warnings

pelicun/tests/model/test_loss_model.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the loss model of pelicun.
 """
 
+from __future__ import annotations
 from itertools import product
 from copy import deepcopy
 import pytest

pelicun/tests/model/test_model.py

@@ -42,6 +42,7 @@
 This file defines a clas used by the model unit tests.
 """
 
+from __future__ import annotations
 from copy import deepcopy
 import pytest
 from pelicun import assessment

pelicun/tests/model/test_pelicun_model.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the PelicunModel class.
 """
 
+from __future__ import annotations
 from copy import deepcopy
 import pytest
 import numpy as np

pelicun/tests/reset_tests.py

@@ -42,6 +42,7 @@
 This file is used to reset all expected test result data.
 """
 
+from __future__ import annotations
 import os
 import re
 import glob

pelicun/tests/test_assessment.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the assessment module of pelicun.
 """
 
+from __future__ import annotations
 import pytest
 from pelicun import assessment
 

pelicun/tests/test_auto.py

@@ -43,6 +43,7 @@
 
 """
 
+from __future__ import annotations
 from unittest.mock import patch
 from unittest.mock import MagicMock
 import pytest

pelicun/tests/test_base.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the base module of pelicun.
 """
 
+from __future__ import annotations
 import os
 import io
 import re

pelicun/tests/test_file_io.py

@@ -42,6 +42,7 @@
 These are unit and integration tests on the file_io module of pelicun.
 """
 
+from __future__ import annotations
 import tempfile
 import os
 import pytest

pelicun/tests/test_uq.py

@@ -46,6 +46,7 @@
 reset from the `reset_all_test_data` function in `reset_tests.py`.
 """
 
+from __future__ import annotations
 import warnings
 import pytest
 import numpy as np

pelicun/tests/util.py

@@ -42,6 +42,7 @@
 These are utility functions for the unit and integration tests.
 """
 
+from __future__ import annotations
 import pickle
 import os
 

pelicun/tests/validation/0/test_loss_function.py

@@ -47,6 +47,7 @@
 
 """
 
+from __future__ import annotations
 import numpy as np
 import pandas as pd
 import pelicun

pelicun/tests/validation/1/test_1.py

@@ -44,6 +44,7 @@
 
 """
 
+from __future__ import annotations
 import tempfile
 import numpy as np
 import pandas as pd

pelicun/tools/DL_calculation.py

@@ -37,6 +37,7 @@
 # Contributors:
 # Adam Zsarnóczay
 
+from __future__ import annotations
 from time import gmtime
 from time import strftime
 import sys

pelicun/tools/HDF_to_CSV.py

@@ -37,6 +37,7 @@
 # Contributors:
 # Adam Zsarnóczay
 
+from __future__ import annotations
 import pandas as pd
 import sys
 import argparse

pelicun/tools/export_DB.py

@@ -37,6 +37,7 @@
 # Contributors:
 # Adam Zsarnóczay
 
+from __future__ import annotations
 import sys
 import json
 import argparse