Skip to content

Commit 481b530

Browse files
committed
send database fix
1 parent a118ceb commit 481b530

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

configs/app_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hydra:
1313

1414
pipeline:
1515
save_video : False # Сохранение итогового видео обработки
16-
sent_info_db: False # Сохраняем ли инфо в бд (требуется заранее запустить микросервисы если ставите True)
16+
send_info_db: False # Сохраняем ли инфо в бд (требуется заранее запустить микросервисы если ставите True)
1717

1818
#--------------------------------------------------GENERAL--------------------------------------------------
1919

@@ -69,7 +69,7 @@ video_saver_node:
6969
out_folder : test_videos/videos_out # в какую папку сохранить результат
7070

7171

72-
sent_info_db_node:
72+
send_info_db_node:
7373
how_often_add_info: 5 # как часто добавлять новую информацию (раз в столько секунд)
7474
table_name: traffic_info # имя таблицы в БД в которую ведем запись
7575
connection_info: # данные о подключении (должны совпадать со значениями из docker-compose файла)

main.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from nodes.DetectionTrackingNodes import DetectionTrackingNodes
66
from nodes.TrackerInfoUpdateNode import TrackerInfoUpdateNode
77
from nodes.CalcStatisticsNode import CalcStatisticsNode
8-
from nodes.SentInfoDBNode import SentInfoDBNode
8+
from nodes.SendInfoDBNode import SendInfoDBNode
99

1010

1111
@hydra.main(version_base=None, config_path="configs", config_name="app_config")
@@ -18,19 +18,19 @@ def main(config) -> None:
1818
video_saver_node = VideoSaverNode(config["video_saver_node"])
1919

2020
save_video = config["pipeline"]["save_video"]
21-
sent_info_db = config["pipeline"]["sent_info_db"]
21+
send_info_db = config["pipeline"]["send_info_db"]
2222

23-
if sent_info_db:
24-
sent_info_db_node = SentInfoDBNode(config)
23+
if send_info_db:
24+
send_info_db_node = SendInfoDBNode(config)
2525

2626
for frame_element in video_reader.process():
2727

2828
frame_element = detection_node.process(frame_element)
2929
frame_element = tracker_info_update_node.process(frame_element)
3030
frame_element = calc_statistics_node.process(frame_element)
3131

32-
if sent_info_db:
33-
frame_element = sent_info_db_node.process(frame_element)
32+
if send_info_db:
33+
frame_element = send_info_db_node.process(frame_element)
3434

3535
frame_element = show_node.process(frame_element)
3636

main_optimized.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from nodes.DetectionTrackingNodes import DetectionTrackingNodes
1010
from nodes.TrackerInfoUpdateNode import TrackerInfoUpdateNode
1111
from nodes.CalcStatisticsNode import CalcStatisticsNode
12-
from nodes.SentInfoDBNode import SentInfoDBNode
12+
from nodes.SendInfoDBNode import SendInfoDBNode
1313

1414
from elements.VideoEndBreakElement import VideoEndBreakElement
1515

@@ -40,17 +40,17 @@ def proc_frame_reader_and_detection(queue_out: Queue, config: dict, time_sleep_s
4040
def proc_tracker_update_and_calc(queue_in: Queue, queue_out: Queue, config: dict):
4141
tracker_info_update_node = TrackerInfoUpdateNode(config)
4242
calc_statistics_node = CalcStatisticsNode(config)
43-
sent_info_db = config["pipeline"]["sent_info_db"]
44-
if sent_info_db:
45-
sent_info_db_node = SentInfoDBNode(config)
43+
send_info_db = config["pipeline"]["send_info_db"]
44+
if send_info_db:
45+
send_info_db_node = SendInfoDBNode(config)
4646
while True:
4747
ts0 = time()
4848
frame_element = queue_in.get()
4949
ts1 = time()
5050
frame_element = tracker_info_update_node.process(frame_element)
5151
frame_element = calc_statistics_node.process(frame_element)
52-
if sent_info_db:
53-
frame_element = sent_info_db_node.process(frame_element)
52+
if send_info_db:
53+
frame_element = send_info_db_node.process(frame_element)
5454
ts2 = time()
5555
queue_out.put(frame_element)
5656
if PRINT_PROFILE_INFO:

nodes/SentInfoDBNode.py renamed to nodes/SendInfoDBNode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
logger = logging.getLogger(__name__)
1010

11-
class SentInfoDBNode:
11+
class SendInfoDBNode:
1212
"""Модуль для отправки актуальной информации о трафике в базу данных"""
1313

1414
def __init__(self, config: dict) -> None:
15-
config_db = config["sent_info_db_node"]
15+
config_db = config["send_info_db_node"]
1616
self.how_often_add_info = config_db["how_often_add_info"]
1717
self.table_name = config_db["table_name"]
1818
self.last_db_update = time.time()
@@ -89,7 +89,7 @@ def process(self, frame_element: FrameElement) -> FrameElement:
8989
return frame_element
9090
assert isinstance(
9191
frame_element, FrameElement
92-
), f"SentInfoDBNode | Неправильный формат входного элемента {type(frame_element)}"
92+
), f"SendInfoDBNode | Неправильный формат входного элемента {type(frame_element)}"
9393

9494
# Получение значений для записи в бд новой строки:
9595
info_dictionary = frame_element.info

0 commit comments

Comments
 (0)