add properties to tts span for mod_*_tts (#45)

* add properties to tts span for mod_*_tts

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

* support deepgram tts span

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

* support tts span for playht

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

* support rimelabs tts span

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

---------

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>
This commit is contained in:
Hoan Luu Huu
2024-04-14 20:13:54 +07:00
committed by GitHub
parent 622cb14957
commit 3f642467eb
12 changed files with 61 additions and 26 deletions

View File

@@ -470,8 +470,14 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, ConnInfo_t *conn) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write_cb: firing playback-started\n");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Playback-File-Type", "tts_stream");
if (d->reported_latency) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_deepgram_reported_latency_ms", d->reported_latency);
if (d->reported_model_name) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_deepgram_reported_model_name", d->reported_model_name);
}
if (d->reported_model_uuid) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_deepgram_reported_model_uuid", d->reported_model_uuid);
}
if (d->reported_char_count) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_deepgram_reported_char_count", d->reported_char_count);
}
if (d->request_id) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_deepgram_request_id", d->request_id);
@@ -549,6 +555,9 @@ static size_t header_callback(char *buffer, size_t size, size_t nitems, ConnInfo
if (parseHeader(input, header, value)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "recv header: %s with value %s\n", header.c_str(), value.c_str());
if (0 == header.compare("dg-request-id")) d->request_id = strdup(value.c_str());
else if (0 == header.compare("dg-model-name")) d->reported_model_name = strdup(value.c_str());
else if (0 == header.compare("dg-model-uuid")) d->reported_model_uuid = strdup(value.c_str());
else if (0 == header.compare("dg-char-count")) d->reported_char_count = strdup(value.c_str());
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "header_callback: %s\n", input.c_str());

View File

@@ -10,7 +10,9 @@ static void cleardeepgram(deepgram_t* d, int freeAll) {
if (d->api_key) free(d->api_key);
if (d->request_id) free(d->request_id);
if (d->reported_latency) free(d->reported_latency);
if (d->reported_model_name) free(d->reported_model_name);
if (d->reported_model_uuid) free(d->reported_model_uuid);
if (d->reported_char_count) free(d->reported_char_count);
if (d->ct) free(d->ct);
if (d->err_msg) free(d->err_msg);
if (d->name_lookup_time_ms) free(d->name_lookup_time_ms);
@@ -22,7 +24,9 @@ static void cleardeepgram(deepgram_t* d, int freeAll) {
d->api_key = NULL;
d->request_id = NULL;
d->reported_latency = NULL;
d->reported_model_name = NULL;
d->reported_model_uuid = NULL;
d->reported_char_count = NULL;
d->ct = NULL;
d->err_msg = NULL;
d->name_lookup_time_ms = NULL;

View File

@@ -11,7 +11,14 @@ typedef struct deepgram_data {
/* result data */
long response_code;
char *ct;
char *reported_latency;
// Deepgram hedaers
//dg-model-name
char *reported_model_name;
//dg-model-uuid
char *reported_model_uuid;
//dg-char-count
char *reported_char_count;
//dg-request-id
char *request_id;
char *name_lookup_time_ms;
char *connect_time_ms;

View File

@@ -21,7 +21,6 @@ static void clearPlayht(playht_t* p, int freeAll) {
if (p->request_id) free(p->request_id);
if (p->reported_latency) free(p->reported_latency);
if (p->ct) free(p->ct);
if (p->err_msg) free(p->err_msg);
if (p->name_lookup_time_ms) free(p->name_lookup_time_ms);
@@ -43,7 +42,6 @@ static void clearPlayht(playht_t* p, int freeAll) {
p->text_guidance = NULL;
p->request_id = NULL;
p->reported_latency = NULL;
p->ct = NULL;
p->err_msg = NULL;
p->name_lookup_time_ms = NULL;

View File

@@ -19,7 +19,6 @@ typedef struct playht_data {
/* result data */
long response_code;
char *ct;
char *reported_latency;
char *request_id;
char *name_lookup_time_ms;
char *connect_time_ms;

View File

@@ -489,9 +489,6 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, ConnInfo_t *conn) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write_cb: firing playback-started\n");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Playback-File-Type", "tts_stream");
if (p->reported_latency) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_playht_reported_latency_ms", p->reported_latency);
}
if (p->request_id) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_playht_request_id", p->request_id);
}
@@ -567,8 +564,7 @@ static size_t header_callback(char *buffer, size_t size, size_t nitems, ConnInfo
std::string input(buffer, bytes_received);
if (parseHeader(input, header, value)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "recv header: %s with value %s\n", header.c_str(), value.c_str());
if (0 == header.compare("openai-processing-ms")) p->reported_latency = strdup(value.c_str());
else if (0 == header.compare("x-request-id")) p->request_id = strdup(value.c_str());
if (0 == header.compare("x-job-ids")) p->request_id = strdup(value.c_str());
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "header_callback: %s\n", input.c_str());

View File

@@ -12,8 +12,6 @@ static void clearrimelabs(rimelabs_t* d, int freeAll) {
if (d->speed_alpha) free(d->speed_alpha);
if (d->reduce_latency) free(d->reduce_latency);
if (d->request_id) free(d->request_id);
if (d->reported_latency) free(d->reported_latency);
if (d->ct) free(d->ct);
if (d->err_msg) free(d->err_msg);
if (d->name_lookup_time_ms) free(d->name_lookup_time_ms);
@@ -27,8 +25,6 @@ static void clearrimelabs(rimelabs_t* d, int freeAll) {
d->speed_alpha = NULL;
d->reduce_latency = NULL;
d->request_id = NULL;
d->reported_latency = NULL;
d->ct = NULL;
d->err_msg = NULL;
d->name_lookup_time_ms = NULL;

View File

@@ -14,8 +14,6 @@ typedef struct rimelabs_data {
/* result data */
long response_code;
char *ct;
char *reported_latency;
char *request_id;
char *name_lookup_time_ms;
char *connect_time_ms;
char *final_response_time_ms;

View File

@@ -471,12 +471,6 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, ConnInfo_t *conn) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write_cb: firing playback-started\n");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Playback-File-Type", "tts_stream");
if (d->reported_latency) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_rimelabs_reported_latency_ms", d->reported_latency);
}
if (d->request_id) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_rimelabs_request_id", d->request_id);
}
if (d->name_lookup_time_ms) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_rimelabs_name_lookup_time_ms", d->name_lookup_time_ms);
}
@@ -549,7 +543,6 @@ static size_t header_callback(char *buffer, size_t size, size_t nitems, ConnInfo
std::string input(buffer, bytes_received);
if (parseHeader(input, header, value)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "recv header: %s with value %s\n", header.c_str(), value.c_str());
if (0 == header.compare("dg-request-id")) d->request_id = strdup(value.c_str());
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "header_callback: %s\n", input.c_str());

