From 3801925b72802f3e547720c474ad541d6e074393 Mon Sep 17 00:00:00 2001
From: Sviatoslav Tsariov <slava982007@gmail.com>
Date: Fri, 29 Mar 2024 10:39:10 +0300
Subject: [PATCH] Fixed typo
QueueStack -> ProcessStack
---
src/app.py | 10 +++++-----
src/config.py | 6 +++---
src/process_stack/__init__.py | 1 +
.../queue_stack.py => process_stack/process_stack.py} | 4 ++--
src/process_stack/strategies/__init__.py | 2 ++
.../strategies/base_process_strategy.py | 0
.../strategies/recognize_and_send_strategy.py | 2 +-
src/queue_stack/__init__.py | 1 -
src/queue_stack/strategies/__init__.py | 2 --
9 files changed, 14 insertions(+), 14 deletions(-)
create mode 100644 src/process_stack/__init__.py
rename src/{queue_stack/queue_stack.py => process_stack/process_stack.py} (91%)
create mode 100644 src/process_stack/strategies/__init__.py
rename src/{queue_stack => process_stack}/strategies/base_process_strategy.py (100%)
rename src/{queue_stack => process_stack}/strategies/recognize_and_send_strategy.py (84%)
delete mode 100644 src/queue_stack/__init__.py
delete mode 100644 src/queue_stack/strategies/__init__.py
diff --git a/src/app.py b/src/app.py
index fc612fe..93e55c6 100644
--- a/src/app.py
+++ b/src/app.py
@@ -5,8 +5,8 @@ import sys
import config
-from queue_stack import QueueStack
-from queue_stack.strategies import RecognizeAndSendStrategy
+from process_stack import ProcessQueue
+from process_stack.strategies import RecognizeAndSendStrategy
from recognizer import Recognizer
from recognizer.strategies import WhisperStrategy, FastWhisperStrategy
@@ -22,8 +22,8 @@ fast_whisper_recognizer = Recognizer(FastWhisperStrategy())
sos_message_service = MessageService(SosMessageStrategy())
number_message_service = MessageService(NumberMessageStrategy())
-queue_stack = QueueStack(RecognizeAndSendStrategy())
-queue_stack.start_loop_in_thread()
+process_stack = ProcessQueue(RecognizeAndSendStrategy())
+process_stack.start_loop_in_thread()
@app.route("/")
def hello():
@@ -39,7 +39,7 @@ def recognize_files(message_service: MessageService):
temp = NamedTemporaryFile()
handle.save(temp)
- results.append(queue_stack.append_and_await((
+ results.append(process_stack.append_and_await((
temp,
whisper_recognizer,
message_service,
diff --git a/src/config.py b/src/config.py
index 9f9cba9..bf04401 100644
--- a/src/config.py
+++ b/src/config.py
@@ -4,7 +4,7 @@ from dotenv import load_dotenv
load_dotenv()
-HARPYIA_MODEL = os.getenv('HARPYIA_MODEL') or 'small'
+HARPYIA_MODEL = os.getenv('HARPYIA_MODEL') or 'medium'
HARPYIA_LANGUAGE = os.getenv('HARPYIA_LANGUAGE') or 'ru'
HARPYIA_SAMPLE_RATE = os.getenv('HARPYIA_SAMPLE_RATE') or 160000
@@ -12,10 +12,10 @@ WHISPER_NUM_WORKERS = os.getenv('WHISPER_NUM_WORKERS') or 6
WHISPER_CPU_THREADS = os.getenv('WHISPER_CPU_THREADS') or 10
WHISPER_BEAM_SIZE = os.getenv('WHISPER_BEAM_SIZE') or 5
-SOS_PROMPT = os.getenv('SOS_PROMPT') or 'спасите помогите помощь пожар караул кирилл'
+SOS_PROMPT = os.getenv('SOS_PROMPT') or 'спасите помогите помощь пожар караул гит'
NUMBER_PROMPT = os.getenv('NUMBER_PROMPT') or 'один два три четыре пять шесть семь восемь девять десять одинадцать двенадцать тринадцать сто сот'
RAT_URL = os.getenv('RAT_URL') or 'localhost:8081'
# Check if NVIDIA GPU is available
-DEVICE = "cuda" if torch.cuda.is_available() else "cpu"
\ No newline at end of file
+DEVICE = "cuda" if torch.cuda.is_available() else "cpu"
diff --git a/src/process_stack/__init__.py b/src/process_stack/__init__.py
new file mode 100644
index 0000000..0b99f98
--- /dev/null
+++ b/src/process_stack/__init__.py
@@ -0,0 +1 @@
+from process_stack.process_stack import ProcessQueue
diff --git a/src/queue_stack/queue_stack.py b/src/process_stack/process_stack.py
similarity index 91%
rename from src/queue_stack/queue_stack.py
rename to src/process_stack/process_stack.py
index 6c38e20..0709ee9 100644
--- a/src/queue_stack/queue_stack.py
+++ b/src/process_stack/process_stack.py
@@ -2,9 +2,9 @@ import sys
from threading import Thread, Event, Lock
-from queue_stack.strategies import BaseProcessStrategy
+from process_stack.strategies import BaseProcessStrategy
-class QueueStack:
+class ProcessQueue:
def __init__(self, strategy: BaseProcessStrategy) -> None:
self._stack = []
self._strategy = strategy
diff --git a/src/process_stack/strategies/__init__.py b/src/process_stack/strategies/__init__.py
new file mode 100644
index 0000000..6d8c109
--- /dev/null
+++ b/src/process_stack/strategies/__init__.py
@@ -0,0 +1,2 @@
+from process_stack.strategies.base_process_strategy import BaseProcessStrategy
+from process_stack.strategies.recognize_and_send_strategy import RecognizeAndSendStrategy
\ No newline at end of file
diff --git a/src/queue_stack/strategies/base_process_strategy.py b/src/process_stack/strategies/base_process_strategy.py
similarity index 100%
rename from src/queue_stack/strategies/base_process_strategy.py
rename to src/process_stack/strategies/base_process_strategy.py
diff --git a/src/queue_stack/strategies/recognize_and_send_strategy.py b/src/process_stack/strategies/recognize_and_send_strategy.py
similarity index 84%
rename from src/queue_stack/strategies/recognize_and_send_strategy.py
rename to src/process_stack/strategies/recognize_and_send_strategy.py
index 1269ff5..0fbfd50 100644
--- a/src/queue_stack/strategies/recognize_and_send_strategy.py
+++ b/src/process_stack/strategies/recognize_and_send_strategy.py
@@ -1,6 +1,6 @@
import sys
-from queue_stack.strategies import BaseProcessStrategy
+from process_stack.strategies import BaseProcessStrategy
from message import MessageService
from recognizer import Recognizer
diff --git a/src/queue_stack/__init__.py b/src/queue_stack/__init__.py
deleted file mode 100644
index b065d1b..0000000
--- a/src/queue_stack/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from queue_stack.queue_stack import QueueStack
diff --git a/src/queue_stack/strategies/__init__.py b/src/queue_stack/strategies/__init__.py
deleted file mode 100644
index e274e9b..0000000
--- a/src/queue_stack/strategies/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from queue_stack.strategies.base_process_strategy import BaseProcessStrategy
-from queue_stack.strategies.recognize_and_send_strategy import RecognizeAndSendStrategy
\ No newline at end of file