Spaces:
Build error
Build error
Michael Hu
commited on
Commit
·
781eb5f
1
Parent(s):
3fea4d9
Revert "lgos"
Browse filesThis reverts commit 3fea4d942941cf4051eba1a5e19c7e6a670cd135.
- DEVELOPER_GUIDE.md +2 -2
- src/application/dtos/dto_validation.py +36 -36
- src/application/error_handling/error_mapper.py +1 -1
- src/application/error_handling/structured_logger.py +1 -1
- src/application/services/audio_processing_service.py +26 -26
- src/application/services/configuration_service.py +4 -4
- src/infrastructure/base/file_utils.py +9 -9
- src/infrastructure/base/stt_provider_base.py +4 -4
- src/infrastructure/base/translation_provider_base.py +2 -2
- src/infrastructure/base/tts_provider_base.py +1 -1
- src/infrastructure/config/container_setup.py +1 -8
- src/infrastructure/config/dependency_container.py +34 -34
- src/infrastructure/stt/provider_factory.py +17 -17
- src/infrastructure/stt/whisper_provider.py +8 -8
- src/infrastructure/translation/nllb_provider.py +3 -3
- src/infrastructure/translation/provider_factory.py +3 -3
- src/infrastructure/tts/provider_factory.py +10 -10
- tests/unit/application/error_handling/test_structured_logger.py +1 -1
- utils/stt.py +21 -21
DEVELOPER_GUIDE.md
CHANGED
@@ -173,7 +173,7 @@ def _register_default_providers(self):
|
|
173 |
self._providers['my_tts'] = MyTTSProvider
|
174 |
logger.info("Registered MyTTS provider")
|
175 |
except ImportError as e:
|
176 |
-
logger.
|
177 |
```
|
178 |
|
179 |
### Step 3: Add Configuration Support
|
@@ -590,7 +590,7 @@ import logging
|
|
590 |
logger = logging.getLogger(__name__)
|
591 |
|
592 |
# Use appropriate log levels
|
593 |
-
logger.
|
594 |
logger.info("General information about program execution")
|
595 |
logger.warning("Something unexpected happened")
|
596 |
logger.error("A serious error occurred")
|
|
|
173 |
self._providers['my_tts'] = MyTTSProvider
|
174 |
logger.info("Registered MyTTS provider")
|
175 |
except ImportError as e:
|
176 |
+
logger.debug(f"MyTTS provider not available: {e}")
|
177 |
```
|
178 |
|
179 |
### Step 3: Add Configuration Support
|
|
|
590 |
logger = logging.getLogger(__name__)
|
591 |
|
592 |
# Use appropriate log levels
|
593 |
+
logger.debug("Detailed debugging information")
|
594 |
logger.info("General information about program execution")
|
595 |
logger.warning("Something unexpected happened")
|
596 |
logger.error("A serious error occurred")
|
src/application/dtos/dto_validation.py
CHANGED
@@ -15,13 +15,13 @@ T = TypeVar('T')
|
|
15 |
|
16 |
class ValidationError(Exception):
|
17 |
"""Custom exception for DTO validation errors"""
|
18 |
-
|
19 |
def __init__(self, message: str, field: str = None, value: Any = None):
|
20 |
self.message = message
|
21 |
self.field = field
|
22 |
self.value = value
|
23 |
super().__init__(self.message)
|
24 |
-
|
25 |
def __str__(self):
|
26 |
if self.field:
|
27 |
return f"Validation error for field '{self.field}': {self.message}"
|
@@ -30,13 +30,13 @@ class ValidationError(Exception):
|
|
30 |
|
31 |
def validate_dto(dto_instance: Any) -> bool:
|
32 |
"""Validate a DTO instance
|
33 |
-
|
34 |
Args:
|
35 |
dto_instance: The DTO instance to validate
|
36 |
-
|
37 |
Returns:
|
38 |
bool: True if validation passes
|
39 |
-
|
40 |
Raises:
|
41 |
ValidationError: If validation fails
|
42 |
"""
|
@@ -44,11 +44,11 @@ def validate_dto(dto_instance: Any) -> bool:
|
|
44 |
# Call the DTO's validation method if it exists
|
45 |
if hasattr(dto_instance, '_validate'):
|
46 |
dto_instance._validate()
|
47 |
-
|
48 |
# Additional validation can be added here
|
49 |
-
logger.
|
50 |
return True
|
51 |
-
|
52 |
except ValueError as e:
|
53 |
logger.error(f"Validation failed for {type(dto_instance).__name__}: {e}")
|
54 |
raise ValidationError(str(e)) from e
|
@@ -59,10 +59,10 @@ def validate_dto(dto_instance: Any) -> bool:
|
|
59 |
|
60 |
def validation_required(func: Callable[..., T]) -> Callable[..., T]:
|
61 |
"""Decorator to ensure DTO validation before method execution
|
62 |
-
|
63 |
Args:
|
64 |
func: The method to decorate
|
65 |
-
|
66 |
Returns:
|
67 |
Decorated function that validates 'self' before execution
|
68 |
"""
|
@@ -75,23 +75,23 @@ def validation_required(func: Callable[..., T]) -> Callable[..., T]:
|
|
75 |
raise
|
76 |
except Exception as e:
|
77 |
raise ValidationError(f"Error in {func.__name__}: {e}") from e
|
78 |
-
|
79 |
return wrapper
|
80 |
|
81 |
|
82 |
-
def validate_field(value: Any, field_name: str, validator: Callable[[Any], bool],
|
83 |
error_message: str = None) -> Any:
|
84 |
"""Validate a single field value
|
85 |
-
|
86 |
Args:
|
87 |
value: The value to validate
|
88 |
field_name: Name of the field being validated
|
89 |
validator: Function that returns True if value is valid
|
90 |
error_message: Custom error message
|
91 |
-
|
92 |
Returns:
|
93 |
The validated value
|
94 |
-
|
95 |
Raises:
|
96 |
ValidationError: If validation fails
|
97 |
"""
|
@@ -108,37 +108,37 @@ def validate_field(value: Any, field_name: str, validator: Callable[[Any], bool]
|
|
108 |
|
109 |
def validate_required(value: Any, field_name: str) -> Any:
|
110 |
"""Validate that a field is not None or empty
|
111 |
-
|
112 |
Args:
|
113 |
value: The value to validate
|
114 |
field_name: Name of the field being validated
|
115 |
-
|
116 |
Returns:
|
117 |
The validated value
|
118 |
-
|
119 |
Raises:
|
120 |
ValidationError: If field is None or empty
|
121 |
"""
|
122 |
if value is None:
|
123 |
raise ValidationError(f"Field '{field_name}' is required", field_name, value)
|
124 |
-
|
125 |
if isinstance(value, (str, list, dict)) and len(value) == 0:
|
126 |
raise ValidationError(f"Field '{field_name}' cannot be empty", field_name, value)
|
127 |
-
|
128 |
return value
|
129 |
|
130 |
|
131 |
def validate_type(value: Any, field_name: str, expected_type: Union[type, tuple]) -> Any:
|
132 |
"""Validate that a field is of the expected type
|
133 |
-
|
134 |
Args:
|
135 |
value: The value to validate
|
136 |
field_name: Name of the field being validated
|
137 |
expected_type: Expected type or tuple of types
|
138 |
-
|
139 |
Returns:
|
140 |
The validated value
|
141 |
-
|
142 |
Raises:
|
143 |
ValidationError: If type doesn't match
|
144 |
"""
|
@@ -148,30 +148,30 @@ def validate_type(value: Any, field_name: str, expected_type: Union[type, tuple]
|
|
148 |
expected_str = " or ".join(type_names)
|
149 |
else:
|
150 |
expected_str = expected_type.__name__
|
151 |
-
|
152 |
actual_type = type(value).__name__
|
153 |
raise ValidationError(
|
154 |
f"Field '{field_name}' must be of type {expected_str}, got {actual_type}",
|
155 |
field_name, value
|
156 |
)
|
157 |
-
|
158 |
return value
|
159 |
|
160 |
|
161 |
-
def validate_range(value: Union[int, float], field_name: str,
|
162 |
-
min_value: Union[int, float] = None,
|
163 |
max_value: Union[int, float] = None) -> Union[int, float]:
|
164 |
"""Validate that a numeric value is within a specified range
|
165 |
-
|
166 |
Args:
|
167 |
value: The numeric value to validate
|
168 |
field_name: Name of the field being validated
|
169 |
min_value: Minimum allowed value (inclusive)
|
170 |
max_value: Maximum allowed value (inclusive)
|
171 |
-
|
172 |
Returns:
|
173 |
The validated value
|
174 |
-
|
175 |
Raises:
|
176 |
ValidationError: If value is outside the range
|
177 |
"""
|
@@ -180,27 +180,27 @@ def validate_range(value: Union[int, float], field_name: str,
|
|
180 |
f"Field '{field_name}' must be >= {min_value}, got {value}",
|
181 |
field_name, value
|
182 |
)
|
183 |
-
|
184 |
if max_value is not None and value > max_value:
|
185 |
raise ValidationError(
|
186 |
f"Field '{field_name}' must be <= {max_value}, got {value}",
|
187 |
field_name, value
|
188 |
)
|
189 |
-
|
190 |
return value
|
191 |
|
192 |
|
193 |
def validate_choices(value: Any, field_name: str, choices: list) -> Any:
|
194 |
"""Validate that a value is one of the allowed choices
|
195 |
-
|
196 |
Args:
|
197 |
value: The value to validate
|
198 |
field_name: Name of the field being validated
|
199 |
choices: List of allowed values
|
200 |
-
|
201 |
Returns:
|
202 |
The validated value
|
203 |
-
|
204 |
Raises:
|
205 |
ValidationError: If value is not in choices
|
206 |
"""
|
@@ -209,5 +209,5 @@ def validate_choices(value: Any, field_name: str, choices: list) -> Any:
|
|
209 |
f"Field '{field_name}' must be one of {choices}, got '{value}'",
|
210 |
field_name, value
|
211 |
)
|
212 |
-
|
213 |
return value
|
|
|
15 |
|
16 |
class ValidationError(Exception):
|
17 |
"""Custom exception for DTO validation errors"""
|
18 |
+
|
19 |
def __init__(self, message: str, field: str = None, value: Any = None):
|
20 |
self.message = message
|
21 |
self.field = field
|
22 |
self.value = value
|
23 |
super().__init__(self.message)
|
24 |
+
|
25 |
def __str__(self):
|
26 |
if self.field:
|
27 |
return f"Validation error for field '{self.field}': {self.message}"
|
|
|
30 |
|
31 |
def validate_dto(dto_instance: Any) -> bool:
|
32 |
"""Validate a DTO instance
|
33 |
+
|
34 |
Args:
|
35 |
dto_instance: The DTO instance to validate
|
36 |
+
|
37 |
Returns:
|
38 |
bool: True if validation passes
|
39 |
+
|
40 |
Raises:
|
41 |
ValidationError: If validation fails
|
42 |
"""
|
|
|
44 |
# Call the DTO's validation method if it exists
|
45 |
if hasattr(dto_instance, '_validate'):
|
46 |
dto_instance._validate()
|
47 |
+
|
48 |
# Additional validation can be added here
|
49 |
+
logger.debug(f"Successfully validated {type(dto_instance).__name__}")
|
50 |
return True
|
51 |
+
|
52 |
except ValueError as e:
|
53 |
logger.error(f"Validation failed for {type(dto_instance).__name__}: {e}")
|
54 |
raise ValidationError(str(e)) from e
|
|
|
59 |
|
60 |
def validation_required(func: Callable[..., T]) -> Callable[..., T]:
|
61 |
"""Decorator to ensure DTO validation before method execution
|
62 |
+
|
63 |
Args:
|
64 |
func: The method to decorate
|
65 |
+
|
66 |
Returns:
|
67 |
Decorated function that validates 'self' before execution
|
68 |
"""
|
|
|
75 |
raise
|
76 |
except Exception as e:
|
77 |
raise ValidationError(f"Error in {func.__name__}: {e}") from e
|
78 |
+
|
79 |
return wrapper
|
80 |
|
81 |
|
82 |
+
def validate_field(value: Any, field_name: str, validator: Callable[[Any], bool],
|
83 |
error_message: str = None) -> Any:
|
84 |
"""Validate a single field value
|
85 |
+
|
86 |
Args:
|
87 |
value: The value to validate
|
88 |
field_name: Name of the field being validated
|
89 |
validator: Function that returns True if value is valid
|
90 |
error_message: Custom error message
|
91 |
+
|
92 |
Returns:
|
93 |
The validated value
|
94 |
+
|
95 |
Raises:
|
96 |
ValidationError: If validation fails
|
97 |
"""
|
|
|
108 |
|
109 |
def validate_required(value: Any, field_name: str) -> Any:
|
110 |
"""Validate that a field is not None or empty
|
111 |
+
|
112 |
Args:
|
113 |
value: The value to validate
|
114 |
field_name: Name of the field being validated
|
115 |
+
|
116 |
Returns:
|
117 |
The validated value
|
118 |
+
|
119 |
Raises:
|
120 |
ValidationError: If field is None or empty
|
121 |
"""
|
122 |
if value is None:
|
123 |
raise ValidationError(f"Field '{field_name}' is required", field_name, value)
|
124 |
+
|
125 |
if isinstance(value, (str, list, dict)) and len(value) == 0:
|
126 |
raise ValidationError(f"Field '{field_name}' cannot be empty", field_name, value)
|
127 |
+
|
128 |
return value
|
129 |
|
130 |
|
131 |
def validate_type(value: Any, field_name: str, expected_type: Union[type, tuple]) -> Any:
|
132 |
"""Validate that a field is of the expected type
|
133 |
+
|
134 |
Args:
|
135 |
value: The value to validate
|
136 |
field_name: Name of the field being validated
|
137 |
expected_type: Expected type or tuple of types
|
138 |
+
|
139 |
Returns:
|
140 |
The validated value
|
141 |
+
|
142 |
Raises:
|
143 |
ValidationError: If type doesn't match
|
144 |
"""
|
|
|
148 |
expected_str = " or ".join(type_names)
|
149 |
else:
|
150 |
expected_str = expected_type.__name__
|
151 |
+
|
152 |
actual_type = type(value).__name__
|
153 |
raise ValidationError(
|
154 |
f"Field '{field_name}' must be of type {expected_str}, got {actual_type}",
|
155 |
field_name, value
|
156 |
)
|
157 |
+
|
158 |
return value
|
159 |
|
160 |
|
161 |
+
def validate_range(value: Union[int, float], field_name: str,
|
162 |
+
min_value: Union[int, float] = None,
|
163 |
max_value: Union[int, float] = None) -> Union[int, float]:
|
164 |
"""Validate that a numeric value is within a specified range
|
165 |
+
|
166 |
Args:
|
167 |
value: The numeric value to validate
|
168 |
field_name: Name of the field being validated
|
169 |
min_value: Minimum allowed value (inclusive)
|
170 |
max_value: Maximum allowed value (inclusive)
|
171 |
+
|
172 |
Returns:
|
173 |
The validated value
|
174 |
+
|
175 |
Raises:
|
176 |
ValidationError: If value is outside the range
|
177 |
"""
|
|
|
180 |
f"Field '{field_name}' must be >= {min_value}, got {value}",
|
181 |
field_name, value
|
182 |
)
|
183 |
+
|
184 |
if max_value is not None and value > max_value:
|
185 |
raise ValidationError(
|
186 |
f"Field '{field_name}' must be <= {max_value}, got {value}",
|
187 |
field_name, value
|
188 |
)
|
189 |
+
|
190 |
return value
|
191 |
|
192 |
|
193 |
def validate_choices(value: Any, field_name: str, choices: list) -> Any:
|
194 |
"""Validate that a value is one of the allowed choices
|
195 |
+
|
196 |
Args:
|
197 |
value: The value to validate
|
198 |
field_name: Name of the field being validated
|
199 |
choices: List of allowed values
|
200 |
+
|
201 |
Returns:
|
202 |
The validated value
|
203 |
+
|
204 |
Raises:
|
205 |
ValidationError: If value is not in choices
|
206 |
"""
|
|
|
209 |
f"Field '{field_name}' must be one of {choices}, got '{value}'",
|
210 |
field_name, value
|
211 |
)
|
212 |
+
|
213 |
return value
|
src/application/error_handling/error_mapper.py
CHANGED
@@ -249,7 +249,7 @@ class ErrorMapper:
|
|
249 |
if context:
|
250 |
mapping = self._enhance_mapping_with_context(mapping, exception, context)
|
251 |
|
252 |
-
logger.
|
253 |
return mapping
|
254 |
|
255 |
except Exception as e:
|
|
|
249 |
if context:
|
250 |
mapping = self._enhance_mapping_with_context(mapping, exception, context)
|
251 |
|
252 |
+
logger.debug(f"Mapped {type(exception).__name__} to {mapping.error_code}")
|
253 |
return mapping
|
254 |
|
255 |
except Exception as e:
|
src/application/error_handling/structured_logger.py
CHANGED
@@ -124,7 +124,7 @@ class StructuredLogger:
|
|
124 |
"""Log debug message."""
|
125 |
if self.logger.isEnabledFor(logging.DEBUG):
|
126 |
log_data = self._get_log_data(message, LogLevel.DEBUG.value, context, extra)
|
127 |
-
self.logger.
|
128 |
|
129 |
def info(self, message: str, context: Optional[LogContext] = None,
|
130 |
extra: Optional[Dict[str, Any]] = None) -> None:
|
|
|
124 |
"""Log debug message."""
|
125 |
if self.logger.isEnabledFor(logging.DEBUG):
|
126 |
log_data = self._get_log_data(message, LogLevel.DEBUG.value, context, extra)
|
127 |
+
self.logger.debug(message, extra=log_data)
|
128 |
|
129 |
def info(self, message: str, context: Optional[LogContext] = None,
|
130 |
extra: Optional[Dict[str, Any]] = None) -> None:
|
src/application/services/audio_processing_service.py
CHANGED
@@ -51,39 +51,39 @@ class AudioProcessingApplicationService:
|
|
51 |
container: Dependency injection container
|
52 |
config: Application configuration (optional, will be resolved from container)
|
53 |
"""
|
54 |
-
|
55 |
-
|
56 |
-
|
57 |
-
self._container = container
|
58 |
-
self._config = config or container.resolve(AppConfig)
|
59 |
-
self._temp_files: Dict[str, str] = {} # Track temporary files for cleanup
|
60 |
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
|
65 |
-
|
66 |
-
|
67 |
|
68 |
-
|
69 |
-
|
70 |
-
except Exception as e:
|
71 |
-
logger.error(f"Failed to initialize AudioProcessingApplicationService: {e}", exc_info=True)
|
72 |
-
raise
|
73 |
|
74 |
def _setup_logging(self) -> None:
|
75 |
"""Setup logging configuration."""
|
76 |
try:
|
77 |
-
logger.info("Setting up logging configuration...")
|
78 |
log_config = self._config.get_logging_config()
|
79 |
|
80 |
# Configure logger level
|
81 |
logger.setLevel(getattr(logging, log_config['level'].upper(), logging.INFO))
|
82 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
83 |
|
84 |
except Exception as e:
|
85 |
logger.warning(f"Failed to setup logging configuration: {e}")
|
86 |
-
# Continue with default logging
|
87 |
|
88 |
def process_audio_pipeline(self, request: ProcessingRequestDto) -> ProcessingResultDto:
|
89 |
"""
|
@@ -332,7 +332,7 @@ class AudioProcessingApplicationService:
|
|
332 |
|
333 |
try:
|
334 |
os.makedirs(temp_dir, exist_ok=True)
|
335 |
-
logger.
|
336 |
yield temp_dir
|
337 |
|
338 |
finally:
|
@@ -341,7 +341,7 @@ class AudioProcessingApplicationService:
|
|
341 |
try:
|
342 |
import shutil
|
343 |
shutil.rmtree(temp_dir, ignore_errors=True)
|
344 |
-
logger.
|
345 |
except Exception as e:
|
346 |
logger.warning(f"Failed to cleanup temp directory {temp_dir}: {e}")
|
347 |
|
@@ -384,7 +384,7 @@ class AudioProcessingApplicationService:
|
|
384 |
duration=0.0 # Would be calculated from actual file
|
385 |
)
|
386 |
|
387 |
-
logger.
|
388 |
return audio_content
|
389 |
|
390 |
except Exception as e:
|
@@ -412,7 +412,7 @@ class AudioProcessingApplicationService:
|
|
412 |
SpeechRecognitionException: If STT fails
|
413 |
"""
|
414 |
try:
|
415 |
-
logger.
|
416 |
|
417 |
# Get STT provider from container
|
418 |
stt_provider = self._container.get_stt_provider(model)
|
@@ -454,7 +454,7 @@ class AudioProcessingApplicationService:
|
|
454 |
TranslationFailedException: If translation fails
|
455 |
"""
|
456 |
try:
|
457 |
-
logger.
|
458 |
f"Starting translation: {source_language or 'auto'} -> {target_language} "
|
459 |
f"[correlation_id={correlation_id}]"
|
460 |
)
|
@@ -510,7 +510,7 @@ class AudioProcessingApplicationService:
|
|
510 |
SpeechSynthesisException: If TTS fails
|
511 |
"""
|
512 |
try:
|
513 |
-
logger.
|
514 |
f"Starting TTS with voice: {voice}, speed: {speed} "
|
515 |
f"[correlation_id={correlation_id}]"
|
516 |
)
|
@@ -582,7 +582,7 @@ class AudioProcessingApplicationService:
|
|
582 |
try:
|
583 |
if os.path.exists(file_path):
|
584 |
os.remove(file_path)
|
585 |
-
logger.
|
586 |
except Exception as e:
|
587 |
logger.warning(f"Failed to cleanup temp file {file_path}: {e}")
|
588 |
finally:
|
|
|
51 |
container: Dependency injection container
|
52 |
config: Application configuration (optional, will be resolved from container)
|
53 |
"""
|
54 |
+
self._container = container
|
55 |
+
self._config = config or container.resolve(AppConfig)
|
56 |
+
self._temp_files: Dict[str, str] = {} # Track temporary files for cleanup
|
|
|
|
|
|
|
57 |
|
58 |
+
# Initialize error handling components
|
59 |
+
self._error_mapper = ErrorMapper()
|
60 |
+
self._recovery_manager = RecoveryManager()
|
61 |
|
62 |
+
# Setup logging
|
63 |
+
self._setup_logging()
|
64 |
|
65 |
+
logger.info("AudioProcessingApplicationService initialized")
|
|
|
|
|
|
|
|
|
66 |
|
67 |
def _setup_logging(self) -> None:
|
68 |
"""Setup logging configuration."""
|
69 |
try:
|
|
|
70 |
log_config = self._config.get_logging_config()
|
71 |
|
72 |
# Configure logger level
|
73 |
logger.setLevel(getattr(logging, log_config['level'].upper(), logging.INFO))
|
74 |
+
|
75 |
+
# Add file handler if enabled
|
76 |
+
if log_config.get('enable_file_logging', False):
|
77 |
+
file_handler = logging.FileHandler(log_config['log_file_path'])
|
78 |
+
file_handler.setLevel(logger.level)
|
79 |
+
|
80 |
+
formatter = logging.Formatter(log_config['format'])
|
81 |
+
file_handler.setFormatter(formatter)
|
82 |
+
|
83 |
+
logger.addHandler(file_handler)
|
84 |
|
85 |
except Exception as e:
|
86 |
logger.warning(f"Failed to setup logging configuration: {e}")
|
|
|
87 |
|
88 |
def process_audio_pipeline(self, request: ProcessingRequestDto) -> ProcessingResultDto:
|
89 |
"""
|
|
|
332 |
|
333 |
try:
|
334 |
os.makedirs(temp_dir, exist_ok=True)
|
335 |
+
logger.debug(f"Created temporary directory: {temp_dir}")
|
336 |
yield temp_dir
|
337 |
|
338 |
finally:
|
|
|
341 |
try:
|
342 |
import shutil
|
343 |
shutil.rmtree(temp_dir, ignore_errors=True)
|
344 |
+
logger.debug(f"Cleaned up temporary directory: {temp_dir}")
|
345 |
except Exception as e:
|
346 |
logger.warning(f"Failed to cleanup temp directory {temp_dir}: {e}")
|
347 |
|
|
|
384 |
duration=0.0 # Would be calculated from actual file
|
385 |
)
|
386 |
|
387 |
+
logger.debug(f"Converted upload to AudioContent: {upload.filename}")
|
388 |
return audio_content
|
389 |
|
390 |
except Exception as e:
|
|
|
412 |
SpeechRecognitionException: If STT fails
|
413 |
"""
|
414 |
try:
|
415 |
+
logger.debug(f"Starting STT with model: {model} [correlation_id={correlation_id}]")
|
416 |
|
417 |
# Get STT provider from container
|
418 |
stt_provider = self._container.get_stt_provider(model)
|
|
|
454 |
TranslationFailedException: If translation fails
|
455 |
"""
|
456 |
try:
|
457 |
+
logger.debug(
|
458 |
f"Starting translation: {source_language or 'auto'} -> {target_language} "
|
459 |
f"[correlation_id={correlation_id}]"
|
460 |
)
|
|
|
510 |
SpeechSynthesisException: If TTS fails
|
511 |
"""
|
512 |
try:
|
513 |
+
logger.debug(
|
514 |
f"Starting TTS with voice: {voice}, speed: {speed} "
|
515 |
f"[correlation_id={correlation_id}]"
|
516 |
)
|
|
|
582 |
try:
|
583 |
if os.path.exists(file_path):
|
584 |
os.remove(file_path)
|
585 |
+
logger.debug(f"Cleaned up temp file: {file_path}")
|
586 |
except Exception as e:
|
587 |
logger.warning(f"Failed to cleanup temp file {file_path}: {e}")
|
588 |
finally:
|
src/application/services/configuration_service.py
CHANGED
@@ -153,7 +153,7 @@ class ConfigurationApplicationService:
|
|
153 |
# Update the actual config object
|
154 |
if hasattr(self._config.tts, key):
|
155 |
setattr(self._config.tts, key, value)
|
156 |
-
logger.
|
157 |
else:
|
158 |
logger.warning(f"Unknown TTS configuration key: {key}")
|
159 |
|
@@ -192,7 +192,7 @@ class ConfigurationApplicationService:
|
|
192 |
# Update the actual config object
|
193 |
if hasattr(self._config.stt, key):
|
194 |
setattr(self._config.stt, key, value)
|
195 |
-
logger.
|
196 |
else:
|
197 |
logger.warning(f"Unknown STT configuration key: {key}")
|
198 |
|
@@ -231,7 +231,7 @@ class ConfigurationApplicationService:
|
|
231 |
# Update the actual config object
|
232 |
if hasattr(self._config.translation, key):
|
233 |
setattr(self._config.translation, key, value)
|
234 |
-
logger.
|
235 |
else:
|
236 |
logger.warning(f"Unknown translation configuration key: {key}")
|
237 |
|
@@ -270,7 +270,7 @@ class ConfigurationApplicationService:
|
|
270 |
# Update the actual config object
|
271 |
if hasattr(self._config.processing, key):
|
272 |
setattr(self._config.processing, key, value)
|
273 |
-
logger.
|
274 |
else:
|
275 |
logger.warning(f"Unknown processing configuration key: {key}")
|
276 |
|
|
|
153 |
# Update the actual config object
|
154 |
if hasattr(self._config.tts, key):
|
155 |
setattr(self._config.tts, key, value)
|
156 |
+
logger.debug(f"Updated TTS config: {key} = {value}")
|
157 |
else:
|
158 |
logger.warning(f"Unknown TTS configuration key: {key}")
|
159 |
|
|
|
192 |
# Update the actual config object
|
193 |
if hasattr(self._config.stt, key):
|
194 |
setattr(self._config.stt, key, value)
|
195 |
+
logger.debug(f"Updated STT config: {key} = {value}")
|
196 |
else:
|
197 |
logger.warning(f"Unknown STT configuration key: {key}")
|
198 |
|
|
|
231 |
# Update the actual config object
|
232 |
if hasattr(self._config.translation, key):
|
233 |
setattr(self._config.translation, key, value)
|
234 |
+
logger.debug(f"Updated translation config: {key} = {value}")
|
235 |
else:
|
236 |
logger.warning(f"Unknown translation configuration key: {key}")
|
237 |
|
|
|
270 |
# Update the actual config object
|
271 |
if hasattr(self._config.processing, key):
|
272 |
setattr(self._config.processing, key, value)
|
273 |
+
logger.debug(f"Updated processing config: {key} = {value}")
|
274 |
else:
|
275 |
logger.warning(f"Unknown processing configuration key: {key}")
|
276 |
|
src/infrastructure/base/file_utils.py
CHANGED
@@ -27,7 +27,7 @@ class FileManager:
|
|
27 |
self.base_dir = Path(tempfile.gettempdir()) / "tts_app"
|
28 |
|
29 |
self.base_dir.mkdir(exist_ok=True)
|
30 |
-
logger.
|
31 |
|
32 |
def create_temp_file(self, suffix: str = ".tmp", prefix: str = "temp", content: bytes = None) -> Path:
|
33 |
"""
|
@@ -51,7 +51,7 @@ class FileManager:
|
|
51 |
else:
|
52 |
file_path.touch()
|
53 |
|
54 |
-
logger.
|
55 |
return file_path
|
56 |
|
57 |
def create_unique_filename(self, base_name: str, extension: str = "", content_hash: bool = False, content: bytes = None) -> str:
|
@@ -103,7 +103,7 @@ class FileManager:
|
|
103 |
with open(file_path, 'wb') as f:
|
104 |
f.write(audio_data)
|
105 |
|
106 |
-
logger.
|
107 |
return file_path
|
108 |
|
109 |
def save_text_file(self, text_content: str, encoding: str = "utf-8", prefix: str = "text") -> Path:
|
@@ -124,7 +124,7 @@ class FileManager:
|
|
124 |
with open(file_path, 'w', encoding=encoding) as f:
|
125 |
f.write(text_content)
|
126 |
|
127 |
-
logger.
|
128 |
return file_path
|
129 |
|
130 |
def cleanup_file(self, file_path: Union[str, Path]) -> bool:
|
@@ -141,7 +141,7 @@ class FileManager:
|
|
141 |
path = Path(file_path)
|
142 |
if path.exists() and path.is_file():
|
143 |
path.unlink()
|
144 |
-
logger.
|
145 |
return True
|
146 |
return False
|
147 |
except Exception as e:
|
@@ -223,7 +223,7 @@ class FileManager:
|
|
223 |
"""
|
224 |
path = Path(dir_path)
|
225 |
path.mkdir(parents=True, exist_ok=True)
|
226 |
-
logger.
|
227 |
return path
|
228 |
|
229 |
def get_disk_usage(self) -> dict:
|
@@ -282,7 +282,7 @@ class AudioFileGenerator:
|
|
282 |
wav_file.setframerate(sample_rate)
|
283 |
wav_file.writeframes(audio_data)
|
284 |
|
285 |
-
logger.
|
286 |
return path
|
287 |
|
288 |
except Exception as e:
|
@@ -318,7 +318,7 @@ class AudioFileGenerator:
|
|
318 |
|
319 |
sf.write(str(path), audio_array, sample_rate)
|
320 |
|
321 |
-
logger.
|
322 |
return path
|
323 |
|
324 |
except ImportError:
|
@@ -406,4 +406,4 @@ class ErrorHandler:
|
|
406 |
debug_msg += f" ({context})"
|
407 |
debug_msg += f": {message}"
|
408 |
|
409 |
-
self.logger.
|
|
|
27 |
self.base_dir = Path(tempfile.gettempdir()) / "tts_app"
|
28 |
|
29 |
self.base_dir.mkdir(exist_ok=True)
|
30 |
+
logger.debug(f"FileManager initialized with base directory: {self.base_dir}")
|
31 |
|
32 |
def create_temp_file(self, suffix: str = ".tmp", prefix: str = "temp", content: bytes = None) -> Path:
|
33 |
"""
|
|
|
51 |
else:
|
52 |
file_path.touch()
|
53 |
|
54 |
+
logger.debug(f"Created temporary file: {file_path}")
|
55 |
return file_path
|
56 |
|
57 |
def create_unique_filename(self, base_name: str, extension: str = "", content_hash: bool = False, content: bytes = None) -> str:
|
|
|
103 |
with open(file_path, 'wb') as f:
|
104 |
f.write(audio_data)
|
105 |
|
106 |
+
logger.debug(f"Saved audio file: {file_path} ({len(audio_data)} bytes)")
|
107 |
return file_path
|
108 |
|
109 |
def save_text_file(self, text_content: str, encoding: str = "utf-8", prefix: str = "text") -> Path:
|
|
|
124 |
with open(file_path, 'w', encoding=encoding) as f:
|
125 |
f.write(text_content)
|
126 |
|
127 |
+
logger.debug(f"Saved text file: {file_path} ({len(text_content)} characters)")
|
128 |
return file_path
|
129 |
|
130 |
def cleanup_file(self, file_path: Union[str, Path]) -> bool:
|
|
|
141 |
path = Path(file_path)
|
142 |
if path.exists() and path.is_file():
|
143 |
path.unlink()
|
144 |
+
logger.debug(f"Cleaned up file: {path}")
|
145 |
return True
|
146 |
return False
|
147 |
except Exception as e:
|
|
|
223 |
"""
|
224 |
path = Path(dir_path)
|
225 |
path.mkdir(parents=True, exist_ok=True)
|
226 |
+
logger.debug(f"Ensured directory exists: {path}")
|
227 |
return path
|
228 |
|
229 |
def get_disk_usage(self) -> dict:
|
|
|
282 |
wav_file.setframerate(sample_rate)
|
283 |
wav_file.writeframes(audio_data)
|
284 |
|
285 |
+
logger.debug(f"Saved WAV file: {path} (sample_rate={sample_rate}, channels={channels})")
|
286 |
return path
|
287 |
|
288 |
except Exception as e:
|
|
|
318 |
|
319 |
sf.write(str(path), audio_array, sample_rate)
|
320 |
|
321 |
+
logger.debug(f"Converted numpy array to WAV: {path}")
|
322 |
return path
|
323 |
|
324 |
except ImportError:
|
|
|
406 |
debug_msg += f" ({context})"
|
407 |
debug_msg += f": {message}"
|
408 |
|
409 |
+
self.logger.debug(debug_msg)
|
src/infrastructure/base/stt_provider_base.py
CHANGED
@@ -145,7 +145,7 @@ class STTProviderBase(ISpeechRecognitionService, ABC):
|
|
145 |
# Convert to required format if needed
|
146 |
processed_file = self._convert_audio_format(temp_file, audio)
|
147 |
|
148 |
-
logger.
|
149 |
return processed_file
|
150 |
|
151 |
except Exception as e:
|
@@ -191,7 +191,7 @@ class STTProviderBase(ISpeechRecognitionService, ABC):
|
|
191 |
# Export converted audio
|
192 |
standardized_audio.export(output_path, format="wav")
|
193 |
|
194 |
-
logger.
|
195 |
return output_path
|
196 |
|
197 |
except ImportError:
|
@@ -273,7 +273,7 @@ class STTProviderBase(ISpeechRecognitionService, ABC):
|
|
273 |
try:
|
274 |
if file_path.exists():
|
275 |
file_path.unlink()
|
276 |
-
logger.
|
277 |
except Exception as e:
|
278 |
logger.warning(f"Failed to cleanup temp file {file_path}: {str(e)}")
|
279 |
|
@@ -294,7 +294,7 @@ class STTProviderBase(ISpeechRecognitionService, ABC):
|
|
294 |
file_age = current_time - file_path.stat().st_mtime
|
295 |
if file_age > max_age_seconds:
|
296 |
file_path.unlink()
|
297 |
-
logger.
|
298 |
|
299 |
except Exception as e:
|
300 |
logger.warning(f"Failed to cleanup old temp files: {str(e)}")
|
|
|
145 |
# Convert to required format if needed
|
146 |
processed_file = self._convert_audio_format(temp_file, audio)
|
147 |
|
148 |
+
logger.debug(f"Audio preprocessed and saved to: {processed_file}")
|
149 |
return processed_file
|
150 |
|
151 |
except Exception as e:
|
|
|
191 |
# Export converted audio
|
192 |
standardized_audio.export(output_path, format="wav")
|
193 |
|
194 |
+
logger.debug(f"Audio converted from {audio.format} to WAV: {output_path}")
|
195 |
return output_path
|
196 |
|
197 |
except ImportError:
|
|
|
273 |
try:
|
274 |
if file_path.exists():
|
275 |
file_path.unlink()
|
276 |
+
logger.debug(f"Cleaned up temp file: {file_path}")
|
277 |
except Exception as e:
|
278 |
logger.warning(f"Failed to cleanup temp file {file_path}: {str(e)}")
|
279 |
|
|
|
294 |
file_age = current_time - file_path.stat().st_mtime
|
295 |
if file_age > max_age_seconds:
|
296 |
file_path.unlink()
|
297 |
+
logger.debug(f"Cleaned up old temp file: {file_path}")
|
298 |
|
299 |
except Exception as e:
|
300 |
logger.warning(f"Failed to cleanup old temp files: {str(e)}")
|
src/infrastructure/base/translation_provider_base.py
CHANGED
@@ -56,7 +56,7 @@ class TranslationProviderBase(ITranslationService, ABC):
|
|
56 |
# Translate each chunk
|
57 |
translated_chunks = []
|
58 |
for i, chunk in enumerate(text_chunks):
|
59 |
-
logger.
|
60 |
translated_chunk = self._translate_chunk(
|
61 |
chunk,
|
62 |
request.source_text.language,
|
@@ -160,7 +160,7 @@ class TranslationProviderBase(ITranslationService, ABC):
|
|
160 |
if current_chunk.strip():
|
161 |
chunks.append(current_chunk.strip())
|
162 |
|
163 |
-
logger.
|
164 |
return chunks
|
165 |
|
166 |
def _split_into_sentences(self, text: str) -> List[str]:
|
|
|
56 |
# Translate each chunk
|
57 |
translated_chunks = []
|
58 |
for i, chunk in enumerate(text_chunks):
|
59 |
+
logger.debug(f"Translating chunk {i+1}/{len(text_chunks)}")
|
60 |
translated_chunk = self._translate_chunk(
|
61 |
chunk,
|
62 |
request.source_text.language,
|
|
|
160 |
if current_chunk.strip():
|
161 |
chunks.append(current_chunk.strip())
|
162 |
|
163 |
+
logger.debug(f"Text chunked into {len(chunks)} pieces")
|
164 |
return chunks
|
165 |
|
166 |
def _split_into_sentences(self, text: str) -> List[str]:
|
src/infrastructure/base/tts_provider_base.py
CHANGED
@@ -322,7 +322,7 @@ class TTSProviderBase(ISpeechSynthesisService, ABC):
|
|
322 |
file_age = current_time - file_path.stat().st_mtime
|
323 |
if file_age > max_age_seconds:
|
324 |
file_path.unlink()
|
325 |
-
logger.
|
326 |
|
327 |
except Exception as e:
|
328 |
logger.warning(f"Failed to cleanup temp files: {str(e)}")
|
|
|
322 |
file_age = current_time - file_path.stat().st_mtime
|
323 |
if file_age > max_age_seconds:
|
324 |
file_path.unlink()
|
325 |
+
logger.debug(f"Cleaned up old temp file: {file_path}")
|
326 |
|
327 |
except Exception as e:
|
328 |
logger.warning(f"Failed to cleanup temp files: {str(e)}")
|
src/infrastructure/config/container_setup.py
CHANGED
@@ -131,14 +131,7 @@ def _register_application_services(container: DependencyContainer) -> None:
|
|
131 |
# It manages resources and should be scoped to request/session
|
132 |
def create_audio_processing_app_service() -> AudioProcessingApplicationService:
|
133 |
"""Factory function for creating audio processing application service."""
|
134 |
-
|
135 |
-
logger.info("Creating AudioProcessingApplicationService...")
|
136 |
-
service = AudioProcessingApplicationService(container)
|
137 |
-
logger.info("AudioProcessingApplicationService created successfully")
|
138 |
-
return service
|
139 |
-
except Exception as e:
|
140 |
-
logger.error(f"Failed to create AudioProcessingApplicationService: {e}", exc_info=True)
|
141 |
-
raise
|
142 |
|
143 |
container.register_scoped(
|
144 |
AudioProcessingApplicationService,
|
|
|
131 |
# It manages resources and should be scoped to request/session
|
132 |
def create_audio_processing_app_service() -> AudioProcessingApplicationService:
|
133 |
"""Factory function for creating audio processing application service."""
|
134 |
+
return AudioProcessingApplicationService(container)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
135 |
|
136 |
container.register_scoped(
|
137 |
AudioProcessingApplicationService,
|
src/infrastructure/config/dependency_container.py
CHANGED
@@ -67,12 +67,12 @@ class DependencyContainer:
|
|
67 |
self._singletons: Dict[Type, Any] = {}
|
68 |
self._scoped_instances: Dict[Type, Any] = {}
|
69 |
self._lock = Lock()
|
70 |
-
|
71 |
# Provider factories
|
72 |
self._tts_factory: Optional[TTSProviderFactory] = None
|
73 |
self._stt_factory: Optional[STTProviderFactory] = None
|
74 |
self._translation_factory: Optional[TranslationProviderFactory] = None
|
75 |
-
|
76 |
# Register default services
|
77 |
self._register_default_services()
|
78 |
|
@@ -80,7 +80,7 @@ class DependencyContainer:
|
|
80 |
"""Register default service implementations."""
|
81 |
# Register configuration as singleton
|
82 |
self.register_singleton(AppConfig, self._config)
|
83 |
-
|
84 |
# Register provider factories as singletons
|
85 |
self.register_singleton(TTSProviderFactory, self._get_tts_factory)
|
86 |
self.register_singleton(STTProviderFactory, self._get_stt_factory)
|
@@ -104,7 +104,7 @@ class DependencyContainer:
|
|
104 |
# If implementation is already an instance, store it directly
|
105 |
if not (isinstance(implementation, type) or callable(implementation)):
|
106 |
self._singletons[service_type] = implementation
|
107 |
-
logger.
|
108 |
return
|
109 |
|
110 |
descriptor = ServiceDescriptor(
|
@@ -114,7 +114,7 @@ class DependencyContainer:
|
|
114 |
factory_args=factory_args
|
115 |
)
|
116 |
self._services[service_type] = descriptor
|
117 |
-
logger.
|
118 |
|
119 |
def register_transient(
|
120 |
self,
|
@@ -138,7 +138,7 @@ class DependencyContainer:
|
|
138 |
factory_args=factory_args
|
139 |
)
|
140 |
self._services[service_type] = descriptor
|
141 |
-
logger.
|
142 |
|
143 |
def register_scoped(
|
144 |
self,
|
@@ -162,7 +162,7 @@ class DependencyContainer:
|
|
162 |
factory_args=factory_args
|
163 |
)
|
164 |
self._services[service_type] = descriptor
|
165 |
-
logger.
|
166 |
|
167 |
def resolve(self, service_type: Type[T]) -> T:
|
168 |
"""
|
@@ -208,7 +208,7 @@ class DependencyContainer:
|
|
208 |
|
209 |
instance = self._create_instance(descriptor)
|
210 |
self._singletons[service_type] = instance
|
211 |
-
logger.
|
212 |
return instance
|
213 |
|
214 |
def _create_scoped(self, service_type: Type[T], descriptor: ServiceDescriptor) -> T:
|
@@ -218,13 +218,13 @@ class DependencyContainer:
|
|
218 |
|
219 |
instance = self._create_instance(descriptor)
|
220 |
self._scoped_instances[service_type] = instance
|
221 |
-
logger.
|
222 |
return instance
|
223 |
|
224 |
def _create_transient(self, descriptor: ServiceDescriptor) -> T:
|
225 |
"""Create new transient instance."""
|
226 |
instance = self._create_instance(descriptor)
|
227 |
-
logger.
|
228 |
return instance
|
229 |
|
230 |
def _create_instance(self, descriptor: ServiceDescriptor) -> T:
|
@@ -246,21 +246,21 @@ class DependencyContainer:
|
|
246 |
"""Get or create TTS provider factory."""
|
247 |
if self._tts_factory is None:
|
248 |
self._tts_factory = TTSProviderFactory()
|
249 |
-
logger.
|
250 |
return self._tts_factory
|
251 |
|
252 |
def _get_stt_factory(self) -> STTProviderFactory:
|
253 |
"""Get or create STT provider factory."""
|
254 |
if self._stt_factory is None:
|
255 |
self._stt_factory = STTProviderFactory()
|
256 |
-
logger.
|
257 |
return self._stt_factory
|
258 |
|
259 |
def _get_translation_factory(self) -> TranslationProviderFactory:
|
260 |
"""Get or create translation provider factory."""
|
261 |
if self._translation_factory is None:
|
262 |
self._translation_factory = TranslationProviderFactory()
|
263 |
-
logger.
|
264 |
return self._translation_factory
|
265 |
|
266 |
def get_tts_provider(self, provider_name: Optional[str] = None, **kwargs) -> ISpeechSynthesisService:
|
@@ -275,7 +275,7 @@ class DependencyContainer:
|
|
275 |
ISpeechSynthesisService: TTS provider instance
|
276 |
"""
|
277 |
factory = self.resolve(TTSProviderFactory)
|
278 |
-
|
279 |
if provider_name:
|
280 |
return factory.create_provider(provider_name, **kwargs)
|
281 |
else:
|
@@ -293,7 +293,7 @@ class DependencyContainer:
|
|
293 |
ISpeechRecognitionService: STT provider instance
|
294 |
"""
|
295 |
factory = self.resolve(STTProviderFactory)
|
296 |
-
|
297 |
if provider_name:
|
298 |
return factory.create_provider(provider_name)
|
299 |
else:
|
@@ -316,7 +316,7 @@ class DependencyContainer:
|
|
316 |
ITranslationService: Translation provider instance
|
317 |
"""
|
318 |
factory = self.resolve(TranslationProviderFactory)
|
319 |
-
|
320 |
if provider_type:
|
321 |
return factory.create_provider(provider_type, config)
|
322 |
else:
|
@@ -328,9 +328,9 @@ class DependencyContainer:
|
|
328 |
# Cleanup scoped instances if they have cleanup methods
|
329 |
for instance in self._scoped_instances.values():
|
330 |
self._cleanup_instance(instance)
|
331 |
-
|
332 |
self._scoped_instances.clear()
|
333 |
-
logger.
|
334 |
|
335 |
def _cleanup_instance(self, instance: Any) -> None:
|
336 |
"""Cleanup instance if it has cleanup methods."""
|
@@ -342,7 +342,7 @@ class DependencyContainer:
|
|
342 |
method = getattr(instance, method_name)
|
343 |
if callable(method):
|
344 |
method()
|
345 |
-
logger.
|
346 |
break
|
347 |
except Exception as e:
|
348 |
logger.warning(f"Failed to cleanup instance {type(instance).__name__}: {e}")
|
@@ -351,33 +351,33 @@ class DependencyContainer:
|
|
351 |
"""Cleanup all managed resources."""
|
352 |
with self._lock:
|
353 |
logger.info("Starting dependency container cleanup")
|
354 |
-
|
355 |
# Cleanup scoped instances
|
356 |
self.clear_scoped_instances()
|
357 |
-
|
358 |
# Cleanup singleton instances
|
359 |
for instance in self._singletons.values():
|
360 |
self._cleanup_instance(instance)
|
361 |
-
|
362 |
# Cleanup provider factories
|
363 |
if self._tts_factory:
|
364 |
try:
|
365 |
self._tts_factory.cleanup_providers()
|
366 |
except Exception as e:
|
367 |
logger.warning(f"Failed to cleanup TTS factory: {e}")
|
368 |
-
|
369 |
if self._translation_factory:
|
370 |
try:
|
371 |
self._translation_factory.clear_cache()
|
372 |
except Exception as e:
|
373 |
logger.warning(f"Failed to cleanup translation factory: {e}")
|
374 |
-
|
375 |
# Clear all references
|
376 |
self._singletons.clear()
|
377 |
self._tts_factory = None
|
378 |
self._stt_factory = None
|
379 |
self._translation_factory = None
|
380 |
-
|
381 |
logger.info("Dependency container cleanup completed")
|
382 |
|
383 |
def is_registered(self, service_type: Type) -> bool:
|
@@ -402,16 +402,16 @@ class DependencyContainer:
|
|
402 |
"""
|
403 |
with self._lock:
|
404 |
services_info = {}
|
405 |
-
|
406 |
# Add singleton instances
|
407 |
for service_type in self._singletons.keys():
|
408 |
services_info[service_type.__name__] = "singleton (instance)"
|
409 |
-
|
410 |
# Add registered services
|
411 |
for service_type, descriptor in self._services.items():
|
412 |
if service_type not in self._singletons:
|
413 |
services_info[service_type.__name__] = descriptor.lifetime.value
|
414 |
-
|
415 |
return services_info
|
416 |
|
417 |
def create_scope(self) -> 'DependencyScope':
|
@@ -465,7 +465,7 @@ class DependencyScope:
|
|
465 |
instance = self._parent.resolve(service_type)
|
466 |
|
467 |
# If it's a scoped service, store it in this scope
|
468 |
-
if (service_type in self._parent._services and
|
469 |
self._parent._services[service_type].lifetime == ServiceLifetime.SCOPED):
|
470 |
self._scoped_instances[service_type] = instance
|
471 |
|
@@ -500,12 +500,12 @@ def get_container() -> DependencyContainer:
|
|
500 |
DependencyContainer: Global container instance
|
501 |
"""
|
502 |
global _global_container
|
503 |
-
|
504 |
with _container_lock:
|
505 |
if _global_container is None:
|
506 |
_global_container = DependencyContainer()
|
507 |
logger.info("Created global dependency container")
|
508 |
-
|
509 |
return _global_container
|
510 |
|
511 |
|
@@ -517,11 +517,11 @@ def set_container(container: DependencyContainer) -> None:
|
|
517 |
container: Container instance to set as global
|
518 |
"""
|
519 |
global _global_container
|
520 |
-
|
521 |
with _container_lock:
|
522 |
if _global_container is not None:
|
523 |
_global_container.cleanup()
|
524 |
-
|
525 |
_global_container = container
|
526 |
logger.info("Set global dependency container")
|
527 |
|
@@ -529,7 +529,7 @@ def set_container(container: DependencyContainer) -> None:
|
|
529 |
def cleanup_container() -> None:
|
530 |
"""Cleanup the global dependency container."""
|
531 |
global _global_container
|
532 |
-
|
533 |
with _container_lock:
|
534 |
if _global_container is not None:
|
535 |
_global_container.cleanup()
|
|
|
67 |
self._singletons: Dict[Type, Any] = {}
|
68 |
self._scoped_instances: Dict[Type, Any] = {}
|
69 |
self._lock = Lock()
|
70 |
+
|
71 |
# Provider factories
|
72 |
self._tts_factory: Optional[TTSProviderFactory] = None
|
73 |
self._stt_factory: Optional[STTProviderFactory] = None
|
74 |
self._translation_factory: Optional[TranslationProviderFactory] = None
|
75 |
+
|
76 |
# Register default services
|
77 |
self._register_default_services()
|
78 |
|
|
|
80 |
"""Register default service implementations."""
|
81 |
# Register configuration as singleton
|
82 |
self.register_singleton(AppConfig, self._config)
|
83 |
+
|
84 |
# Register provider factories as singletons
|
85 |
self.register_singleton(TTSProviderFactory, self._get_tts_factory)
|
86 |
self.register_singleton(STTProviderFactory, self._get_stt_factory)
|
|
|
104 |
# If implementation is already an instance, store it directly
|
105 |
if not (isinstance(implementation, type) or callable(implementation)):
|
106 |
self._singletons[service_type] = implementation
|
107 |
+
logger.debug(f"Registered singleton instance for {service_type.__name__}")
|
108 |
return
|
109 |
|
110 |
descriptor = ServiceDescriptor(
|
|
|
114 |
factory_args=factory_args
|
115 |
)
|
116 |
self._services[service_type] = descriptor
|
117 |
+
logger.debug(f"Registered singleton service: {service_type.__name__}")
|
118 |
|
119 |
def register_transient(
|
120 |
self,
|
|
|
138 |
factory_args=factory_args
|
139 |
)
|
140 |
self._services[service_type] = descriptor
|
141 |
+
logger.debug(f"Registered transient service: {service_type.__name__}")
|
142 |
|
143 |
def register_scoped(
|
144 |
self,
|
|
|
162 |
factory_args=factory_args
|
163 |
)
|
164 |
self._services[service_type] = descriptor
|
165 |
+
logger.debug(f"Registered scoped service: {service_type.__name__}")
|
166 |
|
167 |
def resolve(self, service_type: Type[T]) -> T:
|
168 |
"""
|
|
|
208 |
|
209 |
instance = self._create_instance(descriptor)
|
210 |
self._singletons[service_type] = instance
|
211 |
+
logger.debug(f"Created singleton instance for {service_type.__name__}")
|
212 |
return instance
|
213 |
|
214 |
def _create_scoped(self, service_type: Type[T], descriptor: ServiceDescriptor) -> T:
|
|
|
218 |
|
219 |
instance = self._create_instance(descriptor)
|
220 |
self._scoped_instances[service_type] = instance
|
221 |
+
logger.debug(f"Created scoped instance for {service_type.__name__}")
|
222 |
return instance
|
223 |
|
224 |
def _create_transient(self, descriptor: ServiceDescriptor) -> T:
|
225 |
"""Create new transient instance."""
|
226 |
instance = self._create_instance(descriptor)
|
227 |
+
logger.debug(f"Created transient instance for {descriptor.service_type.__name__}")
|
228 |
return instance
|
229 |
|
230 |
def _create_instance(self, descriptor: ServiceDescriptor) -> T:
|
|
|
246 |
"""Get or create TTS provider factory."""
|
247 |
if self._tts_factory is None:
|
248 |
self._tts_factory = TTSProviderFactory()
|
249 |
+
logger.debug("Created TTS provider factory")
|
250 |
return self._tts_factory
|
251 |
|
252 |
def _get_stt_factory(self) -> STTProviderFactory:
|
253 |
"""Get or create STT provider factory."""
|
254 |
if self._stt_factory is None:
|
255 |
self._stt_factory = STTProviderFactory()
|
256 |
+
logger.debug("Created STT provider factory")
|
257 |
return self._stt_factory
|
258 |
|
259 |
def _get_translation_factory(self) -> TranslationProviderFactory:
|
260 |
"""Get or create translation provider factory."""
|
261 |
if self._translation_factory is None:
|
262 |
self._translation_factory = TranslationProviderFactory()
|
263 |
+
logger.debug("Created translation provider factory")
|
264 |
return self._translation_factory
|
265 |
|
266 |
def get_tts_provider(self, provider_name: Optional[str] = None, **kwargs) -> ISpeechSynthesisService:
|
|
|
275 |
ISpeechSynthesisService: TTS provider instance
|
276 |
"""
|
277 |
factory = self.resolve(TTSProviderFactory)
|
278 |
+
|
279 |
if provider_name:
|
280 |
return factory.create_provider(provider_name, **kwargs)
|
281 |
else:
|
|
|
293 |
ISpeechRecognitionService: STT provider instance
|
294 |
"""
|
295 |
factory = self.resolve(STTProviderFactory)
|
296 |
+
|
297 |
if provider_name:
|
298 |
return factory.create_provider(provider_name)
|
299 |
else:
|
|
|
316 |
ITranslationService: Translation provider instance
|
317 |
"""
|
318 |
factory = self.resolve(TranslationProviderFactory)
|
319 |
+
|
320 |
if provider_type:
|
321 |
return factory.create_provider(provider_type, config)
|
322 |
else:
|
|
|
328 |
# Cleanup scoped instances if they have cleanup methods
|
329 |
for instance in self._scoped_instances.values():
|
330 |
self._cleanup_instance(instance)
|
331 |
+
|
332 |
self._scoped_instances.clear()
|
333 |
+
logger.debug("Cleared scoped instances")
|
334 |
|
335 |
def _cleanup_instance(self, instance: Any) -> None:
|
336 |
"""Cleanup instance if it has cleanup methods."""
|
|
|
342 |
method = getattr(instance, method_name)
|
343 |
if callable(method):
|
344 |
method()
|
345 |
+
logger.debug(f"Called {method_name} on {type(instance).__name__}")
|
346 |
break
|
347 |
except Exception as e:
|
348 |
logger.warning(f"Failed to cleanup instance {type(instance).__name__}: {e}")
|
|
|
351 |
"""Cleanup all managed resources."""
|
352 |
with self._lock:
|
353 |
logger.info("Starting dependency container cleanup")
|
354 |
+
|
355 |
# Cleanup scoped instances
|
356 |
self.clear_scoped_instances()
|
357 |
+
|
358 |
# Cleanup singleton instances
|
359 |
for instance in self._singletons.values():
|
360 |
self._cleanup_instance(instance)
|
361 |
+
|
362 |
# Cleanup provider factories
|
363 |
if self._tts_factory:
|
364 |
try:
|
365 |
self._tts_factory.cleanup_providers()
|
366 |
except Exception as e:
|
367 |
logger.warning(f"Failed to cleanup TTS factory: {e}")
|
368 |
+
|
369 |
if self._translation_factory:
|
370 |
try:
|
371 |
self._translation_factory.clear_cache()
|
372 |
except Exception as e:
|
373 |
logger.warning(f"Failed to cleanup translation factory: {e}")
|
374 |
+
|
375 |
# Clear all references
|
376 |
self._singletons.clear()
|
377 |
self._tts_factory = None
|
378 |
self._stt_factory = None
|
379 |
self._translation_factory = None
|
380 |
+
|
381 |
logger.info("Dependency container cleanup completed")
|
382 |
|
383 |
def is_registered(self, service_type: Type) -> bool:
|
|
|
402 |
"""
|
403 |
with self._lock:
|
404 |
services_info = {}
|
405 |
+
|
406 |
# Add singleton instances
|
407 |
for service_type in self._singletons.keys():
|
408 |
services_info[service_type.__name__] = "singleton (instance)"
|
409 |
+
|
410 |
# Add registered services
|
411 |
for service_type, descriptor in self._services.items():
|
412 |
if service_type not in self._singletons:
|
413 |
services_info[service_type.__name__] = descriptor.lifetime.value
|
414 |
+
|
415 |
return services_info
|
416 |
|
417 |
def create_scope(self) -> 'DependencyScope':
|
|
|
465 |
instance = self._parent.resolve(service_type)
|
466 |
|
467 |
# If it's a scoped service, store it in this scope
|
468 |
+
if (service_type in self._parent._services and
|
469 |
self._parent._services[service_type].lifetime == ServiceLifetime.SCOPED):
|
470 |
self._scoped_instances[service_type] = instance
|
471 |
|
|
|
500 |
DependencyContainer: Global container instance
|
501 |
"""
|
502 |
global _global_container
|
503 |
+
|
504 |
with _container_lock:
|
505 |
if _global_container is None:
|
506 |
_global_container = DependencyContainer()
|
507 |
logger.info("Created global dependency container")
|
508 |
+
|
509 |
return _global_container
|
510 |
|
511 |
|
|
|
517 |
container: Container instance to set as global
|
518 |
"""
|
519 |
global _global_container
|
520 |
+
|
521 |
with _container_lock:
|
522 |
if _global_container is not None:
|
523 |
_global_container.cleanup()
|
524 |
+
|
525 |
_global_container = container
|
526 |
logger.info("Set global dependency container")
|
527 |
|
|
|
529 |
def cleanup_container() -> None:
|
530 |
"""Cleanup the global dependency container."""
|
531 |
global _global_container
|
532 |
+
|
533 |
with _container_lock:
|
534 |
if _global_container is not None:
|
535 |
_global_container.cleanup()
|
src/infrastructure/stt/provider_factory.py
CHANGED
@@ -36,21 +36,21 @@ class STTProviderFactory:
|
|
36 |
SpeechRecognitionException: If provider is not available or creation fails
|
37 |
"""
|
38 |
provider_name = provider_name.lower()
|
39 |
-
|
40 |
if provider_name not in cls._providers:
|
41 |
raise SpeechRecognitionException(f"Unknown STT provider: {provider_name}")
|
42 |
|
43 |
provider_class = cls._providers[provider_name]
|
44 |
-
|
45 |
try:
|
46 |
provider = provider_class()
|
47 |
-
|
48 |
if not provider.is_available():
|
49 |
raise SpeechRecognitionException(f"STT provider {provider_name} is not available")
|
50 |
-
|
51 |
logger.info(f"Created STT provider: {provider_name}")
|
52 |
return provider
|
53 |
-
|
54 |
except Exception as e:
|
55 |
logger.error(f"Failed to create STT provider {provider_name}: {str(e)}")
|
56 |
raise SpeechRecognitionException(f"Failed to create STT provider {provider_name}: {str(e)}") from e
|
@@ -79,7 +79,7 @@ class STTProviderFactory:
|
|
79 |
for provider_name in cls._fallback_order:
|
80 |
if provider_name.lower() == preferred_provider.lower():
|
81 |
continue # Skip the preferred provider we already tried
|
82 |
-
|
83 |
try:
|
84 |
logger.info(f"Trying fallback STT provider: {provider_name}")
|
85 |
return cls.create_provider(provider_name)
|
@@ -98,15 +98,15 @@ class STTProviderFactory:
|
|
98 |
list[str]: List of available provider names
|
99 |
"""
|
100 |
available = []
|
101 |
-
|
102 |
for provider_name, provider_class in cls._providers.items():
|
103 |
try:
|
104 |
provider = provider_class()
|
105 |
if provider.is_available():
|
106 |
available.append(provider_name)
|
107 |
except Exception as e:
|
108 |
-
logger.
|
109 |
-
|
110 |
return available
|
111 |
|
112 |
@classmethod
|
@@ -121,12 +121,12 @@ class STTProviderFactory:
|
|
121 |
Optional[dict]: Provider information or None if not found
|
122 |
"""
|
123 |
provider_name = provider_name.lower()
|
124 |
-
|
125 |
if provider_name not in cls._providers:
|
126 |
return None
|
127 |
|
128 |
provider_class = cls._providers[provider_name]
|
129 |
-
|
130 |
try:
|
131 |
provider = provider_class()
|
132 |
return {
|
@@ -137,7 +137,7 @@ class STTProviderFactory:
|
|
137 |
"default_model": provider.get_default_model() if provider.is_available() else None
|
138 |
}
|
139 |
except Exception as e:
|
140 |
-
logger.
|
141 |
return {
|
142 |
"name": provider_name,
|
143 |
"available": False,
|
@@ -160,15 +160,15 @@ class STTProviderFactory:
|
|
160 |
# Legacy compatibility - create an ASRFactory alias
|
161 |
class ASRFactory:
|
162 |
"""Legacy ASRFactory for backward compatibility."""
|
163 |
-
|
164 |
@staticmethod
|
165 |
def get_model(model_name: str = "parakeet") -> STTProviderBase:
|
166 |
"""
|
167 |
Get STT provider by model name (legacy interface).
|
168 |
-
|
169 |
Args:
|
170 |
model_name: Name of the model/provider to use
|
171 |
-
|
172 |
Returns:
|
173 |
STTProviderBase: The provider instance
|
174 |
"""
|
@@ -178,9 +178,9 @@ class ASRFactory:
|
|
178 |
"parakeet": "parakeet",
|
179 |
"faster-whisper": "whisper"
|
180 |
}
|
181 |
-
|
182 |
provider_name = provider_mapping.get(model_name.lower(), model_name.lower())
|
183 |
-
|
184 |
try:
|
185 |
return STTProviderFactory.create_provider(provider_name)
|
186 |
except SpeechRecognitionException:
|
|
|
36 |
SpeechRecognitionException: If provider is not available or creation fails
|
37 |
"""
|
38 |
provider_name = provider_name.lower()
|
39 |
+
|
40 |
if provider_name not in cls._providers:
|
41 |
raise SpeechRecognitionException(f"Unknown STT provider: {provider_name}")
|
42 |
|
43 |
provider_class = cls._providers[provider_name]
|
44 |
+
|
45 |
try:
|
46 |
provider = provider_class()
|
47 |
+
|
48 |
if not provider.is_available():
|
49 |
raise SpeechRecognitionException(f"STT provider {provider_name} is not available")
|
50 |
+
|
51 |
logger.info(f"Created STT provider: {provider_name}")
|
52 |
return provider
|
53 |
+
|
54 |
except Exception as e:
|
55 |
logger.error(f"Failed to create STT provider {provider_name}: {str(e)}")
|
56 |
raise SpeechRecognitionException(f"Failed to create STT provider {provider_name}: {str(e)}") from e
|
|
|
79 |
for provider_name in cls._fallback_order:
|
80 |
if provider_name.lower() == preferred_provider.lower():
|
81 |
continue # Skip the preferred provider we already tried
|
82 |
+
|
83 |
try:
|
84 |
logger.info(f"Trying fallback STT provider: {provider_name}")
|
85 |
return cls.create_provider(provider_name)
|
|
|
98 |
list[str]: List of available provider names
|
99 |
"""
|
100 |
available = []
|
101 |
+
|
102 |
for provider_name, provider_class in cls._providers.items():
|
103 |
try:
|
104 |
provider = provider_class()
|
105 |
if provider.is_available():
|
106 |
available.append(provider_name)
|
107 |
except Exception as e:
|
108 |
+
logger.debug(f"Provider {provider_name} not available: {str(e)}")
|
109 |
+
|
110 |
return available
|
111 |
|
112 |
@classmethod
|
|
|
121 |
Optional[dict]: Provider information or None if not found
|
122 |
"""
|
123 |
provider_name = provider_name.lower()
|
124 |
+
|
125 |
if provider_name not in cls._providers:
|
126 |
return None
|
127 |
|
128 |
provider_class = cls._providers[provider_name]
|
129 |
+
|
130 |
try:
|
131 |
provider = provider_class()
|
132 |
return {
|
|
|
137 |
"default_model": provider.get_default_model() if provider.is_available() else None
|
138 |
}
|
139 |
except Exception as e:
|
140 |
+
logger.debug(f"Failed to get info for provider {provider_name}: {str(e)}")
|
141 |
return {
|
142 |
"name": provider_name,
|
143 |
"available": False,
|
|
|
160 |
# Legacy compatibility - create an ASRFactory alias
|
161 |
class ASRFactory:
|
162 |
"""Legacy ASRFactory for backward compatibility."""
|
163 |
+
|
164 |
@staticmethod
|
165 |
def get_model(model_name: str = "parakeet") -> STTProviderBase:
|
166 |
"""
|
167 |
Get STT provider by model name (legacy interface).
|
168 |
+
|
169 |
Args:
|
170 |
model_name: Name of the model/provider to use
|
171 |
+
|
172 |
Returns:
|
173 |
STTProviderBase: The provider instance
|
174 |
"""
|
|
|
178 |
"parakeet": "parakeet",
|
179 |
"faster-whisper": "whisper"
|
180 |
}
|
181 |
+
|
182 |
provider_name = provider_mapping.get(model_name.lower(), model_name.lower())
|
183 |
+
|
184 |
try:
|
185 |
return STTProviderFactory.create_provider(provider_name)
|
186 |
except SpeechRecognitionException:
|
src/infrastructure/stt/whisper_provider.py
CHANGED
@@ -36,7 +36,7 @@ class WhisperSTTProvider(STTProviderBase):
|
|
36 |
except ImportError:
|
37 |
# Fallback to CPU if torch is not available
|
38 |
self._device = "cpu"
|
39 |
-
|
40 |
self._compute_type = "float16" if self._device == "cuda" else "int8"
|
41 |
logger.info(f"Whisper provider initialized with device: {self._device}, compute_type: {self._compute_type}")
|
42 |
|
@@ -57,7 +57,7 @@ class WhisperSTTProvider(STTProviderBase):
|
|
57 |
self._load_model(model)
|
58 |
|
59 |
logger.info(f"Starting Whisper transcription with model {model}")
|
60 |
-
|
61 |
# Perform transcription
|
62 |
segments, info = self.model.transcribe(
|
63 |
str(audio_path),
|
@@ -72,7 +72,7 @@ class WhisperSTTProvider(STTProviderBase):
|
|
72 |
result_text = ""
|
73 |
for segment in segments:
|
74 |
result_text += segment.text + " "
|
75 |
-
logger.
|
76 |
|
77 |
result = result_text.strip()
|
78 |
logger.info("Whisper transcription completed successfully")
|
@@ -90,18 +90,18 @@ class WhisperSTTProvider(STTProviderBase):
|
|
90 |
"""
|
91 |
try:
|
92 |
from faster_whisper import WhisperModel as FasterWhisperModel
|
93 |
-
|
94 |
logger.info(f"Loading Whisper model: {model_name}")
|
95 |
logger.info(f"Using device: {self._device}, compute_type: {self._compute_type}")
|
96 |
-
|
97 |
self.model = FasterWhisperModel(
|
98 |
model_name,
|
99 |
device=self._device,
|
100 |
compute_type=self._compute_type
|
101 |
)
|
102 |
-
|
103 |
logger.info(f"Whisper model {model_name} loaded successfully")
|
104 |
-
|
105 |
except ImportError as e:
|
106 |
raise SpeechRecognitionException(
|
107 |
"faster-whisper not available. Please install with: pip install faster-whisper"
|
@@ -134,7 +134,7 @@ class WhisperSTTProvider(STTProviderBase):
|
|
134 |
"tiny",
|
135 |
"tiny.en",
|
136 |
"base",
|
137 |
-
"base.en",
|
138 |
"small",
|
139 |
"small.en",
|
140 |
"medium",
|
|
|
36 |
except ImportError:
|
37 |
# Fallback to CPU if torch is not available
|
38 |
self._device = "cpu"
|
39 |
+
|
40 |
self._compute_type = "float16" if self._device == "cuda" else "int8"
|
41 |
logger.info(f"Whisper provider initialized with device: {self._device}, compute_type: {self._compute_type}")
|
42 |
|
|
|
57 |
self._load_model(model)
|
58 |
|
59 |
logger.info(f"Starting Whisper transcription with model {model}")
|
60 |
+
|
61 |
# Perform transcription
|
62 |
segments, info = self.model.transcribe(
|
63 |
str(audio_path),
|
|
|
72 |
result_text = ""
|
73 |
for segment in segments:
|
74 |
result_text += segment.text + " "
|
75 |
+
logger.debug(f"[{segment.start:.2f}s -> {segment.end:.2f}s] {segment.text}")
|
76 |
|
77 |
result = result_text.strip()
|
78 |
logger.info("Whisper transcription completed successfully")
|
|
|
90 |
"""
|
91 |
try:
|
92 |
from faster_whisper import WhisperModel as FasterWhisperModel
|
93 |
+
|
94 |
logger.info(f"Loading Whisper model: {model_name}")
|
95 |
logger.info(f"Using device: {self._device}, compute_type: {self._compute_type}")
|
96 |
+
|
97 |
self.model = FasterWhisperModel(
|
98 |
model_name,
|
99 |
device=self._device,
|
100 |
compute_type=self._compute_type
|
101 |
)
|
102 |
+
|
103 |
logger.info(f"Whisper model {model_name} loaded successfully")
|
104 |
+
|
105 |
except ImportError as e:
|
106 |
raise SpeechRecognitionException(
|
107 |
"faster-whisper not available. Please install with: pip install faster-whisper"
|
|
|
134 |
"tiny",
|
135 |
"tiny.en",
|
136 |
"base",
|
137 |
+
"base.en",
|
138 |
"small",
|
139 |
"small.en",
|
140 |
"medium",
|
src/infrastructure/translation/nllb_provider.py
CHANGED
@@ -430,7 +430,7 @@ class NLLBTranslationProvider(TranslationProviderBase):
|
|
430 |
# For simplicity, assume all languages can translate to all other languages
|
431 |
# In practice, you might want to be more specific about supported pairs
|
432 |
supported_languages[lang_code] = [
|
433 |
-
target for target in self.LANGUAGE_MAPPINGS.keys()
|
434 |
if target != lang_code
|
435 |
]
|
436 |
|
@@ -465,7 +465,7 @@ class NLLBTranslationProvider(TranslationProviderBase):
|
|
465 |
source_nllb = self._map_language_code(source_language)
|
466 |
target_nllb = self._map_language_code(target_language)
|
467 |
|
468 |
-
logger.
|
469 |
|
470 |
# Tokenize with source language specification
|
471 |
inputs = self._tokenizer(
|
@@ -490,7 +490,7 @@ class NLLBTranslationProvider(TranslationProviderBase):
|
|
490 |
# Post-process the translation
|
491 |
translated = self._postprocess_text(translated)
|
492 |
|
493 |
-
logger.
|
494 |
return translated
|
495 |
|
496 |
except Exception as e:
|
|
|
430 |
# For simplicity, assume all languages can translate to all other languages
|
431 |
# In practice, you might want to be more specific about supported pairs
|
432 |
supported_languages[lang_code] = [
|
433 |
+
target for target in self.LANGUAGE_MAPPINGS.keys()
|
434 |
if target != lang_code
|
435 |
]
|
436 |
|
|
|
465 |
source_nllb = self._map_language_code(source_language)
|
466 |
target_nllb = self._map_language_code(target_language)
|
467 |
|
468 |
+
logger.debug(f"Translating chunk from {source_nllb} to {target_nllb}")
|
469 |
|
470 |
# Tokenize with source language specification
|
471 |
inputs = self._tokenizer(
|
|
|
490 |
# Post-process the translation
|
491 |
translated = self._postprocess_text(translated)
|
492 |
|
493 |
+
logger.debug(f"Chunk translation completed: {len(text)} -> {len(translated)} chars")
|
494 |
return translated
|
495 |
|
496 |
except Exception as e:
|
src/infrastructure/translation/provider_factory.py
CHANGED
@@ -67,7 +67,7 @@ class TranslationProviderFactory:
|
|
67 |
|
68 |
# Return cached instance if available and requested
|
69 |
if use_cache and cache_key in self._provider_cache:
|
70 |
-
logger.
|
71 |
return self._provider_cache[cache_key]
|
72 |
|
73 |
# Check if provider type is registered
|
@@ -86,7 +86,7 @@ class TranslationProviderFactory:
|
|
86 |
final_config.update(config)
|
87 |
|
88 |
logger.info(f"Creating {provider_type.value} translation provider")
|
89 |
-
logger.
|
90 |
|
91 |
# Create provider instance
|
92 |
provider = provider_class(**final_config)
|
@@ -258,7 +258,7 @@ class TranslationProviderFactory:
|
|
258 |
# Cache the result
|
259 |
self._availability_cache[provider_type] = is_available
|
260 |
|
261 |
-
logger.
|
262 |
return is_available
|
263 |
|
264 |
except Exception as e:
|
|
|
67 |
|
68 |
# Return cached instance if available and requested
|
69 |
if use_cache and cache_key in self._provider_cache:
|
70 |
+
logger.debug(f"Returning cached {provider_type.value} provider")
|
71 |
return self._provider_cache[cache_key]
|
72 |
|
73 |
# Check if provider type is registered
|
|
|
86 |
final_config.update(config)
|
87 |
|
88 |
logger.info(f"Creating {provider_type.value} translation provider")
|
89 |
+
logger.debug(f"Provider config: {final_config}")
|
90 |
|
91 |
# Create provider instance
|
92 |
provider = provider_class(**final_config)
|
|
|
258 |
# Cache the result
|
259 |
self._availability_cache[provider_type] = is_available
|
260 |
|
261 |
+
logger.debug(f"Provider {provider_type.value} availability: {is_available}")
|
262 |
return is_available
|
263 |
|
264 |
except Exception as e:
|
src/infrastructure/tts/provider_factory.py
CHANGED
@@ -20,7 +20,7 @@ class TTSProviderFactory:
|
|
20 |
def _register_default_providers(self):
|
21 |
"""Register all available TTS providers."""
|
22 |
# Import providers dynamically to avoid import errors if dependencies are missing
|
23 |
-
|
24 |
# Always register dummy provider as fallback
|
25 |
from .dummy_provider import DummyTTSProvider
|
26 |
self._providers['dummy'] = DummyTTSProvider
|
@@ -31,7 +31,7 @@ class TTSProviderFactory:
|
|
31 |
self._providers['kokoro'] = KokoroTTSProvider
|
32 |
logger.info("Registered Kokoro TTS provider")
|
33 |
except ImportError as e:
|
34 |
-
logger.
|
35 |
|
36 |
# Try to register Dia provider
|
37 |
try:
|
@@ -39,7 +39,7 @@ class TTSProviderFactory:
|
|
39 |
self._providers['dia'] = DiaTTSProvider
|
40 |
logger.info("Registered Dia TTS provider")
|
41 |
except ImportError as e:
|
42 |
-
logger.
|
43 |
|
44 |
# Try to register CosyVoice2 provider
|
45 |
try:
|
@@ -47,7 +47,7 @@ class TTSProviderFactory:
|
|
47 |
self._providers['cosyvoice2'] = CosyVoice2TTSProvider
|
48 |
logger.info("Registered CosyVoice2 TTS provider")
|
49 |
except ImportError as e:
|
50 |
-
logger.
|
51 |
|
52 |
def get_available_providers(self) -> List[str]:
|
53 |
"""Get list of available TTS providers."""
|
@@ -68,10 +68,10 @@ class TTSProviderFactory:
|
|
68 |
# Check if provider is available
|
69 |
if self._provider_instances[name].is_available():
|
70 |
available.append(name)
|
71 |
-
|
72 |
except Exception as e:
|
73 |
logger.warning(f"Failed to check availability of {name} provider: {e}")
|
74 |
-
|
75 |
return available
|
76 |
|
77 |
def create_provider(self, provider_name: str, **kwargs) -> TTSProviderBase:
|
@@ -96,7 +96,7 @@ class TTSProviderFactory:
|
|
96 |
|
97 |
try:
|
98 |
provider_class = self._providers[provider_name]
|
99 |
-
|
100 |
# Create instance with appropriate parameters
|
101 |
if provider_name in ['kokoro', 'dia', 'cosyvoice2']:
|
102 |
lang_code = kwargs.get('lang_code', 'z')
|
@@ -133,7 +133,7 @@ class TTSProviderFactory:
|
|
133 |
preferred_providers = ['kokoro', 'dia', 'cosyvoice2', 'dummy']
|
134 |
|
135 |
available_providers = self.get_available_providers()
|
136 |
-
|
137 |
# Try preferred providers in order
|
138 |
for provider_name in preferred_providers:
|
139 |
if provider_name in available_providers:
|
@@ -177,7 +177,7 @@ class TTSProviderFactory:
|
|
177 |
self._provider_instances[provider_name] = provider_class()
|
178 |
|
179 |
provider = self._provider_instances[provider_name]
|
180 |
-
|
181 |
return {
|
182 |
"available": provider.is_available(),
|
183 |
"name": provider.provider_name,
|
@@ -199,6 +199,6 @@ class TTSProviderFactory:
|
|
199 |
provider._cleanup_temp_files()
|
200 |
except Exception as e:
|
201 |
logger.warning(f"Failed to cleanup provider {provider.provider_name}: {e}")
|
202 |
-
|
203 |
self._provider_instances.clear()
|
204 |
logger.info("Cleaned up TTS provider instances")
|
|
|
20 |
def _register_default_providers(self):
|
21 |
"""Register all available TTS providers."""
|
22 |
# Import providers dynamically to avoid import errors if dependencies are missing
|
23 |
+
|
24 |
# Always register dummy provider as fallback
|
25 |
from .dummy_provider import DummyTTSProvider
|
26 |
self._providers['dummy'] = DummyTTSProvider
|
|
|
31 |
self._providers['kokoro'] = KokoroTTSProvider
|
32 |
logger.info("Registered Kokoro TTS provider")
|
33 |
except ImportError as e:
|
34 |
+
logger.debug(f"Kokoro TTS provider not available: {e}")
|
35 |
|
36 |
# Try to register Dia provider
|
37 |
try:
|
|
|
39 |
self._providers['dia'] = DiaTTSProvider
|
40 |
logger.info("Registered Dia TTS provider")
|
41 |
except ImportError as e:
|
42 |
+
logger.debug(f"Dia TTS provider not available: {e}")
|
43 |
|
44 |
# Try to register CosyVoice2 provider
|
45 |
try:
|
|
|
47 |
self._providers['cosyvoice2'] = CosyVoice2TTSProvider
|
48 |
logger.info("Registered CosyVoice2 TTS provider")
|
49 |
except ImportError as e:
|
50 |
+
logger.debug(f"CosyVoice2 TTS provider not available: {e}")
|
51 |
|
52 |
def get_available_providers(self) -> List[str]:
|
53 |
"""Get list of available TTS providers."""
|
|
|
68 |
# Check if provider is available
|
69 |
if self._provider_instances[name].is_available():
|
70 |
available.append(name)
|
71 |
+
|
72 |
except Exception as e:
|
73 |
logger.warning(f"Failed to check availability of {name} provider: {e}")
|
74 |
+
|
75 |
return available
|
76 |
|
77 |
def create_provider(self, provider_name: str, **kwargs) -> TTSProviderBase:
|
|
|
96 |
|
97 |
try:
|
98 |
provider_class = self._providers[provider_name]
|
99 |
+
|
100 |
# Create instance with appropriate parameters
|
101 |
if provider_name in ['kokoro', 'dia', 'cosyvoice2']:
|
102 |
lang_code = kwargs.get('lang_code', 'z')
|
|
|
133 |
preferred_providers = ['kokoro', 'dia', 'cosyvoice2', 'dummy']
|
134 |
|
135 |
available_providers = self.get_available_providers()
|
136 |
+
|
137 |
# Try preferred providers in order
|
138 |
for provider_name in preferred_providers:
|
139 |
if provider_name in available_providers:
|
|
|
177 |
self._provider_instances[provider_name] = provider_class()
|
178 |
|
179 |
provider = self._provider_instances[provider_name]
|
180 |
+
|
181 |
return {
|
182 |
"available": provider.is_available(),
|
183 |
"name": provider.provider_name,
|
|
|
199 |
provider._cleanup_temp_files()
|
200 |
except Exception as e:
|
201 |
logger.warning(f"Failed to cleanup provider {provider.provider_name}: {e}")
|
202 |
+
|
203 |
self._provider_instances.clear()
|
204 |
logger.info("Cleaned up TTS provider instances")
|
tests/unit/application/error_handling/test_structured_logger.py
CHANGED
@@ -60,7 +60,7 @@ class TestStructuredLogger:
|
|
60 |
context = LogContext(correlation_id="test-123", operation="test_op")
|
61 |
|
62 |
with patch.object(self.logger.logger, 'debug') as mock_debug:
|
63 |
-
self.logger.
|
64 |
|
65 |
mock_debug.assert_called_once()
|
66 |
args, kwargs = mock_debug.call_args
|
|
|
60 |
context = LogContext(correlation_id="test-123", operation="test_op")
|
61 |
|
62 |
with patch.object(self.logger.logger, 'debug') as mock_debug:
|
63 |
+
self.logger.debug("Test debug message", context=context)
|
64 |
|
65 |
mock_debug.assert_called_once()
|
66 |
args, kwargs = mock_debug.call_args
|
utils/stt.py
CHANGED
@@ -16,17 +16,17 @@ from pydub import AudioSegment
|
|
16 |
|
17 |
class ASRModel(ABC):
|
18 |
"""Base class for ASR models"""
|
19 |
-
|
20 |
@abstractmethod
|
21 |
def load_model(self):
|
22 |
"""Load the ASR model"""
|
23 |
pass
|
24 |
-
|
25 |
@abstractmethod
|
26 |
def transcribe(self, audio_path):
|
27 |
"""Transcribe audio to text"""
|
28 |
pass
|
29 |
-
|
30 |
def preprocess_audio(self, audio_path):
|
31 |
"""Convert audio to required format"""
|
32 |
logger.info("Converting audio format")
|
@@ -42,7 +42,7 @@ class ASRModel(ABC):
|
|
42 |
|
43 |
class WhisperModel(ASRModel):
|
44 |
"""Faster Whisper ASR model implementation"""
|
45 |
-
|
46 |
def __init__(self):
|
47 |
self.model = None
|
48 |
# Check for CUDA availability without torch dependency
|
@@ -53,13 +53,13 @@ class WhisperModel(ASRModel):
|
|
53 |
# Fallback to CPU if torch is not available
|
54 |
self.device = "cpu"
|
55 |
self.compute_type = "float16" if self.device == "cuda" else "int8"
|
56 |
-
|
57 |
def load_model(self):
|
58 |
"""Load Faster Whisper model"""
|
59 |
logger.info("Loading Faster Whisper model")
|
60 |
logger.info(f"Using device: {self.device}")
|
61 |
logger.info(f"Using compute type: {self.compute_type}")
|
62 |
-
|
63 |
# Use large-v3 model with appropriate compute type based on device
|
64 |
self.model = FasterWhisperModel(
|
65 |
"large-v3",
|
@@ -67,14 +67,14 @@ class WhisperModel(ASRModel):
|
|
67 |
compute_type=self.compute_type
|
68 |
)
|
69 |
logger.info("Faster Whisper model loaded successfully")
|
70 |
-
|
71 |
def transcribe(self, audio_path):
|
72 |
"""Transcribe audio using Faster Whisper"""
|
73 |
if self.model is None:
|
74 |
self.load_model()
|
75 |
-
|
76 |
wav_path = self.preprocess_audio(audio_path)
|
77 |
-
|
78 |
# Transcription with Faster Whisper
|
79 |
logger.info("Generating transcription with Faster Whisper")
|
80 |
segments, info = self.model.transcribe(
|
@@ -83,15 +83,15 @@ class WhisperModel(ASRModel):
|
|
83 |
language="en",
|
84 |
task="transcribe"
|
85 |
)
|
86 |
-
|
87 |
logger.info(f"Detected language '{info.language}' with probability {info.language_probability}")
|
88 |
-
|
89 |
# Collect all segments into a single text
|
90 |
result_text = ""
|
91 |
for segment in segments:
|
92 |
result_text += segment.text + " "
|
93 |
-
logger.
|
94 |
-
|
95 |
result = result_text.strip()
|
96 |
logger.info(f"Transcription completed successfully")
|
97 |
return result
|
@@ -99,10 +99,10 @@ class WhisperModel(ASRModel):
|
|
99 |
|
100 |
class ParakeetModel(ASRModel):
|
101 |
"""Parakeet ASR model implementation"""
|
102 |
-
|
103 |
def __init__(self):
|
104 |
self.model = None
|
105 |
-
|
106 |
def load_model(self):
|
107 |
"""Load Parakeet model"""
|
108 |
try:
|
@@ -113,14 +113,14 @@ class ParakeetModel(ASRModel):
|
|
113 |
except ImportError:
|
114 |
logger.error("Failed to import nemo_toolkit. Please install with: pip install -U 'nemo_toolkit[asr]'")
|
115 |
raise
|
116 |
-
|
117 |
def transcribe(self, audio_path):
|
118 |
"""Transcribe audio using Parakeet"""
|
119 |
if self.model is None:
|
120 |
self.load_model()
|
121 |
-
|
122 |
wav_path = self.preprocess_audio(audio_path)
|
123 |
-
|
124 |
# Transcription
|
125 |
logger.info("Generating transcription with Parakeet")
|
126 |
output = self.model.transcribe([wav_path])
|
@@ -131,7 +131,7 @@ class ParakeetModel(ASRModel):
|
|
131 |
|
132 |
class ASRFactory:
|
133 |
"""Factory for creating ASR model instances"""
|
134 |
-
|
135 |
@staticmethod
|
136 |
def get_model(model_name="parakeet"):
|
137 |
"""
|
@@ -160,11 +160,11 @@ def transcribe_audio(audio_path, model_name="parakeet"):
|
|
160 |
Transcribed English text
|
161 |
"""
|
162 |
logger.info(f"Starting transcription for: {audio_path} using {model_name} model")
|
163 |
-
|
164 |
try:
|
165 |
# Get the appropriate model
|
166 |
asr_model = ASRFactory.get_model(model_name)
|
167 |
-
|
168 |
# Transcribe audio
|
169 |
result = asr_model.transcribe(audio_path)
|
170 |
logger.info(f"transcription: %s" % result)
|
|
|
16 |
|
17 |
class ASRModel(ABC):
|
18 |
"""Base class for ASR models"""
|
19 |
+
|
20 |
@abstractmethod
|
21 |
def load_model(self):
|
22 |
"""Load the ASR model"""
|
23 |
pass
|
24 |
+
|
25 |
@abstractmethod
|
26 |
def transcribe(self, audio_path):
|
27 |
"""Transcribe audio to text"""
|
28 |
pass
|
29 |
+
|
30 |
def preprocess_audio(self, audio_path):
|
31 |
"""Convert audio to required format"""
|
32 |
logger.info("Converting audio format")
|
|
|
42 |
|
43 |
class WhisperModel(ASRModel):
|
44 |
"""Faster Whisper ASR model implementation"""
|
45 |
+
|
46 |
def __init__(self):
|
47 |
self.model = None
|
48 |
# Check for CUDA availability without torch dependency
|
|
|
53 |
# Fallback to CPU if torch is not available
|
54 |
self.device = "cpu"
|
55 |
self.compute_type = "float16" if self.device == "cuda" else "int8"
|
56 |
+
|
57 |
def load_model(self):
|
58 |
"""Load Faster Whisper model"""
|
59 |
logger.info("Loading Faster Whisper model")
|
60 |
logger.info(f"Using device: {self.device}")
|
61 |
logger.info(f"Using compute type: {self.compute_type}")
|
62 |
+
|
63 |
# Use large-v3 model with appropriate compute type based on device
|
64 |
self.model = FasterWhisperModel(
|
65 |
"large-v3",
|
|
|
67 |
compute_type=self.compute_type
|
68 |
)
|
69 |
logger.info("Faster Whisper model loaded successfully")
|
70 |
+
|
71 |
def transcribe(self, audio_path):
|
72 |
"""Transcribe audio using Faster Whisper"""
|
73 |
if self.model is None:
|
74 |
self.load_model()
|
75 |
+
|
76 |
wav_path = self.preprocess_audio(audio_path)
|
77 |
+
|
78 |
# Transcription with Faster Whisper
|
79 |
logger.info("Generating transcription with Faster Whisper")
|
80 |
segments, info = self.model.transcribe(
|
|
|
83 |
language="en",
|
84 |
task="transcribe"
|
85 |
)
|
86 |
+
|
87 |
logger.info(f"Detected language '{info.language}' with probability {info.language_probability}")
|
88 |
+
|
89 |
# Collect all segments into a single text
|
90 |
result_text = ""
|
91 |
for segment in segments:
|
92 |
result_text += segment.text + " "
|
93 |
+
logger.debug(f"[{segment.start:.2f}s -> {segment.end:.2f}s] {segment.text}")
|
94 |
+
|
95 |
result = result_text.strip()
|
96 |
logger.info(f"Transcription completed successfully")
|
97 |
return result
|
|
|
99 |
|
100 |
class ParakeetModel(ASRModel):
|
101 |
"""Parakeet ASR model implementation"""
|
102 |
+
|
103 |
def __init__(self):
|
104 |
self.model = None
|
105 |
+
|
106 |
def load_model(self):
|
107 |
"""Load Parakeet model"""
|
108 |
try:
|
|
|
113 |
except ImportError:
|
114 |
logger.error("Failed to import nemo_toolkit. Please install with: pip install -U 'nemo_toolkit[asr]'")
|
115 |
raise
|
116 |
+
|
117 |
def transcribe(self, audio_path):
|
118 |
"""Transcribe audio using Parakeet"""
|
119 |
if self.model is None:
|
120 |
self.load_model()
|
121 |
+
|
122 |
wav_path = self.preprocess_audio(audio_path)
|
123 |
+
|
124 |
# Transcription
|
125 |
logger.info("Generating transcription with Parakeet")
|
126 |
output = self.model.transcribe([wav_path])
|
|
|
131 |
|
132 |
class ASRFactory:
|
133 |
"""Factory for creating ASR model instances"""
|
134 |
+
|
135 |
@staticmethod
|
136 |
def get_model(model_name="parakeet"):
|
137 |
"""
|
|
|
160 |
Transcribed English text
|
161 |
"""
|
162 |
logger.info(f"Starting transcription for: {audio_path} using {model_name} model")
|
163 |
+
|
164 |
try:
|
165 |
# Get the appropriate model
|
166 |
asr_model = ASRFactory.get_model(model_name)
|
167 |
+
|
168 |
# Transcribe audio
|
169 |
result = asr_model.transcribe(audio_path)
|
170 |
logger.info(f"transcription: %s" % result)
|