View File

@@ -12,6 +12,10 @@ static void clearWhisper(whisper_t* w, int freeAll) {
if (w->speed) free(w->speed);
if (w->request_id) free(w->request_id);
if (w->reported_latency) free(w->reported_latency);
if (w->reported_organization) free(w->reported_organization);
if (w->reported_ratelimit_requests) free(w->reported_ratelimit_requests);
if (w->reported_ratelimit_remaining_requests) free(w->reported_ratelimit_remaining_requests);
if (w->reported_ratelimit_reset_requests) free(w->reported_ratelimit_reset_requests);
if (w->ct) free(w->ct);
if (w->err_msg) free(w->err_msg);
if (w->name_lookup_time_ms) free(w->name_lookup_time_ms);
@@ -25,6 +29,10 @@ static void clearWhisper(whisper_t* w, int freeAll) {
w->speed = NULL;
w->request_id = NULL;
w->reported_latency = NULL;
w->reported_organization = NULL;
w->reported_ratelimit_requests = NULL;
w->reported_ratelimit_remaining_requests = NULL;
w->reported_ratelimit_reset_requests = NULL;
w->ct = NULL;
w->err_msg = NULL;
w->name_lookup_time_ms = NULL;

View File

@@ -11,7 +11,18 @@ typedef struct whisper_data {
/* result data */
long response_code;
char *ct;
//whisper headers
//openai-organization
char *reported_organization;
//openai-processing-ms
char *reported_latency;
//x-ratelimit-limit-requests
char *reported_ratelimit_requests;
//x-ratelimit-remaining-requests
char *reported_ratelimit_remaining_requests;
//x-ratelimit-reset-requests
char *reported_ratelimit_reset_requests;
//x-request-id
char *request_id;
char *name_lookup_time_ms;
char *connect_time_ms;

View File

@@ -495,6 +495,18 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, ConnInfo_t *conn) {
if (w->request_id) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_request_id", w->request_id);
}
if (w->reported_organization) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_reported_organization", w->reported_latency);
}
if (w->reported_ratelimit_requests) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_reported_ratelimit_requests", w->reported_ratelimit_requests);
}
if (w->reported_ratelimit_remaining_requests) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_reported_ratelimit_remaining_requests", w->reported_ratelimit_remaining_requests);
}
if (w->reported_ratelimit_reset_requests) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_reported_ratelimit_reset_requests", w->reported_ratelimit_reset_requests);
}
if (w->name_lookup_time_ms) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "variable_tts_whisper_name_lookup_time_ms", w->name_lookup_time_ms);
}
@@ -572,6 +584,10 @@ static size_t header_callback(char *buffer, size_t size, size_t nitems, ConnInfo
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "recv header: %s with value %s\n", header.c_str(), value.c_str());
if (0 == header.compare("openai-processing-ms")) w->reported_latency = strdup(value.c_str());
else if (0 == header.compare("x-request-id")) w->request_id = strdup(value.c_str());
else if (0 == header.compare("openai-organization")) w->reported_organization = strdup(value.c_str());
else if (0 == header.compare("x-ratelimit-limit-requests")) w->reported_ratelimit_requests = strdup(value.c_str());
else if (0 == header.compare("x-ratelimit-remaining-requests")) w->reported_ratelimit_remaining_requests = strdup(value.c_str());
else if (0 == header.compare("x-ratelimit-reset-requests")) w->reported_ratelimit_reset_requests = strdup(value.c_str());
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "header_callback: %s\n", input.c_str());