Cosmetics.

Author: hmgaudecker

src/ttsim/compute_taxes_and_transfers.py

@@ -37,7 +37,7 @@
     merge_trees,
     partition_by_reference_dict,
 )
-from ttsim.time_conversion import _TIME_UNITS
+from ttsim.time_conversion import TIME_UNITS
 from ttsim.typing import (
     check_series_has_expected_type,
     convert_series_to_internal_type,
@@ -49,6 +49,7 @@
         NestedTargetDict,
         QualNameDataDict,
         QualNameTargetList,
+        QualNameTTSIMFunctionDict,
         QualNameTTSIMObjectDict,
     )
 
@@ -94,8 +95,8 @@ def compute_taxes_and_transfers(
     # Transform functions tree to qualified names dict with qualified arguments
     top_level_namespace = _get_top_level_namespace(
         environment=environment,
-        supported_time_conversions=list(_TIME_UNITS.keys()),
-        supported_groupings=list(SUPPORTED_GROUPINGS.keys()),
+        supported_time_conversions=tuple(TIME_UNITS.keys()),
+        supported_groupings=tuple(SUPPORTED_GROUPINGS.keys()),
     )
     functions = dt.functions_without_tree_logic(
         functions=environment.functions_tree, top_level_namespace=top_level_namespace
@@ -137,7 +138,7 @@ def compute_taxes_and_transfers(
 
     # Remove unnecessary elements from user-provided data.
     input_data = _create_input_data_for_concatenated_function(
-        data=data_with_correct_types,
+        data=data,
         functions=functions_with_partialled_parameters,
         targets=targets,
     )
@@ -174,8 +175,8 @@ def compute_taxes_and_transfers(
 
 def _get_top_level_namespace(
     environment: PolicyEnvironment,
-    supported_time_conversions: list[str],
-    supported_groupings: list[str],
+    supported_time_conversions: tuple[str, ...],
+    supported_groupings: tuple[str, ...],
 ) -> set[str]:
     """Get the top level namespace.
 

src/ttsim/shared.py

@@ -38,7 +38,7 @@ def validate_date_range(start: datetime.date, end: datetime.date):
 
 
 def get_re_pattern_for_time_units_and_groupings(
-    supported_groupings: list[str], supported_time_units: list[str]
+    supported_groupings: tuple[str, ...], supported_time_units: tuple[str, ...]
 ) -> re.Pattern:
     """Get a regex pattern for time units and groupings.
 

src/ttsim/time_conversion.py

@@ -19,7 +19,7 @@
 
     from ttsim.typing import QualNameDataDict, QualNameTTSIMObjectDict
 
-_TIME_UNITS = {
+TIME_UNITS = {
     "y": "year",
     "q": "quarter",
     "m": "month",
@@ -421,7 +421,7 @@ def create_time_conversion_functions(
     converted_ttsim_objects = {}
 
     for source_name, ttsim_object in ttsim_objects.items():
-        all_time_units = list(_TIME_UNITS)
+        all_time_units = tuple(TIME_UNITS)
         time_unit_pattern = get_re_pattern_for_time_units_and_groupings(
             supported_groupings=SUPPORTED_GROUPINGS,
             supported_time_units=all_time_units,

tests/ttsim/test_shared.py

@@ -355,13 +355,13 @@ def test_all_variations_of_base_name(
         "expected_aggregation",
     ),
     [
-        ("foo", ["m", "y"], ["hh"], "foo", None, None),
-        ("foo_m_hh", ["m", "y"], ["hh"], "foo", "m", "hh"),
-        ("foo_y_hh", ["m", "y"], ["hh"], "foo", "y", "hh"),
-        ("foo_m", ["m", "y"], ["hh"], "foo", "m", None),
-        ("foo_y", ["m", "y"], ["hh"], "foo", "y", None),
-        ("foo_hh", ["m", "y"], ["hh"], "foo", None, "hh"),
-        ("foo_hh_bar", ["m", "y"], ["hh"], "foo_hh_bar", None, None),
+        ("foo", ("m", "y"), ["hh"], "foo", None, None),
+        ("foo_m_hh", ("m", "y"), ["hh"], "foo", "m", "hh"),
+        ("foo_y_hh", ("m", "y"), ["hh"], "foo", "y", "hh"),
+        ("foo_m", ("m", "y"), ["hh"], "foo", "m", None),
+        ("foo_y", ("m", "y"), ["hh"], "foo", "y", None),
+        ("foo_hh", ("m", "y"), ["hh"], "foo", None, "hh"),
+        ("foo_hh_bar", ("m", "y"), ["hh"], "foo_hh_bar", None, None),
     ],
 )
 def test_get_re_pattern_for_time_units_and_groupings(