From 200266afb038e34b1620fa806911152392a591b0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 10 Jan 2025 10:57:34 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BA=D1=8D=D1=88=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20-=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controller/passportFormer.py | 2 +- src/utils/base/base.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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 в хешируемый ключ для кэша. """