diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 48bcbe3..78d5a42 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -102,7 +102,7 @@ class PassportFormer(BasePointPassportFormer): params_list = [operator_settings, system_settings] cache_key = self._generate_cache_key(params_list) - if cache_key in self._ideal_data_cashe and False: + if cache_key in self._ideal_data_cashe: ideal_data = self._ideal_data_cashe[cache_key] else: ideal_data = self._build_ideal_data(idealDataBuilder=idealDataBuilder, params=params_list) diff --git a/src/utils/base/base.py b/src/utils/base/base.py index 59b53ae..14a62bc 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -485,7 +485,12 @@ class BasePointPassportFormer: "dist_close_end_2", "time_command", "time_robot_movement", - "object_thickness", + "object_thickness", + "object_position", + "distance_h_end1", + "distance_h_end2", + "distance_l_1", + "distance_l_2", "force_target", "force_capture", "time_wielding"] @@ -575,7 +580,7 @@ class BasePointPassportFormer: ... def _generate_cache_key(self, - params_list: list[dict[str, Any]]) -> tuple[tuple[tuple[str, Any], ...], tuple[tuple[str, Any], ...]]: + params_list: list[dict[str, Any]]) -> tuple: """ Преобразует params_list в хешируемый ключ для кэша. """