🔧(backend) rename OpenAI settings to WhisperX to avoid confusion
Rename incorrectly named OpenAI configuration settings since they're used to instantiate WhisperX client which is not OpenAI compatible, preventing confusion about actual service dependencies.
This commit is contained in:
committed by
aleb_the_flash
parent
0102b428f1
commit
bfdf5548a0
@@ -8,7 +8,9 @@ AWS_S3_SECURE_ACCESS=false
|
|||||||
AWS_S3_ACCESS_KEY_ID="meet"
|
AWS_S3_ACCESS_KEY_ID="meet"
|
||||||
AWS_S3_SECRET_ACCESS_KEY="password"
|
AWS_S3_SECRET_ACCESS_KEY="password"
|
||||||
|
|
||||||
OPENAI_API_KEY="your-openai-key"
|
WHISPERX_BASE_URL="https://configure-your-url.com"
|
||||||
|
WHISPERX_ASR_MODEL="large-v2"
|
||||||
|
WHISPERX_API_KEY="your-secret-key"
|
||||||
|
|
||||||
WEBHOOK_API_TOKEN="secret"
|
WEBHOOK_API_TOKEN="secret"
|
||||||
WEBHOOK_URL="https://configure-your-url.com"
|
WEBHOOK_URL="https://configure-your-url.com"
|
||||||
|
|||||||
@@ -144,11 +144,10 @@ summary:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: large-v2
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
@@ -177,11 +176,10 @@ celery:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: large-v2
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
|
|||||||
@@ -151,11 +151,10 @@ summary:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: large-v2
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
@@ -185,11 +184,10 @@ celery:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: large-v2
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
|
|||||||
@@ -171,11 +171,10 @@ summary:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: openai/whisper-large-v3
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
@@ -204,11 +203,10 @@ celery:
|
|||||||
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
AWS_S3_ENDPOINT_URL: minio.meet.svc.cluster.local:9000
|
||||||
AWS_S3_ACCESS_KEY_ID: meet
|
AWS_S3_ACCESS_KEY_ID: meet
|
||||||
AWS_S3_SECRET_ACCESS_KEY: password
|
AWS_S3_SECRET_ACCESS_KEY: password
|
||||||
OPENAI_API_KEY: password
|
|
||||||
OPENAI_BASE_URL: https://albertine.beta.numerique.gouv.fr/v1
|
|
||||||
OPENAI_ASR_MODEL: openai/whisper-large-v3
|
|
||||||
OPENAI_LLM_MODEL: meta-llama/Llama-3.1-8B-Instruct
|
|
||||||
AWS_S3_SECURE_ACCESS: False
|
AWS_S3_SECURE_ACCESS: False
|
||||||
|
WHISPERX_API_KEY: your-secret-value
|
||||||
|
WHISPERX_BASE_URL: https://configure-your-url.com
|
||||||
|
WHISPERX_ASR_MODEL: large-v2
|
||||||
WEBHOOK_API_TOKEN: password
|
WEBHOOK_API_TOKEN: password
|
||||||
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
WEBHOOK_URL: https://www.mock-impress.com/webhook/
|
||||||
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ class MetadataManager:
|
|||||||
|
|
||||||
initial_metadata = {
|
initial_metadata = {
|
||||||
"start_time": time.time(),
|
"start_time": time.time(),
|
||||||
"asr_model": settings.openai_asr_model,
|
"asr_model": settings.whisperx_asr_model,
|
||||||
"retries": 0,
|
"retries": 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -215,19 +215,19 @@ def process_audio_transcribe_summarize_v2(
|
|||||||
logger.error(error_msg)
|
logger.error(error_msg)
|
||||||
raise AudioValidationError(error_msg)
|
raise AudioValidationError(error_msg)
|
||||||
|
|
||||||
logger.info("Initiating OpenAI client")
|
logger.info("Initiating WhisperX client")
|
||||||
openai_client = openai.OpenAI(
|
whisperx_client = openai.OpenAI(
|
||||||
api_key=settings.openai_api_key,
|
api_key=settings.whisperx_api_key,
|
||||||
base_url=settings.openai_base_url,
|
base_url=settings.whisperx_base_url,
|
||||||
max_retries=settings.openai_max_retries,
|
max_retries=settings.whisperx_max_retries,
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
logger.info("Querying transcription …")
|
logger.info("Querying transcription …")
|
||||||
transcription_start_time = time.time()
|
transcription_start_time = time.time()
|
||||||
with open(temp_file_path, "rb") as audio_file:
|
with open(temp_file_path, "rb") as audio_file:
|
||||||
transcription = openai_client.audio.transcriptions.create(
|
transcription = whisperx_client.audio.transcriptions.create(
|
||||||
model=settings.openai_asr_model, file=audio_file
|
model=settings.whisperx_asr_model, file=audio_file
|
||||||
)
|
)
|
||||||
metadata_manager.track(
|
metadata_manager.track(
|
||||||
task_id,
|
task_id,
|
||||||
|
|||||||
@@ -32,10 +32,10 @@ class Settings(BaseSettings):
|
|||||||
aws_s3_secure_access: bool = True
|
aws_s3_secure_access: bool = True
|
||||||
|
|
||||||
# AI-related settings
|
# AI-related settings
|
||||||
openai_api_key: str
|
whisperx_api_key: str
|
||||||
openai_base_url: str = "https://api.openai.com/v1"
|
whisperx_base_url: str = "https://api.openai.com/v1"
|
||||||
openai_asr_model: str = "whisper-1"
|
whisperx_asr_model: str = "whisper-1"
|
||||||
openai_max_retries: int = 0
|
whisperx_max_retries: int = 0
|
||||||
|
|
||||||
# Webhook-related settings
|
# Webhook-related settings
|
||||||
webhook_max_retries: int = 2
|
webhook_max_retries: int = 2
|
||||||
|
|||||||
Reference in New Issue
Block a user