From 81045bd15a569d5d8c4231a9482a89d44e410946 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Tue, 26 Dec 2023 15:50:25 +0100
Subject: [PATCH 01/15] chore: refactored cohere client

---
 .idea/runConfigurations/Cohere_Connector.xml  |  15 +
 .../config-create-wizard/base-form.tsx        |  74 +--
 .../cohere-model-parameters-form.tsx          | 296 ++++++++++++
 .../openai-model-parameters-form.tsx          | 354 ++++++++++++++
 .../parameters-and-prompt-form.spec.tsx       |   4 +-
 .../parameters-and-prompt-form.tsx            | 439 ++----------------
 .../config-create-wizard/parameter-slider.tsx |  52 +++
 gen/go/cohere/v1/cohere.pb.go                 | 286 +++++-------
 gen/ts/cohere/v1/cohere.d.ts                  |  83 ++--
 gen/ts/cohere/v1/cohere.js                    |  23 +-
 gen/ts/google/protobuf/any.d.ts               | 214 ---------
 gen/ts/google/protobuf/any.js                 | 185 --------
 proto/cohere/v1/cohere.proto                  |  45 +-
 services/cohere-connector/src/client.ts       |  63 ++-
 .../cohere-connector/src/handlers.spec.ts     |  94 ++--
 services/cohere-connector/src/handlers.ts     |  61 ++-
 services/cohere-connector/src/utils.spec.ts   |  98 +---
 services/cohere-connector/src/utils.ts        |  82 ++--
 .../openai-connector/src/handlers.spec.ts     |   2 +-
 services/openai-connector/src/handlers.ts     |  11 +-
 services/openai-connector/src/utils.ts        |  10 -
 shared/ts/src/grpc.ts                         |  11 +
 22 files changed, 1172 insertions(+), 1330 deletions(-)
 create mode 100644 .idea/runConfigurations/Cohere_Connector.xml
 create mode 100644 frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
 create mode 100644 frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
 create mode 100644 frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx
 delete mode 100644 gen/ts/google/protobuf/any.d.ts
 delete mode 100644 gen/ts/google/protobuf/any.js

diff --git a/.idea/runConfigurations/Cohere_Connector.xml b/.idea/runConfigurations/Cohere_Connector.xml
new file mode 100644
index 00000000..09ea8f44
--- /dev/null
+++ b/.idea/runConfigurations/Cohere_Connector.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration
+		default="false"
+		name="Cohere Connector"
+		type="JavaScriptTestRunnerVitest"
+	>
+    <node-interpreter value="project" />
+    <vitest-package value="$PROJECT_DIR$/node_modules/vitest" />
+    <working-dir value="$PROJECT_DIR$" />
+    <vitest-options value="services/cohere-connector" />
+    <envs />
+    <scope-kind value="ALL" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
index b45fa56d..01de8931 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
@@ -37,6 +37,44 @@ export function PromptConfigBaseForm({
 		return Object.values(modelVendorTypeMap[modelVendor]) as string[];
 	}, [modelVendor]);
 
+	const activeModelVendor = useMemo(
+		() =>
+			Object.entries(ModelVendor)
+				.filter(([, value]) =>
+					[ModelVendor.OpenAI, ModelVendor.Cohere].includes(value),
+				)
+				.map(([key, value]) => {
+					return (
+						<option key={key} value={value}>
+							{key}
+						</option>
+					);
+				}),
+		[],
+	);
+
+	const invalidModelVendors = useMemo(
+		() =>
+			Object.entries(UnavailableModelVendor).map(([key, value]) => (
+				<option disabled key={value} value={value}>
+					{key}
+				</option>
+			)),
+		[],
+	);
+
+	const choices = useMemo(
+		() =>
+			modelChoices.map((modelChoice) => {
+				return (
+					<option key={modelChoice} value={modelChoice}>
+						{modelTypeToLocaleMap[modelChoice as ModelType<any>]}
+					</option>
+				);
+			}),
+		[modelChoices],
+	);
+
 	return (
 		<div data-testid="base-form-container">
 			{showConfigNameInput && (
@@ -73,27 +111,10 @@ export function PromptConfigBaseForm({
 							className="card-select w-full"
 							value={modelVendor}
 							onChange={handleChange(setVendor)}
-							disabled={true}
 							data-testid="create-prompt-base-form-vendor-select"
 						>
-							{Object.entries(ModelVendor)
-								.filter(
-									([, value]) => value === ModelVendor.OpenAI,
-								)
-								.map(([key, value]) => {
-									return (
-										<option key={key} value={value}>
-											{key}
-										</option>
-									);
-								})}
-							{Object.entries(UnavailableModelVendor).map(
-								([key, value]) => (
-									<option disabled key={value} value={value}>
-										{key}
-									</option>
-								),
-							)}
+							{activeModelVendor}
+							{invalidModelVendors}
 						</select>
 					</div>
 					<div className="form-control">
@@ -108,20 +129,7 @@ export function PromptConfigBaseForm({
 							onChange={handleChange(setModelType)}
 							data-testid="create-prompt-base-form-model-select"
 						>
-							{modelChoices.map((modelChoice) => {
-								return (
-									<option
-										key={modelChoice}
-										value={modelChoice}
-									>
-										{
-											modelTypeToLocaleMap[
-												modelChoice as ModelType<any>
-											]
-										}
-									</option>
-								);
-							})}
+							{choices}
 						</select>
 					</div>
 				</div>
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
new file mode 100644
index 00000000..fa949e78
--- /dev/null
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
@@ -0,0 +1,296 @@
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+
+import { ParameterSlider } from '@/components/prompt-display-components/config-create-wizard/parameter-slider';
+import { openAIRoleColorMap } from '@/constants/models';
+import {
+	ModelParameters,
+	ModelVendor,
+	OpenAIContentMessage,
+	OpenAIMessageRole,
+	OpenAIModelType,
+	OpenAIPromptMessageRole,
+} from '@/types';
+import { handleChange } from '@/utils/events';
+import { extractTemplateVariables } from '@/utils/models';
+
+export function CohereParametersForm({
+	modelType,
+	setParameters,
+	existingParameters,
+}: {
+	existingParameters?: ModelParameters<ModelVendor.OpenAI>;
+	modelType: OpenAIModelType;
+	setParameters: (parameters: ModelParameters<any>) => void;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	const [temperature, setTemperature] = useState(
+		existingParameters?.temperature ?? 1,
+	);
+
+	const inputs: {
+		key: string;
+		labelText: string;
+		max: number;
+		min: number;
+		setter: Dispatch<SetStateAction<number>>;
+		step: number;
+		toolTipText: string;
+		value: number;
+	}[] = [
+		{
+			key: 'temperature',
+			labelText: t('openaiParametersTemperatureLabel'),
+			max: 2,
+			min: 0,
+			setter: setTemperature,
+			step: 0.1,
+			toolTipText: t('openaiParametersTemperatureTooltip'),
+			value: temperature,
+		},
+	];
+
+	useEffect(() => {
+		setParameters({
+			temperature,
+		});
+	}, [temperature]);
+
+	return (
+		<div data-testid="openai-model-parameters-form">
+			<h2 className="card-header">{t('modelParameters')}</h2>
+			<div className="rounded-dark-card  columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
+				{inputs.map(ParameterSlider)}
+			</div>
+		</div>
+	);
+}
+
+export const OPEN_AI_DRAFT_MESSAGE = {
+	content: '',
+	name: '',
+	role: OpenAIPromptMessageRole.System,
+} satisfies OpenAIContentMessage;
+
+export function OpenAIMessageItem({
+	name,
+	role,
+	dataTestId,
+	className,
+	handleClick,
+}: {
+	className: string;
+	dataTestId: string;
+	handleClick: () => void;
+	name?: string;
+	role?: OpenAIMessageRole;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	return (
+		<button
+			className={`btn btn-sm border-neutral rounded-full ${className}`}
+			data-testid={dataTestId}
+			onClick={() => {
+				handleClick();
+			}}
+		>
+			<span className="capitalize">
+				{name || `${role} ${t('message')}`}
+			</span>
+		</button>
+	);
+}
+
+export function OpenAIPromptTemplate({
+	messages,
+	setMessages,
+}: {
+	messages: OpenAIContentMessage[];
+	setMessages: (messages: OpenAIContentMessage[]) => void;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	const [activeMessageIndex, setActiveMessageIndex] = useState(
+		messages.length,
+	);
+	const [draftMessage, setDraftMessage] = useState<OpenAIContentMessage>(
+		structuredClone(OPEN_AI_DRAFT_MESSAGE),
+	);
+
+	const handleRoleChange = (role: OpenAIPromptMessageRole) => {
+		setDraftMessage({ ...draftMessage, role });
+	};
+
+	const handleNameChange = (value: string) => {
+		setDraftMessage({ ...draftMessage, name: value });
+	};
+
+	const handleMessageChange = (value: string) => {
+		setDraftMessage({ ...draftMessage, content: value });
+	};
+
+	const handleDeleteMessage = () => {
+		const copiedMessages = [...messages];
+
+		copiedMessages.splice(activeMessageIndex, 1);
+
+		setMessages(copiedMessages);
+		setActiveMessageIndex(
+			activeMessageIndex - 1 >= 0 ? activeMessageIndex - 1 : 0,
+		);
+	};
+
+	const handleSaveMessage = () => {
+		const copiedMessages = [...messages];
+		draftMessage.templateVariables = extractTemplateVariables(
+			draftMessage.content,
+		);
+		copiedMessages[activeMessageIndex] = draftMessage;
+
+		setMessages(copiedMessages);
+		setDraftMessage(structuredClone(OPEN_AI_DRAFT_MESSAGE));
+		setActiveMessageIndex(copiedMessages.length);
+	};
+
+	return (
+		<div data-testid="openai-prompt-template-form">
+			<h2 className="card-header">{t('promptMessages')}</h2>
+			<div className="rounded-dark-card flex flex-col gap-4">
+				<div className=" p-4 flex items-start content-start gap-4 self-stretch flex-wrap pt-4 pb-4">
+					{messages.map((message, index) => (
+						<OpenAIMessageItem
+							key={message.name || `${message.role}${index}`}
+							role={message.role}
+							name={message.name}
+							className={
+								activeMessageIndex === index
+									? 'btn-secondary'
+									: `btn-secondary btn-outline ${
+											openAIRoleColorMap[message.role]
+										} hover:text-secondary-content`
+							}
+							dataTestId={`parameters-and-prompt-form-message-${index}`}
+							handleClick={() => {
+								setActiveMessageIndex(index);
+								setDraftMessage(message);
+							}}
+						/>
+					))}
+					<OpenAIMessageItem
+						name={t('newMessage')}
+						dataTestId="parameters-and-prompt-form-new-message"
+						handleClick={() => {
+							setActiveMessageIndex(messages.length);
+							setDraftMessage({
+								content: '',
+								name: '',
+								role: OpenAIPromptMessageRole.System,
+							});
+						}}
+						className={
+							activeMessageIndex === messages.length
+								? 'btn-secondary'
+								: 'btn-secondary text-neutral-content btn-outline hover:text-secondary-content'
+						}
+					/>
+				</div>
+				<div className="flex justify-between items-center">
+					<div className="w-full flex justify-start gap-10">
+						<div className="form-control">
+							<label
+								className="label"
+								data-testid="parameters-and-prompt-form-new-message-role-label"
+							>
+								<span className="label-text">
+									{t('messageRole')}
+								</span>
+							</label>
+							<select
+								className="card-select"
+								value={draftMessage.role}
+								onChange={handleChange(handleRoleChange)}
+								data-testid="parameters-and-prompt-form-message-role-select"
+							>
+								{Object.entries(OpenAIPromptMessageRole).map(
+									([key, value]) => (
+										<option
+											key={value}
+											id={value}
+											value={value}
+										>
+											{key.toUpperCase()}
+										</option>
+									),
+								)}
+							</select>
+						</div>
+						<div className="form-control">
+							<label
+								className="label"
+								data-testid="parameters-and-prompt-form-new-message-name-label"
+							>
+								<span className="label-text">
+									{t('messageName')}
+								</span>
+								<span className="label-text-alt">
+									{t('optional')}
+								</span>
+							</label>
+							<input
+								type="text"
+								placeholder={t('messageNameInputPlaceholder')}
+								className="card-input"
+								data-testid="parameters-and-prompt-form-message-name-input"
+								value={draftMessage.name}
+								onChange={handleChange(handleNameChange)}
+							/>
+						</div>
+					</div>
+				</div>
+				<div className="form-control">
+					<label
+						className="label"
+						data-testid="parameters-and-prompt-form-new-message-content-label"
+					>
+						<span className="label-text">
+							{t('messageContent')}
+						</span>
+						<span
+							className="text-info label-text-alt text-sm"
+							data-testid="parameters-and-prompt-form-wrap-variable-label"
+						>
+							{t('wrapVariable')}
+						</span>
+					</label>
+					<textarea
+						className="card-textarea"
+						placeholder={t('promptMessagePlaceholder')}
+						value={draftMessage.content}
+						onChange={handleChange(handleMessageChange)}
+						data-testid="parameters-and-prompt-form-message-textarea"
+					/>
+				</div>
+				<div className="join justify-end">
+					<button
+						className="btn join-item btn-sm btn-neutral"
+						onClick={handleDeleteMessage}
+						data-testid="parameters-and-prompt-form-delete-message-button"
+						disabled={!messages.length}
+					>
+						{t('deleteMessage')}
+					</button>
+					<button
+						className="btn join-item btn-sm btn-primary"
+						onClick={handleSaveMessage}
+						data-testid="parameters-and-prompt-form-save-message-button"
+						disabled={!draftMessage.content}
+					>
+						{t('saveMessage')}
+					</button>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
new file mode 100644
index 00000000..dbd436a3
--- /dev/null
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
@@ -0,0 +1,354 @@
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+
+import { ParameterSlider } from '@/components/prompt-display-components/config-create-wizard/parameter-slider';
+import {
+	DEFAULT_MAX_TOKENS,
+	openAIModelsMaxTokensMap,
+	openAIRoleColorMap,
+} from '@/constants/models';
+import {
+	ModelParameters,
+	ModelVendor,
+	OpenAIContentMessage,
+	OpenAIMessageRole,
+	OpenAIModelType,
+	OpenAIPromptMessageRole,
+} from '@/types';
+import { handleChange } from '@/utils/events';
+import { extractTemplateVariables } from '@/utils/models';
+
+export function OpenAIModelParametersForm({
+	modelType,
+	setParameters,
+	existingParameters,
+}: {
+	existingParameters?: ModelParameters<ModelVendor.OpenAI>;
+	modelType: OpenAIModelType;
+	setParameters: (parameters: ModelParameters<any>) => void;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	const [maxTokens, setMaxTokens] = useState(
+		existingParameters?.maxTokens ?? DEFAULT_MAX_TOKENS,
+	);
+	const [frequencyPenalty, setFrequencyPenalty] = useState(
+		existingParameters?.frequencyPenalty ?? 0,
+	);
+	const [presencePenalty, setPresencePenalty] = useState(
+		existingParameters?.presencePenalty ?? 0,
+	);
+	const [temperature, setTemperature] = useState(
+		existingParameters?.temperature ?? 1,
+	);
+	const [topP, setTopP] = useState(existingParameters?.topP ?? 1);
+
+	const inputs: {
+		key: string;
+		labelText: string;
+		max: number;
+		min: number;
+		setter: Dispatch<SetStateAction<number>>;
+		step: number;
+		toolTipText: string;
+		value: number;
+	}[] = [
+		{
+			key: 'maxTokens',
+			labelText: t('openaiParametersMaxTokensLabel'),
+			max: openAIModelsMaxTokensMap[modelType],
+			min: 1,
+			setter: setMaxTokens,
+			step: 1,
+			toolTipText: t('openaiParametersMaxTokensTooltip'),
+			value: maxTokens,
+		},
+		{
+			key: 'temperature',
+			labelText: t('openaiParametersTemperatureLabel'),
+			max: 2,
+			min: 0,
+			setter: setTemperature,
+			step: 0.1,
+			toolTipText: t('openaiParametersTemperatureTooltip'),
+			value: temperature,
+		},
+		{
+			key: 'topP',
+			labelText: t('openaiParametersTopPLabel'),
+			max: 1,
+			min: 0,
+			setter: setTopP,
+			step: 0.1,
+			toolTipText: t('openaiParametersTopPTooltip'),
+			value: topP,
+		},
+		{
+			key: 'frequencyPenalty',
+			labelText: t('openaiParametersFrequencyPenaltyLabel'),
+			max: 2,
+			min: 0,
+			setter: setFrequencyPenalty,
+			step: 0.1,
+			toolTipText: t('openaiParametersFrequencyPenaltyTooltip'),
+			value: frequencyPenalty,
+		},
+		{
+			key: 'presencePenalty',
+			labelText: t('openaiParametersPresencePenaltyLabel'),
+			max: 2,
+			min: 0,
+			setter: setPresencePenalty,
+			step: 0.1,
+			toolTipText: t('openaiParametersPresencePenaltyTooltip'),
+			value: presencePenalty,
+		},
+	];
+
+	useEffect(() => {
+		setParameters({
+			frequencyPenalty,
+			maxTokens,
+			presencePenalty,
+			temperature,
+			topP,
+		});
+	}, [maxTokens, frequencyPenalty, presencePenalty, temperature, topP]);
+
+	return (
+		<div data-testid="openai-model-parameters-form">
+			<h2 className="card-header">{t('modelParameters')}</h2>
+			<div className="rounded-dark-card  columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
+				{inputs.map(ParameterSlider)}
+			</div>
+		</div>
+	);
+}
+
+export const OPEN_AI_DRAFT_MESSAGE = {
+	content: '',
+	name: '',
+	role: OpenAIPromptMessageRole.System,
+} satisfies OpenAIContentMessage;
+
+export function OpenAIMessageItem({
+	name,
+	role,
+	dataTestId,
+	className,
+	handleClick,
+}: {
+	className: string;
+	dataTestId: string;
+	handleClick: () => void;
+	name?: string;
+	role?: OpenAIMessageRole;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	return (
+		<button
+			className={`btn btn-sm border-neutral rounded-full ${className}`}
+			data-testid={dataTestId}
+			onClick={() => {
+				handleClick();
+			}}
+		>
+			<span className="capitalize">
+				{name || `${role} ${t('message')}`}
+			</span>
+		</button>
+	);
+}
+
+export function OpenAIPromptTemplate({
+	messages,
+	setMessages,
+}: {
+	messages: OpenAIContentMessage[];
+	setMessages: (messages: OpenAIContentMessage[]) => void;
+}) {
+	const t = useTranslations('createConfigWizard');
+
+	const [activeMessageIndex, setActiveMessageIndex] = useState(
+		messages.length,
+	);
+	const [draftMessage, setDraftMessage] = useState<OpenAIContentMessage>(
+		structuredClone(OPEN_AI_DRAFT_MESSAGE),
+	);
+
+	const handleRoleChange = (role: OpenAIPromptMessageRole) => {
+		setDraftMessage({ ...draftMessage, role });
+	};
+
+	const handleNameChange = (value: string) => {
+		setDraftMessage({ ...draftMessage, name: value });
+	};
+
+	const handleMessageChange = (value: string) => {
+		setDraftMessage({ ...draftMessage, content: value });
+	};
+
+	const handleDeleteMessage = () => {
+		const copiedMessages = [...messages];
+
+		copiedMessages.splice(activeMessageIndex, 1);
+
+		setMessages(copiedMessages);
+		setActiveMessageIndex(
+			activeMessageIndex - 1 >= 0 ? activeMessageIndex - 1 : 0,
+		);
+	};
+
+	const handleSaveMessage = () => {
+		const copiedMessages = [...messages];
+		draftMessage.templateVariables = extractTemplateVariables(
+			draftMessage.content,
+		);
+		copiedMessages[activeMessageIndex] = draftMessage;
+
+		setMessages(copiedMessages);
+		setDraftMessage(structuredClone(OPEN_AI_DRAFT_MESSAGE));
+		setActiveMessageIndex(copiedMessages.length);
+	};
+
+	return (
+		<div data-testid="openai-prompt-template-form">
+			<h2 className="card-header">{t('promptMessages')}</h2>
+			<div className="rounded-dark-card flex flex-col gap-4">
+				<div className=" p-4 flex items-start content-start gap-4 self-stretch flex-wrap pt-4 pb-4">
+					{messages.map((message, index) => (
+						<OpenAIMessageItem
+							key={message.name || `${message.role}${index}`}
+							role={message.role}
+							name={message.name}
+							className={
+								activeMessageIndex === index
+									? 'btn-secondary'
+									: `btn-secondary btn-outline ${
+											openAIRoleColorMap[message.role]
+										} hover:text-secondary-content`
+							}
+							dataTestId={`parameters-and-prompt-form-message-${index}`}
+							handleClick={() => {
+								setActiveMessageIndex(index);
+								setDraftMessage(message);
+							}}
+						/>
+					))}
+					<OpenAIMessageItem
+						name={t('newMessage')}
+						dataTestId="parameters-and-prompt-form-new-message"
+						handleClick={() => {
+							setActiveMessageIndex(messages.length);
+							setDraftMessage({
+								content: '',
+								name: '',
+								role: OpenAIPromptMessageRole.System,
+							});
+						}}
+						className={
+							activeMessageIndex === messages.length
+								? 'btn-secondary'
+								: 'btn-secondary text-neutral-content btn-outline hover:text-secondary-content'
+						}
+					/>
+				</div>
+				<div className="flex justify-between items-center">
+					<div className="w-full flex justify-start gap-10">
+						<div className="form-control">
+							<label
+								className="label"
+								data-testid="parameters-and-prompt-form-new-message-role-label"
+							>
+								<span className="label-text">
+									{t('messageRole')}
+								</span>
+							</label>
+							<select
+								className="card-select"
+								value={draftMessage.role}
+								onChange={handleChange(handleRoleChange)}
+								data-testid="parameters-and-prompt-form-message-role-select"
+							>
+								{Object.entries(OpenAIPromptMessageRole).map(
+									([key, value]) => (
+										<option
+											key={value}
+											id={value}
+											value={value}
+										>
+											{key.toUpperCase()}
+										</option>
+									),
+								)}
+							</select>
+						</div>
+						<div className="form-control">
+							<label
+								className="label"
+								data-testid="parameters-and-prompt-form-new-message-name-label"
+							>
+								<span className="label-text">
+									{t('messageName')}
+								</span>
+								<span className="label-text-alt">
+									{t('optional')}
+								</span>
+							</label>
+							<input
+								type="text"
+								placeholder={t('messageNameInputPlaceholder')}
+								className="card-input"
+								data-testid="parameters-and-prompt-form-message-name-input"
+								value={draftMessage.name}
+								onChange={handleChange(handleNameChange)}
+							/>
+						</div>
+					</div>
+				</div>
+				<div className="form-control">
+					<label
+						className="label"
+						data-testid="parameters-and-prompt-form-new-message-content-label"
+					>
+						<span className="label-text">
+							{t('messageContent')}
+						</span>
+						<span
+							className="text-info label-text-alt text-sm"
+							data-testid="parameters-and-prompt-form-wrap-variable-label"
+						>
+							{t('wrapVariable')}
+						</span>
+					</label>
+					<textarea
+						className="card-textarea"
+						placeholder={t('promptMessagePlaceholder')}
+						value={draftMessage.content}
+						onChange={handleChange(handleMessageChange)}
+						data-testid="parameters-and-prompt-form-message-textarea"
+					/>
+				</div>
+				<div className="join justify-end">
+					<button
+						className="btn join-item btn-sm btn-neutral"
+						onClick={handleDeleteMessage}
+						data-testid="parameters-and-prompt-form-delete-message-button"
+						disabled={!messages.length}
+					>
+						{t('deleteMessage')}
+					</button>
+					<button
+						className="btn join-item btn-sm btn-primary"
+						onClick={handleSaveMessage}
+						data-testid="parameters-and-prompt-form-save-message-button"
+						disabled={!draftMessage.content}
+					>
+						{t('saveMessage')}
+					</button>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
index 349945d9..6db84465 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
@@ -5,8 +5,8 @@ import { expect } from 'vitest';
 import {
 	OpenAIModelParametersForm,
 	OpenAIPromptTemplate,
-	PromptConfigParametersAndPromptForm,
-} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form';
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form';
+import { PromptConfigParametersAndPromptForm } from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form';
 import {
 	DEFAULT_MAX_TOKENS,
 	openAIModelsMaxTokensMap,
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
index 033bdb98..1587c2d7 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
@@ -1,29 +1,19 @@
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+import { useMemo } from 'react';
 
-import { useTranslations } from 'next-intl';
-import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { InfoCircle } from 'react-bootstrap-icons';
-
-import { EntityNameInput } from '@/components/entity-name-input';
+import { CohereParametersForm } from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form';
 import {
-	DEFAULT_MAX_TOKENS,
-	openAIModelsMaxTokensMap,
-	openAIRoleColorMap,
-} from '@/constants/models';
+	OpenAIModelParametersForm,
+	OpenAIPromptTemplate,
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form';
 import {
 	ModelParameters,
 	ModelType,
 	ModelVendor,
 	OpenAIContentMessage,
-	OpenAIMessageRole,
 	OpenAIModelParameters,
 	OpenAIModelType,
-	OpenAIPromptMessageRole,
 	ProviderMessageType,
 } from '@/types';
-import { handleChange } from '@/utils/events';
-import { formatNumber } from '@/utils/format';
-import { extractTemplateVariables } from '@/utils/models';
 
 export function PromptConfigParametersAndPromptForm<T extends ModelVendor>({
 	modelVendor,
@@ -40,22 +30,33 @@ export function PromptConfigParametersAndPromptForm<T extends ModelVendor>({
 	setMessages: (messages: ProviderMessageType<T>[]) => void;
 	setParameters: (parameters: ModelParameters<T>) => void;
 }) {
+	const parametersForm = useMemo(() => {
+		if (modelVendor === ModelVendor.Cohere) {
+			return (
+				<CohereParametersForm
+					modelType={modelType as OpenAIModelType}
+					setParameters={setParameters}
+					existingParameters={
+						existingParameters as OpenAIModelParameters
+					}
+				/>
+			);
+		}
+		return (
+			<OpenAIModelParametersForm
+				modelType={modelType as OpenAIModelType}
+				setParameters={setParameters}
+				existingParameters={existingParameters as OpenAIModelParameters}
+			/>
+		);
+	}, [modelVendor]);
+
 	return (
 		<div
 			className="flex flex-col"
 			data-testid="parameters-and-prompt-form-container"
 		>
-			<div>
-				{modelVendor === ModelVendor.OpenAI && (
-					<OpenAIModelParametersForm
-						modelType={modelType as OpenAIModelType}
-						setParameters={setParameters}
-						existingParameters={
-							existingParameters as OpenAIModelParameters
-						}
-					/>
-				)}
-			</div>
+			<div>{parametersForm}</div>
 			<div className="card-divider" />
 			<div>
 				{modelVendor === ModelVendor.OpenAI && (
@@ -72,389 +73,3 @@ export function PromptConfigParametersAndPromptForm<T extends ModelVendor>({
 		</div>
 	);
 }
-
-function ParameterSlider({
-	key,
-	toolTipText,
-	labelText,
-	min,
-	max,
-	step,
-	value,
-	setter,
-}: {
-	key: string;
-	labelText: string;
-	max: number;
-	min: number;
-	setter: (value: number) => void;
-	step: number;
-	toolTipText: string;
-	value: number;
-}) {
-	return (
-		<div className="form-control min-w-xs" key={key}>
-			<label className="label">
-				<div
-					className="tooltip flex items-center gap-1 pr-3"
-					data-tip={toolTipText}
-					data-testid={`${key}-tooltip`}
-				>
-					<span className="label-text">{labelText}</span>
-					<InfoCircle className="w-3 h-3" />
-				</div>
-				<span className="label-text-alt">{formatNumber(value)}</span>
-			</label>
-			<input
-				type="range"
-				min={min}
-				max={max}
-				step={step}
-				value={value}
-				onChange={handleChange((value: string) => {
-					setter(Number.parseFloat(value));
-				})}
-				className="range range-xs"
-				data-testid={`create-prompt-config-dialog-model-parameter-range-${key}`}
-			/>
-		</div>
-	);
-}
-
-export function OpenAIModelParametersForm({
-	modelType,
-	setParameters,
-	existingParameters,
-}: {
-	existingParameters?: ModelParameters<ModelVendor.OpenAI>;
-	modelType: OpenAIModelType;
-	setParameters: (parameters: ModelParameters<any>) => void;
-}) {
-	const t = useTranslations('createConfigWizard');
-
-	const [maxTokens, setMaxTokens] = useState(
-		existingParameters?.maxTokens ?? DEFAULT_MAX_TOKENS,
-	);
-	const [frequencyPenalty, setFrequencyPenalty] = useState(
-		existingParameters?.frequencyPenalty ?? 0,
-	);
-	const [presencePenalty, setPresencePenalty] = useState(
-		existingParameters?.presencePenalty ?? 0,
-	);
-	const [temperature, setTemperature] = useState(
-		existingParameters?.temperature ?? 1,
-	);
-	const [topP, setTopP] = useState(existingParameters?.topP ?? 1);
-
-	const inputs: {
-		key: string;
-		labelText: string;
-		max: number;
-		min: number;
-		setter: Dispatch<SetStateAction<number>>;
-		step: number;
-		toolTipText: string;
-		value: number;
-	}[] = [
-		{
-			key: 'maxTokens',
-			labelText: t('openaiParametersMaxTokensLabel'),
-			max: openAIModelsMaxTokensMap[modelType],
-			min: 1,
-			setter: setMaxTokens,
-			step: 1,
-			toolTipText: t('openaiParametersMaxTokensTooltip'),
-			value: maxTokens,
-		},
-		{
-			key: 'temperature',
-			labelText: t('openaiParametersTemperatureLabel'),
-			max: 2,
-			min: 0,
-			setter: setTemperature,
-			step: 0.1,
-			toolTipText: t('openaiParametersTemperatureTooltip'),
-			value: temperature,
-		},
-		{
-			key: 'topP',
-			labelText: t('openaiParametersTopPLabel'),
-			max: 1,
-			min: 0,
-			setter: setTopP,
-			step: 0.1,
-			toolTipText: t('openaiParametersTopPTooltip'),
-			value: topP,
-		},
-		{
-			key: 'frequencyPenalty',
-			labelText: t('openaiParametersFrequencyPenaltyLabel'),
-			max: 2,
-			min: 0,
-			setter: setFrequencyPenalty,
-			step: 0.1,
-			toolTipText: t('openaiParametersFrequencyPenaltyTooltip'),
-			value: frequencyPenalty,
-		},
-		{
-			key: 'presencePenalty',
-			labelText: t('openaiParametersPresencePenaltyLabel'),
-			max: 2,
-			min: 0,
-			setter: setPresencePenalty,
-			step: 0.1,
-			toolTipText: t('openaiParametersPresencePenaltyTooltip'),
-			value: presencePenalty,
-		},
-	];
-
-	useEffect(() => {
-		setParameters({
-			frequencyPenalty,
-			maxTokens,
-			presencePenalty,
-			temperature,
-			topP,
-		});
-	}, [maxTokens, frequencyPenalty, presencePenalty, temperature, topP]);
-
-	return (
-		<div data-testid="openai-model-parameters-form">
-			<h2 className="card-header">{t('modelParameters')}</h2>
-			<div className="rounded-dark-card  columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
-				{inputs.map(ParameterSlider)}
-			</div>
-		</div>
-	);
-}
-
-const OPEN_AI_DRAFT_MESSAGE = {
-	content: '',
-	name: '',
-	role: OpenAIPromptMessageRole.System,
-} satisfies OpenAIContentMessage;
-
-function MessageItem({
-	name,
-	role,
-	dataTestId,
-	className,
-	handleClick,
-}: {
-	className: string;
-	dataTestId: string;
-	handleClick: () => void;
-	name?: string;
-	role?: OpenAIMessageRole;
-}) {
-	const t = useTranslations('createConfigWizard');
-
-	return (
-		<button
-			className={`btn btn-sm border-neutral rounded-full ${className}`}
-			data-testid={dataTestId}
-			onClick={() => {
-				handleClick();
-			}}
-		>
-			<span className="capitalize">
-				{name || `${role} ${t('message')}`}
-			</span>
-		</button>
-	);
-}
-
-export function OpenAIPromptTemplate({
-	messages,
-	setMessages,
-}: {
-	messages: OpenAIContentMessage[];
-	setMessages: (messages: OpenAIContentMessage[]) => void;
-}) {
-	const t = useTranslations('createConfigWizard');
-
-	const [activeMessageIndex, setActiveMessageIndex] = useState(
-		messages.length,
-	);
-	const [draftMessage, setDraftMessage] = useState<OpenAIContentMessage>(
-		structuredClone(OPEN_AI_DRAFT_MESSAGE),
-	);
-	const handleRoleChange = (role: OpenAIPromptMessageRole) => {
-		setDraftMessage({ ...draftMessage, role });
-	};
-
-	const handleNameChange = (value: string) => {
-		setDraftMessage({ ...draftMessage, name: value });
-	};
-
-	const handleMessageChange = (value: string) => {
-		setDraftMessage({ ...draftMessage, content: value });
-	};
-
-	const handleDeleteMessage = () => {
-		const copiedMessages = [...messages];
-
-		copiedMessages.splice(activeMessageIndex, 1);
-
-		setMessages(copiedMessages);
-		setActiveMessageIndex(
-			activeMessageIndex - 1 >= 0 ? activeMessageIndex - 1 : 0,
-		);
-	};
-
-	const handleSaveMessage = () => {
-		const copiedMessages = [...messages];
-		draftMessage.templateVariables = extractTemplateVariables(
-			draftMessage.content,
-		);
-		copiedMessages[activeMessageIndex] = draftMessage;
-
-		setMessages(copiedMessages);
-		setDraftMessage(structuredClone(OPEN_AI_DRAFT_MESSAGE));
-		setActiveMessageIndex(copiedMessages.length);
-	};
-
-	return (
-		<div data-testid="openai-prompt-template-form">
-			<h2 className="card-header">{t('promptMessages')}</h2>
-			<div className="rounded-dark-card flex flex-col gap-4">
-				<div className=" p-4 flex items-start content-start gap-4 self-stretch flex-wrap pt-4 pb-4">
-					{messages.map((message, index) => (
-						<MessageItem
-							key={message.name || `${message.role}${index}`}
-							role={message.role}
-							name={message.name}
-							className={
-								activeMessageIndex === index
-									? 'btn-secondary'
-									: `btn-secondary btn-outline ${
-											openAIRoleColorMap[message.role]
-										} hover:text-secondary-content`
-							}
-							dataTestId={`parameters-and-prompt-form-message-${index}`}
-							handleClick={() => {
-								setActiveMessageIndex(index);
-								setDraftMessage(message);
-							}}
-						/>
-					))}
-					<MessageItem
-						name={t('newMessage')}
-						dataTestId="parameters-and-prompt-form-new-message"
-						handleClick={() => {
-							setActiveMessageIndex(messages.length);
-							setDraftMessage({
-								content: '',
-								name: '',
-								role: OpenAIPromptMessageRole.System,
-							});
-						}}
-						className={
-							activeMessageIndex === messages.length
-								? 'btn-secondary'
-								: 'btn-secondary text-neutral-content btn-outline hover:text-secondary-content'
-						}
-					/>
-				</div>
-				<div className="flex justify-between items-center">
-					<div className="w-full flex justify-start gap-10">
-						<div className="form-control">
-							<label
-								className="label"
-								data-testid="parameters-and-prompt-form-new-message-role-label"
-							>
-								<span className="label-text">
-									{t('messageRole')}
-								</span>
-							</label>
-							<select
-								className="card-select"
-								value={draftMessage.role}
-								onChange={handleChange(handleRoleChange)}
-								data-testid="parameters-and-prompt-form-message-role-select"
-							>
-								{Object.entries(OpenAIPromptMessageRole).map(
-									([key, value]) => (
-										<option
-											key={value}
-											id={value}
-											value={value}
-										>
-											{key.toUpperCase()}
-										</option>
-									),
-								)}
-							</select>
-						</div>
-						<div className="form-control">
-							<label
-								className="label"
-								data-testid="parameters-and-prompt-form-new-message-name-label"
-							>
-								<span className="label-text">
-									{t('messageName')}
-								</span>
-								<span className="label-text-alt">
-									{t('optional')}
-								</span>
-							</label>
-							<EntityNameInput
-								value={draftMessage.name ?? ''}
-								setValue={handleNameChange}
-								dataTestId="parameters-and-prompt-form-message-name-input"
-								placeholder={t('messageNameInputPlaceholder')}
-								isLoading={false}
-								validateValue={(value: string) => {
-									return !messages
-										.map((message) => message.name)
-										.includes(value);
-								}}
-							/>
-						</div>
-					</div>
-				</div>
-				<div className="form-control">
-					<label
-						className="label"
-						data-testid="parameters-and-prompt-form-new-message-content-label"
-					>
-						<span className="label-text">
-							{t('messageContent')}
-						</span>
-						<span
-							className="text-info label-text-alt text-sm"
-							data-testid="parameters-and-prompt-form-wrap-variable-label"
-						>
-							{t('wrapVariable')}
-						</span>
-					</label>
-					<textarea
-						className="card-textarea"
-						placeholder={t('promptMessagePlaceholder')}
-						value={draftMessage.content}
-						onChange={handleChange(handleMessageChange)}
-						data-testid="parameters-and-prompt-form-message-textarea"
-					/>
-				</div>
-				<div className="join justify-end">
-					<button
-						className="btn join-item btn-sm btn-neutral"
-						onClick={handleDeleteMessage}
-						data-testid="parameters-and-prompt-form-delete-message-button"
-						disabled={!messages.length}
-					>
-						{t('deleteMessage')}
-					</button>
-					<button
-						className="btn join-item btn-sm btn-primary"
-						onClick={handleSaveMessage}
-						data-testid="parameters-and-prompt-form-save-message-button"
-						disabled={!draftMessage.content}
-					>
-						{t('saveMessage')}
-					</button>
-				</div>
-			</div>
-		</div>
-	);
-}
diff --git a/frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx b/frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx
new file mode 100644
index 00000000..010843c3
--- /dev/null
+++ b/frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx
@@ -0,0 +1,52 @@
+import { InfoCircle } from 'react-bootstrap-icons';
+
+import { handleChange } from '@/utils/events';
+import { formatNumber } from '@/utils/format';
+
+export function ParameterSlider({
+	key,
+	toolTipText,
+	labelText,
+	min,
+	max,
+	step,
+	value,
+	setter,
+}: {
+	key: string;
+	labelText: string;
+	max: number;
+	min: number;
+	setter: (value: number) => void;
+	step: number;
+	toolTipText: string;
+	value: number;
+}) {
+	return (
+		<div className="form-control min-w-xs" key={key}>
+			<label className="label">
+				<div
+					className="tooltip flex items-center gap-1 pr-3"
+					data-tip={toolTipText}
+					data-testid={`${key}-tooltip`}
+				>
+					<span className="label-text">{labelText}</span>
+					<InfoCircle className="w-3 h-3" />
+				</div>
+				<span className="label-text-alt">{formatNumber(value)}</span>
+			</label>
+			<input
+				type="range"
+				min={min}
+				max={max}
+				step={step}
+				value={value}
+				onChange={handleChange((value: string) => {
+					setter(Number.parseFloat(value));
+				})}
+				className="range range-xs"
+				data-testid={`create-prompt-config-dialog-model-parameter-range-${key}`}
+			/>
+		</div>
+	);
+}
diff --git a/gen/go/cohere/v1/cohere.pb.go b/gen/go/cohere/v1/cohere.pb.go
index 38e414b3..2e66167c 100644
--- a/gen/go/cohere/v1/cohere.pb.go
+++ b/gen/go/cohere/v1/cohere.pb.go
@@ -9,7 +9,6 @@ package cohereconnector
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -135,20 +134,39 @@ func (CohereConnectorType) EnumDescriptor() ([]byte, []int) {
 	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{1}
 }
 
-// Cohere RAG Connector
-type CohereConnector struct {
+// Cohere API Request parameters
+type CohereModelParameters struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Cohere Connector type
-	Id CohereConnectorType `protobuf:"varint,1,opt,name=id,proto3,enum=cohere.v1.CohereConnectorType" json:"id,omitempty"`
-	// Cohere Connector options
-	Options map[string]*anypb.Any `protobuf:"bytes,2,rep,name=options,proto3" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Temperature Sampling: Should be a non-negative float (0-5.0) that tunes the degree of randomness in generation.
+	// Lower temperatures mean less random generations.
+	Temperature *float32 `protobuf:"fixed32,1,opt,name=temperature,proto3,oneof" json:"temperature,omitempty"`
+	// Ensures only the top k most likely tokens are considered for generation at each step.
+	// Defaults to 0, min value of 0, max value of 500.
+	K *float32 `protobuf:"fixed32,2,opt,name=k,proto3,oneof" json:"k,omitempty"`
+	// Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step.
+	// If both k and p are enabled, p acts after k.
+	P *float32 `protobuf:"fixed32,3,opt,name=p,proto3,oneof" json:"p,omitempty"`
+	// Used to reduce repetitiveness of generated tokens. The higher the value, the stronger a penalty is applied to
+	// previously present tokens, proportional to how many times they have already appeared in the
+	// prompt or prior generation.
+	FrequencyPenalty *float32 `protobuf:"fixed32,4,opt,name=frequency_penalty,json=frequencyPenalty,proto3,oneof" json:"frequency_penalty,omitempty"`
+	// Defaults to 0.0, min value of 0.0, max value of 1.0. Can be used to reduce repetitiveness of generated tokens.
+	// Similar to frequency_penalty, except that this penalty is applied equally to all tokens that have already appeared,
+	// regardless of their exact frequencies.
+	PresencePenalty *float32 `protobuf:"fixed32,5,opt,name=presence_penalty,json=presencePenalty,proto3,oneof" json:"presence_penalty,omitempty"`
+	// The maximum number of tokens the model will generate as part of the response.
+	//
+	// Note: Setting a low value may
+	// result in incomplete generations. This parameter is off by default, and if it's not specified, the model will
+	// continue generating until it emits an EOS completion token.
+	MaxTokens *uint32 `protobuf:"varint,6,opt,name=max_tokens,json=maxTokens,proto3,oneof" json:"max_tokens,omitempty"`
 }
 
-func (x *CohereConnector) Reset() {
-	*x = CohereConnector{}
+func (x *CohereModelParameters) Reset() {
+	*x = CohereModelParameters{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_cohere_v1_cohere_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -156,13 +174,13 @@ func (x *CohereConnector) Reset() {
 	}
 }
 
-func (x *CohereConnector) String() string {
+func (x *CohereModelParameters) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CohereConnector) ProtoMessage() {}
+func (*CohereModelParameters) ProtoMessage() {}
 
-func (x *CohereConnector) ProtoReflect() protoreflect.Message {
+func (x *CohereModelParameters) ProtoReflect() protoreflect.Message {
 	mi := &file_cohere_v1_cohere_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -174,84 +192,51 @@ func (x *CohereConnector) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CohereConnector.ProtoReflect.Descriptor instead.
-func (*CohereConnector) Descriptor() ([]byte, []int) {
+// Deprecated: Use CohereModelParameters.ProtoReflect.Descriptor instead.
+func (*CohereModelParameters) Descriptor() ([]byte, []int) {
 	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *CohereConnector) GetId() CohereConnectorType {
-	if x != nil {
-		return x.Id
+func (x *CohereModelParameters) GetTemperature() float32 {
+	if x != nil && x.Temperature != nil {
+		return *x.Temperature
 	}
-	return CohereConnectorType_COHERE_CONNECTOR_TYPE_UNSPECIFIED
+	return 0
 }
 
-func (x *CohereConnector) GetOptions() map[string]*anypb.Any {
-	if x != nil {
-		return x.Options
+func (x *CohereModelParameters) GetK() float32 {
+	if x != nil && x.K != nil {
+		return *x.K
 	}
-	return nil
-}
-
-// Cohere API Request parameters
-type CohereModelParameters struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Temperature Sampling.
-	// Should be a non-negative float (0-1.0) that tunes the degree of randomness in generation. Lower temperatures mean
-	// less random generations, and higher temperatures mean more random generations.
-	Temperature *float32 `protobuf:"fixed32,1,opt,name=temperature,proto3,oneof" json:"temperature,omitempty"`
-	// RAG connectors to use, when specified, the model's reply will be enriched with information found by querying each
-	// of the connectors.
-	Connectors []*CohereConnector `protobuf:"bytes,2,rep,name=connectors,proto3" json:"connectors,omitempty"`
+	return 0
 }
 
-func (x *CohereModelParameters) Reset() {
-	*x = CohereModelParameters{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_cohere_v1_cohere_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
+func (x *CohereModelParameters) GetP() float32 {
+	if x != nil && x.P != nil {
+		return *x.P
 	}
+	return 0
 }
 
-func (x *CohereModelParameters) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CohereModelParameters) ProtoMessage() {}
-
-func (x *CohereModelParameters) ProtoReflect() protoreflect.Message {
-	mi := &file_cohere_v1_cohere_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
+func (x *CohereModelParameters) GetFrequencyPenalty() float32 {
+	if x != nil && x.FrequencyPenalty != nil {
+		return *x.FrequencyPenalty
 	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CohereModelParameters.ProtoReflect.Descriptor instead.
-func (*CohereModelParameters) Descriptor() ([]byte, []int) {
-	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{1}
+	return 0
 }
 
-func (x *CohereModelParameters) GetTemperature() float32 {
-	if x != nil && x.Temperature != nil {
-		return *x.Temperature
+func (x *CohereModelParameters) GetPresencePenalty() float32 {
+	if x != nil && x.PresencePenalty != nil {
+		return *x.PresencePenalty
 	}
 	return 0
 }
 
-func (x *CohereModelParameters) GetConnectors() []*CohereConnector {
-	if x != nil {
-		return x.Connectors
+func (x *CohereModelParameters) GetMaxTokens() uint32 {
+	if x != nil && x.MaxTokens != nil {
+		return *x.MaxTokens
 	}
-	return nil
+	return 0
 }
 
 // The CoherePromptRequest contains the data that will be sent to the Cohere API.
@@ -266,16 +251,12 @@ type CoherePromptRequest struct {
 	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// Cohere API Request parameters
 	Parameters *CohereModelParameters `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
-	// An identifier for the conversation chain. Conversations can be resumed by providing the conversation's identifier.
-	// The contents of `message` and the model's response will be stored as part of this conversation.
-	// If a conversation with this id does not already exist, a new conversation will be created.
-	ConversationId *string `protobuf:"bytes,4,opt,name=conversation_id,json=conversationId,proto3,oneof" json:"conversation_id,omitempty"`
 }
 
 func (x *CoherePromptRequest) Reset() {
 	*x = CoherePromptRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cohere_v1_cohere_proto_msgTypes[2]
+		mi := &file_cohere_v1_cohere_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -288,7 +269,7 @@ func (x *CoherePromptRequest) String() string {
 func (*CoherePromptRequest) ProtoMessage() {}
 
 func (x *CoherePromptRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_cohere_v1_cohere_proto_msgTypes[2]
+	mi := &file_cohere_v1_cohere_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -301,7 +282,7 @@ func (x *CoherePromptRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CoherePromptRequest.ProtoReflect.Descriptor instead.
 func (*CoherePromptRequest) Descriptor() ([]byte, []int) {
-	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{2}
+	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *CoherePromptRequest) GetModel() CohereModel {
@@ -325,13 +306,6 @@ func (x *CoherePromptRequest) GetParameters() *CohereModelParameters {
 	return nil
 }
 
-func (x *CoherePromptRequest) GetConversationId() string {
-	if x != nil && x.ConversationId != nil {
-		return *x.ConversationId
-	}
-	return ""
-}
-
 // The CoherePromptResponse contains the data that is returned from the Cohere API.
 type CoherePromptResponse struct {
 	state         protoimpl.MessageState
@@ -345,7 +319,7 @@ type CoherePromptResponse struct {
 func (x *CoherePromptResponse) Reset() {
 	*x = CoherePromptResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cohere_v1_cohere_proto_msgTypes[3]
+		mi := &file_cohere_v1_cohere_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -358,7 +332,7 @@ func (x *CoherePromptResponse) String() string {
 func (*CoherePromptResponse) ProtoMessage() {}
 
 func (x *CoherePromptResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_cohere_v1_cohere_proto_msgTypes[3]
+	mi := &file_cohere_v1_cohere_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -371,7 +345,7 @@ func (x *CoherePromptResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CoherePromptResponse.ProtoReflect.Descriptor instead.
 func (*CoherePromptResponse) Descriptor() ([]byte, []int) {
-	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{3}
+	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *CoherePromptResponse) GetContent() string {
@@ -396,7 +370,7 @@ type CohereStreamResponse struct {
 func (x *CohereStreamResponse) Reset() {
 	*x = CohereStreamResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cohere_v1_cohere_proto_msgTypes[4]
+		mi := &file_cohere_v1_cohere_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -409,7 +383,7 @@ func (x *CohereStreamResponse) String() string {
 func (*CohereStreamResponse) ProtoMessage() {}
 
 func (x *CohereStreamResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_cohere_v1_cohere_proto_msgTypes[4]
+	mi := &file_cohere_v1_cohere_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -422,7 +396,7 @@ func (x *CohereStreamResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CohereStreamResponse.ProtoReflect.Descriptor instead.
 func (*CohereStreamResponse) Descriptor() ([]byte, []int) {
-	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{4}
+	return file_cohere_v1_cohere_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *CohereStreamResponse) GetContent() string {
@@ -444,45 +418,37 @@ var File_cohere_v1_cohere_proto protoreflect.FileDescriptor
 var file_cohere_v1_cohere_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x68, 0x65,
 	0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x2e, 0x76, 0x31, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd6,
-	0x01, 0x0a, 0x0f, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x12, 0x2e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e,
-	0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72,
-	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x41, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e,
-	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x50, 0x0a, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8a, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x25, 0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x22, 0xe1, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
-	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x05,
-	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x63, 0x6f,
-	0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f,
-	0x64, 0x65, 0x6c, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-	0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72,
-	0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61,
-	0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72,
-	0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x88, 0x01, 0x01, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0x41, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65,
+	0x2e, 0x76, 0x31, 0x22, 0xc0, 0x02, 0x0a, 0x15, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f,
+	0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a,
+	0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x02, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x48,
+	0x01, 0x52, 0x01, 0x6b, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x70, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x02, 0x48, 0x02, 0x52, 0x01, 0x70, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x11, 0x66, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x70, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x02, 0x48, 0x03, 0x52, 0x10, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e,
+	0x63, 0x79, 0x50, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10,
+	0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x70, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x48, 0x04, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e,
+	0x63, 0x65, 0x50, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x22, 0x0a, 0x0a,
+	0x6d, 0x61, 0x78, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d,
+	0x48, 0x05, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x88, 0x01, 0x01,
+	0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65,
+	0x42, 0x04, 0x0a, 0x02, 0x5f, 0x6b, 0x42, 0x04, 0x0a, 0x02, 0x5f, 0x70, 0x42, 0x14, 0x0a, 0x12,
+	0x5f, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x70, 0x65, 0x6e, 0x61, 0x6c,
+	0x74, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x63, 0x65, 0x5f,
+	0x70, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6d, 0x61, 0x78, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x22, 0x9f, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65, 0x72,
+	0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c,
+	0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e,
+	0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
+	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
+	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
+	0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0a, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0x41, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65,
 	0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x42,
@@ -551,34 +517,27 @@ func file_cohere_v1_cohere_proto_rawDescGZIP() []byte {
 }
 
 var file_cohere_v1_cohere_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_cohere_v1_cohere_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_cohere_v1_cohere_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_cohere_v1_cohere_proto_goTypes = []interface{}{
 	(CohereModel)(0),              // 0: cohere.v1.CohereModel
 	(CohereConnectorType)(0),      // 1: cohere.v1.CohereConnectorType
-	(*CohereConnector)(nil),       // 2: cohere.v1.CohereConnector
-	(*CohereModelParameters)(nil), // 3: cohere.v1.CohereModelParameters
-	(*CoherePromptRequest)(nil),   // 4: cohere.v1.CoherePromptRequest
-	(*CoherePromptResponse)(nil),  // 5: cohere.v1.CoherePromptResponse
-	(*CohereStreamResponse)(nil),  // 6: cohere.v1.CohereStreamResponse
-	nil,                           // 7: cohere.v1.CohereConnector.OptionsEntry
-	(*anypb.Any)(nil),             // 8: google.protobuf.Any
+	(*CohereModelParameters)(nil), // 2: cohere.v1.CohereModelParameters
+	(*CoherePromptRequest)(nil),   // 3: cohere.v1.CoherePromptRequest
+	(*CoherePromptResponse)(nil),  // 4: cohere.v1.CoherePromptResponse
+	(*CohereStreamResponse)(nil),  // 5: cohere.v1.CohereStreamResponse
 }
 var file_cohere_v1_cohere_proto_depIdxs = []int32{
-	1, // 0: cohere.v1.CohereConnector.id:type_name -> cohere.v1.CohereConnectorType
-	7, // 1: cohere.v1.CohereConnector.options:type_name -> cohere.v1.CohereConnector.OptionsEntry
-	2, // 2: cohere.v1.CohereModelParameters.connectors:type_name -> cohere.v1.CohereConnector
-	0, // 3: cohere.v1.CoherePromptRequest.model:type_name -> cohere.v1.CohereModel
-	3, // 4: cohere.v1.CoherePromptRequest.parameters:type_name -> cohere.v1.CohereModelParameters
-	8, // 5: cohere.v1.CohereConnector.OptionsEntry.value:type_name -> google.protobuf.Any
-	4, // 6: cohere.v1.CohereService.CoherePrompt:input_type -> cohere.v1.CoherePromptRequest
-	4, // 7: cohere.v1.CohereService.CohereStream:input_type -> cohere.v1.CoherePromptRequest
-	5, // 8: cohere.v1.CohereService.CoherePrompt:output_type -> cohere.v1.CoherePromptResponse
-	6, // 9: cohere.v1.CohereService.CohereStream:output_type -> cohere.v1.CohereStreamResponse
-	8, // [8:10] is the sub-list for method output_type
-	6, // [6:8] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
+	0, // 0: cohere.v1.CoherePromptRequest.model:type_name -> cohere.v1.CohereModel
+	2, // 1: cohere.v1.CoherePromptRequest.parameters:type_name -> cohere.v1.CohereModelParameters
+	3, // 2: cohere.v1.CohereService.CoherePrompt:input_type -> cohere.v1.CoherePromptRequest
+	3, // 3: cohere.v1.CohereService.CohereStream:input_type -> cohere.v1.CoherePromptRequest
+	4, // 4: cohere.v1.CohereService.CoherePrompt:output_type -> cohere.v1.CoherePromptResponse
+	5, // 5: cohere.v1.CohereService.CohereStream:output_type -> cohere.v1.CohereStreamResponse
+	4, // [4:6] is the sub-list for method output_type
+	2, // [2:4] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_cohere_v1_cohere_proto_init() }
@@ -588,18 +547,6 @@ func file_cohere_v1_cohere_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_cohere_v1_cohere_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CohereConnector); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_cohere_v1_cohere_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CohereModelParameters); i {
 			case 0:
 				return &v.state
@@ -611,7 +558,7 @@ func file_cohere_v1_cohere_proto_init() {
 				return nil
 			}
 		}
-		file_cohere_v1_cohere_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_cohere_v1_cohere_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CoherePromptRequest); i {
 			case 0:
 				return &v.state
@@ -623,7 +570,7 @@ func file_cohere_v1_cohere_proto_init() {
 				return nil
 			}
 		}
-		file_cohere_v1_cohere_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_cohere_v1_cohere_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CoherePromptResponse); i {
 			case 0:
 				return &v.state
@@ -635,7 +582,7 @@ func file_cohere_v1_cohere_proto_init() {
 				return nil
 			}
 		}
-		file_cohere_v1_cohere_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_cohere_v1_cohere_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CohereStreamResponse); i {
 			case 0:
 				return &v.state
@@ -648,17 +595,16 @@ func file_cohere_v1_cohere_proto_init() {
 			}
 		}
 	}
-	file_cohere_v1_cohere_proto_msgTypes[1].OneofWrappers = []interface{}{}
+	file_cohere_v1_cohere_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	file_cohere_v1_cohere_proto_msgTypes[2].OneofWrappers = []interface{}{}
 	file_cohere_v1_cohere_proto_msgTypes[3].OneofWrappers = []interface{}{}
-	file_cohere_v1_cohere_proto_msgTypes[4].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_cohere_v1_cohere_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   6,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/gen/ts/cohere/v1/cohere.d.ts b/gen/ts/cohere/v1/cohere.d.ts
index d8a43eca..5537ada1 100644
--- a/gen/ts/cohere/v1/cohere.d.ts
+++ b/gen/ts/cohere/v1/cohere.d.ts
@@ -2,49 +2,61 @@
 // @generated from protobuf file "cohere/v1/cohere.proto" (package "cohere.v1", syntax proto3)
 // tslint:disable
 import { MessageType } from "@protobuf-ts/runtime";
-import { Any } from "../../google/protobuf/any";
 /**
- * Cohere RAG Connector
+ * Cohere API Request parameters
+ *
+ * see: https://docs.cohere.com/reference/generate
  *
- * @generated from protobuf message cohere.v1.CohereConnector
+ * @generated from protobuf message cohere.v1.CohereModelParameters
  */
-export interface CohereConnector {
+export interface CohereModelParameters {
     /**
-     * Cohere Connector type
+     * Temperature Sampling: Should be a non-negative float (0-5.0) that tunes the degree of randomness in generation.
+     * Lower temperatures mean less random generations.
      *
-     * @generated from protobuf field: cohere.v1.CohereConnectorType id = 1;
+     * @generated from protobuf field: optional float temperature = 1;
      */
-    id: CohereConnectorType;
+    temperature?: number;
     /**
-     * Cohere Connector options
+     * Ensures only the top k most likely tokens are considered for generation at each step.
+     * Defaults to 0, min value of 0, max value of 500.
      *
-     * @generated from protobuf field: map<string, google.protobuf.Any> options = 2;
+     * @generated from protobuf field: optional float k = 2;
      */
-    options: {
-        [key: string]: Any;
-    };
-}
-/**
- * Cohere API Request parameters
- *
- * @generated from protobuf message cohere.v1.CohereModelParameters
- */
-export interface CohereModelParameters {
+    k?: number;
     /**
-     * Temperature Sampling.
-     * Should be a non-negative float (0-1.0) that tunes the degree of randomness in generation. Lower temperatures mean
-     * less random generations, and higher temperatures mean more random generations.
+     * Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step.
+     * If both k and p are enabled, p acts after k.
      *
-     * @generated from protobuf field: optional float temperature = 1;
+     * @generated from protobuf field: optional float p = 3;
      */
-    temperature?: number;
+    p?: number;
     /**
-     * RAG connectors to use, when specified, the model's reply will be enriched with information found by querying each
-     * of the connectors.
+     * Used to reduce repetitiveness of generated tokens. The higher the value, the stronger a penalty is applied to
+     * previously present tokens, proportional to how many times they have already appeared in the
+     * prompt or prior generation.
      *
-     * @generated from protobuf field: repeated cohere.v1.CohereConnector connectors = 2;
+     * @generated from protobuf field: optional float frequency_penalty = 4;
      */
-    connectors: CohereConnector[];
+    frequencyPenalty?: number;
+    /**
+     * Defaults to 0.0, min value of 0.0, max value of 1.0. Can be used to reduce repetitiveness of generated tokens.
+     * Similar to frequency_penalty, except that this penalty is applied equally to all tokens that have already appeared,
+     * regardless of their exact frequencies.
+     *
+     * @generated from protobuf field: optional float presence_penalty = 5;
+     */
+    presencePenalty?: number;
+    /**
+     * The maximum number of tokens the model will generate as part of the response.
+     *
+     * Note: Setting a low value may
+     * result in incomplete generations. This parameter is off by default, and if it's not specified, the model will
+     * continue generating until it emits an EOS completion token.
+     *
+     * @generated from protobuf field: optional uint32 max_tokens = 6;
+     */
+    maxTokens?: number;
 }
 /**
  *  The CoherePromptRequest contains the data that will be sent to the Cohere API.
@@ -70,14 +82,6 @@ export interface CoherePromptRequest {
      * @generated from protobuf field: cohere.v1.CohereModelParameters parameters = 3;
      */
     parameters?: CohereModelParameters;
-    /**
-     * An identifier for the conversation chain. Conversations can be resumed by providing the conversation's identifier.
-     * The contents of `message` and the model's response will be stored as part of this conversation.
-     * If a conversation with this id does not already exist, a new conversation will be created.
-     *
-     * @generated from protobuf field: optional string conversation_id = 4;
-     */
-    conversationId?: string;
 }
 /**
  * The CoherePromptResponse contains the data that is returned from the Cohere API.
@@ -173,13 +177,6 @@ export declare enum CohereConnectorType {
      */
     ID = 2
 }
-declare class CohereConnector$Type extends MessageType<CohereConnector> {
-    constructor();
-}
-/**
- * @generated MessageType for protobuf message cohere.v1.CohereConnector
- */
-export declare const CohereConnector: CohereConnector$Type;
 declare class CohereModelParameters$Type extends MessageType<CohereModelParameters> {
     constructor();
 }
diff --git a/gen/ts/cohere/v1/cohere.js b/gen/ts/cohere/v1/cohere.js
index 49893b1d..4399d5d0 100644
--- a/gen/ts/cohere/v1/cohere.js
+++ b/gen/ts/cohere/v1/cohere.js
@@ -6,7 +6,6 @@
 // tslint:disable
 import { ServiceType } from "@protobuf-ts/runtime-rpc";
 import { MessageType } from "@protobuf-ts/runtime";
-import { Any } from "../../google/protobuf/any";
 /**
  * Type of Cohere Model
  *
@@ -72,24 +71,15 @@ export var CohereConnectorType;
     CohereConnectorType[CohereConnectorType["ID"] = 2] = "ID";
 })(CohereConnectorType || (CohereConnectorType = {}));
 // @generated message type with reflection information, may provide speed optimized methods
-class CohereConnector$Type extends MessageType {
-    constructor() {
-        super("cohere.v1.CohereConnector", [
-            { no: 1, name: "id", kind: "enum", T: () => ["cohere.v1.CohereConnectorType", CohereConnectorType, "COHERE_CONNECTOR_TYPE_"] },
-            { no: 2, name: "options", kind: "map", K: 9 /*ScalarType.STRING*/, V: { kind: "message", T: () => Any } }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message cohere.v1.CohereConnector
- */
-export const CohereConnector = new CohereConnector$Type();
-// @generated message type with reflection information, may provide speed optimized methods
 class CohereModelParameters$Type extends MessageType {
     constructor() {
         super("cohere.v1.CohereModelParameters", [
             { no: 1, name: "temperature", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
-            { no: 2, name: "connectors", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => CohereConnector }
+            { no: 2, name: "k", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
+            { no: 3, name: "p", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
+            { no: 4, name: "frequency_penalty", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
+            { no: 5, name: "presence_penalty", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
+            { no: 6, name: "max_tokens", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
@@ -103,8 +93,7 @@ class CoherePromptRequest$Type extends MessageType {
         super("cohere.v1.CoherePromptRequest", [
             { no: 1, name: "model", kind: "enum", T: () => ["cohere.v1.CohereModel", CohereModel, "COHERE_MODEL_"] },
             { no: 2, name: "message", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "parameters", kind: "message", T: () => CohereModelParameters },
-            { no: 4, name: "conversation_id", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "parameters", kind: "message", T: () => CohereModelParameters }
         ]);
     }
 }
diff --git a/gen/ts/google/protobuf/any.d.ts b/gen/ts/google/protobuf/any.d.ts
deleted file mode 100644
index cabaf76f..00000000
--- a/gen/ts/google/protobuf/any.d.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-// @generated by protobuf-ts 2.9.3 with parameter generate_dependencies,long_type_string,output_javascript_es2020,server_grpc1,force_client_none
-// @generated from protobuf file "google/protobuf/any.proto" (package "google.protobuf", syntax proto3)
-// tslint:disable
-//
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-import type { BinaryWriteOptions } from "@protobuf-ts/runtime";
-import type { IBinaryWriter } from "@protobuf-ts/runtime";
-import type { IBinaryReader } from "@protobuf-ts/runtime";
-import type { PartialMessage } from "@protobuf-ts/runtime";
-import type { JsonValue } from "@protobuf-ts/runtime";
-import type { JsonReadOptions } from "@protobuf-ts/runtime";
-import type { JsonWriteOptions } from "@protobuf-ts/runtime";
-import type { BinaryReadOptions } from "@protobuf-ts/runtime";
-import type { IMessageType } from "@protobuf-ts/runtime";
-import { MessageType } from "@protobuf-ts/runtime";
-/**
- * `Any` contains an arbitrary serialized protocol buffer message along with a
- * URL that describes the type of the serialized message.
- *
- * Protobuf library provides support to pack/unpack Any values in the form
- * of utility functions or additional generated methods of the Any type.
- *
- * Example 1: Pack and unpack a message in C++.
- *
- *     Foo foo = ...;
- *     Any any;
- *     any.PackFrom(foo);
- *     ...
- *     if (any.UnpackTo(&foo)) {
- *       ...
- *     }
- *
- * Example 2: Pack and unpack a message in Java.
- *
- *     Foo foo = ...;
- *     Any any = Any.pack(foo);
- *     ...
- *     if (any.is(Foo.class)) {
- *       foo = any.unpack(Foo.class);
- *     }
- *     // or ...
- *     if (any.isSameTypeAs(Foo.getDefaultInstance())) {
- *       foo = any.unpack(Foo.getDefaultInstance());
- *     }
- *
- *  Example 3: Pack and unpack a message in Python.
- *
- *     foo = Foo(...)
- *     any = Any()
- *     any.Pack(foo)
- *     ...
- *     if any.Is(Foo.DESCRIPTOR):
- *       any.Unpack(foo)
- *       ...
- *
- *  Example 4: Pack and unpack a message in Go
- *
- *      foo := &pb.Foo{...}
- *      any, err := anypb.New(foo)
- *      if err != nil {
- *        ...
- *      }
- *      ...
- *      foo := &pb.Foo{}
- *      if err := any.UnmarshalTo(foo); err != nil {
- *        ...
- *      }
- *
- * The pack methods provided by protobuf library will by default use
- * 'type.googleapis.com/full.type.name' as the type URL and the unpack
- * methods only use the fully qualified type name after the last '/'
- * in the type URL, for example "foo.bar.com/x/y.z" will yield type
- * name "y.z".
- *
- * JSON
- * ====
- * The JSON representation of an `Any` value uses the regular
- * representation of the deserialized, embedded message, with an
- * additional field `@type` which contains the type URL. Example:
- *
- *     package google.profile;
- *     message Person {
- *       string first_name = 1;
- *       string last_name = 2;
- *     }
- *
- *     {
- *       "@type": "type.googleapis.com/google.profile.Person",
- *       "firstName": <string>,
- *       "lastName": <string>
- *     }
- *
- * If the embedded message type is well-known and has a custom JSON
- * representation, that representation will be embedded adding a field
- * `value` which holds the custom JSON in addition to the `@type`
- * field. Example (for message [google.protobuf.Duration][]):
- *
- *     {
- *       "@type": "type.googleapis.com/google.protobuf.Duration",
- *       "value": "1.212s"
- *     }
- *
- *
- * @generated from protobuf message google.protobuf.Any
- */
-export interface Any {
-    /**
-     * A URL/resource name that uniquely identifies the type of the serialized
-     * protocol buffer message. This string must contain at least
-     * one "/" character. The last segment of the URL's path must represent
-     * the fully qualified name of the type (as in
-     * `path/google.protobuf.Duration`). The name should be in a canonical form
-     * (e.g., leading "." is not accepted).
-     *
-     * In practice, teams usually precompile into the binary all types that they
-     * expect it to use in the context of Any. However, for URLs which use the
-     * scheme `http`, `https`, or no scheme, one can optionally set up a type
-     * server that maps type URLs to message definitions as follows:
-     *
-     * * If no scheme is provided, `https` is assumed.
-     * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *   value in binary format, or produce an error.
-     * * Applications are allowed to cache lookup results based on the
-     *   URL, or have them precompiled into a binary to avoid any
-     *   lookup. Therefore, binary compatibility needs to be preserved
-     *   on changes to types. (Use versioned type names to manage
-     *   breaking changes.)
-     *
-     * Note: this functionality is not currently available in the official
-     * protobuf release, and it is not used for type URLs beginning with
-     * type.googleapis.com. As of May 2023, there are no widely used type server
-     * implementations and no plans to implement one.
-     *
-     * Schemes other than `http`, `https` (or the empty scheme) might be
-     * used with implementation specific semantics.
-     *
-     *
-     * @generated from protobuf field: string type_url = 1;
-     */
-    typeUrl: string;
-    /**
-     * Must be a valid serialized protocol buffer of the above specified type.
-     *
-     * @generated from protobuf field: bytes value = 2;
-     */
-    value: Uint8Array;
-}
-declare class Any$Type extends MessageType<Any> {
-    constructor();
-    /**
-     * Pack the message into a new `Any`.
-     *
-     * Uses 'type.googleapis.com/full.type.name' as the type URL.
-     */
-    pack<T extends object>(message: T, type: IMessageType<T>): Any;
-    /**
-     * Unpack the message from the `Any`.
-     */
-    unpack<T extends object>(any: Any, type: IMessageType<T>, options?: Partial<BinaryReadOptions>): T;
-    /**
-     * Does the given `Any` contain a packed message of the given type?
-     */
-    contains(any: Any, type: IMessageType<any> | string): boolean;
-    /**
-     * Convert the message to canonical JSON value.
-     *
-     * You have to provide the `typeRegistry` option so that the
-     * packed message can be converted to JSON.
-     *
-     * The `typeRegistry` option is also required to read
-     * `google.protobuf.Any` from JSON format.
-     */
-    internalJsonWrite(any: Any, options: JsonWriteOptions): JsonValue;
-    internalJsonRead(json: JsonValue, options: JsonReadOptions, target?: Any): Any;
-    typeNameToUrl(name: string): string;
-    typeUrlToName(url: string): string;
-    create(value?: PartialMessage<Any>): Any;
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Any): Any;
-    internalBinaryWrite(message: Any, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
-}
-/**
- * @generated MessageType for protobuf message google.protobuf.Any
- */
-export declare const Any: Any$Type;
-export {};
diff --git a/gen/ts/google/protobuf/any.js b/gen/ts/google/protobuf/any.js
deleted file mode 100644
index 941aa5e2..00000000
--- a/gen/ts/google/protobuf/any.js
+++ /dev/null
@@ -1,185 +0,0 @@
-// @generated by protobuf-ts 2.9.3 with parameter generate_dependencies,long_type_string,output_javascript_es2020,server_grpc1,force_client_none
-// @generated from protobuf file "google/protobuf/any.proto" (package "google.protobuf", syntax proto3)
-// tslint:disable
-//
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-import { WireType } from "@protobuf-ts/runtime";
-import { UnknownFieldHandler } from "@protobuf-ts/runtime";
-import { reflectionMergePartial } from "@protobuf-ts/runtime";
-import { isJsonObject } from "@protobuf-ts/runtime";
-import { typeofJsonValue } from "@protobuf-ts/runtime";
-import { jsonWriteOptions } from "@protobuf-ts/runtime";
-import { MessageType } from "@protobuf-ts/runtime";
-// @generated message type with reflection information, may provide speed optimized methods
-class Any$Type extends MessageType {
-    constructor() {
-        super("google.protobuf.Any", [
-            { no: 1, name: "type_url", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "value", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-    /**
-     * Pack the message into a new `Any`.
-     *
-     * Uses 'type.googleapis.com/full.type.name' as the type URL.
-     */
-    pack(message, type) {
-        return {
-            typeUrl: this.typeNameToUrl(type.typeName), value: type.toBinary(message),
-        };
-    }
-    /**
-     * Unpack the message from the `Any`.
-     */
-    unpack(any, type, options) {
-        if (!this.contains(any, type))
-            throw new Error("Cannot unpack google.protobuf.Any with typeUrl '" + any.typeUrl + "' as " + type.typeName + ".");
-        return type.fromBinary(any.value, options);
-    }
-    /**
-     * Does the given `Any` contain a packed message of the given type?
-     */
-    contains(any, type) {
-        if (!any.typeUrl.length)
-            return false;
-        let wants = typeof type == "string" ? type : type.typeName;
-        let has = this.typeUrlToName(any.typeUrl);
-        return wants === has;
-    }
-    /**
-     * Convert the message to canonical JSON value.
-     *
-     * You have to provide the `typeRegistry` option so that the
-     * packed message can be converted to JSON.
-     *
-     * The `typeRegistry` option is also required to read
-     * `google.protobuf.Any` from JSON format.
-     */
-    internalJsonWrite(any, options) {
-        if (any.typeUrl === "")
-            return {};
-        let typeName = this.typeUrlToName(any.typeUrl);
-        let opt = jsonWriteOptions(options);
-        let type = opt.typeRegistry?.find(t => t.typeName === typeName);
-        if (!type)
-            throw new globalThis.Error("Unable to convert google.protobuf.Any with typeUrl '" + any.typeUrl + "' to JSON. The specified type " + typeName + " is not available in the type registry.");
-        let value = type.fromBinary(any.value, { readUnknownField: false });
-        let json = type.internalJsonWrite(value, opt);
-        if (typeName.startsWith("google.protobuf.") || !isJsonObject(json))
-            json = { value: json };
-        json["@type"] = any.typeUrl;
-        return json;
-    }
-    internalJsonRead(json, options, target) {
-        if (!isJsonObject(json))
-            throw new globalThis.Error("Unable to parse google.protobuf.Any from JSON " + typeofJsonValue(json) + ".");
-        if (typeof json["@type"] != "string" || json["@type"] == "")
-            return this.create();
-        let typeName = this.typeUrlToName(json["@type"]);
-        let type = options?.typeRegistry?.find(t => t.typeName == typeName);
-        if (!type)
-            throw new globalThis.Error("Unable to parse google.protobuf.Any from JSON. The specified type " + typeName + " is not available in the type registry.");
-        let value;
-        if (typeName.startsWith("google.protobuf.") && json.hasOwnProperty("value"))
-            value = type.fromJson(json["value"], options);
-        else {
-            let copy = Object.assign({}, json);
-            delete copy["@type"];
-            value = type.fromJson(copy, options);
-        }
-        if (target === undefined)
-            target = this.create();
-        target.typeUrl = json["@type"];
-        target.value = type.toBinary(value);
-        return target;
-    }
-    typeNameToUrl(name) {
-        if (!name.length)
-            throw new Error("invalid type name: " + name);
-        return "type.googleapis.com/" + name;
-    }
-    typeUrlToName(url) {
-        if (!url.length)
-            throw new Error("invalid type url: " + url);
-        let slash = url.lastIndexOf("/");
-        let name = slash > 0 ? url.substring(slash + 1) : url;
-        if (!name.length)
-            throw new Error("invalid type url: " + url);
-        return name;
-    }
-    create(value) {
-        const message = globalThis.Object.create((this.messagePrototype));
-        message.typeUrl = "";
-        message.value = new Uint8Array(0);
-        if (value !== undefined)
-            reflectionMergePartial(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader, length, options, target) {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string type_url */ 1:
-                    message.typeUrl = reader.string();
-                    break;
-                case /* bytes value */ 2:
-                    message.value = reader.bytes();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message, writer, options) {
-        /* string type_url = 1; */
-        if (message.typeUrl !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.typeUrl);
-        /* bytes value = 2; */
-        if (message.value.length)
-            writer.tag(2, WireType.LengthDelimited).bytes(message.value);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message google.protobuf.Any
- */
-export const Any = new Any$Type();
diff --git a/proto/cohere/v1/cohere.proto b/proto/cohere/v1/cohere.proto
index ffccdb71..e123b449 100644
--- a/proto/cohere/v1/cohere.proto
+++ b/proto/cohere/v1/cohere.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package cohere.v1;
 
-import "google/protobuf/any.proto";
-
 option go_package = "github.com/basemind-ai/monorepo/gen/cohereconnector";
 
 // The CohereService service definition.
@@ -38,23 +36,34 @@ enum CohereConnectorType {
   COHERE_CONNECTOR_TYPE_ID = 2;
 }
 
-// Cohere RAG Connector
-message CohereConnector {
-  // Cohere Connector type
-  CohereConnectorType id = 1;
-  // Cohere Connector options
-  map<string, google.protobuf.Any> options = 2;
-}
-
 // Cohere API Request parameters
 message CohereModelParameters {
-  // Temperature Sampling.
-  // Should be a non-negative float (0-1.0) that tunes the degree of randomness in generation. Lower temperatures mean
-  // less random generations, and higher temperatures mean more random generations.
+  // see: https://docs.cohere.com/reference/generate
+
+  // Temperature Sampling: Should be a non-negative float (0-5.0) that tunes the degree of randomness in generation.
+  // Lower temperatures mean less random generations.
   optional float temperature = 1;
-  // RAG connectors to use, when specified, the model's reply will be enriched with information found by querying each
-  // of the connectors.
-  repeated CohereConnector connectors = 2;
+  //Ensures only the top k most likely tokens are considered for generation at each step.
+  // Defaults to 0, min value of 0, max value of 500.
+  optional float k = 2;
+  // Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step.
+  // If both k and p are enabled, p acts after k.
+  optional float p = 3;
+  // Used to reduce repetitiveness of generated tokens. The higher the value, the stronger a penalty is applied to
+  // previously present tokens, proportional to how many times they have already appeared in the
+  // prompt or prior generation.
+  optional float frequency_penalty = 4;
+  // Defaults to 0.0, min value of 0.0, max value of 1.0. Can be used to reduce repetitiveness of generated tokens.
+  // Similar to frequency_penalty, except that this penalty is applied equally to all tokens that have already appeared,
+  // regardless of their exact frequencies.
+  optional float presence_penalty = 5;
+
+  // The maximum number of tokens the model will generate as part of the response.
+  //
+  // Note: Setting a low value may
+  // result in incomplete generations. This parameter is off by default, and if it's not specified, the model will
+  // continue generating until it emits an EOS completion token.
+  optional uint32 max_tokens = 6;
 }
 
 //  The CoherePromptRequest contains the data that will be sent to the Cohere API.
@@ -65,10 +74,6 @@ message CoherePromptRequest {
   string message = 2;
   // Cohere API Request parameters
   CohereModelParameters parameters = 3;
-  // An identifier for the conversation chain. Conversations can be resumed by providing the conversation's identifier.
-  // The contents of `message` and the model's response will be stored as part of this conversation.
-  // If a conversation with this id does not already exist, a new conversation will be created.
-  optional string conversation_id = 4;
 }
 
 // The CoherePromptResponse contains the data that is returned from the Cohere API.
diff --git a/services/cohere-connector/src/client.ts b/services/cohere-connector/src/client.ts
index 00a1eac8..186184bf 100644
--- a/services/cohere-connector/src/client.ts
+++ b/services/cohere-connector/src/client.ts
@@ -1,7 +1,60 @@
 import { CohereClient } from 'cohere-ai';
+import { Generation } from 'cohere-ai/api';
+import { GenerateRequest } from 'cohere-ai/api/client/requests/GenerateRequest';
 import { loadEnv } from 'shared/env';
 
-const ref: { instance: CohereClient | null } = { instance: null };
+import { readChunks } from '@/utils';
+
+const ref: { instance: BasemindCohereClient | null } = { instance: null };
+
+/*
+ * The client class wraps the Cohere client because the Cohere client doesn't support streaming for the time being.
+ * */
+class BasemindCohereClient {
+	private readonly token: string;
+	private readonly client: CohereClient;
+	constructor({ token, ...rest }: { token: string } & CohereClient.Options) {
+		this.token = token;
+		this.client = new CohereClient({ token, ...rest });
+	}
+
+	/**
+	 * The generate function takes a GenerateRequest and returns a Generation
+	 *
+	 * @param request GenerateRequest
+	 *
+	 * @return A Generation
+	 */
+	async generate(request: GenerateRequest) {
+		return this.client.generate(request);
+	}
+
+	async generateStream(request: GenerateRequest) {
+		const url = 'https://api.cohere.ai/v1/generate';
+		const options = {
+			body: JSON.stringify({
+				...request,
+				stream: true,
+			}),
+			headers: {
+				'accept': 'application/json',
+				'authorization': `Bearer ${this.token}`,
+				'content-type': 'application/json',
+			},
+			method: 'POST',
+		};
+
+		const response = await fetch(url, options);
+		const reader = response.body!.getReader();
+
+		return readChunks<{
+			finish_reason?: 'COMPLETE' | 'MAX_TOKENS' | 'ERROR' | 'ERROR_TOXIC';
+			is_finished: boolean;
+			response?: Generation;
+			text: string;
+		}>(reader);
+	}
+}
 
 /**
  * The getCohereClient function is a singleton that returns an instance of the Cohere client.
@@ -9,11 +62,11 @@ const ref: { instance: CohereClient | null } = { instance: null };
  *
  * @return An Cohere class instance
  */
-export function getCohereClient(): CohereClient {
+export function getCohereClient(): BasemindCohereClient {
 	if (!ref.instance) {
 		const apiKey = loadEnv('COHERE_API_KEY');
 
-		ref.instance = new CohereClient({
+		ref.instance = new BasemindCohereClient({
 			token: apiKey,
 		});
 	}
@@ -25,9 +78,9 @@ export function getCohereClient(): CohereClient {
  *
  * @return An Cohere class instance
  * */
-export function createOrDefaultClient(apiKey?: string): CohereClient {
+export function createOrDefaultClient(apiKey?: string): BasemindCohereClient {
 	if (apiKey) {
-		return new CohereClient({
+		return new BasemindCohereClient({
 			token: apiKey,
 		});
 	}
diff --git a/services/cohere-connector/src/handlers.spec.ts b/services/cohere-connector/src/handlers.spec.ts
index 4418243e..49185d42 100644
--- a/services/cohere-connector/src/handlers.spec.ts
+++ b/services/cohere-connector/src/handlers.spec.ts
@@ -5,20 +5,18 @@ import {
 	ServerUnaryCall,
 	ServerWritableStream,
 } from '@grpc/grpc-js';
-import { StreamedChatResponse } from 'cohere-ai/api';
 import {
 	CohereModel,
 	CoherePromptRequest,
 	CoherePromptResponse,
 	CohereStreamResponse,
 } from 'gen/cohere/v1/cohere';
+import { StreamFinishReason } from 'shared/constants';
 import { GrpcError } from 'shared/grpc';
-import { Mock } from 'vitest';
+import { Mock, MockInstance } from 'vitest';
 
 import { getCohereClient } from '@/client';
 import { coherePrompt, cohereStream } from '@/handlers';
-import StreamEnd = StreamedChatResponse.StreamEnd;
-import { StreamFinishReason } from 'shared/constants';
 
 describe('handlers tests', () => {
 	const openAPIKey = (process.env.COHERE_API_KEY =
@@ -31,7 +29,7 @@ describe('handlers tests', () => {
 	const client = getCohereClient();
 
 	describe('coherePrompt', () => {
-		const chatSpy = vi.spyOn(client, 'chat');
+		const generateSpy = vi.spyOn(client, 'generate');
 
 		const makeMockUnaryCall = (
 			request: CoherePromptRequest,
@@ -48,27 +46,23 @@ describe('handlers tests', () => {
 
 		it('should successfully complete an Cohere prompt request and send the expected response', async () => {
 			const call = makeMockUnaryCall({
-				conversationId: '123',
 				message: 'test',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.8,
 				},
 			});
 			const callback: sendUnaryData<CoherePromptResponse> = vi.fn();
 
-			chatSpy.mockResolvedValueOnce({
-				generationId: '123',
-				text: 'Generated response',
+			generateSpy.mockResolvedValueOnce({
+				generations: [{ id: 'def', text: 'Generated response' }],
+				id: 'abc',
 			});
 
 			await coherePrompt(call, callback);
-			expect(chatSpy).toHaveBeenCalledWith({
-				connectors: undefined,
-				conversationId: '123',
-				message: 'test',
+			expect(generateSpy).toHaveBeenCalledWith({
 				model: 'command',
+				prompt: 'test',
 				temperature: 0.8,
 			});
 
@@ -79,25 +73,21 @@ describe('handlers tests', () => {
 
 		it('should send a GrpcError when an error occurs during the Cohere prompt request', async () => {
 			const call = makeMockUnaryCall({
-				conversationId: '123',
 				message: 'test',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.8,
 				},
 			});
 			const callback: sendUnaryData<CoherePromptResponse> = vi.fn();
 
 			const error = new Error('Cohere error');
-			chatSpy.mockRejectedValueOnce(error);
+			generateSpy.mockRejectedValueOnce(error);
 
 			await coherePrompt(call, callback);
-			expect(chatSpy).toHaveBeenCalledWith({
-				connectors: undefined,
-				conversationId: '123',
-				message: 'test',
+			expect(generateSpy).toHaveBeenCalledWith({
 				model: 'command',
+				prompt: 'test',
 				temperature: 0.8,
 			});
 
@@ -109,12 +99,17 @@ describe('handlers tests', () => {
 	});
 
 	describe('cohereStream', () => {
-		const chatStreamSpy = vi.spyOn(client, 'chatStream');
+		global.fetch = vi.fn().mockResolvedValue({
+			body: {
+				getReader: vi.fn().mockReturnValue(createStreamReader()),
+			},
+		});
 
 		const makeServerWritableStream = (
 			request: CoherePromptRequest,
 		): ServerWritableStream<CoherePromptRequest, CohereStreamResponse> => {
 			return {
+				destroy: vi.fn(),
 				end: vi.fn(),
 				getPath: vi.fn(),
 				metadata: new Metadata(),
@@ -126,10 +121,16 @@ describe('handlers tests', () => {
 			>;
 		};
 
-		function createReadableStream(): AsyncIterableIterator<any> {
+		function createStreamReader(): ReadableStreamDefaultReader {
 			let count = 0;
+			const encoder = new TextEncoder();
+
 			return {
-				async next() {
+				cancel(): Promise<void> {
+					return Promise.resolve(undefined);
+				},
+				closed: Promise.resolve(undefined),
+				async read() {
 					if (count === 11) {
 						return { done: true, value: undefined };
 					}
@@ -137,43 +138,38 @@ describe('handlers tests', () => {
 						count++;
 						return {
 							done: false,
-							value: {
-								eventType: 'stream-end',
-								finishReason: 'COMPLETE',
-								response: {
-									generationId: '100',
-									text: '',
-								},
-							} satisfies StreamEnd,
+							value: encoder.encode(
+								JSON.stringify({
+									finish_reason: 'COMPLETE',
+									is_finished: true,
+								}),
+							),
 						};
 					}
 					const value = {
-						eventType: 'text-generation',
+						is_finished: false,
 						text: `${count}`,
 					};
 					count++;
-					return { done: false, value };
-				},
-				async return() {
-					return { done: true, value: undefined };
+					return {
+						done: false,
+						value: encoder.encode(JSON.stringify(value)),
+					};
 				},
-				[Symbol.asyncIterator]() {
-					return this;
+				releaseLock(): void {
+					return;
 				},
 			};
 		}
 
 		it('should successfully create an Cohere stream request and write the response to the call', async () => {
 			const call = makeServerWritableStream({
-				conversationId: '123',
 				message: 'test',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.8,
 				},
 			});
-			chatStreamSpy.mockResolvedValueOnce(createReadableStream() as any);
 
 			await cohereStream(call);
 
@@ -238,25 +234,19 @@ describe('handlers tests', () => {
 
 		it('should handle errors', async () => {
 			const call = makeServerWritableStream({
-				conversationId: '123',
 				message: 'test',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.8,
 				},
 			});
 
-			chatStreamSpy.mockRejectedValueOnce(new Error('test error'));
+			(global.fetch as unknown as MockInstance).mockRejectedValueOnce(
+				new Error('test error'),
+			);
 
 			await cohereStream(call);
-			expect((call.write as Mock).mock.calls).toEqual([
-				[
-					{
-						finishReason: StreamFinishReason.ERROR,
-					},
-				],
-			]);
+			expect(call.destroy as Mock).toHaveBeenCalled();
 		});
 	});
 });
diff --git a/services/cohere-connector/src/handlers.ts b/services/cohere-connector/src/handlers.ts
index 118b097e..ddf61a81 100644
--- a/services/cohere-connector/src/handlers.ts
+++ b/services/cohere-connector/src/handlers.ts
@@ -9,14 +9,18 @@ import {
 	CohereStreamResponse,
 } from 'gen/cohere/v1/cohere';
 import { StreamFinishReason } from 'shared/constants';
-import { extractProviderAPIKeyFromMetadata, GrpcError } from 'shared/grpc';
+import {
+	createInternalGrpcError,
+	extractProviderAPIKeyFromMetadata,
+	GrpcError,
+} from 'shared/grpc';
 import logger from 'shared/logger';
 
 import { createOrDefaultClient } from '@/client';
-import { createCohereRequest, finishReasonMapping } from '@/utils';
+import { createCohereRequest } from '@/utils';
 
 /**
- * The openAIPrompt function is a gRPC handler function.
+ * The coherePrompt function is a gRPC handler function.
  *
  * @param call ServerUnaryCall object, including the request and metadata
  * @param callback sendUnaryData handler, allowing sending a response back to the client.
@@ -37,16 +41,18 @@ export async function coherePrompt(
 	try {
 		logger.debug('making Cohere prompt request');
 		const startTime = Date.now();
-		const { text, generationId } = await client.chat(
+		const { generations } = await client.generate(
 			createCohereRequest(call.request),
 		);
 		const finishTime = Date.now();
 
 		logger.debug(
-			{ finishTime, generationId, startTime, text },
+			{ finishTime, generations, startTime },
 			'Cohere request completed',
 		);
-		callback(null, { content: text } satisfies CoherePromptResponse);
+		callback(null, {
+			content: generations[0]?.text ?? '',
+		} satisfies CoherePromptResponse);
 	} catch (error: unknown) {
 		logger.error(error as Error, 'error communicating with Cohere');
 		callback(new GrpcError({ message: (error as Error).message }), null);
@@ -73,22 +79,33 @@ export async function cohereStream(
 
 	const startTime = Date.now();
 	try {
-		logger.debug('making OpenAI stream request');
-		const stream = await client.chatStream(
+		logger.debug('making Cohere stream request');
+		const stream = await client.generateStream(
 			createCohereRequest(call.request),
 		);
-		for await (const message of stream) {
-			if (message.eventType === 'text-generation') {
-				call.write({
-					content: message.text,
-				} satisfies CohereStreamResponse);
+
+		for await (const {
+			is_finished: isFinished,
+			finish_reason: finishReason,
+			text: content,
+		} of stream) {
+			if (isFinished) {
+				if (finishReason === 'COMPLETE') {
+					call.write({
+						finishReason: StreamFinishReason.DONE,
+					});
+				} else if (finishReason === 'MAX_TOKENS') {
+					call.write({
+						finishReason: StreamFinishReason.LIMIT,
+					});
+				} else {
+					call.write({
+						finishReason: StreamFinishReason.ERROR,
+					});
+				}
 				continue;
 			}
-			if (message.eventType === 'stream-end') {
-				call.write({
-					finishReason: finishReasonMapping[message.finishReason],
-				} satisfies CohereStreamResponse);
-			}
+			call.write({ content });
 		}
 
 		const finishTime = Date.now();
@@ -97,11 +114,9 @@ export async function cohereStream(
 			'Cohere streaming request completed',
 		);
 	} catch (error: unknown) {
-		call.write({
-			finishReason: StreamFinishReason.ERROR,
-		} satisfies CohereStreamResponse);
+		call.destroy(createInternalGrpcError(error as Error));
 		logger.error(error as Error, 'error communicating with Cohere');
-	} finally {
-		call.end();
+		return;
 	}
+	call.end();
 }
diff --git a/services/cohere-connector/src/utils.spec.ts b/services/cohere-connector/src/utils.spec.ts
index f717f8df..5a0575b5 100644
--- a/services/cohere-connector/src/utils.spec.ts
+++ b/services/cohere-connector/src/utils.spec.ts
@@ -1,89 +1,46 @@
-import {
-	CohereConnector,
-	CohereConnectorType,
-	CohereModel,
-	CoherePromptRequest,
-} from 'gen/cohere/v1/cohere';
+import { CohereModel, CoherePromptRequest } from 'gen/cohere/v1/cohere';
 
-import { createCohereRequest, getCohereConnectors } from '@/utils';
+import { createCohereRequest } from '@/utils';
 
 describe('utils tests', () => {
-	describe('getCohereConnectors', () => {
-		it('returns an empty array if the input is empty', () => {
-			expect(getCohereConnectors([])).toEqual([]);
-		});
-
-		it('returns id type connectors correctly', () => {
-			const connectors = [
-				{ id: CohereConnectorType.ID, options: {} },
-			] as CohereConnector[];
-			expect(getCohereConnectors(connectors)).toEqual([
-				{ id: 'id', options: {} },
-			]);
-		});
-
-		it('returns web-search type connectors correctly', () => {
-			const connectors = [
-				{ id: CohereConnectorType.WEB_SEARCH, options: {} },
-			] as CohereConnector[];
-			expect(getCohereConnectors(connectors)).toEqual([
-				{ id: 'web-search', options: {} },
-			]);
-		});
-
-		it('filters our unspecified connectors', () => {
-			const connectors = [
-				{ id: CohereConnectorType.WEB_SEARCH, options: {} },
-				{ id: CohereConnectorType.ID, options: {} },
-				{ id: CohereConnectorType.UNSPECIFIED, options: {} },
-			] as CohereConnector[];
-			expect(getCohereConnectors(connectors)).toEqual([
-				{ id: 'web-search', options: {} },
-				{ id: 'id', options: {} },
-			]);
-		});
-	});
-
 	describe('createCohereRequest', () => {
-		it('returns a ChatRequest with the correct model', () => {
+		it('returns a GenerateRequest with the correct model', () => {
 			const grpcRequest = {
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
+
 			expect(result).toEqual({
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 			});
 		});
 
-		it('returns a ChatRequest with the correct conversationId', () => {
+		it('returns a GenerateRequest with the correct conversationId', () => {
 			const grpcRequest = {
-				conversationId: '123',
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
 			expect(result).toEqual({
-				conversationId: '123',
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 			});
 		});
 
-		it('returns a ChatRequest with the correct temperature', () => {
+		it('returns a GenerateRequest with the correct temperature', () => {
 			const grpcRequest = {
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.5,
 				},
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
 			expect(result).toEqual({
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 				temperature: 0.5,
 			});
 		});
@@ -93,59 +50,29 @@ describe('utils tests', () => {
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0,
 				},
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
 			expect(result).toEqual({
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 				temperature: 0,
 			});
 		});
 
-		it('returns a ChatRequest with the correct connectors', () => {
-			const grpcRequest = {
-				message: 'hello world',
-				model: CohereModel.COMMAND,
-				parameters: {
-					connectors: [
-						{
-							id: CohereConnectorType.WEB_SEARCH,
-							options: {},
-						},
-					],
-					temperature: 0.5,
-				},
-			} satisfies CoherePromptRequest;
-			const result = createCohereRequest(grpcRequest);
-			expect(result).toEqual({
-				connectors: [
-					{
-						id: 'web-search',
-						options: {},
-					},
-				],
-				message: 'hello world',
-				model: 'command',
-				temperature: 0.5,
-			});
-		});
-
 		it('does not add connectors when the grpcRequest connectors is an empty array', () => {
 			const grpcRequest = {
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.5,
 				},
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
 			expect(result).toEqual({
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 				temperature: 0.5,
 			});
 		});
@@ -155,14 +82,13 @@ describe('utils tests', () => {
 				message: 'hello world',
 				model: CohereModel.COMMAND,
 				parameters: {
-					connectors: [],
 					temperature: 0.5,
 				},
 			} satisfies CoherePromptRequest;
 			const result = createCohereRequest(grpcRequest);
 			expect(result).toEqual({
-				message: 'hello world',
 				model: 'command',
+				prompt: 'hello world',
 				temperature: 0.5,
 			});
 		});
diff --git a/services/cohere-connector/src/utils.ts b/services/cohere-connector/src/utils.ts
index aceff439..dc5e60c0 100644
--- a/services/cohere-connector/src/utils.ts
+++ b/services/cohere-connector/src/utils.ts
@@ -1,15 +1,6 @@
-import {
-	ChatConnector as CohereChatConnector,
-	ChatRequest,
-	ChatStreamRequest,
-} from 'cohere-ai/api';
+import { GenerateRequest } from 'cohere-ai/api/client/requests/GenerateRequest';
 import { ChatStreamEndEventFinishReason } from 'cohere-ai/api/types/ChatStreamEndEventFinishReason';
-import {
-	CohereConnector,
-	CohereConnectorType,
-	CohereModel,
-	CoherePromptRequest,
-} from 'gen/cohere/v1/cohere';
+import { CohereModel, CoherePromptRequest } from 'gen/cohere/v1/cohere';
 import { StreamFinishReason } from 'shared/constants';
 
 export const modelMapping: Record<CohereModel, string> = {
@@ -32,51 +23,40 @@ export const finishReasonMapping: Record<
 };
 
 /**
- * The getCohereConnectors function takes an array of CohereConnector enums and returns
- * an array of connector objects.
- *
- * @return An array of CohereChatConnector objects
- * @param connectors
- */
-export function getCohereConnectors(
-	connectors: CohereConnector[],
-): CohereChatConnector[] {
-	const result: CohereChatConnector[] = [];
-	for (const { id, options } of connectors) {
-		if (id === CohereConnectorType.UNSPECIFIED) {
-			continue;
-		}
-		result.push({
-			id: id === CohereConnectorType.WEB_SEARCH ? 'web-search' : 'id',
-			options,
-		});
-	}
-
-	return result;
-}
-
-/**
- * The createCohereRequest function takes a CoherePromptRequest and returns a ChatRequest or
- * ChatStreamRequest.
+ * The createCohereRequest function takes a CoherePromptRequest and returns a Cohere client.CoherePromptRequest
  *
  * @param grpcRequest CoherePromptRequest
- * @return A ChatRequest or a ChatStreamRequest
+ * @param stream boolean
+ *
+ * @return A CoherePromptRequest
  */
 export function createCohereRequest(
 	grpcRequest: CoherePromptRequest,
-): ChatRequest | ChatStreamRequest {
+): GenerateRequest {
 	return {
-		connectors:
-			Array.isArray(grpcRequest.parameters?.connectors) &&
-			grpcRequest.parameters.connectors.length
-				? getCohereConnectors(grpcRequest.parameters.connectors)
-				: undefined,
-		conversationId: grpcRequest.conversationId,
-		message: grpcRequest.message,
 		model: modelMapping[grpcRequest.model],
-		temperature:
-			typeof grpcRequest.parameters?.temperature === 'number'
-				? grpcRequest.parameters.temperature
-				: undefined,
-	} satisfies ChatRequest | ChatStreamRequest;
+		prompt: grpcRequest.message,
+		...grpcRequest.parameters,
+	} satisfies GenerateRequest;
+}
+
+/*
+ * The readChunks function takes a ReadableStreamDefaultReader and returns an AsyncIterableIterator that yields values
+ * from the stream.
+ * */
+export function readChunks<T extends Record<string, any>>(
+	reader: ReadableStreamDefaultReader<Uint8Array>,
+) {
+	const decoder = new TextDecoder();
+
+	return {
+		async *[Symbol.asyncIterator]() {
+			let readResult = await reader.read();
+
+			while (!readResult.done) {
+				yield JSON.parse(decoder.decode(readResult.value)) as T;
+				readResult = await reader.read();
+			}
+		},
+	};
 }
diff --git a/services/openai-connector/src/handlers.spec.ts b/services/openai-connector/src/handlers.spec.ts
index c1b7e373..9c30d909 100644
--- a/services/openai-connector/src/handlers.spec.ts
+++ b/services/openai-connector/src/handlers.spec.ts
@@ -13,11 +13,11 @@ import {
 	OpenAIStreamResponse,
 } from 'gen/openai/v1/openai';
 import { StreamFinishReason } from 'shared/constants';
+import { createInternalGrpcError } from 'shared/grpc';
 import { Mock } from 'vitest';
 
 import { getOpenAIClient } from '@/client';
 import { openAIPrompt, openAIStream } from '@/handlers';
-import { createInternalGrpcError } from '@/utils';
 
 describe('handlers tests', () => {
 	const openAPIKey = (process.env.OPEN_AI_API_KEY =
diff --git a/services/openai-connector/src/handlers.ts b/services/openai-connector/src/handlers.ts
index d45e482a..8dd2de4e 100644
--- a/services/openai-connector/src/handlers.ts
+++ b/services/openai-connector/src/handlers.ts
@@ -9,15 +9,14 @@ import {
 	OpenAIPromptResponse,
 	OpenAIStreamResponse,
 } from 'gen/openai/v1/openai';
-import { extractProviderAPIKeyFromMetadata } from 'shared/grpc';
+import {
+	createInternalGrpcError,
+	extractProviderAPIKeyFromMetadata,
+} from 'shared/grpc';
 import logger from 'shared/logger';
 
 import { createOrDefaultClient } from '@/client';
-import {
-	createInternalGrpcError,
-	createOpenAIRequest,
-	finishReasonMap,
-} from '@/utils';
+import { createOpenAIRequest, finishReasonMap } from '@/utils';
 
 /**
  * The openAIPrompt function is a gRPC handler function.
diff --git a/services/openai-connector/src/utils.ts b/services/openai-connector/src/utils.ts
index 32ba90fc..be27c4da 100644
--- a/services/openai-connector/src/utils.ts
+++ b/services/openai-connector/src/utils.ts
@@ -1,4 +1,3 @@
-import { Status } from '@grpc/grpc-js/build/src/constants';
 import {
 	OpenAIMessageRole,
 	OpenAIModel,
@@ -10,7 +9,6 @@ import {
 	ChatCompletionMessageParam,
 } from 'openai/src/resources/chat/completions';
 import { StreamFinishReason } from 'shared/constants';
-import { GrpcError } from 'shared/grpc';
 
 type OpenAIModels =
 	| 'gpt-4-0613'
@@ -125,11 +123,3 @@ export function createOpenAIRequest(
 		user: applicationId,
 	};
 }
-
-export function createInternalGrpcError(error: Error) {
-	return new GrpcError({
-		code: Status.INTERNAL,
-		details: error.message,
-		message: 'an error has occurred communicating with OpenAI',
-	});
-}
diff --git a/shared/ts/src/grpc.ts b/shared/ts/src/grpc.ts
index 2454bd5a..65c3e60c 100644
--- a/shared/ts/src/grpc.ts
+++ b/shared/ts/src/grpc.ts
@@ -119,3 +119,14 @@ export function extractProviderAPIKeyFromMetadata(
 	const md = call.metadata.get('X-API-Key');
 	return md.length ? (md[0] as string) : undefined;
 }
+
+/**
+ * Creates an internal gRPC error from the given error.
+ * */
+export function createInternalGrpcError(error: Error): GrpcError {
+	return new GrpcError({
+		code: Status.INTERNAL,
+		details: error.message,
+		message: 'an error has occurred communicating with the provider',
+	});
+}

From e69b8ac15011a7d4b99ea43d8a115c6eb0e1717c Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Tue, 26 Dec 2023 16:13:14 +0100
Subject: [PATCH 02/15] chore: updated tests

---
 .../cohere-connector/src/handlers.spec.ts     | 10 ++++----
 services/cohere-connector/src/handlers.ts     | 19 ++++-----------
 services/cohere-connector/src/utils.spec.ts   | 24 ++++++++++++++++++-
 services/cohere-connector/src/utils.ts        | 19 +++++++++++++++
 4 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/services/cohere-connector/src/handlers.spec.ts b/services/cohere-connector/src/handlers.spec.ts
index 49185d42..e258f3ac 100644
--- a/services/cohere-connector/src/handlers.spec.ts
+++ b/services/cohere-connector/src/handlers.spec.ts
@@ -5,6 +5,7 @@ import {
 	ServerUnaryCall,
 	ServerWritableStream,
 } from '@grpc/grpc-js';
+import * as cohere from 'cohere-ai';
 import {
 	CohereModel,
 	CoherePromptRequest,
@@ -15,7 +16,6 @@ import { StreamFinishReason } from 'shared/constants';
 import { GrpcError } from 'shared/grpc';
 import { Mock, MockInstance } from 'vitest';
 
-import { getCohereClient } from '@/client';
 import { coherePrompt, cohereStream } from '@/handlers';
 
 describe('handlers tests', () => {
@@ -26,10 +26,9 @@ describe('handlers tests', () => {
 		process.env.COHERE_API_KEY = openAPIKey;
 	});
 
-	const client = getCohereClient();
-
 	describe('coherePrompt', () => {
-		const generateSpy = vi.spyOn(client, 'generate');
+		// @ts-expect-error - MockInstance is not typed correctly
+		const generateSpy = vi.spyOn(cohere, 'generate');
 
 		const makeMockUnaryCall = (
 			request: CoherePromptRequest,
@@ -55,6 +54,7 @@ describe('handlers tests', () => {
 			const callback: sendUnaryData<CoherePromptResponse> = vi.fn();
 
 			generateSpy.mockResolvedValueOnce({
+				// @ts-expect-error - MockInstance is not typed correctly
 				generations: [{ id: 'def', text: 'Generated response' }],
 				id: 'abc',
 			});
@@ -232,7 +232,7 @@ describe('handlers tests', () => {
 			]);
 		});
 
-		it('should handle errors', async () => {
+		it.each([''])('should handle errors', async () => {
 			const call = makeServerWritableStream({
 				message: 'test',
 				model: CohereModel.COMMAND,
diff --git a/services/cohere-connector/src/handlers.ts b/services/cohere-connector/src/handlers.ts
index ddf61a81..87e95d43 100644
--- a/services/cohere-connector/src/handlers.ts
+++ b/services/cohere-connector/src/handlers.ts
@@ -8,7 +8,6 @@ import {
 	CoherePromptResponse,
 	CohereStreamResponse,
 } from 'gen/cohere/v1/cohere';
-import { StreamFinishReason } from 'shared/constants';
 import {
 	createInternalGrpcError,
 	extractProviderAPIKeyFromMetadata,
@@ -17,7 +16,7 @@ import {
 import logger from 'shared/logger';
 
 import { createOrDefaultClient } from '@/client';
-import { createCohereRequest } from '@/utils';
+import { createCohereRequest, getFinishReason } from '@/utils';
 
 /**
  * The coherePrompt function is a gRPC handler function.
@@ -90,19 +89,9 @@ export async function cohereStream(
 			text: content,
 		} of stream) {
 			if (isFinished) {
-				if (finishReason === 'COMPLETE') {
-					call.write({
-						finishReason: StreamFinishReason.DONE,
-					});
-				} else if (finishReason === 'MAX_TOKENS') {
-					call.write({
-						finishReason: StreamFinishReason.LIMIT,
-					});
-				} else {
-					call.write({
-						finishReason: StreamFinishReason.ERROR,
-					});
-				}
+				call.write({
+					finishReason: getFinishReason(finishReason!),
+				});
 				continue;
 			}
 			call.write({ content });
diff --git a/services/cohere-connector/src/utils.spec.ts b/services/cohere-connector/src/utils.spec.ts
index 5a0575b5..ca086f7c 100644
--- a/services/cohere-connector/src/utils.spec.ts
+++ b/services/cohere-connector/src/utils.spec.ts
@@ -1,6 +1,7 @@
 import { CohereModel, CoherePromptRequest } from 'gen/cohere/v1/cohere';
+import { StreamFinishReason } from 'shared/constants';
 
-import { createCohereRequest } from '@/utils';
+import { createCohereRequest, getFinishReason } from '@/utils';
 
 describe('utils tests', () => {
 	describe('createCohereRequest', () => {
@@ -93,4 +94,25 @@ describe('utils tests', () => {
 			});
 		});
 	});
+
+	describe('getFinishReason', () => {
+		it('returns the correct finish reason for a complete event', () => {
+			expect(getFinishReason('COMPLETE')).toEqual(
+				StreamFinishReason.DONE,
+			);
+		});
+		it('returns the correct finish reason for an error limit event', () => {
+			expect(getFinishReason('MAX_TOKENS')).toEqual(
+				StreamFinishReason.LIMIT,
+			);
+		});
+		it('returns the correct finish reason for an error event', () => {
+			expect(getFinishReason('ERROR')).toEqual(StreamFinishReason.ERROR);
+		});
+		it('returns the correct finish reason for an error toxic event', () => {
+			expect(getFinishReason('ERROR_TOXIC')).toEqual(
+				StreamFinishReason.ERROR,
+			);
+		});
+	});
 });
diff --git a/services/cohere-connector/src/utils.ts b/services/cohere-connector/src/utils.ts
index dc5e60c0..5f6f5fa4 100644
--- a/services/cohere-connector/src/utils.ts
+++ b/services/cohere-connector/src/utils.ts
@@ -60,3 +60,22 @@ export function readChunks<T extends Record<string, any>>(
 		},
 	};
 }
+
+/**
+ *
+ * @param finishReason the stream finish reason from Cohere
+ *
+ * @return A StreamFinishReason
+ */
+
+export function getFinishReason(
+	finishReason: 'COMPLETE' | 'MAX_TOKENS' | 'ERROR' | 'ERROR_TOXIC',
+) {
+	if (finishReason === 'COMPLETE') {
+		return StreamFinishReason.DONE;
+	} else if (finishReason === 'MAX_TOKENS') {
+		return StreamFinishReason.LIMIT;
+	} else {
+		return StreamFinishReason.ERROR;
+	}
+}

From 2b02b138f542ea4568b5eef72ec99e3d664d1c2a Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Tue, 26 Dec 2023 17:05:54 +0100
Subject: [PATCH 03/15] chore: updated tests

---
 e2e/factories/factories.go                    | 41 ++++++++++-----
 gen/go/cohere/v1/cohere.pb.go                 |  6 +--
 gen/ts/cohere/v1/cohere.d.ts                  |  2 +-
 gen/ts/cohere/v1/cohere.js                    |  2 +-
 proto/cohere/v1/cohere.proto                  |  2 +-
 .../internal/connectors/cohere/cohere.go      |  3 +-
 .../connectors/cohere/request_test.go         | 12 ++++-
 .../internal/connectors/cohere/utils.go       | 52 +++++++++++++++++--
 .../internal/connectors/cohere/utils_test.go  | 31 +++++------
 .../internal/connectors/connectors.go         |  3 +-
 .../connectors/openai/request_test.go         |  6 ++-
 .../internal/connectors/openai/utils.go       | 51 +++++++++++++++---
 .../internal/connectors/openai/utils_test.go  |  6 +--
 .../internal/services/integration_test.go     | 11 ++--
 .../internal/services/prompttesting_test.go   |  2 +-
 .../internal/api/promptconfigs_test.go        |  2 +-
 shared/go/datatypes/datatypes.go              | 14 +++--
 17 files changed, 174 insertions(+), 72 deletions(-)

diff --git a/e2e/factories/factories.go b/e2e/factories/factories.go
index 37e921b3..b78a8507 100644
--- a/e2e/factories/factories.go
+++ b/e2e/factories/factories.go
@@ -40,13 +40,16 @@ func CreateOpenAIPromptMessages(
 	return ptr.To(json.RawMessage(serialization.SerializeJSON(msgs)))
 }
 
-func CreateModelParameters() *json.RawMessage {
-	modelParameters := serialization.SerializeJSON(map[string]float32{
-		"temperature":       1,
-		"top_p":             1,
-		"max_tokens":        1,
-		"presence_penalty":  1,
-		"frequency_penalty": 1,
+func CreateOpenAIModelParameters() *json.RawMessage {
+	floatValue := float32(0)
+	intValue := int32(0)
+
+	modelParameters := serialization.SerializeJSON(datatypes.OpenAIModelParametersDTO{
+		Temperature:      &floatValue,
+		TopP:             &floatValue,
+		MaxTokens:        &intValue,
+		FrequencyPenalty: &floatValue,
+		PresencePenalty:  &floatValue,
 	})
 
 	return ptr.To(json.RawMessage(modelParameters))
@@ -107,7 +110,7 @@ func CreateOpenAIPromptConfig(
 	userMessage := "This is what the user asked for: {userInput}"
 	templateVariables := []string{"userInput"}
 
-	modelParameters := CreateModelParameters()
+	modelParameters := CreateOpenAIModelParameters()
 
 	promptMessages := CreateOpenAIPromptMessages(
 		systemMessage,
@@ -132,6 +135,22 @@ func CreateOpenAIPromptConfig(
 	return &promptConfig, nil
 }
 
+func CreateCohereModelParameters() *json.RawMessage {
+	floatValue := float32(0)
+	uintValue := uint32(0)
+	intValue := int32(0)
+
+	modelParameters := serialization.SerializeJSON(datatypes.CohereModelParametersDTO{
+		Temperature:      &floatValue,
+		K:                &uintValue,
+		P:                &floatValue,
+		FrequencyPenalty: &floatValue,
+		PresencePenalty:  &floatValue,
+		MaxTokens:        &intValue,
+	})
+	return ptr.To(json.RawMessage(modelParameters))
+}
+
 func CreateCoherePromptConfig(
 	ctx context.Context,
 	applicationID pgtype.UUID,
@@ -139,11 +158,7 @@ func CreateCoherePromptConfig(
 	userMessage := "This is what the user asked for: {userInput}"
 	templateVariables := []string{"userInput"}
 
-	modelParameters := ptr.To(
-		json.RawMessage(serialization.SerializeJSON(datatypes.CohereModelParametersDTO{
-			Temperature: ptr.To(float32(1)),
-		})),
-	)
+	modelParameters := CreateCohereModelParameters()
 
 	promptMessages := ptr.To(
 		json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
diff --git a/gen/go/cohere/v1/cohere.pb.go b/gen/go/cohere/v1/cohere.pb.go
index 2e66167c..dd0781c3 100644
--- a/gen/go/cohere/v1/cohere.pb.go
+++ b/gen/go/cohere/v1/cohere.pb.go
@@ -145,7 +145,7 @@ type CohereModelParameters struct {
 	Temperature *float32 `protobuf:"fixed32,1,opt,name=temperature,proto3,oneof" json:"temperature,omitempty"`
 	// Ensures only the top k most likely tokens are considered for generation at each step.
 	// Defaults to 0, min value of 0, max value of 500.
-	K *float32 `protobuf:"fixed32,2,opt,name=k,proto3,oneof" json:"k,omitempty"`
+	K *uint32 `protobuf:"varint,2,opt,name=k,proto3,oneof" json:"k,omitempty"`
 	// Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step.
 	// If both k and p are enabled, p acts after k.
 	P *float32 `protobuf:"fixed32,3,opt,name=p,proto3,oneof" json:"p,omitempty"`
@@ -204,7 +204,7 @@ func (x *CohereModelParameters) GetTemperature() float32 {
 	return 0
 }
 
-func (x *CohereModelParameters) GetK() float32 {
+func (x *CohereModelParameters) GetK() uint32 {
 	if x != nil && x.K != nil {
 		return *x.K
 	}
@@ -422,7 +422,7 @@ var file_cohere_v1_cohere_proto_rawDesc = []byte{
 	0x64, 0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a,
 	0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x02, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x48,
+	0x65, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48,
 	0x01, 0x52, 0x01, 0x6b, 0x88, 0x01, 0x01, 0x12, 0x11, 0x0a, 0x01, 0x70, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x02, 0x48, 0x02, 0x52, 0x01, 0x70, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x11, 0x66, 0x72,
 	0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x70, 0x65, 0x6e, 0x61, 0x6c, 0x74, 0x79, 0x18,
diff --git a/gen/ts/cohere/v1/cohere.d.ts b/gen/ts/cohere/v1/cohere.d.ts
index 5537ada1..4b7c86a4 100644
--- a/gen/ts/cohere/v1/cohere.d.ts
+++ b/gen/ts/cohere/v1/cohere.d.ts
@@ -21,7 +21,7 @@ export interface CohereModelParameters {
      * Ensures only the top k most likely tokens are considered for generation at each step.
      * Defaults to 0, min value of 0, max value of 500.
      *
-     * @generated from protobuf field: optional float k = 2;
+     * @generated from protobuf field: optional uint32 k = 2;
      */
     k?: number;
     /**
diff --git a/gen/ts/cohere/v1/cohere.js b/gen/ts/cohere/v1/cohere.js
index 4399d5d0..1cc40ab2 100644
--- a/gen/ts/cohere/v1/cohere.js
+++ b/gen/ts/cohere/v1/cohere.js
@@ -75,7 +75,7 @@ class CohereModelParameters$Type extends MessageType {
     constructor() {
         super("cohere.v1.CohereModelParameters", [
             { no: 1, name: "temperature", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
-            { no: 2, name: "k", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
+            { no: 2, name: "k", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
             { no: 3, name: "p", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
             { no: 4, name: "frequency_penalty", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
             { no: 5, name: "presence_penalty", kind: "scalar", opt: true, T: 2 /*ScalarType.FLOAT*/ },
diff --git a/proto/cohere/v1/cohere.proto b/proto/cohere/v1/cohere.proto
index e123b449..effab560 100644
--- a/proto/cohere/v1/cohere.proto
+++ b/proto/cohere/v1/cohere.proto
@@ -45,7 +45,7 @@ message CohereModelParameters {
   optional float temperature = 1;
   //Ensures only the top k most likely tokens are considered for generation at each step.
   // Defaults to 0, min value of 0, max value of 500.
-  optional float k = 2;
+  optional uint32 k = 2;
   // Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step.
   // If both k and p are enabled, p acts after k.
   optional float p = 3;
diff --git a/services/api-gateway/internal/connectors/cohere/cohere.go b/services/api-gateway/internal/connectors/cohere/cohere.go
index 3fdae605..f4ef50b7 100644
--- a/services/api-gateway/internal/connectors/cohere/cohere.go
+++ b/services/api-gateway/internal/connectors/cohere/cohere.go
@@ -3,6 +3,7 @@ package cohere
 import (
 	cohereconnector "github.com/basemind-ai/monorepo/gen/go/cohere/v1"
 	"github.com/basemind-ai/monorepo/shared/go/exc"
+	"github.com/basemind-ai/monorepo/shared/go/grpcutils"
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc"
 )
@@ -14,7 +15,7 @@ type Client struct {
 
 // New creates a new Cohere connector client.
 func New(serverAddress string, opts ...grpc.DialOption) *Client {
-	conn := exc.MustResult(grpc.Dial(serverAddress, opts...))
+	conn := exc.MustResult(grpcutils.NewConnection(serverAddress, opts...))
 	log.Info().Msg("initialized Cohere connector connection")
 
 	return &Client{client: cohereconnector.NewCohereServiceClient(conn)}
diff --git a/services/api-gateway/internal/connectors/cohere/request_test.go b/services/api-gateway/internal/connectors/cohere/request_test.go
index d8b8cfe8..7834028c 100644
--- a/services/api-gateway/internal/connectors/cohere/request_test.go
+++ b/services/api-gateway/internal/connectors/cohere/request_test.go
@@ -52,10 +52,18 @@ func TestRequestPrompt(t *testing.T) {
 	templateVariables := map[string]string{"userInput": "abc"}
 	expectedParsedContent := "This is what the user asked for: abc"
 
-	floatValue := float32(1)
+	floatValue := float32(0)
+	uintValue := uint32(0)
+
 	expectedModelParameters := &cohereconnector.CohereModelParameters{
-		Temperature: &floatValue,
+		Temperature:      &floatValue,
+		K:                &uintValue,
+		P:                &floatValue,
+		FrequencyPenalty: &floatValue,
+		PresencePenalty:  &floatValue,
+		MaxTokens:        &uintValue,
 	}
+
 	t.Run("returns a prompt response", func(t *testing.T) {
 		client, mockService := CreateClientAndService(t)
 
diff --git a/services/api-gateway/internal/connectors/cohere/utils.go b/services/api-gateway/internal/connectors/cohere/utils.go
index bfcd9304..4c136d5a 100644
--- a/services/api-gateway/internal/connectors/cohere/utils.go
+++ b/services/api-gateway/internal/connectors/cohere/utils.go
@@ -7,8 +7,8 @@ import (
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/utils"
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
-	"github.com/basemind-ai/monorepo/shared/go/db"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
+	"github.com/basemind-ai/monorepo/shared/go/ptr"
 )
 
 var ModelTypeMap = map[models.ModelType]cohereconnector.CohereModel{
@@ -27,6 +27,46 @@ func GetModelType(modelType models.ModelType) (*cohereconnector.CohereModel, err
 	return &value, nil
 }
 
+func parseParameters(
+	rawParameters *json.RawMessage,
+	connectorParameters *cohereconnector.CohereModelParameters,
+) error {
+	if rawParameters == nil {
+		return nil
+	}
+
+	modelParameters := &datatypes.CohereModelParametersDTO{}
+	if parametersUnmarshalErr := json.Unmarshal(*rawParameters, modelParameters); parametersUnmarshalErr != nil {
+		return fmt.Errorf("failed to unmarshal model parameters - %w", parametersUnmarshalErr)
+	}
+
+	if modelParameters.MaxTokens != nil {
+		connectorParameters.MaxTokens = ptr.To(uint32(*modelParameters.MaxTokens))
+	}
+
+	if modelParameters.Temperature != nil {
+		connectorParameters.Temperature = modelParameters.Temperature
+	}
+
+	if modelParameters.K != nil {
+		connectorParameters.K = modelParameters.K
+	}
+
+	if modelParameters.P != nil {
+		connectorParameters.P = modelParameters.P
+	}
+
+	if modelParameters.FrequencyPenalty != nil {
+		connectorParameters.FrequencyPenalty = modelParameters.FrequencyPenalty
+	}
+
+	if modelParameters.PresencePenalty != nil {
+		connectorParameters.PresencePenalty = modelParameters.PresencePenalty
+	}
+
+	return nil
+}
+
 func CreatePromptRequest(
 	requestConfiguration *dto.RequestConfigurationDTO,
 	templateVariables map[string]string,
@@ -36,12 +76,14 @@ func CreatePromptRequest(
 		return nil, modelErr
 	}
 
-	applicationID := db.UUIDToString(&requestConfiguration.ApplicationID)
+	modelParameters := &cohereconnector.CohereModelParameters{}
+	if parametersParseErr := parseParameters(requestConfiguration.PromptConfigData.ModelParameters, modelParameters); parametersParseErr != nil {
+		return nil, fmt.Errorf("failed to unmarshal model parameters - %w", parametersParseErr)
+	}
 
 	promptRequest := &cohereconnector.CoherePromptRequest{
-		Model:          *model,
-		Parameters:     &cohereconnector.CohereModelParameters{},
-		ConversationId: &applicationID,
+		Model:      *model,
+		Parameters: modelParameters,
 	}
 
 	if parametersUnmarshalErr := json.Unmarshal(
diff --git a/services/api-gateway/internal/connectors/cohere/utils_test.go b/services/api-gateway/internal/connectors/cohere/utils_test.go
index 28b219ab..36f786b0 100644
--- a/services/api-gateway/internal/connectors/cohere/utils_test.go
+++ b/services/api-gateway/internal/connectors/cohere/utils_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/connectors/cohere"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
-	"github.com/basemind-ai/monorepo/shared/go/db"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/ptr"
 	"github.com/basemind-ai/monorepo/shared/go/serialization"
@@ -43,10 +42,16 @@ func TestUtils(t *testing.T) {
 		project, _ := factories.CreateProject(context.TODO())
 		application, _ := factories.CreateApplication(context.TODO(), project.ID)
 
-		floatValue := float32(1)
+		floatValue := float32(0)
+		uintValue := uint32(0)
 
 		expectedModelParameters := &cohereconnector.CohereModelParameters{
-			Temperature: &floatValue,
+			Temperature:      &floatValue,
+			K:                &uintValue,
+			P:                &floatValue,
+			FrequencyPenalty: &floatValue,
+			PresencePenalty:  &floatValue,
+			MaxTokens:        &uintValue,
 		}
 
 		promptMessage := "This is what the user asked for: {userInput}"
@@ -59,19 +64,12 @@ func TestUtils(t *testing.T) {
 
 		expectedPromptMessage := fmt.Sprintf("This is what the user asked for: %s", userInput)
 
-		applicationID := db.UUIDToString(&application.ID)
-
 		requestConfig := &dto.RequestConfigurationDTO{
 			ApplicationID: application.ID,
 			PromptConfigData: datatypes.PromptConfigDTO{
-				ModelType:   modelType,
-				ModelVendor: models.ModelVendorCOHERE,
-				ModelParameters: ptr.To(
-					json.RawMessage(serialization.SerializeJSON(datatypes.CohereModelParametersDTO{
-						Temperature: &floatValue,
-						Connectors:  nil,
-					})),
-				),
+				ModelType:       modelType,
+				ModelVendor:     models.ModelVendorCOHERE,
+				ModelParameters: factories.CreateCohereModelParameters(),
 				ProviderPromptMessages: ptr.To(
 					json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
 						Content:           promptMessage,
@@ -84,10 +82,9 @@ func TestUtils(t *testing.T) {
 
 		t.Run("creates a prompt request correctly", func(t *testing.T) {
 			expectedPromptRequest := &cohereconnector.CoherePromptRequest{
-				Model:          cohereconnector.CohereModel_COHERE_MODEL_COMMAND,
-				Parameters:     expectedModelParameters,
-				Message:        expectedPromptMessage,
-				ConversationId: &applicationID,
+				Model:      cohereconnector.CohereModel_COHERE_MODEL_COMMAND,
+				Parameters: expectedModelParameters,
+				Message:    expectedPromptMessage,
 			}
 
 			promptRequest, err := cohere.CreatePromptRequest(
diff --git a/services/api-gateway/internal/connectors/connectors.go b/services/api-gateway/internal/connectors/connectors.go
index 697b6194..f9843bfd 100644
--- a/services/api-gateway/internal/connectors/connectors.go
+++ b/services/api-gateway/internal/connectors/connectors.go
@@ -41,7 +41,8 @@ func Init(ctx context.Context, opts ...grpc.DialOption) {
 	config := &connectorConfig{}
 	exc.Must(envconfig.Process(ctx, config), "failed to process environment variables")
 
-	openaiConnectorClient = openai.New(config.OpenAIConnectorAddress)
+	openaiConnectorClient = openai.New(config.OpenAIConnectorAddress, opts...)
+	cohereConnectorClient = cohere.New(config.CohereConnectorAddress, opts...)
 }
 
 // GetProviderConnector - returns the connector for the given provider.
diff --git a/services/api-gateway/internal/connectors/openai/request_test.go b/services/api-gateway/internal/connectors/openai/request_test.go
index f259b2e4..89ae29e7 100644
--- a/services/api-gateway/internal/connectors/openai/request_test.go
+++ b/services/api-gateway/internal/connectors/openai/request_test.go
@@ -53,8 +53,9 @@ func TestRequestPrompt(t *testing.T) {
 	templateVariables := map[string]string{"userInput": "abc"}
 	expectedParsedContent := "This is what the user asked for: abc"
 
-	floatValue := float32(1)
-	uintValue := uint32(1)
+	floatValue := float32(0)
+	uintValue := uint32(0)
+
 	expectedModelParameters := &openaiconnector.OpenAIModelParameters{
 		Temperature:      &floatValue,
 		TopP:             &floatValue,
@@ -62,6 +63,7 @@ func TestRequestPrompt(t *testing.T) {
 		PresencePenalty:  &floatValue,
 		FrequencyPenalty: &floatValue,
 	}
+
 	t.Run("returns a prompt response", func(t *testing.T) {
 		client, mockService := CreateClientAndService(t)
 
diff --git a/services/api-gateway/internal/connectors/openai/utils.go b/services/api-gateway/internal/connectors/openai/utils.go
index 4006516d..021c2842 100644
--- a/services/api-gateway/internal/connectors/openai/utils.go
+++ b/services/api-gateway/internal/connectors/openai/utils.go
@@ -8,6 +8,7 @@ import (
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/exc"
+	"github.com/basemind-ai/monorepo/shared/go/ptr"
 	"github.com/shopspring/decimal"
 	"github.com/tiktoken-go/tokenizer"
 	"google.golang.org/grpc/codes"
@@ -50,6 +51,42 @@ func GetMessageRole(role string) (*openaiconnector.OpenAIMessageRole, error) {
 	}
 }
 
+func parseParameters(
+	rawParameters *json.RawMessage,
+	connectorParameters *openaiconnector.OpenAIModelParameters,
+) error {
+	if rawParameters == nil {
+		return nil
+	}
+
+	modelParameters := &datatypes.OpenAIModelParametersDTO{}
+	if parametersUnmarshalErr := json.Unmarshal(*rawParameters, modelParameters); parametersUnmarshalErr != nil {
+		return fmt.Errorf("failed to unmarshal model parameters - %w", parametersUnmarshalErr)
+	}
+
+	if modelParameters.MaxTokens != nil {
+		connectorParameters.MaxTokens = ptr.To(uint32(*modelParameters.MaxTokens))
+	}
+
+	if modelParameters.Temperature != nil {
+		connectorParameters.Temperature = modelParameters.Temperature
+	}
+
+	if modelParameters.TopP != nil {
+		connectorParameters.TopP = modelParameters.TopP
+	}
+
+	if modelParameters.FrequencyPenalty != nil {
+		connectorParameters.FrequencyPenalty = modelParameters.FrequencyPenalty
+	}
+
+	if modelParameters.PresencePenalty != nil {
+		connectorParameters.PresencePenalty = modelParameters.PresencePenalty
+	}
+
+	return nil
+}
+
 func CreatePromptRequest(
 	requestConfiguration *dto.RequestConfigurationDTO,
 	templateVariables map[string]string,
@@ -61,20 +98,18 @@ func CreatePromptRequest(
 
 	applicationIDString := db.UUIDToString(&requestConfiguration.ApplicationID)
 
+	modelParameters := &openaiconnector.OpenAIModelParameters{}
+	if parametersParseErr := parseParameters(requestConfiguration.PromptConfigData.ModelParameters, modelParameters); parametersParseErr != nil {
+		return nil, fmt.Errorf("failed to unmarshal model parameters - %w", parametersParseErr)
+	}
+
 	promptRequest := &openaiconnector.OpenAIPromptRequest{
 		Model:         *model,
 		ApplicationId: &applicationIDString,
-		Parameters:    &openaiconnector.OpenAIModelParameters{},
+		Parameters:    modelParameters,
 		Messages:      []*openaiconnector.OpenAIMessage{},
 	}
 
-	if parametersUnmarshalErr := json.Unmarshal(
-		*requestConfiguration.PromptConfigData.ModelParameters,
-		promptRequest.Parameters,
-	); parametersUnmarshalErr != nil {
-		return nil, fmt.Errorf("failed to unmarshal model parameters - %w", parametersUnmarshalErr)
-	}
-
 	var openAIPromptMessageDTOs []*datatypes.OpenAIPromptMessageDTO
 	if messagesUnmarshalErr := json.Unmarshal(*requestConfiguration.PromptConfigData.ProviderPromptMessages, &openAIPromptMessageDTOs); messagesUnmarshalErr != nil {
 		return nil, fmt.Errorf("failed to unmarshal prompt messages - %w", messagesUnmarshalErr)
diff --git a/services/api-gateway/internal/connectors/openai/utils_test.go b/services/api-gateway/internal/connectors/openai/utils_test.go
index 87ecc74b..28a31a41 100644
--- a/services/api-gateway/internal/connectors/openai/utils_test.go
+++ b/services/api-gateway/internal/connectors/openai/utils_test.go
@@ -82,8 +82,8 @@ func TestUtils(t *testing.T) {
 		project, _ := factories.CreateProject(context.TODO())
 		application, _ := factories.CreateApplication(context.TODO(), project.ID)
 
-		floatValue := float32(1)
-		uintValue := uint32(1)
+		floatValue := float32(0)
+		uintValue := uint32(0)
 
 		expectedModelParameters := &openaiconnector.OpenAIModelParameters{
 			Temperature:      &floatValue,
@@ -99,7 +99,7 @@ func TestUtils(t *testing.T) {
 		applicationID := db.UUIDToString(&application.ID)
 		modelType := models.ModelTypeGpt35Turbo
 
-		modelParameters := factories.CreateModelParameters()
+		modelParameters := factories.CreateOpenAIModelParameters()
 		promptMessages := factories.CreateOpenAIPromptMessages(
 			systemMessage,
 			userMessage,
diff --git a/services/api-gateway/internal/services/integration_test.go b/services/api-gateway/internal/services/integration_test.go
index 404f8dc1..99758746 100644
--- a/services/api-gateway/internal/services/integration_test.go
+++ b/services/api-gateway/internal/services/integration_test.go
@@ -37,6 +37,10 @@ const JWTSecret = "ABC123"
 
 func createOpenAIService(t *testing.T) *testutils.MockOpenAIService {
 	t.Helper()
+
+	t.Setenv("OPENAI_CONNECTOR_ADDRESS", "")
+	t.Setenv("COHERE_CONNECTOR_ADDRESS", "")
+
 	mockService := &testutils.MockOpenAIService{T: t}
 	listener := testutils.CreateTestGRPCServer[openaiconnector.OpenAIServiceServer](
 		t,
@@ -44,9 +48,8 @@ func createOpenAIService(t *testing.T) *testutils.MockOpenAIService {
 		mockService,
 	)
 
-	t.Setenv("OPENAI_CONNECTOR_ADDRESS", "")
-
-	connectors.Init(context.TODO(),
+	connectors.Init(
+		context.TODO(),
 		grpc.WithContextDialer(
 			func(context.Context, string) (net.Conn, error) {
 				return listener.Dial()
@@ -84,7 +87,7 @@ func TestIntegration(t *testing.T) { //nolint: revive
 
 	project, _ := factories.CreateProject(context.Background())
 
-	modelParameters := factories.CreateModelParameters()
+	modelParameters := factories.CreateOpenAIModelParameters()
 	promptMessages := factories.CreateOpenAIPromptMessages("you are a bot", "{userInput}", nil)
 	_ = factories.CreateProviderPricingModels(context.Background())
 	requestConfigurationDTO := createRequestConfigurationDTO(t, project.ID)
diff --git a/services/api-gateway/internal/services/prompttesting_test.go b/services/api-gateway/internal/services/prompttesting_test.go
index 7b735e68..52e6aa19 100644
--- a/services/api-gateway/internal/services/prompttesting_test.go
+++ b/services/api-gateway/internal/services/prompttesting_test.go
@@ -61,7 +61,7 @@ func createPromptTestingServiceClient(t *testing.T) ptesting.PromptTestingServic
 
 func TestPromptTestingService(t *testing.T) {
 	srv := services.PromptTestingServer{}
-	modelParameters := factories.CreateModelParameters()
+	modelParameters := factories.CreateOpenAIModelParameters()
 	promptMessages := factories.CreateOpenAIPromptMessages("you are a bot", "{userInput}", nil)
 	project, _ := factories.CreateProject(context.Background())
 	application, _ := factories.CreateApplication(context.TODO(), project.ID)
diff --git a/services/dashboard-backend/internal/api/promptconfigs_test.go b/services/dashboard-backend/internal/api/promptconfigs_test.go
index 64d50223..c7edd8ca 100644
--- a/services/dashboard-backend/internal/api/promptconfigs_test.go
+++ b/services/dashboard-backend/internal/api/promptconfigs_test.go
@@ -39,7 +39,7 @@ func TestPromptConfigAPI(t *testing.T) { //nolint: revive
 		&templateVariables,
 	)
 
-	modelParameters := factories.CreateModelParameters()
+	modelParameters := factories.CreateOpenAIModelParameters()
 
 	fmtListEndpoint := func(projectID string, applicationID string) string {
 		return fmt.Sprintf(
diff --git a/shared/go/datatypes/datatypes.go b/shared/go/datatypes/datatypes.go
index 06c5af58..36850edb 100644
--- a/shared/go/datatypes/datatypes.go
+++ b/shared/go/datatypes/datatypes.go
@@ -33,16 +33,14 @@ type CoherePromptMessageDTO struct { // skipcq: TCV-001
 	TemplateVariables *[]string `json:"templateVariables,omitempty"`
 }
 
-// CohereConnectorDTO - DTO for a Cohere RAG connector.
-type CohereConnectorDTO struct { // skipcq: TCV-001
-	ID      string         `json:"id"      validate:"required"`
-	Options map[string]any `json:"options" validate:"required"`
-}
-
 // CohereModelParametersDTO - DTO for serializing and storing Cohere model parameters.
 type CohereModelParametersDTO struct { // skipcq: TCV-001
-	Temperature *float32              `json:"temperature,omitempty"`
-	Connectors  *[]CohereConnectorDTO `json:"connectors,omitempty"`
+	Temperature      *float32 `json:"temperature,omitempty"`
+	K                *uint32  `json:"k,omitempty"`
+	P                *float32 `json:"p,omitempty"`
+	FrequencyPenalty *float32 `json:"frequencyPenalty,omitempty"`
+	PresencePenalty  *float32 `json:"presencePenalty,omitempty"`
+	MaxTokens        *int32   `json:"maxTokens,omitempty"`
 }
 
 // PromptConfigDTO - DTO for serializing a prompt config.

From d004d49dc10a857b8e0bab84ccd3e142a12ed11e Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Wed, 27 Dec 2023 08:11:41 +0100
Subject: [PATCH 04/15] feat: frontend

---
 ..._dashboard_backend_internal_middleware.xml |   1 -
 docker-compose.yaml                           |   1 +
 e2e/factories/factories.go                    |   2 +-
 frontend/package.json                         |   2 +-
 frontend/public/messages/en.json              |  13 +
 .../config-create-wizard/base-form.tsx        |  33 +-
 .../cohere-model-parameters-form.tsx          | 348 ++++++------------
 .../openai-model-parameters-form.tsx          |   8 +-
 .../parameters-and-prompt-form.tsx            |  25 +-
 .../parameter-slider.tsx                      |   0
 frontend/src/types/models.ts                  |   7 +-
 frontend/vitest.config.ts                     |   1 +
 package.json                                  |   2 +-
 pnpm-lock.yaml                                | 304 ++-------------
 .../internal/connectors/cohere/utils.go       |   2 +-
 .../internal/connectors/cohere/utils_test.go  |   2 +-
 .../api-gateway/internal/services/utils.go    |   4 +
 services/cohere-connector/package.json        |   2 +-
 .../dashboard-backend/internal/dto/dto.go     |   6 +-
 .../internal/repositories/utils.go            |  47 +++
 services/openai-connector/package.json        |   2 +-
 shared/go/datatypes/datatypes.go              |   4 +-
 sql/seed/provider-model-pricing.sql           |  90 ++++-
 23 files changed, 348 insertions(+), 558 deletions(-)
 rename frontend/src/components/prompt-display-components/{config-create-wizard => }/parameter-slider.tsx (100%)

diff --git a/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_dashboard_backend_internal_middleware.xml b/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_dashboard_backend_internal_middleware.xml
index 11c2e8ac..f84a185a 100644
--- a/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_dashboard_backend_internal_middleware.xml
+++ b/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_dashboard_backend_internal_middleware.xml
@@ -5,7 +5,6 @@
 		type="GoTestRunConfiguration"
 		factoryName="Go Test"
 	>
-    <module name="BaseMind.AI" />
     <working_directory value="$PROJECT_DIR$" />
     <kind value="PACKAGE" />
     <package
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c2a5f38e..e9498ae6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -45,6 +45,7 @@ services:
             GOOGLE_APPLICATION_CREDENTIALS: ./.secrets/serviceAccountKey.json
             JWT_SECRET: jeronimo
             OPENAI_CONNECTOR_ADDRESS: openai-connector:8000
+            COHERE_CONNECTOR_ADDRESS: cohere-connector:9000
             REDIS_CONNECTION_STRING: redis://redis:6379
             SERVER_HOST: localhost
             SERVER_PORT: 4000
diff --git a/e2e/factories/factories.go b/e2e/factories/factories.go
index b78a8507..dede66a9 100644
--- a/e2e/factories/factories.go
+++ b/e2e/factories/factories.go
@@ -162,7 +162,7 @@ func CreateCoherePromptConfig(
 
 	promptMessages := ptr.To(
 		json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
-			Content:           userMessage,
+			Message:           userMessage,
 			TemplateVariables: &templateVariables,
 		})),
 	)
diff --git a/frontend/package.json b/frontend/package.json
index 8d4b8d68..a7a032cc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -52,6 +52,6 @@
 		"postcss": "8.4.32",
 		"sass": "^1.69.5",
 		"tailwindcss": "3.4.0",
-		"vite-plugin-magical-svg": "^1.1.0"
+		"vite-plugin-magical-svg": "^1.1.1"
 	}
 }
diff --git a/frontend/public/messages/en.json b/frontend/public/messages/en.json
index 3ba3d317..ab78ed6a 100644
--- a/frontend/public/messages/en.json
+++ b/frontend/public/messages/en.json
@@ -85,6 +85,19 @@
 		"backButtonText": "Back",
 		"cancelButtonText": "Cancel",
 		"cohere": "Cohere",
+		"cohereParametersFrequencyPenaltyLabel": "Frequency Penalty",
+		"cohereParametersFrequencyPenaltyTooltip": "Used to reduce repetitiveness of generated tokens. The higher the value, the stronger a penalty is applied to previously present tokens, proportional to how many times they have already appeared in the prompt or prior generation.",
+		"cohereParametersKLabel": "K",
+		"cohereParametersKTooltip": "Ensures only the top k most likely tokens are considered for generation at each step.",
+		"cohereParametersMaxTokensLabel": "Max Tokens",
+		"cohereParametersMaxTokensTooltip": "The maximum number of tokens the model will generate as part of the response. Note: Setting a low value may result in incomplete generations.",
+		"cohereParametersPLabel": "P",
+		"cohereParametersPTooltip": "Ensures that only the most likely tokens, with total probability mass of p, are considered for generation at each step. If both k and p are enabled, p acts after k.",
+		"cohereParametersPresencePenaltyLabel": "Presence Penalty",
+		"cohereParametersPresencePenaltyTooltip": "Can be used to reduce repetitiveness of generated tokens. Similar to frequency_penalty, except that this penalty is applied equally to all tokens that have already appeared, regardless of their exact frequencies.",
+
+		"cohereParametersTemperatureLabel": "Temperature",
+		"cohereParametersTemperatureTooltip": "A non-negative float that tunes the degree of randomness in generation. Lower temperatures mean less random generations.",
 		"configName": "Config Name",
 		"continueButtonText": "Continue",
 		"createConfig": "Create Configuration",
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
index 01de8931..b06698e5 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
@@ -33,10 +33,6 @@ export function PromptConfigBaseForm({
 }) {
 	const t = useTranslations('createConfigWizard');
 
-	const modelChoices = useMemo(() => {
-		return Object.values(modelVendorTypeMap[modelVendor]) as string[];
-	}, [modelVendor]);
-
 	const activeModelVendor = useMemo(
 		() =>
 			Object.entries(ModelVendor)
@@ -63,18 +59,6 @@ export function PromptConfigBaseForm({
 		[],
 	);
 
-	const choices = useMemo(
-		() =>
-			modelChoices.map((modelChoice) => {
-				return (
-					<option key={modelChoice} value={modelChoice}>
-						{modelTypeToLocaleMap[modelChoice as ModelType<any>]}
-					</option>
-				);
-			}),
-		[modelChoices],
-	);
-
 	return (
 		<div data-testid="base-form-container">
 			{showConfigNameInput && (
@@ -129,7 +113,22 @@ export function PromptConfigBaseForm({
 							onChange={handleChange(setModelType)}
 							data-testid="create-prompt-base-form-model-select"
 						>
-							{choices}
+							{Object.values(modelVendorTypeMap[modelVendor]).map(
+								(modelChoice: string) => {
+									return (
+										<option
+											key={modelChoice}
+											value={modelChoice}
+										>
+											{
+												modelTypeToLocaleMap[
+													modelChoice as ModelType<any>
+												]
+											}
+										</option>
+									);
+								},
+							)}
 						</select>
 					</div>
 				</div>
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
index fa949e78..5fcdab16 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
@@ -1,33 +1,43 @@
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 
-import { ParameterSlider } from '@/components/prompt-display-components/config-create-wizard/parameter-slider';
-import { openAIRoleColorMap } from '@/constants/models';
+import { ParameterSlider } from '@/components/prompt-display-components/parameter-slider';
+import { DEFAULT_MAX_TOKENS } from '@/constants/models';
 import {
+	CohereModelType,
+	CoherePromptMessage,
 	ModelParameters,
 	ModelVendor,
-	OpenAIContentMessage,
-	OpenAIMessageRole,
-	OpenAIModelType,
-	OpenAIPromptMessageRole,
+	ProviderMessageType,
 } from '@/types';
 import { handleChange } from '@/utils/events';
-import { extractTemplateVariables } from '@/utils/models';
 
-export function CohereParametersForm({
-	modelType,
+const COHERE_MAX_TOKENS = 4096;
+
+export function CohereModelParametersForm({
 	setParameters,
 	existingParameters,
 }: {
-	existingParameters?: ModelParameters<ModelVendor.OpenAI>;
-	modelType: OpenAIModelType;
-	setParameters: (parameters: ModelParameters<any>) => void;
+	existingParameters?: ModelParameters<ModelVendor.Cohere>;
+	modelType: CohereModelType;
+	setParameters: (parameters: ModelParameters<ModelVendor.Cohere>) => void;
 }) {
 	const t = useTranslations('createConfigWizard');
 
+	const [maxTokens, setMaxTokens] = useState(
+		existingParameters?.maxTokens ?? DEFAULT_MAX_TOKENS,
+	);
+	const [frequencyPenalty, setFrequencyPenalty] = useState(
+		existingParameters?.frequencyPenalty ?? 0,
+	);
+	const [presencePenalty, setPresencePenalty] = useState(
+		existingParameters?.presencePenalty ?? 0,
+	);
 	const [temperature, setTemperature] = useState(
-		existingParameters?.temperature ?? 1,
+		existingParameters?.temperature ?? 0,
 	);
+	const [p, setP] = useState(existingParameters?.p ?? 0);
+	const [k, setK] = useState(existingParameters?.k ?? 0);
 
 	const inputs: {
 		key: string;
@@ -39,257 +49,127 @@ export function CohereParametersForm({
 		toolTipText: string;
 		value: number;
 	}[] = [
+		{
+			key: 'maxTokens',
+			labelText: t('cohereParametersMaxTokensLabel'),
+			max: COHERE_MAX_TOKENS, // cohere has a static max value for now
+			min: 1,
+			setter: setMaxTokens,
+			step: 1,
+			toolTipText: t('cohereParametersMaxTokensTooltip'),
+			value: maxTokens,
+		},
 		{
 			key: 'temperature',
-			labelText: t('openaiParametersTemperatureLabel'),
-			max: 2,
+			labelText: t('cohereParametersTemperatureLabel'),
+			max: 5,
 			min: 0,
 			setter: setTemperature,
 			step: 0.1,
-			toolTipText: t('openaiParametersTemperatureTooltip'),
+			toolTipText: t('cohereParametersTemperatureTooltip'),
 			value: temperature,
 		},
+		{
+			key: 'p',
+			labelText: t('cohereParametersPLabel'),
+			max: 0.99,
+			min: 0,
+			setter: setP,
+			step: 0.01,
+			toolTipText: t('cohereParametersPTooltip'),
+			value: p,
+		},
+		{
+			key: 'k',
+			labelText: t('cohereParametersKLabel'),
+			max: 500,
+			min: 0,
+			setter: setK,
+			step: 1,
+			toolTipText: t('cohereParametersKTooltip'),
+			value: k,
+		},
+		{
+			key: 'frequencyPenalty',
+			labelText: t('cohereParametersFrequencyPenaltyLabel'),
+			max: 9999,
+			min: 0,
+			setter: setFrequencyPenalty,
+			step: 1,
+			toolTipText: t('cohereParametersFrequencyPenaltyTooltip'),
+			value: frequencyPenalty,
+		},
+		{
+			key: 'presencePenalty',
+			labelText: t('cohereParametersPresencePenaltyLabel'),
+			max: 1,
+			min: 0,
+			setter: setPresencePenalty,
+			step: 0.1,
+			toolTipText: t('cohereParametersPresencePenaltyTooltip'),
+			value: presencePenalty,
+		},
 	];
 
 	useEffect(() => {
 		setParameters({
+			frequencyPenalty,
+			k,
+			maxTokens,
+			p,
+			presencePenalty,
 			temperature,
 		});
-	}, [temperature]);
+	}, [maxTokens, frequencyPenalty, presencePenalty, temperature, p, k]);
 
 	return (
-		<div data-testid="openai-model-parameters-form">
+		<div data-testid="cohere-model-parameters-form">
 			<h2 className="card-header">{t('modelParameters')}</h2>
-			<div className="rounded-dark-card  columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
+			<div className="rounded-dark-card columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
 				{inputs.map(ParameterSlider)}
 			</div>
 		</div>
 	);
 }
 
-export const OPEN_AI_DRAFT_MESSAGE = {
-	content: '',
-	name: '',
-	role: OpenAIPromptMessageRole.System,
-} satisfies OpenAIContentMessage;
-
-export function OpenAIMessageItem({
-	name,
-	role,
-	dataTestId,
-	className,
-	handleClick,
-}: {
-	className: string;
-	dataTestId: string;
-	handleClick: () => void;
-	name?: string;
-	role?: OpenAIMessageRole;
-}) {
-	const t = useTranslations('createConfigWizard');
-
-	return (
-		<button
-			className={`btn btn-sm border-neutral rounded-full ${className}`}
-			data-testid={dataTestId}
-			onClick={() => {
-				handleClick();
-			}}
-		>
-			<span className="capitalize">
-				{name || `${role} ${t('message')}`}
-			</span>
-		</button>
-	);
-}
-
-export function OpenAIPromptTemplate({
+export function CoherePromptTemplate({
 	messages,
 	setMessages,
 }: {
-	messages: OpenAIContentMessage[];
-	setMessages: (messages: OpenAIContentMessage[]) => void;
+	messages: ProviderMessageType<ModelVendor.Cohere>[];
+	setMessages: (messages: ProviderMessageType<ModelVendor.Cohere>[]) => void;
 }) {
 	const t = useTranslations('createConfigWizard');
 
-	const [activeMessageIndex, setActiveMessageIndex] = useState(
-		messages.length,
-	);
-	const [draftMessage, setDraftMessage] = useState<OpenAIContentMessage>(
-		structuredClone(OPEN_AI_DRAFT_MESSAGE),
-	);
-
-	const handleRoleChange = (role: OpenAIPromptMessageRole) => {
-		setDraftMessage({ ...draftMessage, role });
-	};
-
-	const handleNameChange = (value: string) => {
-		setDraftMessage({ ...draftMessage, name: value });
-	};
-
-	const handleMessageChange = (value: string) => {
-		setDraftMessage({ ...draftMessage, content: value });
-	};
-
-	const handleDeleteMessage = () => {
-		const copiedMessages = [...messages];
-
-		copiedMessages.splice(activeMessageIndex, 1);
-
-		setMessages(copiedMessages);
-		setActiveMessageIndex(
-			activeMessageIndex - 1 >= 0 ? activeMessageIndex - 1 : 0,
-		);
-	};
-
-	const handleSaveMessage = () => {
-		const copiedMessages = [...messages];
-		draftMessage.templateVariables = extractTemplateVariables(
-			draftMessage.content,
-		);
-		copiedMessages[activeMessageIndex] = draftMessage;
-
-		setMessages(copiedMessages);
-		setDraftMessage(structuredClone(OPEN_AI_DRAFT_MESSAGE));
-		setActiveMessageIndex(copiedMessages.length);
-	};
-
 	return (
-		<div data-testid="openai-prompt-template-form">
-			<h2 className="card-header">{t('promptMessages')}</h2>
-			<div className="rounded-dark-card flex flex-col gap-4">
-				<div className=" p-4 flex items-start content-start gap-4 self-stretch flex-wrap pt-4 pb-4">
-					{messages.map((message, index) => (
-						<OpenAIMessageItem
-							key={message.name || `${message.role}${index}`}
-							role={message.role}
-							name={message.name}
-							className={
-								activeMessageIndex === index
-									? 'btn-secondary'
-									: `btn-secondary btn-outline ${
-											openAIRoleColorMap[message.role]
-										} hover:text-secondary-content`
-							}
-							dataTestId={`parameters-and-prompt-form-message-${index}`}
-							handleClick={() => {
-								setActiveMessageIndex(index);
-								setDraftMessage(message);
-							}}
-						/>
-					))}
-					<OpenAIMessageItem
-						name={t('newMessage')}
-						dataTestId="parameters-and-prompt-form-new-message"
-						handleClick={() => {
-							setActiveMessageIndex(messages.length);
-							setDraftMessage({
-								content: '',
-								name: '',
-								role: OpenAIPromptMessageRole.System,
-							});
-						}}
-						className={
-							activeMessageIndex === messages.length
-								? 'btn-secondary'
-								: 'btn-secondary text-neutral-content btn-outline hover:text-secondary-content'
-						}
-					/>
-				</div>
-				<div className="flex justify-between items-center">
-					<div className="w-full flex justify-start gap-10">
-						<div className="form-control">
-							<label
-								className="label"
-								data-testid="parameters-and-prompt-form-new-message-role-label"
-							>
-								<span className="label-text">
-									{t('messageRole')}
-								</span>
-							</label>
-							<select
-								className="card-select"
-								value={draftMessage.role}
-								onChange={handleChange(handleRoleChange)}
-								data-testid="parameters-and-prompt-form-message-role-select"
-							>
-								{Object.entries(OpenAIPromptMessageRole).map(
-									([key, value]) => (
-										<option
-											key={value}
-											id={value}
-											value={value}
-										>
-											{key.toUpperCase()}
-										</option>
-									),
-								)}
-							</select>
-						</div>
-						<div className="form-control">
-							<label
-								className="label"
-								data-testid="parameters-and-prompt-form-new-message-name-label"
-							>
-								<span className="label-text">
-									{t('messageName')}
-								</span>
-								<span className="label-text-alt">
-									{t('optional')}
-								</span>
-							</label>
-							<input
-								type="text"
-								placeholder={t('messageNameInputPlaceholder')}
-								className="card-input"
-								data-testid="parameters-and-prompt-form-message-name-input"
-								value={draftMessage.name}
-								onChange={handleChange(handleNameChange)}
-							/>
-						</div>
-					</div>
-				</div>
-				<div className="form-control">
-					<label
-						className="label"
-						data-testid="parameters-and-prompt-form-new-message-content-label"
-					>
-						<span className="label-text">
-							{t('messageContent')}
-						</span>
-						<span
-							className="text-info label-text-alt text-sm"
-							data-testid="parameters-and-prompt-form-wrap-variable-label"
-						>
-							{t('wrapVariable')}
-						</span>
-					</label>
-					<textarea
-						className="card-textarea"
-						placeholder={t('promptMessagePlaceholder')}
-						value={draftMessage.content}
-						onChange={handleChange(handleMessageChange)}
-						data-testid="parameters-and-prompt-form-message-textarea"
-					/>
-				</div>
-				<div className="join justify-end">
-					<button
-						className="btn join-item btn-sm btn-neutral"
-						onClick={handleDeleteMessage}
-						data-testid="parameters-and-prompt-form-delete-message-button"
-						disabled={!messages.length}
-					>
-						{t('deleteMessage')}
-					</button>
-					<button
-						className="btn join-item btn-sm btn-primary"
-						onClick={handleSaveMessage}
-						data-testid="parameters-and-prompt-form-save-message-button"
-						disabled={!draftMessage.content}
+		<div data-testid="cohere-prompt-template-form">
+			<h2 className="card-header">{t('promptTemplate')}</h2>
+			<div className="form-control">
+				<label
+					className="label"
+					data-testid="parameters-and-prompt-form-new-message-content-label"
+				>
+					<span className="label-text">{t('messageContent')}</span>
+					<span
+						className="text-info label-text-alt text-sm"
+						data-testid="parameters-and-prompt-form-wrap-variable-label"
 					>
-						{t('saveMessage')}
-					</button>
-				</div>
+						{t('wrapVariable')}
+					</span>
+				</label>
+				<textarea
+					className="card-textarea"
+					placeholder={t('promptMessagePlaceholder')}
+					value={messages[0]?.message ?? ''}
+					onChange={handleChange((message: string) => {
+						setMessages([
+							{
+								message,
+							} satisfies CoherePromptMessage,
+						]);
+					})}
+					data-testid="parameters-and-prompt-form-message-textarea"
+				/>
 			</div>
 		</div>
 	);
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
index dbd436a3..efd67c1c 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
@@ -1,7 +1,7 @@
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 
-import { ParameterSlider } from '@/components/prompt-display-components/config-create-wizard/parameter-slider';
+import { ParameterSlider } from '@/components/prompt-display-components/parameter-slider';
 import {
 	DEFAULT_MAX_TOKENS,
 	openAIModelsMaxTokensMap,
@@ -25,7 +25,7 @@ export function OpenAIModelParametersForm({
 }: {
 	existingParameters?: ModelParameters<ModelVendor.OpenAI>;
 	modelType: OpenAIModelType;
-	setParameters: (parameters: ModelParameters<any>) => void;
+	setParameters: (parameters: ModelParameters<ModelVendor.OpenAI>) => void;
 }) {
 	const t = useTranslations('createConfigWizard');
 
@@ -39,9 +39,9 @@ export function OpenAIModelParametersForm({
 		existingParameters?.presencePenalty ?? 0,
 	);
 	const [temperature, setTemperature] = useState(
-		existingParameters?.temperature ?? 1,
+		existingParameters?.temperature ?? 0,
 	);
-	const [topP, setTopP] = useState(existingParameters?.topP ?? 1);
+	const [topP, setTopP] = useState(existingParameters?.topP ?? 0);
 
 	const inputs: {
 		key: string;
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
index 1587c2d7..469b103e 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
@@ -1,11 +1,17 @@
 import { useMemo } from 'react';
 
-import { CohereParametersForm } from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form';
+import {
+	CohereModelParametersForm,
+	CoherePromptTemplate,
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form';
 import {
 	OpenAIModelParametersForm,
 	OpenAIPromptTemplate,
 } from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form';
 import {
+	CohereModelParameters,
+	CohereModelType,
+	CoherePromptMessage,
 	ModelParameters,
 	ModelType,
 	ModelVendor,
@@ -33,11 +39,11 @@ export function PromptConfigParametersAndPromptForm<T extends ModelVendor>({
 	const parametersForm = useMemo(() => {
 		if (modelVendor === ModelVendor.Cohere) {
 			return (
-				<CohereParametersForm
-					modelType={modelType as OpenAIModelType}
+				<CohereModelParametersForm
+					modelType={modelType as CohereModelType}
 					setParameters={setParameters}
 					existingParameters={
-						existingParameters as OpenAIModelParameters
+						existingParameters as CohereModelParameters
 					}
 				/>
 			);
@@ -59,7 +65,16 @@ export function PromptConfigParametersAndPromptForm<T extends ModelVendor>({
 			<div>{parametersForm}</div>
 			<div className="card-divider" />
 			<div>
-				{modelVendor === ModelVendor.OpenAI && (
+				{modelVendor === ModelVendor.Cohere ? (
+					<CoherePromptTemplate
+						messages={(messages ?? []) as CoherePromptMessage[]}
+						setMessages={
+							setMessages as (
+								messages: CoherePromptMessage[],
+							) => void
+						}
+					/>
+				) : (
 					<OpenAIPromptTemplate
 						messages={(messages ?? []) as OpenAIContentMessage[]}
 						setMessages={
diff --git a/frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx b/frontend/src/components/prompt-display-components/parameter-slider.tsx
similarity index 100%
rename from frontend/src/components/prompt-display-components/config-create-wizard/parameter-slider.tsx
rename to frontend/src/components/prompt-display-components/parameter-slider.tsx
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index caf89780..6da7434a 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -38,8 +38,11 @@ export interface CohereConnector {
 }
 
 export interface CohereModelParameters {
-	// todo: add support for connectors when we add the backend.
-	// connectors: CohereConnector[];
+	frequencyPenalty?: number;
+	k?: number;
+	maxTokens?: number;
+	p?: number;
+	presencePenalty?: number;
 	temperature?: number;
 }
 
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index 60569992..d0793b0b 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -4,6 +4,7 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
+	// @ts-expect-error plugin has errors
 	plugins: [tsconfigPaths(), react(), magicalSvg({ target: 'react' })],
 	test: {
 		css: true,
diff --git a/package.json b/package.json
index 8fe26e4b..e40a8336 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
 		"grpc-health-check": "^2.0.0",
 		"interface-forge": "^1.6.1",
 		"nodemon-webpack-plugin": "^4.8.2",
-		"pino": "^8.17.1",
+		"pino": "^8.17.2",
 		"pino-pretty": "^10.3.0",
 		"pino-webpack-plugin": "^2.0.0",
 		"prettier": "^3.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 21068e93..86c0f820 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -71,8 +71,8 @@ importers:
                 specifier: ^4.8.2
                 version: 4.8.2(webpack@5.89.0)
             pino:
-                specifier: ^8.17.1
-                version: 8.17.1
+                specifier: ^8.17.2
+                version: 8.17.2
             pino-pretty:
                 specifier: ^10.3.0
                 version: 10.3.0
@@ -240,8 +240,8 @@ importers:
                 specifier: 3.4.0
                 version: 3.4.0(ts-node@10.9.2)
             vite-plugin-magical-svg:
-                specifier: ^1.1.0
-                version: 1.1.0(vite@5.0.10)
+                specifier: ^1.1.1
+                version: 1.1.1(vite@5.0.10)
 
     services/cohere-connector:
         dependencies:
@@ -261,8 +261,8 @@ importers:
                 specifier: ^2.0.0
                 version: 2.0.0
             pino:
-                specifier: ^8.17.1
-                version: 8.17.1
+                specifier: ^8.17.2
+                version: 8.17.2
 
     services/openai-connector:
         dependencies:
@@ -282,8 +282,8 @@ importers:
                 specifier: ^4.24.1
                 version: 4.24.1
             pino:
-                specifier: ^8.17.1
-                version: 8.17.1
+                specifier: ^8.17.2
+                version: 8.17.2
 
 packages:
     /@aashutoshrathi/word-wrap@1.2.6:
@@ -3758,19 +3758,12 @@ packages:
         dev: true
         optional: true
 
-    /@pkgr/utils@2.4.2:
+    /@pkgr/core@0.1.0:
         resolution:
             {
-                integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==,
+                integrity: sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==,
             }
         engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 }
-        dependencies:
-            cross-spawn: 7.0.3
-            fast-glob: 3.3.2
-            is-glob: 4.0.3
-            open: 9.1.0
-            picocolors: 1.0.0
-            tslib: 2.6.2
         dev: true
 
     /@prettier/plugin-xml@3.2.2(prettier@3.1.1):
@@ -7143,14 +7136,6 @@ packages:
                 integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==,
             }
 
-    /big-integer@1.6.52:
-        resolution:
-            {
-                integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==,
-            }
-        engines: { node: '>=0.6' }
-        dev: true
-
     /binary-extensions@2.2.0:
         resolution:
             {
@@ -7165,16 +7150,6 @@ packages:
             }
         dev: true
 
-    /bplist-parser@0.2.0:
-        resolution:
-            {
-                integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==,
-            }
-        engines: { node: '>= 5.10.0' }
-        dependencies:
-            big-integer: 1.6.52
-        dev: true
-
     /brace-expansion@1.1.11:
         resolution:
             {
@@ -7249,16 +7224,6 @@ packages:
             semver: 7.5.4
         dev: true
 
-    /bundle-name@3.0.0:
-        resolution:
-            {
-                integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==,
-            }
-        engines: { node: '>=12' }
-        dependencies:
-            run-applescript: 5.0.0
-        dev: true
-
     /busboy@1.6.0:
         resolution:
             {
@@ -7930,30 +7895,6 @@ packages:
         engines: { node: '>=0.10.0' }
         dev: true
 
-    /default-browser-id@3.0.0:
-        resolution:
-            {
-                integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==,
-            }
-        engines: { node: '>=12' }
-        dependencies:
-            bplist-parser: 0.2.0
-            untildify: 4.0.0
-        dev: true
-
-    /default-browser@4.0.0:
-        resolution:
-            {
-                integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==,
-            }
-        engines: { node: '>=14.16' }
-        dependencies:
-            bundle-name: 3.0.0
-            default-browser-id: 3.0.0
-            execa: 7.2.0
-            titleize: 3.0.0
-        dev: true
-
     /define-data-property@1.1.1:
         resolution:
             {
@@ -7965,14 +7906,6 @@ packages:
             gopd: 1.0.1
             has-property-descriptors: 1.0.1
 
-    /define-lazy-prop@3.0.0:
-        resolution:
-            {
-                integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==,
-            }
-        engines: { node: '>=12' }
-        dev: true
-
     /define-properties@1.2.1:
         resolution:
             {
@@ -8662,7 +8595,7 @@ packages:
             eslint-config-prettier: 9.1.0(eslint@8.56.0)
             prettier: 3.1.1
             prettier-linter-helpers: 1.0.0
-            synckit: 0.8.7
+            synckit: 0.8.8
         dev: true
 
     /eslint-plugin-promise@6.1.1(eslint@8.56.0):
@@ -9041,42 +8974,6 @@ packages:
             }
         engines: { node: '>=0.8.x' }
 
-    /execa@5.1.1:
-        resolution:
-            {
-                integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==,
-            }
-        engines: { node: '>=10' }
-        dependencies:
-            cross-spawn: 7.0.3
-            get-stream: 6.0.1
-            human-signals: 2.1.0
-            is-stream: 2.0.1
-            merge-stream: 2.0.0
-            npm-run-path: 4.0.1
-            onetime: 5.1.2
-            signal-exit: 3.0.7
-            strip-final-newline: 2.0.0
-        dev: true
-
-    /execa@7.2.0:
-        resolution:
-            {
-                integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==,
-            }
-        engines: { node: ^14.18.0 || ^16.14.0 || >=18.0.0 }
-        dependencies:
-            cross-spawn: 7.0.3
-            get-stream: 6.0.1
-            human-signals: 4.3.1
-            is-stream: 3.0.0
-            merge-stream: 2.0.0
-            npm-run-path: 5.2.0
-            onetime: 6.0.0
-            signal-exit: 3.0.7
-            strip-final-newline: 3.0.0
-        dev: true
-
     /execa@8.0.1:
         resolution:
             {
@@ -9501,14 +9398,6 @@ packages:
             has-symbols: 1.0.3
             hasown: 2.0.0
 
-    /get-stream@6.0.1:
-        resolution:
-            {
-                integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==,
-            }
-        engines: { node: '>=10' }
-        dev: true
-
     /get-stream@8.0.1:
         resolution:
             {
@@ -9838,22 +9727,6 @@ packages:
             - supports-color
         dev: true
 
-    /human-signals@2.1.0:
-        resolution:
-            {
-                integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==,
-            }
-        engines: { node: '>=10.17.0' }
-        dev: true
-
-    /human-signals@4.3.1:
-        resolution:
-            {
-                integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==,
-            }
-        engines: { node: '>=14.18.0' }
-        dev: true
-
     /human-signals@5.0.0:
         resolution:
             {
@@ -10158,24 +10031,6 @@ packages:
                 integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==,
             }
 
-    /is-docker@2.2.1:
-        resolution:
-            {
-                integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==,
-            }
-        engines: { node: '>=8' }
-        hasBin: true
-        dev: true
-
-    /is-docker@3.0.0:
-        resolution:
-            {
-                integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==,
-            }
-        engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
-        hasBin: true
-        dev: true
-
     /is-extglob@2.1.1:
         resolution:
             {
@@ -10224,17 +10079,6 @@ packages:
                 integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==,
             }
 
-    /is-inside-container@1.0.0:
-        resolution:
-            {
-                integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==,
-            }
-        engines: { node: '>=14.16' }
-        hasBin: true
-        dependencies:
-            is-docker: 3.0.0
-        dev: true
-
     /is-map@2.0.2:
         resolution:
             {
@@ -10319,14 +10163,6 @@ packages:
             call-bind: 1.0.5
         dev: true
 
-    /is-stream@2.0.1:
-        resolution:
-            {
-                integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==,
-            }
-        engines: { node: '>=8' }
-        dev: true
-
     /is-stream@3.0.0:
         resolution:
             {
@@ -10391,16 +10227,6 @@ packages:
             get-intrinsic: 1.2.2
         dev: true
 
-    /is-wsl@2.2.0:
-        resolution:
-            {
-                integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==,
-            }
-        engines: { node: '>=8' }
-        dependencies:
-            is-docker: 2.2.1
-        dev: true
-
     /isarray@2.0.5:
         resolution:
             {
@@ -10583,7 +10409,7 @@ packages:
             whatwg-encoding: 3.1.1
             whatwg-mimetype: 4.0.0
             whatwg-url: 14.0.0
-            ws: 8.15.1
+            ws: 8.16.0
             xml-name-validator: 5.0.0
         transitivePeerDependencies:
             - bufferutil
@@ -11081,14 +10907,6 @@ packages:
         dependencies:
             mime-db: 1.52.0
 
-    /mimic-fn@2.1.0:
-        resolution:
-            {
-                integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==,
-            }
-        engines: { node: '>=6' }
-        dev: true
-
     /mimic-fn@4.0.0:
         resolution:
             {
@@ -11419,16 +11237,6 @@ packages:
         engines: { node: '>=0.10.0' }
         dev: true
 
-    /npm-run-path@4.0.1:
-        resolution:
-            {
-                integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==,
-            }
-        engines: { node: '>=8' }
-        dependencies:
-            path-key: 3.1.1
-        dev: true
-
     /npm-run-path@5.2.0:
         resolution:
             {
@@ -11589,16 +11397,6 @@ packages:
             wrappy: 1.0.2
         dev: true
 
-    /onetime@5.1.2:
-        resolution:
-            {
-                integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==,
-            }
-        engines: { node: '>=6' }
-        dependencies:
-            mimic-fn: 2.1.0
-        dev: true
-
     /onetime@6.0.0:
         resolution:
             {
@@ -11609,19 +11407,6 @@ packages:
             mimic-fn: 4.0.0
         dev: true
 
-    /open@9.1.0:
-        resolution:
-            {
-                integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==,
-            }
-        engines: { node: '>=14.16' }
-        dependencies:
-            default-browser: 4.0.0
-            define-lazy-prop: 3.0.0
-            is-inside-container: 1.0.0
-            is-wsl: 2.2.0
-        dev: true
-
     /openai@4.24.1:
         resolution:
             {
@@ -11914,10 +11699,10 @@ packages:
             webpack: 5.89.0(webpack-cli@5.1.4)
         dev: true
 
-    /pino@8.17.1:
+    /pino@8.17.2:
         resolution:
             {
-                integrity: sha512-YoN7/NJgnsJ+fkADZqjhRt96iepWBndQHeClmSBH0sQWCb8zGD74t00SK4eOtKFi/f8TUmQnfmgglEhd2kI1RQ==,
+                integrity: sha512-LA6qKgeDMLr2ux2y/YiUt47EfgQ+S9LznBWOJdN3q1dx2sv0ziDLUBeVpyVv17TEcGCBuWf0zNtg3M5m1NhhWQ==,
             }
         hasBin: true
         dependencies:
@@ -11926,7 +11711,7 @@ packages:
             on-exit-leak-free: 2.1.2
             pino-abstract-transport: 1.1.0
             pino-std-serializers: 6.2.2
-            process-warning: 2.3.2
+            process-warning: 3.0.0
             quick-format-unescaped: 4.0.4
             real-require: 0.2.0
             safe-stable-stringify: 2.4.3
@@ -12164,10 +11949,10 @@ packages:
         engines: { node: '>=6' }
         dev: false
 
-    /process-warning@2.3.2:
+    /process-warning@3.0.0:
         resolution:
             {
-                integrity: sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==,
+                integrity: sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==,
             }
 
     /process@0.11.10:
@@ -12709,16 +12494,6 @@ packages:
             }
         dev: true
 
-    /run-applescript@5.0.0:
-        resolution:
-            {
-                integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==,
-            }
-        engines: { node: '>=12' }
-        dependencies:
-            execa: 5.1.1
-        dev: true
-
     /run-parallel@1.2.0:
         resolution:
             {
@@ -12964,13 +12739,6 @@ packages:
             }
         dev: true
 
-    /signal-exit@3.0.7:
-        resolution:
-            {
-                integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==,
-            }
-        dev: true
-
     /signal-exit@4.1.0:
         resolution:
             {
@@ -13253,14 +13021,6 @@ packages:
         engines: { node: '>=4' }
         dev: true
 
-    /strip-final-newline@2.0.0:
-        resolution:
-            {
-                integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==,
-            }
-        engines: { node: '>=6' }
-        dev: true
-
     /strip-final-newline@3.0.0:
         resolution:
             {
@@ -13414,14 +13174,14 @@ packages:
             }
         dev: true
 
-    /synckit@0.8.7:
+    /synckit@0.8.8:
         resolution:
             {
-                integrity: sha512-Ic2DW4WMr0gJ7z9rXYGlWPNBVzmsIZLFfKeVhmuVBUtw6ZOFB1GZnCcWQLc7OuBFLVLHKFAdaIZNc/yyUEvZ1g==,
+                integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==,
             }
         engines: { node: ^14.18.0 || >=16.0.0 }
         dependencies:
-            '@pkgr/utils': 2.4.2
+            '@pkgr/core': 0.1.0
             tslib: 2.6.2
         dev: true
 
@@ -13584,14 +13344,6 @@ packages:
         engines: { node: '>=14.0.0' }
         dev: true
 
-    /titleize@3.0.0:
-        resolution:
-            {
-                integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==,
-            }
-        engines: { node: '>=12' }
-        dev: true
-
     /to-fast-properties@2.0.0:
         resolution:
             {
@@ -14037,14 +13789,6 @@ packages:
         engines: { node: '>= 10.0.0' }
         dev: true
 
-    /untildify@4.0.0:
-        resolution:
-            {
-                integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==,
-            }
-        engines: { node: '>=8' }
-        dev: true
-
     /update-browserslist-db@1.0.13(browserslist@4.22.2):
         resolution:
             {
@@ -14176,10 +13920,10 @@ packages:
             - terser
         dev: true
 
-    /vite-plugin-magical-svg@1.1.0(vite@5.0.10):
+    /vite-plugin-magical-svg@1.1.1(vite@5.0.10):
         resolution:
             {
-                integrity: sha512-MppN0S20mNOmjuoL1NR99awE28EbNzwIrYU3qqaPH5+KOqA1fbSyw0gGjqNqHzHaB89fVbbqz8Y3iG6LnRBSvA==,
+                integrity: sha512-ojJpmiohTfgWE8/fOOFSMWgr0nVbswJeqTmrnKoETvAnTyI92Fvxi64msc4c/boOItVG2/XC00/aep21nBjhVw==,
             }
         peerDependencies:
             vite: '>= 3.0.0'
@@ -14661,10 +14405,10 @@ packages:
             }
         dev: true
 
-    /ws@8.15.1:
+    /ws@8.16.0:
         resolution:
             {
-                integrity: sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==,
+                integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==,
             }
         engines: { node: '>=10.0.0' }
         peerDependencies:
diff --git a/services/api-gateway/internal/connectors/cohere/utils.go b/services/api-gateway/internal/connectors/cohere/utils.go
index 4c136d5a..f18d4c4d 100644
--- a/services/api-gateway/internal/connectors/cohere/utils.go
+++ b/services/api-gateway/internal/connectors/cohere/utils.go
@@ -99,7 +99,7 @@ func CreatePromptRequest(
 	}
 
 	message, parseErr := utils.ParseTemplateVariables(
-		cohereMessageDTO.Content,
+		cohereMessageDTO.Message,
 		*cohereMessageDTO.TemplateVariables,
 		templateVariables,
 	)
diff --git a/services/api-gateway/internal/connectors/cohere/utils_test.go b/services/api-gateway/internal/connectors/cohere/utils_test.go
index 36f786b0..dbbad54b 100644
--- a/services/api-gateway/internal/connectors/cohere/utils_test.go
+++ b/services/api-gateway/internal/connectors/cohere/utils_test.go
@@ -72,7 +72,7 @@ func TestUtils(t *testing.T) {
 				ModelParameters: factories.CreateCohereModelParameters(),
 				ProviderPromptMessages: ptr.To(
 					json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
-						Content:           promptMessage,
+						Message:           promptMessage,
 						TemplateVariables: &expectedTemplateVariables,
 					})),
 				),
diff --git a/services/api-gateway/internal/services/utils.go b/services/api-gateway/internal/services/utils.go
index 971e49ea..4f1b7735 100644
--- a/services/api-gateway/internal/services/utils.go
+++ b/services/api-gateway/internal/services/utils.go
@@ -88,6 +88,10 @@ func RetrieveProviderModelPricing(
 	modelType models.ModelType,
 	modelVendor models.ModelVendor,
 ) datatypes.ProviderModelPricingDTO {
+	log.Debug().
+		Str("modelType", string(modelType)).
+		Str("modelVendor", string(modelVendor)).
+		Msg("retrieving provider model pricing")
 	providerModelPricing := exc.MustResult(db.GetQueries().
 		RetrieveActiveProviderModelPricing(ctx, models.RetrieveActiveProviderModelPricingParams{
 			ModelType:   modelType,
diff --git a/services/cohere-connector/package.json b/services/cohere-connector/package.json
index d6a48ce2..085d8c2e 100644
--- a/services/cohere-connector/package.json
+++ b/services/cohere-connector/package.json
@@ -15,6 +15,6 @@
 		"@protobuf-ts/runtime-rpc": "^2.9.3",
 		"cohere-ai": "^7.6.2",
 		"grpc-health-check": "^2.0.0",
-		"pino": "^8.17.1"
+		"pino": "^8.17.2"
 	}
 }
diff --git a/services/dashboard-backend/internal/dto/dto.go b/services/dashboard-backend/internal/dto/dto.go
index 4a7cb5b3..a94d3d3b 100644
--- a/services/dashboard-backend/internal/dto/dto.go
+++ b/services/dashboard-backend/internal/dto/dto.go
@@ -32,7 +32,7 @@ type ProjectDTO struct { // skipcq: TCV-001
 type PromptConfigCreateDTO struct { // skipcq: TCV-001
 	Name                   string             `json:"name"            validate:"required"`
 	ModelParameters        *json.RawMessage   `json:"modelParameters" validate:"required"`
-	ModelType              models.ModelType   `json:"modelType"       validate:"oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k"`
+	ModelType              models.ModelType   `json:"modelType"       validate:"oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
 	ModelVendor            models.ModelVendor `json:"modelVendor"     validate:"oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages *json.RawMessage   `json:"promptMessages"  validate:"required"`
 	IsTest                 bool               `json:"isTest"`
@@ -42,7 +42,7 @@ type PromptConfigCreateDTO struct { // skipcq: TCV-001
 type PromptConfigUpdateDTO struct { // skipcq: TCV-001
 	Name                   *string             `json:"name,omitempty"            validate:"omitempty,required"`
 	ModelParameters        *json.RawMessage    `json:"modelParameters,omitempty" validate:"omitempty,required"`
-	ModelType              *models.ModelType   `json:"modelType,omitempty"       validate:"omitempty,oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k"`
+	ModelType              *models.ModelType   `json:"modelType,omitempty"       validate:"omitempty,oneof=oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
 	ModelVendor            *models.ModelVendor `json:"modelVendor,omitempty"     validate:"omitempty,oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages *json.RawMessage    `json:"promptMessages,omitempty"  validate:"omitempty,required"`
 }
@@ -88,7 +88,7 @@ type AnalyticsDTO struct { // skipcq: TCV-001
 // PromptConfigTestDTO - DTO for requesting a prompt config test.
 type PromptConfigTestDTO struct { // skipcq: TCV-001
 	ModelParameters        *json.RawMessage   `json:"modelParameters,omitempty"   validate:"omitempty,required"`
-	ModelType              models.ModelType   `json:"modelType"                   validate:"oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k"`
+	ModelType              models.ModelType   `json:"modelType"                   validate:"oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
 	ModelVendor            models.ModelVendor `json:"modelVendor"                 validate:"oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages *json.RawMessage   `json:"promptMessages,omitempty"    validate:"omitempty,required"`
 	TemplateVariables      map[string]string  `json:"templateVariables,omitempty"`
diff --git a/services/dashboard-backend/internal/repositories/utils.go b/services/dashboard-backend/internal/repositories/utils.go
index 345729a8..cc9dd7b7 100644
--- a/services/dashboard-backend/internal/repositories/utils.go
+++ b/services/dashboard-backend/internal/repositories/utils.go
@@ -15,6 +15,7 @@ var (
 	curlyBracesRegex = regexp.MustCompile(`\{([^}]+)\}`)
 	vendorParsers    = map[models.ModelVendor]func(message *json.RawMessage) ([]string, *json.RawMessage, error){
 		models.ModelVendorOPENAI: parseOpenAIMessages,
+		models.ModelVendorCOHERE: parseCohereMessage,
 	}
 	validate = validator.New(validator.WithRequiredStructEnabled())
 )
@@ -32,6 +33,10 @@ func parseOpenAIMessages( //nolint: revive
 		return nil, nil, fmt.Errorf("failed to unmarshal prompt messages - %w", jsonErr)
 	}
 
+	if len(openAIPromptMessages) == 0 {
+		return nil, nil, fmt.Errorf("prompt messages are empty")
+	}
+
 	expectedVariables := make([]string, 0)
 	expectedVariablesMap := make(map[string]struct{})
 
@@ -60,6 +65,48 @@ func parseOpenAIMessages( //nolint: revive
 	return expectedVariables, marshalledMessages, nil
 }
 
+func parseCohereMessage(
+	promptMessages *json.RawMessage,
+) ([]string, *json.RawMessage, error) {
+	var coherePromptMessages []*datatypes.CoherePromptMessageDTO
+
+	if promptMessages == nil {
+		return nil, nil, fmt.Errorf("prompt messages are nil")
+	}
+
+	if jsonErr := json.Unmarshal(*promptMessages, &coherePromptMessages); jsonErr != nil {
+		return nil, nil, fmt.Errorf("failed to unmarshal prompt messages - %w", jsonErr)
+	}
+
+	if len(coherePromptMessages) == 0 {
+		return nil, nil, fmt.Errorf("prompt messages are empty")
+	}
+
+	expectedVariables := make([]string, 0)
+	expectedVariablesMap := make(map[string]struct{})
+
+	promptMessage := coherePromptMessages[0]
+	if validationErr := validate.Struct(promptMessage); validationErr != nil {
+		return nil, nil, fmt.Errorf("prompt meesage failed validation - %w", validationErr)
+	}
+
+	templateVariables := make([]string, 0)
+	for _, match := range curlyBracesRegex.FindAllStringSubmatch(promptMessage.Message, -1) {
+		if _, exists := expectedVariablesMap[match[1]]; !exists {
+			expectedVariablesMap[match[1]] = struct{}{}
+			expectedVariables = append(expectedVariables, match[1])
+		}
+		templateVariables = append(templateVariables, match[1])
+	}
+	if len(templateVariables) > 0 {
+		promptMessage.TemplateVariables = &templateVariables
+	}
+
+	marshalledMessage := ptr.To(json.RawMessage(serialization.SerializeJSON(promptMessage)))
+
+	return expectedVariables, marshalledMessage, nil
+}
+
 func ParsePromptMessages( //nolint: revive
 	promptMessages *json.RawMessage,
 	vendor models.ModelVendor,
diff --git a/services/openai-connector/package.json b/services/openai-connector/package.json
index 1d0157cb..2b78e2c8 100644
--- a/services/openai-connector/package.json
+++ b/services/openai-connector/package.json
@@ -15,6 +15,6 @@
 		"@protobuf-ts/runtime-rpc": "^2.9.3",
 		"grpc-health-check": "^2.0.0",
 		"openai": "^4.24.1",
-		"pino": "^8.17.1"
+		"pino": "^8.17.2"
 	}
 }
diff --git a/shared/go/datatypes/datatypes.go b/shared/go/datatypes/datatypes.go
index 36850edb..93636f7d 100644
--- a/shared/go/datatypes/datatypes.go
+++ b/shared/go/datatypes/datatypes.go
@@ -29,7 +29,7 @@ type OpenAIModelParametersDTO struct { // skipcq: TCV-001
 
 // CoherePromptMessageDTO - DTO for serializing and storing a Cohere prompt message.
 type CoherePromptMessageDTO struct { // skipcq: TCV-001
-	Content           string    `json:"content"                     validate:"required"`
+	Message           string    `json:"message"                     validate:"required"`
 	TemplateVariables *[]string `json:"templateVariables,omitempty"`
 }
 
@@ -48,7 +48,7 @@ type PromptConfigDTO struct { // skipcq: TCV-001
 	ID                        string             `json:"id"`
 	Name                      string             `json:"name"                      validate:"required"`
 	ModelParameters           *json.RawMessage   `json:"modelParameters"           validate:"required"`
-	ModelType                 models.ModelType   `json:"modelType"                 validate:"oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k"`
+	ModelType                 models.ModelType   `json:"modelType"                 validate:"oneof=oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
 	ModelVendor               models.ModelVendor `json:"modelVendor"               validate:"oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages    *json.RawMessage   `json:"providerPromptMessages"    validate:"required"`
 	ExpectedTemplateVariables []string           `json:"expectedTemplateVariables"`
diff --git a/sql/seed/provider-model-pricing.sql b/sql/seed/provider-model-pricing.sql
index 39b54268..1bcb9cee 100644
--- a/sql/seed/provider-model-pricing.sql
+++ b/sql/seed/provider-model-pricing.sql
@@ -13,7 +13,7 @@ INSERT INTO public.provider_model_pricing (
     'gpt-3.5-turbo',
     'OPEN_AI',
     0.0015,
-    0.0020,
+    0.002,
     1000,
     '2023-10-28 03:15:50.335040 +00:00',
     '2023-10-28',
@@ -33,8 +33,8 @@ INSERT INTO public.provider_model_pricing (
     '18dd1f80-31ba-464f-8d6e-89160117d055',
     'gpt-3.5-turbo-16k',
     'OPEN_AI',
-    0.0010,
-    0.0020,
+    0.001,
+    0.002,
     1000,
     '2023-10-28 03:15:50.335040 +00:00',
     '2023-10-28',
@@ -82,3 +82,87 @@ INSERT INTO public.provider_model_pricing (
     '2023-10-28',
     null
 );
+INSERT INTO public.provider_model_pricing (
+    id,
+    model_type,
+    model_vendor,
+    input_token_price,
+    output_token_price,
+    token_unit_size,
+    created_at,
+    active_from_date,
+    active_to_date
+) VALUES (
+    '67e34eef-7f3e-4b27-80e8-dba692c764a9',
+    'command',
+    'COHERE',
+    1,
+    2,
+    1000000,
+    '2023-12-26 17:41:22.855484 +00:00',
+    '2023-12-26',
+    null
+);
+INSERT INTO public.provider_model_pricing (
+    id,
+    model_type,
+    model_vendor,
+    input_token_price,
+    output_token_price,
+    token_unit_size,
+    created_at,
+    active_from_date,
+    active_to_date
+) VALUES (
+    '17990bf9-8324-42cc-8686-55bff7f3dc91',
+    'command-nightly',
+    'COHERE',
+    1,
+    2,
+    1000000,
+    '2023-12-26 17:41:22.855484 +00:00',
+    '2023-12-26',
+    null
+);
+INSERT INTO public.provider_model_pricing (
+    id,
+    model_type,
+    model_vendor,
+    input_token_price,
+    output_token_price,
+    token_unit_size,
+    created_at,
+    active_from_date,
+    active_to_date
+) VALUES (
+    'fdcdacea-bb74-4b67-b120-ec2a7edc083a',
+    'command-light',
+    'COHERE',
+    0.3,
+    0.6,
+    1000000,
+    '2023-12-26 17:41:22.855484 +00:00',
+    '2023-12-26',
+    null
+);
+INSERT INTO public.provider_model_pricing (
+    id,
+    model_type,
+    model_vendor,
+    input_token_price,
+    output_token_price,
+    token_unit_size,
+    created_at,
+    active_from_date,
+    active_to_date
+) VALUES (
+    '9883d9ef-3df8-44f9-a5e0-45d3348859e4',
+    'command-light-nightly',
+    'COHERE',
+    0.3,
+    0.6,
+    1000000,
+    '2023-12-26 17:41:22.855484 +00:00',
+    '2023-12-26',
+    null
+);

From c0704a3654178a389942cb0ea3dedd17826ae23b Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Wed, 27 Dec 2023 17:51:32 +0100
Subject: [PATCH 05/15] chore: fixed cohere communication

---
 .../config-create-wizard/base-form.tsx        | 28 ++++++++-
 .../cohere-model-parameters-form.tsx          | 18 +++---
 go.sum                                        |  2 -
 .../internal/connectors/cohere/utils.go       | 12 +++-
 services/cohere-connector/src/client.ts       | 20 +++----
 services/cohere-connector/src/handlers.ts     | 57 +++++++++++++------
 services/cohere-connector/src/utils.ts        | 22 -------
 7 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
index b06698e5..6c2150d8 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.tsx
@@ -1,5 +1,5 @@
 import { useTranslations } from 'next-intl';
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { EntityNameInput } from '@/components/entity-name-input';
 import {
@@ -7,7 +7,12 @@ import {
 	modelVendorTypeMap,
 	UnavailableModelVendor,
 } from '@/constants/models';
-import { ModelType, ModelVendor } from '@/types';
+import {
+	CohereModelType,
+	ModelType,
+	ModelVendor,
+	OpenAIModelType,
+} from '@/types';
 import { handleChange } from '@/utils/events';
 
 export function PromptConfigBaseForm({
@@ -59,6 +64,25 @@ export function PromptConfigBaseForm({
 		[],
 	);
 
+	useEffect(() => {
+		if (
+			modelVendor === ModelVendor.Cohere &&
+			!Object.values(CohereModelType).includes(
+				modelType as CohereModelType,
+			)
+		) {
+			setModelType(CohereModelType.Command);
+		}
+		if (
+			modelVendor === ModelVendor.OpenAI &&
+			!Object.values(OpenAIModelType).includes(
+				modelType as OpenAIModelType,
+			)
+		) {
+			setModelType(OpenAIModelType.Gpt35Turbo);
+		}
+	}, [modelVendor]);
+
 	return (
 		<div data-testid="base-form-container">
 			{showConfigNameInput && (
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
index 5fcdab16..e747036c 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
@@ -11,6 +11,7 @@ import {
 	ProviderMessageType,
 } from '@/types';
 import { handleChange } from '@/utils/events';
+import { extractTemplateVariables } from '@/utils/models';
 
 const COHERE_MAX_TOKENS = 4096;
 
@@ -141,6 +142,15 @@ export function CoherePromptTemplate({
 }) {
 	const t = useTranslations('createConfigWizard');
 
+	const handleSetMessages = (message: string) => {
+		setMessages([
+			{
+				message,
+				templateVariables: extractTemplateVariables(message),
+			} satisfies CoherePromptMessage,
+		]);
+	};
+
 	return (
 		<div data-testid="cohere-prompt-template-form">
 			<h2 className="card-header">{t('promptTemplate')}</h2>
@@ -161,13 +171,7 @@ export function CoherePromptTemplate({
 					className="card-textarea"
 					placeholder={t('promptMessagePlaceholder')}
 					value={messages[0]?.message ?? ''}
-					onChange={handleChange((message: string) => {
-						setMessages([
-							{
-								message,
-							} satisfies CoherePromptMessage,
-						]);
-					})}
+					onChange={handleChange(handleSetMessages)}
 					data-testid="parameters-and-prompt-form-message-textarea"
 				/>
 			</div>
diff --git a/go.sum b/go.sum
index ef2de8fe..744d0a86 100644
--- a/go.sum
+++ b/go.sum
@@ -1220,8 +1220,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE=
-golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
diff --git a/services/api-gateway/internal/connectors/cohere/utils.go b/services/api-gateway/internal/connectors/cohere/utils.go
index f18d4c4d..902f22d3 100644
--- a/services/api-gateway/internal/connectors/cohere/utils.go
+++ b/services/api-gateway/internal/connectors/cohere/utils.go
@@ -93,14 +93,20 @@ func CreatePromptRequest(
 		return nil, fmt.Errorf("failed to unmarshal model parameters - %w", parametersUnmarshalErr)
 	}
 
-	cohereMessageDTO := datatypes.CoherePromptMessageDTO{}
-	if messageUnmarshalErr := json.Unmarshal(*requestConfiguration.PromptConfigData.ProviderPromptMessages, &cohereMessageDTO); messageUnmarshalErr != nil {
+	var messages []*datatypes.CoherePromptMessageDTO
+	if messageUnmarshalErr := json.Unmarshal(*requestConfiguration.PromptConfigData.ProviderPromptMessages, &messages); messageUnmarshalErr != nil {
 		return nil, fmt.Errorf("failed to unmarshal prompt message - %w", messageUnmarshalErr)
 	}
 
+	if len(messages) == 0 {
+		return nil, fmt.Errorf("no prompt messages provided")
+	}
+
+	cohereMessageDTO := messages[0]
+
 	message, parseErr := utils.ParseTemplateVariables(
 		cohereMessageDTO.Message,
-		*cohereMessageDTO.TemplateVariables,
+		ptr.Deref(cohereMessageDTO.TemplateVariables, []string{}),
 		templateVariables,
 	)
 	if parseErr != nil {
diff --git a/services/cohere-connector/src/client.ts b/services/cohere-connector/src/client.ts
index 186184bf..aee7ffd3 100644
--- a/services/cohere-connector/src/client.ts
+++ b/services/cohere-connector/src/client.ts
@@ -1,9 +1,9 @@
+import { PassThrough } from 'node:stream';
+
 import { CohereClient } from 'cohere-ai';
-import { Generation } from 'cohere-ai/api';
 import { GenerateRequest } from 'cohere-ai/api/client/requests/GenerateRequest';
 import { loadEnv } from 'shared/env';
-
-import { readChunks } from '@/utils';
+import logger from 'shared/logger';
 
 const ref: { instance: BasemindCohereClient | null } = { instance: null };
 
@@ -45,14 +45,14 @@ class BasemindCohereClient {
 		};
 
 		const response = await fetch(url, options);
-		const reader = response.body!.getReader();
 
-		return readChunks<{
-			finish_reason?: 'COMPLETE' | 'MAX_TOKENS' | 'ERROR' | 'ERROR_TOXIC';
-			is_finished: boolean;
-			response?: Generation;
-			text: string;
-		}>(reader);
+		if (!response.ok || response.status !== 200 || !response.body) {
+			const message = await response.text();
+			logger.error(`received non-200 response: ${message}`);
+			throw new Error(`received error response from cohere: ${message}`);
+		}
+
+		return response.body as unknown as PassThrough;
 	}
 }
 
diff --git a/services/cohere-connector/src/handlers.ts b/services/cohere-connector/src/handlers.ts
index 87e95d43..5d63e1ff 100644
--- a/services/cohere-connector/src/handlers.ts
+++ b/services/cohere-connector/src/handlers.ts
@@ -3,6 +3,7 @@ import {
 	ServerUnaryCall,
 	ServerWritableStream,
 } from '@grpc/grpc-js';
+import { Generation } from 'cohere-ai/api';
 import {
 	CoherePromptRequest,
 	CoherePromptResponse,
@@ -18,6 +19,9 @@ import logger from 'shared/logger';
 import { createOrDefaultClient } from '@/client';
 import { createCohereRequest, getFinishReason } from '@/utils';
 
+const COMMUNICATION_ERROR_MESSAGE = 'error communicating with Cohere';
+const DECODER = new TextDecoder();
+
 /**
  * The coherePrompt function is a gRPC handler function.
  *
@@ -53,7 +57,7 @@ export async function coherePrompt(
 			content: generations[0]?.text ?? '',
 		} satisfies CoherePromptResponse);
 	} catch (error: unknown) {
-		logger.error(error as Error, 'error communicating with Cohere');
+		logger.error(error as Error, COMMUNICATION_ERROR_MESSAGE);
 		callback(new GrpcError({ message: (error as Error).message }), null);
 	}
 }
@@ -83,29 +87,46 @@ export async function cohereStream(
 			createCohereRequest(call.request),
 		);
 
-		for await (const {
-			is_finished: isFinished,
-			finish_reason: finishReason,
-			text: content,
-		} of stream) {
+		stream.on('error', (error: Error) => {
+			call.destroy(createInternalGrpcError(error));
+			logger.error(error, COMMUNICATION_ERROR_MESSAGE);
+		});
+
+		stream.on('data', (data: Uint8Array) => {
+			const {
+				is_finished: isFinished,
+				finish_reason: finishReason,
+				text: content,
+			} = JSON.parse(DECODER.decode(data)) as {
+				finish_reason?:
+					| 'COMPLETE'
+					| 'MAX_TOKENS'
+					| 'ERROR'
+					| 'ERROR_TOXIC';
+				is_finished: boolean;
+				response?: Generation;
+				text: string;
+			};
 			if (isFinished) {
+				const finishTime = Date.now();
+				logger.debug(
+					{ finishTime, startTime },
+					'Cohere streaming request completed',
+				);
 				call.write({
 					finishReason: getFinishReason(finishReason!),
 				});
-				continue;
+			} else {
+				logger.debug('writing Cohere stream response', content);
+				call.write({ content });
 			}
-			call.write({ content });
-		}
-
-		const finishTime = Date.now();
-		logger.debug(
-			{ finishTime, startTime },
-			'Cohere streaming request completed',
-		);
+		});
+		stream.on('end', () => {
+			logger.debug('Cohere stream ended, closing');
+			call.end();
+		});
 	} catch (error: unknown) {
+		logger.error(error as Error, COMMUNICATION_ERROR_MESSAGE);
 		call.destroy(createInternalGrpcError(error as Error));
-		logger.error(error as Error, 'error communicating with Cohere');
-		return;
 	}
-	call.end();
 }
diff --git a/services/cohere-connector/src/utils.ts b/services/cohere-connector/src/utils.ts
index 5f6f5fa4..f9058f11 100644
--- a/services/cohere-connector/src/utils.ts
+++ b/services/cohere-connector/src/utils.ts
@@ -26,7 +26,6 @@ export const finishReasonMapping: Record<
  * The createCohereRequest function takes a CoherePromptRequest and returns a Cohere client.CoherePromptRequest
  *
  * @param grpcRequest CoherePromptRequest
- * @param stream boolean
  *
  * @return A CoherePromptRequest
  */
@@ -40,27 +39,6 @@ export function createCohereRequest(
 	} satisfies GenerateRequest;
 }
 
-/*
- * The readChunks function takes a ReadableStreamDefaultReader and returns an AsyncIterableIterator that yields values
- * from the stream.
- * */
-export function readChunks<T extends Record<string, any>>(
-	reader: ReadableStreamDefaultReader<Uint8Array>,
-) {
-	const decoder = new TextDecoder();
-
-	return {
-		async *[Symbol.asyncIterator]() {
-			let readResult = await reader.read();
-
-			while (!readResult.done) {
-				yield JSON.parse(decoder.decode(readResult.value)) as T;
-				readResult = await reader.read();
-			}
-		},
-	};
-}
-
 /**
  *
  * @param finishReason the stream finish reason from Cohere

From 81c2575b08aa713da7f72e1c65d6ade3c920f80d Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sat, 30 Dec 2023 09:40:37 +0100
Subject: [PATCH 06/15] chore: fixed tests

---
 frontend/package.json                         |    8 +-
 .../config-create-wizard/base-form.spec.tsx   |    8 +-
 .../cohere-model-parameters-form.spec.tsx     |    0
 .../openai-model-parameters-form.tsx          |    6 +-
 .../parameters-and-prompt-form.spec.tsx       |    8 +-
 frontend/vitest.config.ts                     |    1 -
 package.json                                  |    6 +-
 pnpm-lock.yaml                                | 1186 ++++++++---------
 8 files changed, 614 insertions(+), 609 deletions(-)
 create mode 100644 frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx

diff --git a/frontend/package.json b/frontend/package.json
index a7a032cc..b7912b0c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,7 +21,7 @@
 		"firebaseui": "^6.1.0",
 		"next": "14.0.4",
 		"next-intl": "^3.4.0",
-		"persist-and-sync": "^1.1.1",
+		"persist-and-sync": "^1.2.0",
 		"react": "18.2.0",
 		"react-bootstrap-icons": "^1.10.3",
 		"react-dom": "18.2.0",
@@ -38,9 +38,9 @@
 		"@tailwindcss/forms": "^0.5.7",
 		"@tailwindcss/typography": "^0.5.10",
 		"@testing-library/dom": "^9.3.3",
-		"@testing-library/jest-dom": "^6.1.5",
+		"@testing-library/jest-dom": "^6.1.6",
 		"@testing-library/react": "^14.1.2",
-		"@types/react": "18.2.45",
+		"@types/react": "18.2.46",
 		"@types/react-dom": "18.2.18",
 		"@types/react-syntax-highlighter": "^15.5.11",
 		"@types/validator": "^13.11.7",
@@ -50,7 +50,7 @@
 		"jsdom": "^23.0.1",
 		"mock-socket": "^9.3.1",
 		"postcss": "8.4.32",
-		"sass": "^1.69.5",
+		"sass": "^1.69.6",
 		"tailwindcss": "3.4.0",
 		"vite-plugin-magical-svg": "^1.1.1"
 	}
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.spec.tsx
index 88106953..ae0bb0de 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.spec.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/base-form.spec.tsx
@@ -175,8 +175,9 @@ describe('PromptConfigBaseForm', () => {
 		expect(setConfigName).toHaveBeenCalledWith('New Config');
 	});
 
-	it('should display the model vendor select field as disabled', () => {
+	it('should display and allow selection of model vendor', () => {
 		const modelVendor = ModelVendor.OpenAI;
+		const setVendor = vi.fn();
 		render(
 			<PromptConfigBaseForm
 				validateConfigName={vi.fn()}
@@ -186,7 +187,7 @@ describe('PromptConfigBaseForm', () => {
 				modelVendor={modelVendor}
 				setConfigName={vi.fn()}
 				setModelType={vi.fn()}
-				setVendor={vi.fn()}
+				setVendor={setVendor}
 			/>,
 		);
 		const select: HTMLInputElement = screen.getByTestId(
@@ -194,7 +195,8 @@ describe('PromptConfigBaseForm', () => {
 		);
 		expect(select).toBeInTheDocument();
 		expect(select.value).toBe(modelVendor);
-		expect(select.disabled).toBe(true);
+		fireEvent.change(select, { target: { value: ModelVendor.Cohere } });
+		expect(setVendor).toHaveBeenCalledWith(ModelVendor.Cohere);
 	});
 
 	it('should display and allow editing of the model type select field based on the selected model vendor', () => {
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
index efd67c1c..bef9e731 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
@@ -155,6 +155,7 @@ export function OpenAIMessageItem({
 			}}
 		>
 			<span className="capitalize">
+				{/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
 				{name || `${role} ${t('message')}`}
 			</span>
 		</button>
@@ -219,7 +220,10 @@ export function OpenAIPromptTemplate({
 				<div className=" p-4 flex items-start content-start gap-4 self-stretch flex-wrap pt-4 pb-4">
 					{messages.map((message, index) => (
 						<OpenAIMessageItem
-							key={message.name || `${message.role}${index}`}
+							key={
+								/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */
+								message.name || `${message.role}${index}`
+							}
 							role={message.role}
 							name={message.name}
 							className={
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
index 6db84465..80576c45 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
@@ -139,8 +139,8 @@ describe('parameters-and-prompt-form components tests', () => {
 			expect(maxTokensInput).toHaveValue(DEFAULT_MAX_TOKENS.toString());
 			expect(frequencyPenaltyInput).toHaveValue('0');
 			expect(presencePenaltyInput).toHaveValue('0');
-			expect(temperatureInput).toHaveValue('1');
-			expect(topPInput).toHaveValue('1');
+			expect(temperatureInput).toHaveValue('0');
+			expect(topPInput).toHaveValue('0');
 		});
 
 		it('should update the parameters state with the correct values when any input field is changed', () => {
@@ -396,8 +396,8 @@ describe('parameters-and-prompt-form components tests', () => {
 			expect(maxTokensInput).toHaveValue(DEFAULT_MAX_TOKENS.toString());
 			expect(frequencyPenaltyInput).toHaveValue('0');
 			expect(presencePenaltyInput).toHaveValue('0');
-			expect(temperatureInput).toHaveValue('1');
-			expect(topPInput).toHaveValue('1');
+			expect(temperatureInput).toHaveValue('0');
+			expect(topPInput).toHaveValue('0');
 		});
 	});
 
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index d0793b0b..60569992 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -4,7 +4,6 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
-	// @ts-expect-error plugin has errors
 	plugins: [tsconfigPaths(), react(), magicalSvg({ target: 'react' })],
 	test: {
 		css: true,
diff --git a/package.json b/package.json
index e40a8336..dbc3ce14 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 		"@protobuf-ts/runtime": "^2.9.3",
 		"@protobuf-ts/runtime-rpc": "^2.9.3",
 		"@tool-belt/eslint-config": "^5.0.4",
-		"@types/node": "20.10.5",
+		"@types/node": "20.10.6",
 		"@types/webpack": "^5.28.5",
 		"@types/webpack-node-externals": "^3.0.4",
 		"@typescript-eslint/eslint-plugin": "^6.16.0",
@@ -31,7 +31,7 @@
 		"interface-forge": "^1.6.1",
 		"nodemon-webpack-plugin": "^4.8.2",
 		"pino": "^8.17.2",
-		"pino-pretty": "^10.3.0",
+		"pino-pretty": "^10.3.1",
 		"pino-webpack-plugin": "^2.0.0",
 		"prettier": "^3.1.1",
 		"prettier-plugin-sort-json": "^3.1.0",
@@ -39,7 +39,7 @@
 		"ts-node": "^10.9.2",
 		"tsconfig-paths-webpack-plugin": "^4.1.0",
 		"typescript": "^5.3.3",
-		"vite-tsconfig-paths": "^4.2.2",
+		"vite-tsconfig-paths": "^4.2.3",
 		"vitest": "^1.1.0",
 		"vitest-mock-extended": "^1.3.1",
 		"webpack": "^5.89.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86c0f820..d501c795 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,8 +32,8 @@ importers:
                 specifier: ^5.0.4
                 version: 5.0.4(@typescript-eslint/eslint-plugin@6.16.0)(@typescript-eslint/parser@6.16.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)(prettier@3.1.1)(typescript@5.3.3)
             '@types/node':
-                specifier: 20.10.5
-                version: 20.10.5
+                specifier: 20.10.6
+                version: 20.10.6
             '@types/webpack':
                 specifier: ^5.28.5
                 version: 5.28.5(webpack-cli@5.1.4)
@@ -74,8 +74,8 @@ importers:
                 specifier: ^8.17.2
                 version: 8.17.2
             pino-pretty:
-                specifier: ^10.3.0
-                version: 10.3.0
+                specifier: ^10.3.1
+                version: 10.3.1
             pino-webpack-plugin:
                 specifier: ^2.0.0
                 version: 2.0.0(webpack@5.89.0)
@@ -90,7 +90,7 @@ importers:
                 version: 9.5.1(typescript@5.3.3)(webpack@5.89.0)
             ts-node:
                 specifier: ^10.9.2
-                version: 10.9.2(@types/node@20.10.5)(typescript@5.3.3)
+                version: 10.9.2(@types/node@20.10.6)(typescript@5.3.3)
             tsconfig-paths-webpack-plugin:
                 specifier: ^4.1.0
                 version: 4.1.0
@@ -98,11 +98,11 @@ importers:
                 specifier: ^5.3.3
                 version: 5.3.3
             vite-tsconfig-paths:
-                specifier: ^4.2.2
-                version: 4.2.2(typescript@5.3.3)
+                specifier: ^4.2.3
+                version: 4.2.3(typescript@5.3.3)
             vitest:
                 specifier: ^1.1.0
-                version: 1.1.0(@types/node@20.10.5)
+                version: 1.1.0(@types/node@20.10.6)
             vitest-mock-extended:
                 specifier: ^1.3.1
                 version: 1.3.1(typescript@5.3.3)(vitest@1.1.0)
@@ -147,13 +147,13 @@ importers:
                 version: 6.1.0(firebase@10.7.1)
             next:
                 specifier: 14.0.4
-                version: 14.0.4(@babel/core@7.23.6)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)
+                version: 14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.6)
             next-intl:
                 specifier: ^3.4.0
                 version: 3.4.0(next@14.0.4)(react@18.2.0)
             persist-and-sync:
-                specifier: ^1.1.1
-                version: 1.1.1(zustand@4.4.7)
+                specifier: ^1.2.0
+                version: 1.2.0(zustand@4.4.7)
             react:
                 specifier: 18.2.0
                 version: 18.2.0
@@ -180,7 +180,7 @@ importers:
                 version: 13.11.0
             zustand:
                 specifier: ^4.4.7
-                version: 4.4.7(@types/react@18.2.45)(react@18.2.0)
+                version: 4.4.7(@types/react@18.2.46)(react@18.2.0)
         devDependencies:
             '@next/eslint-plugin-next':
                 specifier: ^14.0.4
@@ -198,14 +198,14 @@ importers:
                 specifier: ^9.3.3
                 version: 9.3.3
             '@testing-library/jest-dom':
-                specifier: ^6.1.5
-                version: 6.1.5(vitest@1.1.0)
+                specifier: ^6.1.6
+                version: 6.1.6(vitest@1.1.0)
             '@testing-library/react':
                 specifier: ^14.1.2
                 version: 14.1.2(react-dom@18.2.0)(react@18.2.0)
             '@types/react':
-                specifier: 18.2.45
-                version: 18.2.45
+                specifier: 18.2.46
+                version: 18.2.46
             '@types/react-dom':
                 specifier: 18.2.18
                 version: 18.2.18
@@ -234,8 +234,8 @@ importers:
                 specifier: 8.4.32
                 version: 8.4.32
             sass:
-                specifier: ^1.69.5
-                version: 1.69.5
+                specifier: ^1.69.6
+                version: 1.69.6
             tailwindcss:
                 specifier: 3.4.0
                 version: 3.4.0(ts-node@10.9.2)
@@ -336,10 +336,10 @@ packages:
             }
         engines: { node: '>=6.9.0' }
 
-    /@babel/core@7.23.6:
+    /@babel/core@7.23.7:
         resolution:
             {
-                integrity: sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==,
+                integrity: sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==,
             }
         engines: { node: '>=6.9.0' }
         dependencies:
@@ -347,11 +347,11 @@ packages:
             '@babel/code-frame': 7.23.5
             '@babel/generator': 7.23.6
             '@babel/helper-compilation-targets': 7.23.6
-            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
-            '@babel/helpers': 7.23.6
+            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7)
+            '@babel/helpers': 7.23.7
             '@babel/parser': 7.23.6
             '@babel/template': 7.22.15
-            '@babel/traverse': 7.23.6
+            '@babel/traverse': 7.23.7
             '@babel/types': 7.23.6
             convert-source-map: 2.0.0
             debug: 4.3.4
@@ -406,28 +406,28 @@ packages:
             lru-cache: 5.1.1
             semver: 6.3.1
 
-    /@babel/helper-create-class-features-plugin@7.23.6(@babel/core@7.23.6):
+    /@babel/helper-create-class-features-plugin@7.23.7(@babel/core@7.23.7):
         resolution:
             {
-                integrity: sha512-cBXU1vZni/CpGF29iTu4YRbOZt3Wat6zCoMDxRF1MayiEc4URxOj31tT65HUM0CRpMowA3HCJaAOVOUnMf96cw==,
+                integrity: sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==,
             }
         engines: { node: '>=6.9.0' }
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-function-name': 7.23.0
             '@babel/helper-member-expression-to-functions': 7.23.0
             '@babel/helper-optimise-call-expression': 7.22.5
-            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6)
+            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7)
             '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
             '@babel/helper-split-export-declaration': 7.22.6
             semver: 6.3.1
         dev: true
 
-    /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.6):
+    /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==,
@@ -436,13 +436,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             regexpu-core: 5.3.2
             semver: 6.3.1
         dev: true
 
-    /@babel/helper-define-polyfill-provider@0.4.4(@babel/core@7.23.6):
+    /@babel/helper-define-polyfill-provider@0.4.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==,
@@ -450,7 +450,7 @@ packages:
         peerDependencies:
             '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-compilation-targets': 7.23.6
             '@babel/helper-plugin-utils': 7.22.5
             debug: 4.3.4
@@ -505,7 +505,7 @@ packages:
         dependencies:
             '@babel/types': 7.23.6
 
-    /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.6):
+    /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==,
@@ -514,7 +514,7 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-module-imports': 7.22.15
             '@babel/helper-simple-access': 7.22.5
@@ -539,7 +539,7 @@ packages:
         engines: { node: '>=6.9.0' }
         dev: true
 
-    /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.6):
+    /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==,
@@ -548,13 +548,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-wrap-function': 7.22.20
         dev: true
 
-    /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.6):
+    /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==,
@@ -563,7 +563,7 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-member-expression-to-functions': 7.23.0
             '@babel/helper-optimise-call-expression': 7.22.5
@@ -630,15 +630,15 @@ packages:
             '@babel/types': 7.23.6
         dev: true
 
-    /@babel/helpers@7.23.6:
+    /@babel/helpers@7.23.7:
         resolution:
             {
-                integrity: sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==,
+                integrity: sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==,
             }
         engines: { node: '>=6.9.0' }
         dependencies:
             '@babel/template': 7.22.15
-            '@babel/traverse': 7.23.6
+            '@babel/traverse': 7.23.7
             '@babel/types': 7.23.6
         transitivePeerDependencies:
             - supports-color
@@ -664,7 +664,7 @@ packages:
         dependencies:
             '@babel/types': 7.23.6
 
-    /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==,
@@ -673,11 +673,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==,
@@ -686,27 +686,27 @@ packages:
         peerDependencies:
             '@babel/core': ^7.13.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-            '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.6)
+            '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.23.7):
         resolution:
             {
-                integrity: sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==,
+                integrity: sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==,
             }
         engines: { node: '>=6.9.0' }
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.6):
+    /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==,
@@ -715,10 +715,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.6):
+    /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==,
@@ -726,11 +726,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.6):
+    /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==,
@@ -738,11 +738,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.6):
+    /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==,
@@ -751,11 +751,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==,
@@ -763,11 +763,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==,
@@ -775,11 +775,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==,
@@ -788,11 +788,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==,
@@ -801,11 +801,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.6):
+    /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==,
@@ -813,11 +813,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==,
@@ -825,11 +825,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==,
@@ -838,11 +838,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.6):
+    /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==,
@@ -850,11 +850,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==,
@@ -862,11 +862,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.6):
+    /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==,
@@ -874,11 +874,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==,
@@ -886,11 +886,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==,
@@ -898,11 +898,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==,
@@ -910,11 +910,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.6):
+    /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==,
@@ -923,11 +923,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.6):
+    /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==,
@@ -936,11 +936,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==,
@@ -949,11 +949,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.6):
+    /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==,
@@ -962,12 +962,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==,
@@ -976,27 +976,27 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-async-generator-functions@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-async-generator-functions@7.23.7(@babel/core@7.23.7):
         resolution:
             {
-                integrity: sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==,
+                integrity: sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==,
             }
         engines: { node: '>=6.9.0' }
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.6)
-            '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.6)
+            '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.7)
+            '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==,
@@ -1005,13 +1005,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-module-imports': 7.22.15
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.6)
+            '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==,
@@ -1020,11 +1020,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==,
@@ -1033,11 +1033,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==,
@@ -1046,12 +1046,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==,
@@ -1060,13 +1060,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.12.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.6)
+            '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-classes@7.23.5(@babel/core@7.23.6):
+    /@babel/plugin-transform-classes@7.23.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==,
@@ -1075,19 +1075,19 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             '@babel/helper-compilation-targets': 7.23.6
             '@babel/helper-environment-visitor': 7.22.20
             '@babel/helper-function-name': 7.23.0
             '@babel/helper-optimise-call-expression': 7.22.5
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6)
+            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7)
             '@babel/helper-split-export-declaration': 7.22.6
             globals: 11.12.0
         dev: true
 
-    /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==,
@@ -1096,12 +1096,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/template': 7.22.15
         dev: true
 
-    /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==,
@@ -1110,11 +1110,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==,
@@ -1123,12 +1123,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==,
@@ -1137,11 +1137,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==,
@@ -1150,12 +1150,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==,
@@ -1164,12 +1164,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==,
@@ -1178,12 +1178,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.23.6):
+    /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==,
@@ -1192,12 +1192,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==,
@@ -1206,13 +1206,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-compilation-targets': 7.23.6
             '@babel/helper-function-name': 7.23.0
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==,
@@ -1221,12 +1221,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==,
@@ -1235,11 +1235,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==,
@@ -1248,12 +1248,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.6)
+            '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==,
@@ -1262,11 +1262,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==,
@@ -1275,12 +1275,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==,
@@ -1289,13 +1289,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-simple-access': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==,
@@ -1304,14 +1304,14 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-hoist-variables': 7.22.5
-            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
+            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-validator-identifier': 7.22.20
         dev: true
 
-    /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==,
@@ -1320,12 +1320,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.6):
+    /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==,
@@ -1334,12 +1334,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==,
@@ -1348,11 +1348,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==,
@@ -1361,12 +1361,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==,
@@ -1375,12 +1375,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.6)
+            '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==,
@@ -1390,14 +1390,14 @@ packages:
             '@babel/core': ^7.0.0-0
         dependencies:
             '@babel/compat-data': 7.23.5
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-compilation-targets': 7.23.6
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==,
@@ -1406,12 +1406,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6)
+            '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==,
@@ -1420,12 +1420,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==,
@@ -1434,13 +1434,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-            '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==,
@@ -1449,11 +1449,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==,
@@ -1462,12 +1462,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==,
@@ -1476,14 +1476,14 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
-            '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6)
+            '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.6)
+            '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==,
@@ -1492,11 +1492,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-react-constant-elements@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-constant-elements@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-zP0QKq/p6O42OL94udMgSfKXyse4RyJ0JqbQ34zDAONWjyrEsghYEyTSK5FIpmXmCpB55SHokL1cRRKHv8L2Qw==,
@@ -1505,11 +1505,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==,
@@ -1518,11 +1518,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==,
@@ -1531,11 +1531,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-react-jsx-self@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-jsx-self@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==,
@@ -1544,11 +1544,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-react-jsx-source@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-jsx-source@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==,
@@ -1557,11 +1557,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==,
@@ -1570,15 +1570,15 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             '@babel/helper-module-imports': 7.22.15
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7)
             '@babel/types': 7.23.6
         dev: true
 
-    /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==,
@@ -1587,12 +1587,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==,
@@ -1601,12 +1601,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             regenerator-transform: 0.15.2
         dev: true
 
-    /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==,
@@ -1615,11 +1615,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==,
@@ -1628,11 +1628,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==,
@@ -1641,12 +1641,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==,
@@ -1655,11 +1655,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==,
@@ -1668,11 +1668,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==,
@@ -1681,11 +1681,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.23.6):
+    /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==,
@@ -1694,14 +1694,14 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-annotate-as-pure': 7.22.5
-            '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6)
+            '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
-            '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.6)
+            '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==,
@@ -1710,11 +1710,11 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==,
@@ -1723,12 +1723,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==,
@@ -1737,12 +1737,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.6):
+    /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==,
@@ -1751,106 +1751,106 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7)
             '@babel/helper-plugin-utils': 7.22.5
         dev: true
 
-    /@babel/preset-env@7.23.6(@babel/core@7.23.6):
+    /@babel/preset-env@7.23.7(@babel/core@7.23.7):
         resolution:
             {
-                integrity: sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==,
+                integrity: sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==,
             }
         engines: { node: '>=6.9.0' }
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
             '@babel/compat-data': 7.23.5
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-compilation-targets': 7.23.6
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-validator-option': 7.23.5
-            '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.6)
-            '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.6)
-            '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.6)
-            '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.6)
-            '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.6)
-            '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.6)
-            '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.6)
-            '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.6)
-            '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.6)
-            '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.6)
-            '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.6)
-            '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-async-generator-functions': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-classes': 7.23.5(@babel/core@7.23.6)
-            '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.6)
-            '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.6)
-            '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.6)
-            '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.6)
-            babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.23.6)
-            babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.23.6)
-            babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.23.6)
-            core-js-compat: 3.34.0
+            '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.23.7)
+            '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.7)
+            '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.7)
+            '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.7)
+            '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.7)
+            '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.7)
+            '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.7)
+            '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7)
+            '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7)
+            '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.7)
+            '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.7)
+            '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.7)
+            '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-async-generator-functions': 7.23.7(@babel/core@7.23.7)
+            '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-classes': 7.23.5(@babel/core@7.23.7)
+            '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.7)
+            '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.7)
+            '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.7)
+            '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.7)
+            babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.23.7)
+            babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.23.7)
+            babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.23.7)
+            core-js-compat: 3.35.0
             semver: 6.3.1
         transitivePeerDependencies:
             - supports-color
         dev: true
 
-    /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.6):
+    /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==,
@@ -1858,13 +1858,13 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/types': 7.23.6
             esutils: 2.0.3
         dev: true
 
-    /@babel/preset-react@7.23.3(@babel/core@7.23.6):
+    /@babel/preset-react@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==,
@@ -1873,16 +1873,16 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-validator-option': 7.23.5
-            '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.6)
-            '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.6)
-            '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.6)
+            '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7)
+            '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.7)
+            '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.7)
         dev: true
 
-    /@babel/preset-typescript@7.23.3(@babel/core@7.23.6):
+    /@babel/preset-typescript@7.23.3(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==,
@@ -1891,12 +1891,12 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             '@babel/helper-plugin-utils': 7.22.5
             '@babel/helper-validator-option': 7.23.5
-            '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.6)
+            '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7)
         dev: true
 
     /@babel/regjsgen@0.8.0:
@@ -1906,10 +1906,10 @@ packages:
             }
         dev: true
 
-    /@babel/runtime@7.23.6:
+    /@babel/runtime@7.23.7:
         resolution:
             {
-                integrity: sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==,
+                integrity: sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==,
             }
         engines: { node: '>=6.9.0' }
         dependencies:
@@ -1926,10 +1926,10 @@ packages:
             '@babel/parser': 7.23.6
             '@babel/types': 7.23.6
 
-    /@babel/traverse@7.23.6:
+    /@babel/traverse@7.23.7:
         resolution:
             {
-                integrity: sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==,
+                integrity: sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==,
             }
         engines: { node: '>=6.9.0' }
         dependencies:
@@ -2082,10 +2082,10 @@ packages:
         dev: false
         optional: true
 
-    /@esbuild/aix-ppc64@0.19.10:
+    /@esbuild/aix-ppc64@0.19.11:
         resolution:
             {
-                integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==,
+                integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==,
             }
         engines: { node: '>=12' }
         cpu: [ppc64]
@@ -2094,10 +2094,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/android-arm64@0.19.10:
+    /@esbuild/android-arm64@0.19.11:
         resolution:
             {
-                integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==,
+                integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==,
             }
         engines: { node: '>=12' }
         cpu: [arm64]
@@ -2106,10 +2106,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/android-arm@0.19.10:
+    /@esbuild/android-arm@0.19.11:
         resolution:
             {
-                integrity: sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==,
+                integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==,
             }
         engines: { node: '>=12' }
         cpu: [arm]
@@ -2118,10 +2118,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/android-x64@0.19.10:
+    /@esbuild/android-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==,
+                integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2130,10 +2130,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/darwin-arm64@0.19.10:
+    /@esbuild/darwin-arm64@0.19.11:
         resolution:
             {
-                integrity: sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==,
+                integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==,
             }
         engines: { node: '>=12' }
         cpu: [arm64]
@@ -2142,10 +2142,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/darwin-x64@0.19.10:
+    /@esbuild/darwin-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==,
+                integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2154,10 +2154,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/freebsd-arm64@0.19.10:
+    /@esbuild/freebsd-arm64@0.19.11:
         resolution:
             {
-                integrity: sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==,
+                integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==,
             }
         engines: { node: '>=12' }
         cpu: [arm64]
@@ -2166,10 +2166,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/freebsd-x64@0.19.10:
+    /@esbuild/freebsd-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==,
+                integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2178,10 +2178,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-arm64@0.19.10:
+    /@esbuild/linux-arm64@0.19.11:
         resolution:
             {
-                integrity: sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==,
+                integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==,
             }
         engines: { node: '>=12' }
         cpu: [arm64]
@@ -2190,10 +2190,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-arm@0.19.10:
+    /@esbuild/linux-arm@0.19.11:
         resolution:
             {
-                integrity: sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==,
+                integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==,
             }
         engines: { node: '>=12' }
         cpu: [arm]
@@ -2202,10 +2202,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-ia32@0.19.10:
+    /@esbuild/linux-ia32@0.19.11:
         resolution:
             {
-                integrity: sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==,
+                integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==,
             }
         engines: { node: '>=12' }
         cpu: [ia32]
@@ -2214,10 +2214,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-loong64@0.19.10:
+    /@esbuild/linux-loong64@0.19.11:
         resolution:
             {
-                integrity: sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==,
+                integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==,
             }
         engines: { node: '>=12' }
         cpu: [loong64]
@@ -2226,10 +2226,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-mips64el@0.19.10:
+    /@esbuild/linux-mips64el@0.19.11:
         resolution:
             {
-                integrity: sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==,
+                integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==,
             }
         engines: { node: '>=12' }
         cpu: [mips64el]
@@ -2238,10 +2238,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-ppc64@0.19.10:
+    /@esbuild/linux-ppc64@0.19.11:
         resolution:
             {
-                integrity: sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==,
+                integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==,
             }
         engines: { node: '>=12' }
         cpu: [ppc64]
@@ -2250,10 +2250,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-riscv64@0.19.10:
+    /@esbuild/linux-riscv64@0.19.11:
         resolution:
             {
-                integrity: sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==,
+                integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==,
             }
         engines: { node: '>=12' }
         cpu: [riscv64]
@@ -2262,10 +2262,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-s390x@0.19.10:
+    /@esbuild/linux-s390x@0.19.11:
         resolution:
             {
-                integrity: sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==,
+                integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==,
             }
         engines: { node: '>=12' }
         cpu: [s390x]
@@ -2274,10 +2274,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/linux-x64@0.19.10:
+    /@esbuild/linux-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==,
+                integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2286,10 +2286,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/netbsd-x64@0.19.10:
+    /@esbuild/netbsd-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==,
+                integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2298,10 +2298,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/openbsd-x64@0.19.10:
+    /@esbuild/openbsd-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==,
+                integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2310,10 +2310,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/sunos-x64@0.19.10:
+    /@esbuild/sunos-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==,
+                integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -2322,10 +2322,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/win32-arm64@0.19.10:
+    /@esbuild/win32-arm64@0.19.11:
         resolution:
             {
-                integrity: sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==,
+                integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==,
             }
         engines: { node: '>=12' }
         cpu: [arm64]
@@ -2334,10 +2334,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/win32-ia32@0.19.10:
+    /@esbuild/win32-ia32@0.19.11:
         resolution:
             {
-                integrity: sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==,
+                integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==,
             }
         engines: { node: '>=12' }
         cpu: [ia32]
@@ -2346,10 +2346,10 @@ packages:
         dev: true
         optional: true
 
-    /@esbuild/win32-x64@0.19.10:
+    /@esbuild/win32-x64@0.19.11:
         resolution:
             {
-                integrity: sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==,
+                integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==,
             }
         engines: { node: '>=12' }
         cpu: [x64]
@@ -3077,7 +3077,7 @@ packages:
         engines: { node: ^8.13.0 || >=10.10.0 }
         dependencies:
             '@grpc/proto-loader': 0.7.10
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
 
     /@grpc/proto-loader@0.7.10:
         resolution:
@@ -3887,10 +3887,10 @@ packages:
                 integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==,
             }
 
-    /@rollup/rollup-android-arm-eabi@4.9.1:
+    /@rollup/rollup-android-arm-eabi@4.9.2:
         resolution:
             {
-                integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==,
+                integrity: sha512-RKzxFxBHq9ysZ83fn8Iduv3A283K7zPPYuhL/z9CQuyFrjwpErJx0h4aeb/bnJ+q29GRLgJpY66ceQ/Wcsn3wA==,
             }
         cpu: [arm]
         os: [android]
@@ -3898,10 +3898,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-android-arm64@4.9.1:
+    /@rollup/rollup-android-arm64@4.9.2:
         resolution:
             {
-                integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==,
+                integrity: sha512-yZ+MUbnwf3SHNWQKJyWh88ii2HbuHCFQnAYTeeO1Nb8SyEiWASEi5dQUygt3ClHWtA9My9RQAYkjvrsZ0WK8Xg==,
             }
         cpu: [arm64]
         os: [android]
@@ -3909,10 +3909,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-darwin-arm64@4.9.1:
+    /@rollup/rollup-darwin-arm64@4.9.2:
         resolution:
             {
-                integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==,
+                integrity: sha512-vqJ/pAUh95FLc/G/3+xPqlSBgilPnauVf2EXOQCZzhZJCXDXt/5A8mH/OzU6iWhb3CNk5hPJrh8pqJUPldN5zw==,
             }
         cpu: [arm64]
         os: [darwin]
@@ -3920,10 +3920,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-darwin-x64@4.9.1:
+    /@rollup/rollup-darwin-x64@4.9.2:
         resolution:
             {
-                integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==,
+                integrity: sha512-otPHsN5LlvedOprd3SdfrRNhOahhVBwJpepVKUN58L0RnC29vOAej1vMEaVU6DadnpjivVsNTM5eNt0CcwTahw==,
             }
         cpu: [x64]
         os: [darwin]
@@ -3931,10 +3931,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-arm-gnueabihf@4.9.1:
+    /@rollup/rollup-linux-arm-gnueabihf@4.9.2:
         resolution:
             {
-                integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==,
+                integrity: sha512-ewG5yJSp+zYKBYQLbd1CUA7b1lSfIdo9zJShNTyc2ZP1rcPrqyZcNlsHgs7v1zhgfdS+kW0p5frc0aVqhZCiYQ==,
             }
         cpu: [arm]
         os: [linux]
@@ -3942,10 +3942,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-arm64-gnu@4.9.1:
+    /@rollup/rollup-linux-arm64-gnu@4.9.2:
         resolution:
             {
-                integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==,
+                integrity: sha512-pL6QtV26W52aCWTG1IuFV3FMPL1m4wbsRG+qijIvgFO/VBsiXJjDPE/uiMdHBAO6YcpV4KvpKtd0v3WFbaxBtg==,
             }
         cpu: [arm64]
         os: [linux]
@@ -3953,10 +3953,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-arm64-musl@4.9.1:
+    /@rollup/rollup-linux-arm64-musl@4.9.2:
         resolution:
             {
-                integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==,
+                integrity: sha512-On+cc5EpOaTwPSNetHXBuqylDW+765G/oqB9xGmWU3npEhCh8xu0xqHGUA+4xwZLqBbIZNcBlKSIYfkBm6ko7g==,
             }
         cpu: [arm64]
         os: [linux]
@@ -3964,10 +3964,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-riscv64-gnu@4.9.1:
+    /@rollup/rollup-linux-riscv64-gnu@4.9.2:
         resolution:
             {
-                integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==,
+                integrity: sha512-Wnx/IVMSZ31D/cO9HSsU46FjrPWHqtdF8+0eyZ1zIB5a6hXaZXghUKpRrC4D5DcRTZOjml2oBhXoqfGYyXKipw==,
             }
         cpu: [riscv64]
         os: [linux]
@@ -3975,10 +3975,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-x64-gnu@4.9.1:
+    /@rollup/rollup-linux-x64-gnu@4.9.2:
         resolution:
             {
-                integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==,
+                integrity: sha512-ym5x1cj4mUAMBummxxRkI4pG5Vht1QMsJexwGP8547TZ0sox9fCLDHw9KCH9c1FO5d9GopvkaJsBIOkTKxksdw==,
             }
         cpu: [x64]
         os: [linux]
@@ -3986,10 +3986,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-linux-x64-musl@4.9.1:
+    /@rollup/rollup-linux-x64-musl@4.9.2:
         resolution:
             {
-                integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==,
+                integrity: sha512-m0hYELHGXdYx64D6IDDg/1vOJEaiV8f1G/iO+tejvRCJNSwK4jJ15e38JQy5Q6dGkn1M/9KcyEOwqmlZ2kqaZg==,
             }
         cpu: [x64]
         os: [linux]
@@ -3997,10 +3997,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-win32-arm64-msvc@4.9.1:
+    /@rollup/rollup-win32-arm64-msvc@4.9.2:
         resolution:
             {
-                integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==,
+                integrity: sha512-x1CWburlbN5JjG+juenuNa4KdedBdXLjZMp56nHFSHTOsb/MI2DYiGzLtRGHNMyydPGffGId+VgjOMrcltOksA==,
             }
         cpu: [arm64]
         os: [win32]
@@ -4008,10 +4008,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-win32-ia32-msvc@4.9.1:
+    /@rollup/rollup-win32-ia32-msvc@4.9.2:
         resolution:
             {
-                integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==,
+                integrity: sha512-VVzCB5yXR1QlfsH1Xw1zdzQ4Pxuzv+CPr5qpElpKhVxlxD3CRdfubAG9mJROl6/dmj5gVYDDWk8sC+j9BI9/kQ==,
             }
         cpu: [ia32]
         os: [win32]
@@ -4019,10 +4019,10 @@ packages:
         dev: true
         optional: true
 
-    /@rollup/rollup-win32-x64-msvc@4.9.1:
+    /@rollup/rollup-win32-x64-msvc@4.9.2:
         resolution:
             {
-                integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==,
+                integrity: sha512-SYRedJi+mweatroB+6TTnJYLts0L0bosg531xnQWtklOI6dezEagx4Q0qDyvRdK+qgdA3YZpjjGuPFtxBmddBA==,
             }
         cpu: [x64]
         os: [win32]
@@ -5456,7 +5456,7 @@ packages:
             '@stdlib/utils-global': 0.0.7
         dev: false
 
-    /@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==,
@@ -5465,10 +5465,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==,
@@ -5477,10 +5477,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==,
@@ -5489,10 +5489,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==,
@@ -5501,10 +5501,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==,
@@ -5513,10 +5513,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==,
@@ -5525,10 +5525,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==,
@@ -5537,10 +5537,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.23.6):
+    /@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==,
@@ -5549,10 +5549,10 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
         dev: true
 
-    /@svgr/babel-preset@8.1.0(@babel/core@7.23.6):
+    /@svgr/babel-preset@8.1.0(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==,
@@ -5561,15 +5561,15 @@ packages:
         peerDependencies:
             '@babel/core': ^7.0.0-0
         dependencies:
-            '@babel/core': 7.23.6
-            '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.23.6)
-            '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.23.7)
+            '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.23.7)
         dev: true
 
     /@svgr/core@8.1.0(typescript@5.3.3):
@@ -5579,8 +5579,8 @@ packages:
             }
         engines: { node: '>=14' }
         dependencies:
-            '@babel/core': 7.23.6
-            '@svgr/babel-preset': 8.1.0(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@svgr/babel-preset': 8.1.0(@babel/core@7.23.7)
             camelcase: 6.3.0
             cosmiconfig: 8.3.6(typescript@5.3.3)
             snake-case: 3.0.4
@@ -5609,8 +5609,8 @@ packages:
         peerDependencies:
             '@svgr/core': '*'
         dependencies:
-            '@babel/core': 7.23.6
-            '@svgr/babel-preset': 8.1.0(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@svgr/babel-preset': 8.1.0(@babel/core@7.23.7)
             '@svgr/core': 8.1.0(typescript@5.3.3)
             '@svgr/hast-util-to-babel-ast': 8.0.0
             svg-parser: 2.0.4
@@ -5642,11 +5642,11 @@ packages:
             }
         engines: { node: '>=14' }
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/plugin-transform-react-constant-elements': 7.23.3(@babel/core@7.23.6)
-            '@babel/preset-env': 7.23.6(@babel/core@7.23.6)
-            '@babel/preset-react': 7.23.3(@babel/core@7.23.6)
-            '@babel/preset-typescript': 7.23.3(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/plugin-transform-react-constant-elements': 7.23.3(@babel/core@7.23.7)
+            '@babel/preset-env': 7.23.7(@babel/core@7.23.7)
+            '@babel/preset-react': 7.23.3(@babel/core@7.23.7)
+            '@babel/preset-typescript': 7.23.3(@babel/core@7.23.7)
             '@svgr/core': 8.1.0(typescript@5.3.3)
             '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0)
             '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0)(typescript@5.3.3)
@@ -5699,7 +5699,7 @@ packages:
         engines: { node: '>=14' }
         dependencies:
             '@babel/code-frame': 7.23.5
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
             '@types/aria-query': 5.0.4
             aria-query: 5.1.3
             chalk: 4.1.2
@@ -5708,10 +5708,10 @@ packages:
             pretty-format: 27.5.1
         dev: true
 
-    /@testing-library/jest-dom@6.1.5(vitest@1.1.0):
+    /@testing-library/jest-dom@6.1.6(vitest@1.1.0):
         resolution:
             {
-                integrity: sha512-3y04JLW+EceVPy2Em3VwNr95dOKqA8DhR0RJHhHKDZNYXcVXnEK7WIrpj4eYU8SVt/qYZ2aRWt/WgQ+grNES8g==,
+                integrity: sha512-YwuiOdYEcxhfC2u5iNKlvg2Q5MgbutovP6drq7J1HrCbvR+G58BbtoCoq+L/kNlrNFsu2Kt3jaFAviLVxYHJZg==,
             }
         engines: { node: '>=14', npm: '>=6', yarn: '>=1' }
         peerDependencies:
@@ -5730,14 +5730,14 @@ packages:
                 optional: true
         dependencies:
             '@adobe/css-tools': 4.3.2
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
             aria-query: 5.3.0
             chalk: 3.0.0
             css.escape: 1.5.1
             dom-accessibility-api: 0.5.16
             lodash: 4.17.21
             redent: 3.0.0
-            vitest: 1.1.0(@types/node@20.10.5)
+            vitest: 1.1.0(@types/node@20.10.6)
         dev: true
 
     /@testing-library/react@14.1.2(react-dom@18.2.0)(react@18.2.0):
@@ -5750,7 +5750,7 @@ packages:
             react: ^18.0.0
             react-dom: ^18.0.0
         dependencies:
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
             '@testing-library/dom': 9.3.3
             '@types/react-dom': 18.2.18
             react: 18.2.0
@@ -5918,10 +5918,10 @@ packages:
             }
         dev: true
 
-    /@types/hast@2.3.8:
+    /@types/hast@2.3.9:
         resolution:
             {
-                integrity: sha512-aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ==,
+                integrity: sha512-pTHyNlaMD/oKJmS+ZZUyFUcsZeBZpC0lmGquw98CqRVNgAdJZJeD7GoeLiT6Xbx5rU9VCjSt0RwEvDgzh4obFw==,
             }
         dependencies:
             '@types/unist': 2.0.10
@@ -5957,29 +5957,29 @@ packages:
             '@types/unist': 2.0.10
         dev: true
 
-    /@types/node-fetch@2.6.9:
+    /@types/node-fetch@2.6.10:
         resolution:
             {
-                integrity: sha512-bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA==,
+                integrity: sha512-PPpPK6F9ALFTn59Ka3BaL+qGuipRfxNE8qVgkp0bVixeiR2c2/L+IVOiBdu9JhhT22sWnQEp6YyHGI2b2+CMcA==,
             }
         dependencies:
-            '@types/node': 18.19.3
+            '@types/node': 18.19.4
             form-data: 4.0.0
         dev: false
 
-    /@types/node@18.19.3:
+    /@types/node@18.19.4:
         resolution:
             {
-                integrity: sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==,
+                integrity: sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==,
             }
         dependencies:
             undici-types: 5.26.5
         dev: false
 
-    /@types/node@20.10.5:
+    /@types/node@20.10.6:
         resolution:
             {
-                integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==,
+                integrity: sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==,
             }
         dependencies:
             undici-types: 5.26.5
@@ -5990,7 +5990,7 @@ packages:
                 integrity: sha512-vjKuaQOLUA5EY2zkUmWG1ipXbKt9Wd+H/0SiIuHVeH4cHtt6509iRUGH9ZR0iqgUrtj3BrP9KqoTuV3ZCbQcYA==,
             }
         dependencies:
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
         dev: true
 
     /@types/normalize-package-data@2.4.4:
@@ -6012,7 +6012,7 @@ packages:
                 integrity: sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==,
             }
         dependencies:
-            '@types/react': 18.2.45
+            '@types/react': 18.2.46
         dev: true
 
     /@types/react-syntax-highlighter@15.5.11:
@@ -6021,13 +6021,13 @@ packages:
                 integrity: sha512-ZqIJl+Pg8kD+47kxUjvrlElrraSUrYa4h0dauY/U/FTUuprSCqvUj+9PNQNQzVc6AJgIWUUxn87/gqsMHNbRjw==,
             }
         dependencies:
-            '@types/react': 18.2.45
+            '@types/react': 18.2.46
         dev: true
 
-    /@types/react@18.2.45:
+    /@types/react@18.2.46:
         resolution:
             {
-                integrity: sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==,
+                integrity: sha512-nNCvVBcZlvX4NU1nRRNV/mFl1nNRuTuslAJglQsq+8ldXe5Xv0Wd2f7WTE3jOxhLH2BFfiZGC6GCp+kHQbgG+w==,
             }
         dependencies:
             '@types/prop-types': 15.7.11
@@ -6066,7 +6066,7 @@ packages:
                 integrity: sha512-8Z3/edqxE3RRlOJwKSgOFxLZRt/i1qFlv/Bi308ZUKo9jh8oGngd9r8GR0ZNKW5AEJq8QNQE3b17CwghTjQ0Uw==,
             }
         dependencies:
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
             webpack: 5.89.0(webpack-cli@5.1.4)
         transitivePeerDependencies:
             - '@swc/core'
@@ -6081,7 +6081,7 @@ packages:
                 integrity: sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==,
             }
         dependencies:
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
             tapable: 2.2.1
             webpack: 5.89.0(webpack-cli@5.1.4)
         transitivePeerDependencies:
@@ -6356,12 +6356,12 @@ packages:
         peerDependencies:
             vite: ^4.2.0 || ^5.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.6)
-            '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.7)
+            '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.7)
             '@types/babel__core': 7.20.5
             react-refresh: 0.14.0
-            vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)
+            vite: 5.0.10(@types/node@20.10.6)(sass@1.69.6)
         transitivePeerDependencies:
             - supports-color
         dev: true
@@ -6387,7 +6387,7 @@ packages:
             std-env: 3.7.0
             test-exclude: 6.0.0
             v8-to-istanbul: 9.2.0
-            vitest: 1.1.0(@types/node@20.10.5)
+            vitest: 1.1.0(@types/node@20.10.6)
         transitivePeerDependencies:
             - supports-color
         dev: true
@@ -6681,7 +6681,7 @@ packages:
         dependencies:
             event-target-shim: 5.0.1
 
-    /acorn-import-assertions@1.9.0(acorn@8.11.2):
+    /acorn-import-assertions@1.9.0(acorn@8.11.3):
         resolution:
             {
                 integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==,
@@ -6689,7 +6689,7 @@ packages:
         peerDependencies:
             acorn: ^8
         dependencies:
-            acorn: 8.11.2
+            acorn: 8.11.3
         dev: true
 
     /acorn-jsx@5.3.2(acorn@7.4.1):
@@ -6703,7 +6703,7 @@ packages:
             acorn: 7.4.1
         dev: true
 
-    /acorn-jsx@5.3.2(acorn@8.11.2):
+    /acorn-jsx@5.3.2(acorn@8.11.3):
         resolution:
             {
                 integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==,
@@ -6711,7 +6711,7 @@ packages:
         peerDependencies:
             acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
         dependencies:
-            acorn: 8.11.2
+            acorn: 8.11.3
         dev: true
 
     /acorn-walk@8.3.1:
@@ -6731,10 +6731,10 @@ packages:
         hasBin: true
         dev: true
 
-    /acorn@8.11.2:
+    /acorn@8.11.3:
         resolution:
             {
-                integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==,
+                integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==,
             }
         engines: { node: '>=0.4.0' }
         hasBin: true
@@ -7038,7 +7038,7 @@ packages:
             postcss: ^8.1.0
         dependencies:
             browserslist: 4.22.2
-            caniuse-lite: 1.0.30001571
+            caniuse-lite: 1.0.30001572
             fraction.js: 4.3.7
             normalize-range: 0.1.2
             picocolors: 1.0.0
@@ -7071,7 +7071,7 @@ packages:
             dequal: 2.0.3
         dev: true
 
-    /babel-plugin-polyfill-corejs2@0.4.7(@babel/core@7.23.6):
+    /babel-plugin-polyfill-corejs2@0.4.7(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==,
@@ -7080,14 +7080,14 @@ packages:
             '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
         dependencies:
             '@babel/compat-data': 7.23.5
-            '@babel/core': 7.23.6
-            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7)
             semver: 6.3.1
         transitivePeerDependencies:
             - supports-color
         dev: true
 
-    /babel-plugin-polyfill-corejs3@0.8.7(@babel/core@7.23.6):
+    /babel-plugin-polyfill-corejs3@0.8.7(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==,
@@ -7095,14 +7095,14 @@ packages:
         peerDependencies:
             '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6)
-            core-js-compat: 3.34.0
+            '@babel/core': 7.23.7
+            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7)
+            core-js-compat: 3.35.0
         transitivePeerDependencies:
             - supports-color
         dev: true
 
-    /babel-plugin-polyfill-regenerator@0.5.4(@babel/core@7.23.6):
+    /babel-plugin-polyfill-regenerator@0.5.4(@babel/core@7.23.7):
         resolution:
             {
                 integrity: sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==,
@@ -7110,8 +7110,8 @@ packages:
         peerDependencies:
             '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
         dependencies:
-            '@babel/core': 7.23.6
-            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6)
+            '@babel/core': 7.23.7
+            '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7)
         transitivePeerDependencies:
             - supports-color
         dev: true
@@ -7186,7 +7186,7 @@ packages:
         engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
         hasBin: true
         dependencies:
-            caniuse-lite: 1.0.30001571
+            caniuse-lite: 1.0.30001572
             electron-to-chromium: 1.4.616
             node-releases: 2.0.14
             update-browserslist-db: 1.0.13(browserslist@4.22.2)
@@ -7276,10 +7276,10 @@ packages:
         engines: { node: '>=10' }
         dev: true
 
-    /caniuse-lite@1.0.30001571:
+    /caniuse-lite@1.0.30001572:
         resolution:
             {
-                integrity: sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==,
+                integrity: sha512-1Pbh5FLmn5y4+QhNyJE9j3/7dK44dGB83/ZMjv/qJk86TvDbjk0LosiZo0i0WB0Vx607qMX9jYrn1VLHCkN4rw==,
             }
 
     /chai@4.3.10:
@@ -7579,10 +7579,10 @@ packages:
                 integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==,
             }
 
-    /core-js-compat@3.34.0:
+    /core-js-compat@3.35.0:
         resolution:
             {
-                integrity: sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA==,
+                integrity: sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==,
             }
         dependencies:
             browserslist: 4.22.2
@@ -8280,38 +8280,38 @@ packages:
             is-symbol: 1.0.4
         dev: true
 
-    /esbuild@0.19.10:
+    /esbuild@0.19.11:
         resolution:
             {
-                integrity: sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==,
+                integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==,
             }
         engines: { node: '>=12' }
         hasBin: true
         requiresBuild: true
         optionalDependencies:
-            '@esbuild/aix-ppc64': 0.19.10
-            '@esbuild/android-arm': 0.19.10
-            '@esbuild/android-arm64': 0.19.10
-            '@esbuild/android-x64': 0.19.10
-            '@esbuild/darwin-arm64': 0.19.10
-            '@esbuild/darwin-x64': 0.19.10
-            '@esbuild/freebsd-arm64': 0.19.10
-            '@esbuild/freebsd-x64': 0.19.10
-            '@esbuild/linux-arm': 0.19.10
-            '@esbuild/linux-arm64': 0.19.10
-            '@esbuild/linux-ia32': 0.19.10
-            '@esbuild/linux-loong64': 0.19.10
-            '@esbuild/linux-mips64el': 0.19.10
-            '@esbuild/linux-ppc64': 0.19.10
-            '@esbuild/linux-riscv64': 0.19.10
-            '@esbuild/linux-s390x': 0.19.10
-            '@esbuild/linux-x64': 0.19.10
-            '@esbuild/netbsd-x64': 0.19.10
-            '@esbuild/openbsd-x64': 0.19.10
-            '@esbuild/sunos-x64': 0.19.10
-            '@esbuild/win32-arm64': 0.19.10
-            '@esbuild/win32-ia32': 0.19.10
-            '@esbuild/win32-x64': 0.19.10
+            '@esbuild/aix-ppc64': 0.19.11
+            '@esbuild/android-arm': 0.19.11
+            '@esbuild/android-arm64': 0.19.11
+            '@esbuild/android-x64': 0.19.11
+            '@esbuild/darwin-arm64': 0.19.11
+            '@esbuild/darwin-x64': 0.19.11
+            '@esbuild/freebsd-arm64': 0.19.11
+            '@esbuild/freebsd-x64': 0.19.11
+            '@esbuild/linux-arm': 0.19.11
+            '@esbuild/linux-arm64': 0.19.11
+            '@esbuild/linux-ia32': 0.19.11
+            '@esbuild/linux-loong64': 0.19.11
+            '@esbuild/linux-mips64el': 0.19.11
+            '@esbuild/linux-ppc64': 0.19.11
+            '@esbuild/linux-riscv64': 0.19.11
+            '@esbuild/linux-s390x': 0.19.11
+            '@esbuild/linux-x64': 0.19.11
+            '@esbuild/netbsd-x64': 0.19.11
+            '@esbuild/openbsd-x64': 0.19.11
+            '@esbuild/sunos-x64': 0.19.11
+            '@esbuild/win32-arm64': 0.19.11
+            '@esbuild/win32-ia32': 0.19.11
+            '@esbuild/win32-x64': 0.19.11
         dev: true
 
     /escalade@3.1.1:
@@ -8508,7 +8508,7 @@ packages:
         peerDependencies:
             eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
         dependencies:
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
             aria-query: 5.3.0
             array-includes: 3.1.7
             array.prototype.flatmap: 1.3.2
@@ -8737,7 +8737,7 @@ packages:
             '@eslint/eslintrc': 2.1.4
             ci-info: 4.0.0
             clean-regexp: 1.0.0
-            core-js-compat: 3.34.0
+            core-js-compat: 3.35.0
             eslint: 8.56.0
             esquery: 1.5.0
             indent-string: 4.0.0
@@ -8790,7 +8790,7 @@ packages:
             '@typescript-eslint/eslint-plugin': 6.16.0(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)(typescript@5.3.3)
             '@typescript-eslint/utils': 6.16.0(eslint@8.56.0)(typescript@5.3.3)
             eslint: 8.56.0
-            vitest: 1.1.0(@types/node@20.10.5)
+            vitest: 1.1.0(@types/node@20.10.6)
         transitivePeerDependencies:
             - supports-color
             - typescript
@@ -8911,8 +8911,8 @@ packages:
             }
         engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
         dependencies:
-            acorn: 8.11.2
-            acorn-jsx: 5.3.2(acorn@8.11.2)
+            acorn: 8.11.3
+            acorn-jsx: 5.3.2(acorn@8.11.3)
             eslint-visitor-keys: 3.4.3
         dev: true
 
@@ -9649,7 +9649,7 @@ packages:
                 integrity: sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==,
             }
         dependencies:
-            '@types/hast': 2.3.8
+            '@types/hast': 2.3.9
             comma-separated-tokens: 1.0.8
             hast-util-parse-selector: 2.2.5
             property-information: 5.6.0
@@ -10326,7 +10326,7 @@ packages:
             }
         engines: { node: '>= 10.13.0' }
         dependencies:
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
             merge-stream: 2.0.0
             supports-color: 8.1.1
         dev: true
@@ -10970,7 +10970,7 @@ packages:
                 integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==,
             }
         dependencies:
-            acorn: 8.11.2
+            acorn: 8.11.3
             pathe: 1.1.1
             pkg-types: 1.0.3
             ufo: 1.3.2
@@ -11071,12 +11071,12 @@ packages:
         dependencies:
             '@formatjs/intl-localematcher': 0.2.32
             negotiator: 0.6.3
-            next: 14.0.4(@babel/core@7.23.6)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)
+            next: 14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.6)
             react: 18.2.0
             use-intl: 3.4.0(react@18.2.0)
         dev: false
 
-    /next@14.0.4(@babel/core@7.23.6)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5):
+    /next@14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.6):
         resolution:
             {
                 integrity: sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==,
@@ -11097,13 +11097,13 @@ packages:
             '@next/env': 14.0.4
             '@swc/helpers': 0.5.2
             busboy: 1.6.0
-            caniuse-lite: 1.0.30001571
+            caniuse-lite: 1.0.30001572
             graceful-fs: 4.2.11
             postcss: 8.4.31
             react: 18.2.0
             react-dom: 18.2.0(react@18.2.0)
-            sass: 1.69.5
-            styled-jsx: 5.1.1(@babel/core@7.23.6)(react@18.2.0)
+            sass: 1.69.6
+            styled-jsx: 5.1.1(@babel/core@7.23.7)(react@18.2.0)
             watchpack: 2.4.0
         optionalDependencies:
             '@next/swc-darwin-arm64': 14.0.4
@@ -11414,8 +11414,8 @@ packages:
             }
         hasBin: true
         dependencies:
-            '@types/node': 18.19.3
-            '@types/node-fetch': 2.6.9
+            '@types/node': 18.19.4
+            '@types/node-fetch': 2.6.10
             abort-controller: 3.0.0
             agentkeepalive: 4.5.0
             digest-fetch: 1.3.0
@@ -11616,15 +11616,15 @@ packages:
             }
         dev: true
 
-    /persist-and-sync@1.1.1(zustand@4.4.7):
+    /persist-and-sync@1.2.0(zustand@4.4.7):
         resolution:
             {
-                integrity: sha512-n+/3m9dILdRNgxEwxPFyRNxAe6ajKK8kNcg3Jiy6iZ+8Q5JhZ7lahqE0oH2uB1WSuy2vZPf2go/HLOjDnkCD7w==,
+                integrity: sha512-hApzP8QYJ56KiLUi+Y1YfYH7vP00o1cru1x/GudhFT9k5U+w98XDfSwI9G9rJ2WmeNXpnGMmn8wCWxnT2rB0Wg==,
             }
         peerDependencies:
             zustand: ^3 || ^4
         dependencies:
-            zustand: 4.4.7(@types/react@18.2.45)(react@18.2.0)
+            zustand: 4.4.7(@types/react@18.2.46)(react@18.2.0)
         dev: false
 
     /picocolors@1.0.0:
@@ -11654,13 +11654,13 @@ packages:
                 integrity: sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==,
             }
         dependencies:
-            readable-stream: 4.5.1
+            readable-stream: 4.5.2
             split2: 4.2.0
 
-    /pino-pretty@10.3.0:
+    /pino-pretty@10.3.1:
         resolution:
             {
-                integrity: sha512-JthvQW289q3454mhM3/38wFYGWPiBMR28T3CpDNABzoTQOje9UKS7XCJQSnjWF9LQGQkGd8D7h0oq+qwiM3jFA==,
+                integrity: sha512-az8JbIYeN/1iLj2t0jR9DV48/LQ3RC6hZPpapKPkb84Q+yTidMCpgWxIT3N0flnBDilyBQ1luWNpOeJptjdp/g==,
             }
         hasBin: true
         dependencies:
@@ -11674,7 +11674,7 @@ packages:
             on-exit-leak-free: 2.1.2
             pino-abstract-transport: 1.1.0
             pump: 3.0.0
-            readable-stream: 4.5.1
+            readable-stream: 4.5.2
             secure-json-parse: 2.7.0
             sonic-boom: 3.7.0
             strip-json-comments: 3.1.1
@@ -11800,7 +11800,7 @@ packages:
         dependencies:
             lilconfig: 3.0.0
             postcss: 8.4.32
-            ts-node: 10.9.2(@types/node@20.10.5)(typescript@5.3.3)
+            ts-node: 10.9.2(@types/node@20.10.6)(typescript@5.3.3)
             yaml: 2.3.4
         dev: true
 
@@ -11814,7 +11814,7 @@ packages:
             postcss: ^8.2.14
         dependencies:
             postcss: 8.4.32
-            postcss-selector-parser: 6.0.14
+            postcss-selector-parser: 6.0.15
         dev: true
 
     /postcss-selector-parser@6.0.10:
@@ -11828,10 +11828,10 @@ packages:
             util-deprecate: 1.0.2
         dev: true
 
-    /postcss-selector-parser@6.0.14:
+    /postcss-selector-parser@6.0.15:
         resolution:
             {
-                integrity: sha512-65xXYsT40i9GyWzlHQ5ShZoK7JZdySeOozi/tz2EezDo6c04q6+ckYMeoY7idaie1qp2dT5KoYQ2yky6JuoHnA==,
+                integrity: sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==,
             }
         engines: { node: '>=4' }
         dependencies:
@@ -11999,7 +11999,7 @@ packages:
             '@protobufjs/path': 1.1.2
             '@protobufjs/pool': 1.1.0
             '@protobufjs/utf8': 1.1.0
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
             long: 5.2.3
 
     /psl@1.9.0:
@@ -12133,7 +12133,7 @@ packages:
         peerDependencies:
             react: '>= 0.14.0'
         dependencies:
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
             highlight.js: 10.7.3
             lowlight: 1.20.0
             prismjs: 1.29.0
@@ -12197,10 +12197,10 @@ packages:
             type-fest: 0.6.0
         dev: true
 
-    /readable-stream@4.5.1:
+    /readable-stream@4.5.2:
         resolution:
             {
-                integrity: sha512-uQjbf34vmf/asGnOHQEw07Q4llgMACQZTWWa4MmICS0IKJoHbLwKCy71H3eR99Dw5iYejc6W+pqZZEeqRtUFAw==,
+                integrity: sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==,
             }
         engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
         dependencies:
@@ -12302,7 +12302,7 @@ packages:
                 integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==,
             }
         dependencies:
-            '@babel/runtime': 7.23.6
+            '@babel/runtime': 7.23.7
         dev: true
 
     /regexp-to-ast@0.5.0:
@@ -12463,27 +12463,27 @@ packages:
             glob: 7.2.3
         dev: true
 
-    /rollup@4.9.1:
+    /rollup@4.9.2:
         resolution:
             {
-                integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==,
+                integrity: sha512-66RB8OtFKUTozmVEh3qyNfH+b+z2RXBVloqO2KCC/pjFaGaHtxP9fVfOQKPSGXg2mElmjmxjW/fZ7iKrEpMH5Q==,
             }
         engines: { node: '>=18.0.0', npm: '>=8.0.0' }
         hasBin: true
         optionalDependencies:
-            '@rollup/rollup-android-arm-eabi': 4.9.1
-            '@rollup/rollup-android-arm64': 4.9.1
-            '@rollup/rollup-darwin-arm64': 4.9.1
-            '@rollup/rollup-darwin-x64': 4.9.1
-            '@rollup/rollup-linux-arm-gnueabihf': 4.9.1
-            '@rollup/rollup-linux-arm64-gnu': 4.9.1
-            '@rollup/rollup-linux-arm64-musl': 4.9.1
-            '@rollup/rollup-linux-riscv64-gnu': 4.9.1
-            '@rollup/rollup-linux-x64-gnu': 4.9.1
-            '@rollup/rollup-linux-x64-musl': 4.9.1
-            '@rollup/rollup-win32-arm64-msvc': 4.9.1
-            '@rollup/rollup-win32-ia32-msvc': 4.9.1
-            '@rollup/rollup-win32-x64-msvc': 4.9.1
+            '@rollup/rollup-android-arm-eabi': 4.9.2
+            '@rollup/rollup-android-arm64': 4.9.2
+            '@rollup/rollup-darwin-arm64': 4.9.2
+            '@rollup/rollup-darwin-x64': 4.9.2
+            '@rollup/rollup-linux-arm-gnueabihf': 4.9.2
+            '@rollup/rollup-linux-arm64-gnu': 4.9.2
+            '@rollup/rollup-linux-arm64-musl': 4.9.2
+            '@rollup/rollup-linux-riscv64-gnu': 4.9.2
+            '@rollup/rollup-linux-x64-gnu': 4.9.2
+            '@rollup/rollup-linux-x64-musl': 4.9.2
+            '@rollup/rollup-win32-arm64-msvc': 4.9.2
+            '@rollup/rollup-win32-ia32-msvc': 4.9.2
+            '@rollup/rollup-win32-x64-msvc': 4.9.2
             fsevents: 2.3.3
         dev: true
 
@@ -12547,10 +12547,10 @@ packages:
             }
         dev: true
 
-    /sass@1.69.5:
+    /sass@1.69.6:
         resolution:
             {
-                integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==,
+                integrity: sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==,
             }
         engines: { node: '>=14.0.0' }
         hasBin: true
@@ -13053,10 +13053,10 @@ packages:
                 integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==,
             }
         dependencies:
-            acorn: 8.11.2
+            acorn: 8.11.3
         dev: true
 
-    /styled-jsx@5.1.1(@babel/core@7.23.6)(react@18.2.0):
+    /styled-jsx@5.1.1(@babel/core@7.23.7)(react@18.2.0):
         resolution:
             {
                 integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==,
@@ -13072,7 +13072,7 @@ packages:
             babel-plugin-macros:
                 optional: true
         dependencies:
-            '@babel/core': 7.23.6
+            '@babel/core': 7.23.7
             client-only: 0.0.1
             react: 18.2.0
         dev: false
@@ -13212,7 +13212,7 @@ packages:
             postcss-js: 4.0.1(postcss@8.4.32)
             postcss-load-config: 4.0.2(postcss@8.4.32)(ts-node@10.9.2)
             postcss-nested: 6.0.1(postcss@8.4.32)
-            postcss-selector-parser: 6.0.14
+            postcss-selector-parser: 6.0.15
             resolve: 1.22.8
             sucrase: 3.35.0
         transitivePeerDependencies:
@@ -13227,10 +13227,10 @@ packages:
         engines: { node: '>=6' }
         dev: true
 
-    /terser-webpack-plugin@5.3.9(webpack@5.89.0):
+    /terser-webpack-plugin@5.3.10(webpack@5.89.0):
         resolution:
             {
-                integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==,
+                integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==,
             }
         engines: { node: '>= 10.13.0' }
         peerDependencies:
@@ -13263,7 +13263,7 @@ packages:
         hasBin: true
         dependencies:
             '@jridgewell/source-map': 0.3.5
-            acorn: 8.11.2
+            acorn: 8.11.3
             commander: 2.20.3
             source-map-support: 0.5.21
         dev: true
@@ -13452,7 +13452,7 @@ packages:
             webpack: 5.89.0(webpack-cli@5.1.4)
         dev: true
 
-    /ts-node@10.9.2(@types/node@20.10.5)(typescript@5.3.3):
+    /ts-node@10.9.2(@types/node@20.10.6)(typescript@5.3.3):
         resolution:
             {
                 integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==,
@@ -13474,8 +13474,8 @@ packages:
             '@tsconfig/node12': 1.0.11
             '@tsconfig/node14': 1.0.3
             '@tsconfig/node16': 1.0.4
-            '@types/node': 20.10.5
-            acorn: 8.11.2
+            '@types/node': 20.10.6
+            acorn: 8.11.3
             acorn-walk: 8.3.1
             arg: 4.1.3
             create-require: 1.1.1
@@ -13896,7 +13896,7 @@ packages:
         engines: { node: '>= 0.10' }
         dev: false
 
-    /vite-node@1.1.0(@types/node@20.10.5):
+    /vite-node@1.1.0(@types/node@20.10.6):
         resolution:
             {
                 integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==,
@@ -13908,7 +13908,7 @@ packages:
             debug: 4.3.4
             pathe: 1.1.1
             picocolors: 1.0.0
-            vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)
+            vite: 5.0.10(@types/node@20.10.6)(sass@1.69.6)
         transitivePeerDependencies:
             - '@types/node'
             - less
@@ -13930,14 +13930,14 @@ packages:
         dependencies:
             magic-string: 0.30.5
             svgo: 3.1.0
-            vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)
+            vite: 5.0.10(@types/node@20.10.6)(sass@1.69.6)
             xml2js: 0.6.2
         dev: true
 
-    /vite-tsconfig-paths@4.2.2(typescript@5.3.3):
+    /vite-tsconfig-paths@4.2.3(typescript@5.3.3):
         resolution:
             {
-                integrity: sha512-dq0FjyxHHDnp0uS3P12WEOX2W7NeuLzX9AWP38D7Zw2CTbFErapwQVlCiT5DMJcVWKQ1MMdTe92PZl/rBQ7qcw==,
+                integrity: sha512-xVsA2xe6QSlzBujtWF8q2NYexh7PAUYfzJ4C8Axpe/7d2pcERYxuxGgph9F4f0iQO36g5tyGq6eBUYIssdUrVw==,
             }
         peerDependencies:
             vite: '*'
@@ -13953,7 +13953,7 @@ packages:
             - typescript
         dev: true
 
-    /vite@5.0.10(@types/node@20.10.5)(sass@1.69.5):
+    /vite@5.0.10(@types/node@20.10.6)(sass@1.69.6):
         resolution:
             {
                 integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==,
@@ -13984,11 +13984,11 @@ packages:
             terser:
                 optional: true
         dependencies:
-            '@types/node': 20.10.5
-            esbuild: 0.19.10
+            '@types/node': 20.10.6
+            esbuild: 0.19.11
             postcss: 8.4.32
-            rollup: 4.9.1
-            sass: 1.69.5
+            rollup: 4.9.2
+            sass: 1.69.6
         optionalDependencies:
             fsevents: 2.3.3
         dev: true
@@ -14004,10 +14004,10 @@ packages:
         dependencies:
             ts-essentials: 9.4.1(typescript@5.3.3)
             typescript: 5.3.3
-            vitest: 1.1.0(@types/node@20.10.5)
+            vitest: 1.1.0(@types/node@20.10.6)
         dev: true
 
-    /vitest@1.1.0(@types/node@20.10.5):
+    /vitest@1.1.0(@types/node@20.10.6):
         resolution:
             {
                 integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==,
@@ -14035,7 +14035,7 @@ packages:
             jsdom:
                 optional: true
         dependencies:
-            '@types/node': 20.10.5
+            '@types/node': 20.10.6
             '@vitest/expect': 1.1.0
             '@vitest/runner': 1.1.0
             '@vitest/snapshot': 1.1.0
@@ -14054,8 +14054,8 @@ packages:
             strip-literal: 1.3.0
             tinybench: 2.5.1
             tinypool: 0.8.1
-            vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)
-            vite-node: 1.1.0(@types/node@20.10.5)
+            vite: 5.0.10(@types/node@20.10.6)(sass@1.69.6)
+            vite-node: 1.1.0(@types/node@20.10.6)
             why-is-node-running: 2.2.2
         transitivePeerDependencies:
             - less
@@ -14200,8 +14200,8 @@ packages:
             '@webassemblyjs/ast': 1.11.6
             '@webassemblyjs/wasm-edit': 1.11.6
             '@webassemblyjs/wasm-parser': 1.11.6
-            acorn: 8.11.2
-            acorn-import-assertions: 1.9.0(acorn@8.11.2)
+            acorn: 8.11.3
+            acorn-import-assertions: 1.9.0(acorn@8.11.3)
             browserslist: 4.22.2
             chrome-trace-event: 1.0.3
             enhanced-resolve: 5.15.0
@@ -14216,7 +14216,7 @@ packages:
             neo-async: 2.6.2
             schema-utils: 3.3.0
             tapable: 2.2.1
-            terser-webpack-plugin: 5.3.9(webpack@5.89.0)
+            terser-webpack-plugin: 5.3.10(webpack@5.89.0)
             watchpack: 2.4.0
             webpack-cli: 5.1.4(webpack@5.89.0)
             webpack-sources: 3.2.3
@@ -14537,7 +14537,7 @@ packages:
         engines: { node: '>=12.20' }
         dev: true
 
-    /zustand@4.4.7(@types/react@18.2.45)(react@18.2.0):
+    /zustand@4.4.7(@types/react@18.2.46)(react@18.2.0):
         resolution:
             {
                 integrity: sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==,
@@ -14555,7 +14555,7 @@ packages:
             react:
                 optional: true
         dependencies:
-            '@types/react': 18.2.45
+            '@types/react': 18.2.46
             react: 18.2.0
             use-sync-external-store: 1.2.0(react@18.2.0)
         dev: false

From da4699929873c27af4fc564581a70505cc8be192 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sat, 30 Dec 2023 16:29:37 +0100
Subject: [PATCH 07/15] chore: add tests

---
 frontend/public/messages/en.json              |   2 +-
 .../cohere-form-components.spec.tsx           | 245 ++++++++++++++++++
 ...rs-form.tsx => cohere-form-components.tsx} |  41 ++-
 .../cohere-model-parameters-form.spec.tsx     |   0
 ...rs-form.tsx => openai-form-components.tsx} |   0
 .../parameters-and-prompt-form.spec.tsx       |  66 ++---
 .../parameters-and-prompt-form.tsx            |   4 +-
 .../[configId]/prompt-config-testing.spec.tsx |   4 +-
 .../parameter-slider.tsx                      |   2 +-
 frontend/tests/factories.ts                   |  12 +
 shared/ts/src/constants.ts                    |   1 +
 shared/ts/src/env.spec.ts                     |  19 ++
 shared/ts/src/grpc.spec.ts                    |  39 +++
 shared/ts/src/grpc.ts                         |   1 +
 shared/ts/src/logger.spec.ts                  |  36 +++
 shared/ts/src/logger.ts                       |   5 +-
 16 files changed, 419 insertions(+), 58 deletions(-)
 create mode 100644 frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.spec.tsx
 rename frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/{cohere-model-parameters-form.tsx => cohere-form-components.tsx} (80%)
 delete mode 100644 frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx
 rename frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/{openai-model-parameters-form.tsx => openai-form-components.tsx} (100%)
 create mode 100644 shared/ts/src/env.spec.ts
 create mode 100644 shared/ts/src/grpc.spec.ts
 create mode 100644 shared/ts/src/logger.spec.ts

diff --git a/frontend/public/messages/en.json b/frontend/public/messages/en.json
index ab78ed6a..723f8e7f 100644
--- a/frontend/public/messages/en.json
+++ b/frontend/public/messages/en.json
@@ -134,7 +134,7 @@
 		"promptConfigModelSelectLabel": "Model",
 		"promptConfigNameInputPlaceholder": "For example: Default Config",
 		"promptConfigVendorSelectLabel": "Provider",
-		"promptMessagePlaceholder": "Example of a template: The user favourite albums are: '{favouriteAlbums'}.The user disliked albums are: '{dislikedAlbums'}. Please suggest 5 new albums for the user.",
+		"promptMessagePlaceholder": "Example of a template: The user favourite albums are: '{favouriteAlbums'}. The user disliked albums are: '{dislikedAlbums'}. Please suggest 5 new albums for the user.",
 		"promptMessages": "Messages",
 		"promptTemplate": "Prompt Template",
 		"requestTokens": "Request Tokens",
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.spec.tsx
new file mode 100644
index 00000000..79e80f54
--- /dev/null
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.spec.tsx
@@ -0,0 +1,245 @@
+import { CoherePromptParametersFactory } from 'tests/factories';
+import {
+	fireEvent,
+	getLocaleNamespace,
+	render,
+	screen,
+} from 'tests/test-utils';
+
+import {
+	CohereModelParametersForm,
+	CoherePromptTemplate,
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components';
+import { CohereModelParameters, CohereModelType } from '@/types';
+
+describe('Cohere Form Components', () => {
+	const locales = getLocaleNamespace('createConfigWizard');
+
+	describe('CohereModelParametersForm Tests', () => {
+		it('should render the component and all sliders using the provided existing parameters as initial values', () => {
+			const exitingParameters =
+				CoherePromptParametersFactory.buildSync() as Required<CohereModelParameters>;
+
+			render(
+				<CohereModelParametersForm
+					existingParameters={exitingParameters}
+					modelType={CohereModelType.Command}
+					setParameters={vi.fn()}
+				/>,
+			);
+
+			const maxTokensSliderInput: HTMLInputElement = screen.getByTestId(
+				'parameter-slider-maxTokens',
+			);
+			expect(maxTokensSliderInput.value).toBe(
+				exitingParameters.maxTokens.toString(),
+			);
+
+			const temperatureSliderInput: HTMLInputElement = screen.getByTestId(
+				'parameter-slider-temperature',
+			);
+			expect(temperatureSliderInput.value).toBe(
+				exitingParameters.temperature.toString(),
+			);
+
+			const pSliderInput: HTMLInputElement =
+				screen.getByTestId('parameter-slider-p');
+			expect(pSliderInput.value).toBe(exitingParameters.p.toString());
+
+			const kSliderInput: HTMLInputElement =
+				screen.getByTestId('parameter-slider-k');
+			expect(kSliderInput.value).toBe(exitingParameters.k.toString());
+
+			const frequencyPenaltySliderInput: HTMLInputElement =
+				screen.getByTestId('parameter-slider-frequencyPenalty');
+			expect(frequencyPenaltySliderInput.value).toBe(
+				exitingParameters.frequencyPenalty.toString(),
+			);
+
+			const presencePenaltySliderInput: HTMLInputElement =
+				screen.getByTestId('parameter-slider-presencePenalty');
+			expect(presencePenaltySliderInput.value).toBe(
+				exitingParameters.presencePenalty.toString(),
+			);
+		});
+
+		it('should update the value of the slider when it is adjusted by the user', () => {
+			const exitingParameters =
+				CoherePromptParametersFactory.buildSync() as Required<CohereModelParameters>;
+
+			render(
+				<CohereModelParametersForm
+					existingParameters={exitingParameters}
+					modelType={CohereModelType.Command}
+					setParameters={vi.fn()}
+				/>,
+			);
+
+			const maxTokensSliderInput: HTMLInputElement = screen.getByTestId(
+				'parameter-slider-maxTokens',
+			);
+
+			fireEvent.change(maxTokensSliderInput, { target: { value: '50' } });
+
+			expect(maxTokensSliderInput.value).toBe('50');
+		});
+
+		it('should update the model parameters correctly when the slider is adjusted', () => {
+			const exitingParameters =
+				CoherePromptParametersFactory.buildSync() as Required<CohereModelParameters>;
+
+			const setParametersMock = vi.fn();
+
+			render(
+				<CohereModelParametersForm
+					existingParameters={exitingParameters}
+					modelType={CohereModelType.Command}
+					setParameters={setParametersMock}
+				/>,
+			);
+
+			const maxTokensSliderInput: HTMLInputElement = screen.getByTestId(
+				'parameter-slider-maxTokens',
+			);
+
+			fireEvent.change(maxTokensSliderInput, { target: { value: '50' } });
+
+			expect(setParametersMock).toHaveBeenCalledWith({
+				...exitingParameters,
+				maxTokens: 50,
+			});
+		});
+	});
+
+	describe('CoherePromptTemplate tests', () => {
+		it('should render the form with the correct header and label text', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			expect(
+				screen.getByTestId('cohere-prompt-template-form-header'),
+			).toHaveTextContent(locales.promptTemplate);
+			expect(
+				screen.getByTestId('cohere-prompt-template-form-label-text'),
+			).toHaveTextContent(locales.messageContent);
+		});
+
+		it('should display the message content textarea with the correct placeholder text', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			const textArea: HTMLTextAreaElement = screen.getByTestId(
+				'cohere-prompt-template-form-textarea',
+			);
+
+			expect(textArea.placeholder).toBe(
+				locales.promptMessagePlaceholder.replaceAll("'", ''),
+			);
+		});
+
+		it('should update the message state correctly when text is entered into the textarea', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			const textarea = screen.getByTestId(
+				'cohere-prompt-template-form-textarea',
+			);
+			fireEvent.change(textarea, { target: { value: 'Test message' } });
+
+			expect(setMessages).toHaveBeenCalledWith([
+				{
+					message: 'Test message',
+					templateVariables: [],
+				},
+			]);
+		});
+
+		it('should extract template variables correctly from the entered message', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			const textarea = screen.getByTestId(
+				'cohere-prompt-template-form-textarea',
+			);
+			fireEvent.change(textarea, { target: { value: 'Hello {name}!' } });
+
+			expect(setMessages).toHaveBeenCalledWith([
+				{
+					message: 'Hello {name}!',
+					templateVariables: ['name'],
+				},
+			]);
+		});
+
+		it('should render the form with empty message content when no messages are passed in', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			expect(
+				screen.getByTestId('cohere-prompt-template-form-textarea'),
+			).toHaveValue('');
+		});
+
+		it('should render the form with empty message content when messages array is empty', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			expect(
+				screen.getByTestId('cohere-prompt-template-form-textarea'),
+			).toHaveValue('');
+		});
+
+		it('should display a text info label with wrap variable instructions', () => {
+			const setMessages = vi.fn();
+
+			render(
+				<CoherePromptTemplate
+					messages={[]}
+					setMessages={setMessages}
+				/>,
+			);
+
+			expect(
+				screen.getByTestId(
+					'cohere-prompt-template-form-label-alt-text',
+				),
+			).toHaveTextContent(locales.wrapVariable.replaceAll("'", ''));
+		});
+	});
+});
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.tsx
similarity index 80%
rename from frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
rename to frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.tsx
index e747036c..cc901a2c 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components.tsx
@@ -124,9 +124,17 @@ export function CohereModelParametersForm({
 	}, [maxTokens, frequencyPenalty, presencePenalty, temperature, p, k]);
 
 	return (
-		<div data-testid="cohere-model-parameters-form">
-			<h2 className="card-header">{t('modelParameters')}</h2>
-			<div className="rounded-dark-card columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8">
+		<div data-testid="cohere-model-parameters-form-container">
+			<h2
+				className="card-header"
+				data-testid="cohere-model-parameters-form-header"
+			>
+				{t('modelParameters')}
+			</h2>
+			<div
+				className="rounded-dark-card columns-1 md:grid md:grid-cols-2 lg:grid lg:grid-cols-3 gap-8	gap-y-8"
+				data-testid="cohere-model-parameters-form-inputs-container"
+			>
 				{inputs.map(ParameterSlider)}
 			</div>
 		</div>
@@ -152,17 +160,30 @@ export function CoherePromptTemplate({
 	};
 
 	return (
-		<div data-testid="cohere-prompt-template-form">
-			<h2 className="card-header">{t('promptTemplate')}</h2>
-			<div className="form-control">
+		<div data-testid="cohere-prompt-template-form-container">
+			<h2
+				className="card-header"
+				data-testid="cohere-prompt-template-form-header"
+			>
+				{t('promptTemplate')}
+			</h2>
+			<div
+				className="form-control"
+				data-testid="cohere-prompt-template-form"
+			>
 				<label
 					className="label"
-					data-testid="parameters-and-prompt-form-new-message-content-label"
+					data-testid="cohere-prompt-template-form-label"
 				>
-					<span className="label-text">{t('messageContent')}</span>
+					<span
+						className="label-text"
+						data-testid="cohere-prompt-template-form-label-text"
+					>
+						{t('messageContent')}
+					</span>
 					<span
 						className="text-info label-text-alt text-sm"
-						data-testid="parameters-and-prompt-form-wrap-variable-label"
+						data-testid="cohere-prompt-template-form-label-alt-text"
 					>
 						{t('wrapVariable')}
 					</span>
@@ -172,7 +193,7 @@ export function CoherePromptTemplate({
 					placeholder={t('promptMessagePlaceholder')}
 					value={messages[0]?.message ?? ''}
 					onChange={handleChange(handleSetMessages)}
-					data-testid="parameters-and-prompt-form-message-textarea"
+					data-testid="cohere-prompt-template-form-textarea"
 				/>
 			</div>
 		</div>
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form.spec.tsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-form-components.tsx
similarity index 100%
rename from frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form.tsx
rename to frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-form-components.tsx
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
index 80576c45..89da3d84 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.spec.tsx
@@ -5,7 +5,7 @@ import { expect } from 'vitest';
 import {
 	OpenAIModelParametersForm,
 	OpenAIPromptTemplate,
-} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form';
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-form-components';
 import { PromptConfigParametersAndPromptForm } from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form';
 import {
 	DEFAULT_MAX_TOKENS,
@@ -48,10 +48,10 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 
 			fireEvent.change(maxTokensInput, { target: { value: '200' } });
@@ -121,20 +121,18 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 			const presencePenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-presencePenalty',
+				'parameter-slider-presencePenalty',
 			);
 			const temperatureInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-temperature',
-			);
-			const topPInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-topP',
+				'parameter-slider-temperature',
 			);
+			const topPInput = screen.getByTestId('parameter-slider-topP');
 
 			expect(maxTokensInput).toHaveValue(DEFAULT_MAX_TOKENS.toString());
 			expect(frequencyPenaltyInput).toHaveValue('0');
@@ -153,20 +151,18 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 			const presencePenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-presencePenalty',
+				'parameter-slider-presencePenalty',
 			);
 			const temperatureInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-temperature',
-			);
-			const topPInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-topP',
+				'parameter-slider-temperature',
 			);
+			const topPInput = screen.getByTestId('parameter-slider-topP');
 
 			fireEvent.change(maxTokensInput, { target: { value: 100 } });
 			fireEvent.change(frequencyPenaltyInput, { target: { value: 0.5 } });
@@ -275,20 +271,18 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 			const presencePenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-presencePenalty',
+				'parameter-slider-presencePenalty',
 			);
 			const temperatureInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-temperature',
-			);
-			const topPInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-topP',
+				'parameter-slider-temperature',
 			);
+			const topPInput = screen.getByTestId('parameter-slider-topP');
 
 			expect(maxTokensInput).toHaveAttribute('min', '1');
 			expect(maxTokensInput).toHaveAttribute(
@@ -331,20 +325,18 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 			const presencePenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-presencePenalty',
+				'parameter-slider-presencePenalty',
 			);
 			const temperatureInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-temperature',
-			);
-			const topPInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-topP',
+				'parameter-slider-temperature',
 			);
+			const topPInput = screen.getByTestId('parameter-slider-topP');
 
 			expect(maxTokensInput).toHaveValue(
 				existingParameters.maxTokens.toString(),
@@ -378,20 +370,18 @@ describe('parameters-and-prompt-form components tests', () => {
 			);
 
 			const maxTokensInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-maxTokens',
+				'parameter-slider-maxTokens',
 			);
 			const frequencyPenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-frequencyPenalty',
+				'parameter-slider-frequencyPenalty',
 			);
 			const presencePenaltyInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-presencePenalty',
+				'parameter-slider-presencePenalty',
 			);
 			const temperatureInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-temperature',
-			);
-			const topPInput = screen.getByTestId(
-				'create-prompt-config-dialog-model-parameter-range-topP',
+				'parameter-slider-temperature',
 			);
+			const topPInput = screen.getByTestId('parameter-slider-topP');
 
 			expect(maxTokensInput).toHaveValue(DEFAULT_MAX_TOKENS.toString());
 			expect(frequencyPenaltyInput).toHaveValue('0');
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
index 469b103e..bebd88e1 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/parameters-and-prompt-form.tsx
@@ -3,11 +3,11 @@ import { useMemo } from 'react';
 import {
 	CohereModelParametersForm,
 	CoherePromptTemplate,
-} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-model-parameters-form';
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/cohere-form-components';
 import {
 	OpenAIModelParametersForm,
 	OpenAIPromptTemplate,
-} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-model-parameters-form';
+} from '@/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/openai-form-components';
 import {
 	CohereModelParameters,
 	CohereModelType,
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/configs/[configId]/prompt-config-testing.spec.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/configs/[configId]/prompt-config-testing.spec.tsx
index 119c55c9..66654190 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/configs/[configId]/prompt-config-testing.spec.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/configs/[configId]/prompt-config-testing.spec.tsx
@@ -180,9 +180,7 @@ describe('PromptConfigTesting tests', () => {
 		);
 		expect(updateButton).toBeInTheDocument();
 
-		const slider = screen.getByTestId(
-			'create-prompt-config-dialog-model-parameter-range-maxTokens',
-		);
+		const slider = screen.getByTestId('parameter-slider-maxTokens');
 		fireEvent.change(slider, { target: { value: 100 } });
 
 		handleUpdatePromptConfigSpy.mockResolvedValueOnce(updatedPromptConfig);
diff --git a/frontend/src/components/prompt-display-components/parameter-slider.tsx b/frontend/src/components/prompt-display-components/parameter-slider.tsx
index 010843c3..fb2ce1e9 100644
--- a/frontend/src/components/prompt-display-components/parameter-slider.tsx
+++ b/frontend/src/components/prompt-display-components/parameter-slider.tsx
@@ -45,7 +45,7 @@ export function ParameterSlider({
 					setter(Number.parseFloat(value));
 				})}
 				className="range range-xs"
-				data-testid={`create-prompt-config-dialog-model-parameter-range-${key}`}
+				data-testid={`parameter-slider-${key}`}
 			/>
 		</div>
 	);
diff --git a/frontend/tests/factories.ts b/frontend/tests/factories.ts
index 585638ad..c2e6cd4f 100644
--- a/frontend/tests/factories.ts
+++ b/frontend/tests/factories.ts
@@ -6,6 +6,7 @@ import {
 	AccessPermission,
 	APIKey,
 	Application,
+	CohereModelParameters,
 	CoherePromptMessage,
 	ModelVendor,
 	OpenAIModelType,
@@ -44,6 +45,7 @@ export const ApplicationFactory = new TypeFactory<Application>(() => ({
 	name: faker.lorem.words(),
 	updatedAt: faker.date.past().toISOString(),
 }));
+
 export const OpenAIPromptMessageFactory = new TypeFactory<OpenAIPromptMessage>(
 	(i) =>
 		i % 4 === 0
@@ -82,6 +84,16 @@ export const CohereMessageFactory = new TypeFactory<CoherePromptMessage>(
 	}),
 );
 
+export const CoherePromptParametersFactory =
+	new TypeFactory<CohereModelParameters>(() => ({
+		frequencyPenalty: faker.number.int({ max: 100, min: 0 }),
+		k: faker.number.int({ max: 500, min: 0 }),
+		maxTokens: faker.number.float({ max: 4096, min: 1 }),
+		p: faker.number.float({ max: 0.99, min: 0 }),
+		presencePenalty: faker.number.float({ max: 1, min: 0 }),
+		temperature: faker.number.float({ max: 1, min: 0 }),
+	}));
+
 export const APIKeyFactory = new TypeFactory<APIKey>(() => ({
 	createdAt: faker.date.past().toISOString(),
 	hash: faker.string.uuid(),
diff --git a/shared/ts/src/constants.ts b/shared/ts/src/constants.ts
index 340148d6..ef79e8c3 100644
--- a/shared/ts/src/constants.ts
+++ b/shared/ts/src/constants.ts
@@ -1,3 +1,4 @@
+/* c8 ignore next */
 export enum StreamFinishReason {
 	// Stream is done and finished without issues
 	DONE = 'done',
diff --git a/shared/ts/src/env.spec.ts b/shared/ts/src/env.spec.ts
new file mode 100644
index 00000000..96b05ccc
--- /dev/null
+++ b/shared/ts/src/env.spec.ts
@@ -0,0 +1,19 @@
+import { loadEnv } from 'shared/env';
+
+describe('env utils test', () => {
+	describe('loadEnv tests', () => {
+		it('should load an env variable when set', () => {
+			process.env.XYZ = '123';
+
+			expect(loadEnv('XYZ')).toBe('123');
+		});
+
+		it('should throw an error when env variable is not set', () => {
+			expect(() => loadEnv('XXX')).toThrow();
+		});
+
+		it('should return the fallback value when env variable is not set', () => {
+			expect(loadEnv('XXX', 'ABC')).toBe('ABC');
+		});
+	});
+});
diff --git a/shared/ts/src/grpc.spec.ts b/shared/ts/src/grpc.spec.ts
new file mode 100644
index 00000000..78a4e209
--- /dev/null
+++ b/shared/ts/src/grpc.spec.ts
@@ -0,0 +1,39 @@
+import { Status } from '@grpc/grpc-js/build/src/constants';
+import { Metadata } from '@grpc/grpc-js/build/src/metadata';
+import {
+	createInternalGrpcError,
+	extractProviderAPIKeyFromMetadata,
+} from 'shared/grpc';
+import { it } from 'vitest';
+
+describe('GRPC utils tests', () => {
+	describe('createInternalGrpcError tests', () => {
+		it('should create an internal grpc error', () => {
+			const error = new Error('test error');
+			const grpcError = createInternalGrpcError(error);
+
+			expect(grpcError.code).toBe(Status.INTERNAL);
+			expect(grpcError.details).toBe(error.message);
+		});
+	});
+	describe('extractProviderAPIKeyFromMetadata tests', () => {
+		it('should extract the provider API key from the metadata', () => {
+			const md = new Metadata();
+			md.set('X-API-Key', 'test');
+			const call = {
+				metadata: md,
+			};
+			const apiKey = extractProviderAPIKeyFromMetadata(call as any);
+			expect(apiKey).toBe('test');
+		});
+
+		it('should return undefined if the provider API key is not present in the metadata', () => {
+			const md = new Metadata();
+			const call = {
+				metadata: md,
+			};
+			const apiKey = extractProviderAPIKeyFromMetadata(call as any);
+			expect(apiKey).toBeUndefined();
+		});
+	});
+});
diff --git a/shared/ts/src/grpc.ts b/shared/ts/src/grpc.ts
index 65c3e60c..981757f2 100644
--- a/shared/ts/src/grpc.ts
+++ b/shared/ts/src/grpc.ts
@@ -54,6 +54,7 @@ export function createServer<
 		// of TLS.
 		ServerCredentials.createInsecure(),
 		(error: Error | null) => {
+			/* c8 ignore next */
 			if (error) {
 				logger.error('Server failed to start');
 				throw error;
diff --git a/shared/ts/src/logger.spec.ts b/shared/ts/src/logger.spec.ts
new file mode 100644
index 00000000..36b92222
--- /dev/null
+++ b/shared/ts/src/logger.spec.ts
@@ -0,0 +1,36 @@
+import { createLogger } from 'shared/logger';
+
+const mock = vi.fn();
+
+vi.mock('pino', async (importOriginal: () => Promise<Record<string, any>>) => {
+	const original = await importOriginal();
+	return {
+		...original,
+		pino: mock,
+	};
+});
+
+describe('logger utils tests', () => {
+	it('should create an info level logger in production', () => {
+		Reflect.set(process.env, 'NODE_ENV', 'production');
+		createLogger();
+
+		expect(mock).toHaveBeenCalledWith({ level: 'info' });
+
+		Reflect.set(process.env, 'NODE_ENV', 'test');
+	});
+
+	it('should create a debug level logger in development', () => {
+		Reflect.set(process.env, 'NODE_ENV', 'development');
+		createLogger();
+
+		expect(mock).toHaveBeenCalledWith({
+			debug: 'info',
+			transport: {
+				target: 'pino-pretty',
+			},
+		});
+
+		Reflect.set(process.env, 'NODE_ENV', 'test');
+	});
+});
diff --git a/shared/ts/src/logger.ts b/shared/ts/src/logger.ts
index 3a50a101..cfef0809 100644
--- a/shared/ts/src/logger.ts
+++ b/shared/ts/src/logger.ts
@@ -1,13 +1,12 @@
 import { LoggerOptions, pino } from 'pino';
-
-export /**
+/**
  * The createLogger function creates a logger instance.
  *
  * @param options pino logger options
  *
  * @return A logger instance
  */
-const createLogger = (options?: LoggerOptions) =>
+export const createLogger = (options?: LoggerOptions) =>
 	process.env.NODE_ENV === 'production'
 		? pino({ level: 'info', ...options })
 		: pino({

From 0ce5b0565cd4e26a039dc63490e43a853f95c88d Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sat, 30 Dec 2023 17:50:43 +0100
Subject: [PATCH 08/15] chore: update model validation

---
 .idea/externalDependencies.xml                |  1 -
 e2e/factories/factories.go                    |  4 +--
 .../internal/connectors/cohere/utils_test.go  | 22 ++-----------
 .../internal/api/promptconfigs.go             |  3 ++
 .../dashboard-backend/internal/dto/dto.go     |  2 +-
 .../internal/repositories/promptconfig.go     | 17 +++++++---
 shared/go/datatypes/datatypes.go              |  2 +-
 shared/go/db/models/utils.go                  | 32 +++++++++++++++++++
 8 files changed, 54 insertions(+), 29 deletions(-)
 create mode 100644 shared/go/db/models/utils.go

diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
index efd90ca7..98e550ba 100644
--- a/.idea/externalDependencies.xml
+++ b/.idea/externalDependencies.xml
@@ -15,7 +15,6 @@
     <plugin id="intellij.prettierJS" />
     <plugin id="intellij.vitejs" />
     <plugin id="intellij.webpack" />
-    <plugin id="lechuck.intellij-plugin.task" />
     <plugin id="mdx.js" />
     <plugin id="org.intellij.plugins.hcl" />
     <plugin id="org.intellij.plugins.postcss" />
diff --git a/e2e/factories/factories.go b/e2e/factories/factories.go
index dede66a9..ee2391f2 100644
--- a/e2e/factories/factories.go
+++ b/e2e/factories/factories.go
@@ -161,10 +161,10 @@ func CreateCoherePromptConfig(
 	modelParameters := CreateCohereModelParameters()
 
 	promptMessages := ptr.To(
-		json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
+		json.RawMessage(serialization.SerializeJSON([]datatypes.CoherePromptMessageDTO{{
 			Message:           userMessage,
 			TemplateVariables: &templateVariables,
-		})),
+		}})),
 	)
 
 	promptConfig, promptConfigCreateErr := db.GetQueries().
diff --git a/services/api-gateway/internal/connectors/cohere/utils_test.go b/services/api-gateway/internal/connectors/cohere/utils_test.go
index dbbad54b..0b02670d 100644
--- a/services/api-gateway/internal/connectors/cohere/utils_test.go
+++ b/services/api-gateway/internal/connectors/cohere/utils_test.go
@@ -71,10 +71,10 @@ func TestUtils(t *testing.T) {
 				ModelVendor:     models.ModelVendorCOHERE,
 				ModelParameters: factories.CreateCohereModelParameters(),
 				ProviderPromptMessages: ptr.To(
-					json.RawMessage(serialization.SerializeJSON(datatypes.CoherePromptMessageDTO{
+					json.RawMessage(serialization.SerializeJSON([]datatypes.CoherePromptMessageDTO{{
 						Message:           promptMessage,
 						TemplateVariables: &expectedTemplateVariables,
-					})),
+					}})),
 				),
 				ExpectedTemplateVariables: expectedTemplateVariables,
 			},
@@ -117,24 +117,6 @@ func TestUtils(t *testing.T) {
 			assert.Equal(t, expectedError, err.Error())
 		})
 
-		t.Run("returns error for unknown message role", func(t *testing.T) {
-			modelType := models.ModelTypeCommand
-			modelParameters := []byte(`{}`)
-			promptMessages := []byte(`[{"role": "unknown"}]`)
-			templateVariables := map[string]string{}
-
-			copied := *requestConfig
-			copied.PromptConfigData.ModelType = modelType
-			copied.PromptConfigData.ModelParameters = ptr.To(json.RawMessage(modelParameters))
-			copied.PromptConfigData.ProviderPromptMessages = ptr.To(json.RawMessage(promptMessages))
-
-			_, err := cohere.CreatePromptRequest(
-				&copied,
-				templateVariables,
-			)
-			assert.Error(t, err)
-		})
-
 		t.Run("returns error if model parameters is invalid json", func(t *testing.T) {
 			modelType := models.ModelTypeCommand
 			modelParameters := []byte(`invalid_json`)
diff --git a/services/dashboard-backend/internal/api/promptconfigs.go b/services/dashboard-backend/internal/api/promptconfigs.go
index 31a9b4e6..239e2c05 100644
--- a/services/dashboard-backend/internal/api/promptconfigs.go
+++ b/services/dashboard-backend/internal/api/promptconfigs.go
@@ -111,6 +111,9 @@ func handleUpdatePromptConfig(w http.ResponseWriter, r *http.Request) {
 		if strings.Contains(
 			updatePromptConfigErr.Error(),
 			"duplicate key value violates unique constraint",
+		) || strings.Contains(
+			updatePromptConfigErr.Error(),
+			"unsupported model type",
 		) {
 			apiErr = apierror.BadRequest(updatePromptConfigErr.Error())
 		}
diff --git a/services/dashboard-backend/internal/dto/dto.go b/services/dashboard-backend/internal/dto/dto.go
index a94d3d3b..a4a3a6cb 100644
--- a/services/dashboard-backend/internal/dto/dto.go
+++ b/services/dashboard-backend/internal/dto/dto.go
@@ -42,7 +42,7 @@ type PromptConfigCreateDTO struct { // skipcq: TCV-001
 type PromptConfigUpdateDTO struct { // skipcq: TCV-001
 	Name                   *string             `json:"name,omitempty"            validate:"omitempty,required"`
 	ModelParameters        *json.RawMessage    `json:"modelParameters,omitempty" validate:"omitempty,required"`
-	ModelType              *models.ModelType   `json:"modelType,omitempty"       validate:"omitempty,oneof=oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
+	ModelType              *models.ModelType   `json:"modelType,omitempty"       validate:"omitempty,required"`
 	ModelVendor            *models.ModelVendor `json:"modelVendor,omitempty"     validate:"omitempty,oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages *json.RawMessage    `json:"promptMessages,omitempty"  validate:"omitempty,required"`
 }
diff --git a/services/dashboard-backend/internal/repositories/promptconfig.go b/services/dashboard-backend/internal/repositories/promptconfig.go
index 1f1cd896..fa45b2ac 100644
--- a/services/dashboard-backend/internal/repositories/promptconfig.go
+++ b/services/dashboard-backend/internal/repositories/promptconfig.go
@@ -36,6 +36,11 @@ func CreatePromptConfig(
 		GetQueries().
 		CheckDefaultPromptConfigExists(ctx, applicationID))
 
+	if invalidVendorOrModelErr := models.ValidateModelType(createPromptConfigDTO.ModelVendor, createPromptConfigDTO.ModelType); invalidVendorOrModelErr != nil {
+		log.Error().Err(invalidVendorOrModelErr).Msg("invalid vendor or model")
+		return nil, fmt.Errorf("invalid vendor or model - %w", invalidVendorOrModelErr)
+	}
+
 	// we automatically set the first created prompt config as the default.
 	// we know this is the first prompt config for the application, because there must always be a default config.
 	promptConfig, createErr := db.
@@ -154,10 +159,9 @@ func UpdatePromptConfig(
 	if updatePromptConfigDTO.Name != nil {
 		updateParams.Name = strings.TrimSpace(*updatePromptConfigDTO.Name)
 	}
-	// TODO: enable this when we add more vendors
-	// if updatePromptConfigDTO.ModelVendor != nil {
-	//	updateParams.ModelVendor = *updatePromptConfigDTO.ModelVendor
-	//}
+	if updatePromptConfigDTO.ModelVendor != nil {
+		updateParams.ModelVendor = *updatePromptConfigDTO.ModelVendor
+	}
 	if updatePromptConfigDTO.ModelType != nil {
 		updateParams.ModelType = *updatePromptConfigDTO.ModelType
 	}
@@ -177,6 +181,11 @@ func UpdatePromptConfig(
 		updateParams.ExpectedTemplateVariables = expectedTemplateVariables
 	}
 
+	if invalidVendorOrModelErr := models.ValidateModelType(updateParams.ModelVendor, updateParams.ModelType); invalidVendorOrModelErr != nil {
+		log.Error().Err(invalidVendorOrModelErr).Msg("invalid vendor or model")
+		return nil, fmt.Errorf("invalid vendor or model - %w", invalidVendorOrModelErr)
+	}
+
 	updatedPromptConfig, updateErr := db.GetQueries().UpdatePromptConfig(ctx, updateParams)
 	if updateErr != nil {
 		log.Error().Err(updateErr).Msg("failed to update prompt config")
diff --git a/shared/go/datatypes/datatypes.go b/shared/go/datatypes/datatypes.go
index 93636f7d..17d6769b 100644
--- a/shared/go/datatypes/datatypes.go
+++ b/shared/go/datatypes/datatypes.go
@@ -48,7 +48,7 @@ type PromptConfigDTO struct { // skipcq: TCV-001
 	ID                        string             `json:"id"`
 	Name                      string             `json:"name"                      validate:"required"`
 	ModelParameters           *json.RawMessage   `json:"modelParameters"           validate:"required"`
-	ModelType                 models.ModelType   `json:"modelType"                 validate:"oneof=oneof=gpt-3.5-turbo gpt-3.5-turbo-16k gpt-4 gpt-4-32k command command-light command-nightly command-light-nightly"`
+	ModelType                 models.ModelType   `json:"modelType"                 validate:"required"`
 	ModelVendor               models.ModelVendor `json:"modelVendor"               validate:"oneof=OPEN_AI COHERE"`
 	ProviderPromptMessages    *json.RawMessage   `json:"providerPromptMessages"    validate:"required"`
 	ExpectedTemplateVariables []string           `json:"expectedTemplateVariables"`
diff --git a/shared/go/db/models/utils.go b/shared/go/db/models/utils.go
new file mode 100644
index 00000000..22d24509
--- /dev/null
+++ b/shared/go/db/models/utils.go
@@ -0,0 +1,32 @@
+package models
+
+import (
+	"fmt"
+	"slices"
+)
+
+var (
+	openAIModels = []string{
+		string(ModelTypeGpt35Turbo),
+		string(ModelTypeGpt35Turbo16k),
+		string(ModelTypeGpt4),
+		string(ModelTypeGpt432k),
+	}
+	cohereModels = []string{
+		string(ModelTypeCommand),
+		string(ModelTypeCommandLight),
+		string(ModelTypeCommandNightly),
+		string(ModelTypeCommandLightNightly),
+	}
+)
+
+func ValidateModelType(vendor ModelVendor, modelType ModelType) error {
+	if vendor == ModelVendorOPENAI && slices.Contains(openAIModels, string(modelType)) {
+		return nil
+	}
+	if vendor == ModelVendorCOHERE && slices.Contains(cohereModels, string(modelType)) {
+		return nil
+	}
+
+	return fmt.Errorf("unsupported model type {%s}", modelType)
+}

From ee73172cc28360f63ad220a1181c83721c1e7889 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sat, 30 Dec 2023 18:00:34 +0100
Subject: [PATCH 09/15] feat: updated the cohere proto file

---
 gen/go/cohere/v1/cohere.pb.go | 165 +++++++++++++++++++++++-----------
 gen/ts/cohere/v1/cohere.d.ts  |  24 +++++
 gen/ts/cohere/v1/cohere.js    |   8 +-
 proto/cohere/v1/cohere.proto  |   8 ++
 4 files changed, 149 insertions(+), 56 deletions(-)

diff --git a/gen/go/cohere/v1/cohere.pb.go b/gen/go/cohere/v1/cohere.pb.go
index dd0781c3..74b3f28a 100644
--- a/gen/go/cohere/v1/cohere.pb.go
+++ b/gen/go/cohere/v1/cohere.pb.go
@@ -314,6 +314,10 @@ type CoherePromptResponse struct {
 
 	// Prompt Content
 	Content *string `protobuf:"bytes,1,opt,name=content,proto3,oneof" json:"content,omitempty"`
+	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
+	RequestTokensCount *uint32 `protobuf:"varint,2,opt,name=request_tokens_count,json=requestTokensCount,proto3,oneof" json:"request_tokens_count,omitempty"`
+	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
+	ResponseTokensCount *uint32 `protobuf:"varint,3,opt,name=response_tokens_count,json=responseTokensCount,proto3,oneof" json:"response_tokens_count,omitempty"`
 }
 
 func (x *CoherePromptResponse) Reset() {
@@ -355,6 +359,20 @@ func (x *CoherePromptResponse) GetContent() string {
 	return ""
 }
 
+func (x *CoherePromptResponse) GetRequestTokensCount() uint32 {
+	if x != nil && x.RequestTokensCount != nil {
+		return *x.RequestTokensCount
+	}
+	return 0
+}
+
+func (x *CoherePromptResponse) GetResponseTokensCount() uint32 {
+	if x != nil && x.ResponseTokensCount != nil {
+		return *x.ResponseTokensCount
+	}
+	return 0
+}
+
 // The CohereStreamResponse contains the data that is streamed from the Cohere API.
 type CohereStreamResponse struct {
 	state         protoimpl.MessageState
@@ -365,6 +383,10 @@ type CohereStreamResponse struct {
 	Content *string `protobuf:"bytes,1,opt,name=content,proto3,oneof" json:"content,omitempty"`
 	// Finish reason, if this is the last message
 	FinishReason *string `protobuf:"bytes,2,opt,name=finish_reason,json=finishReason,proto3,oneof" json:"finish_reason,omitempty"`
+	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
+	RequestTokensCount *uint32 `protobuf:"varint,3,opt,name=request_tokens_count,json=requestTokensCount,proto3,oneof" json:"request_tokens_count,omitempty"`
+	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
+	ResponseTokensCount *uint32 `protobuf:"varint,4,opt,name=response_tokens_count,json=responseTokensCount,proto3,oneof" json:"response_tokens_count,omitempty"`
 }
 
 func (x *CohereStreamResponse) Reset() {
@@ -413,6 +435,20 @@ func (x *CohereStreamResponse) GetFinishReason() string {
 	return ""
 }
 
+func (x *CohereStreamResponse) GetRequestTokensCount() uint32 {
+	if x != nil && x.RequestTokensCount != nil {
+		return *x.RequestTokensCount
+	}
+	return 0
+}
+
+func (x *CohereStreamResponse) GetResponseTokensCount() uint32 {
+	if x != nil && x.ResponseTokensCount != nil {
+		return *x.ResponseTokensCount
+	}
+	return 0
+}
+
 var File_cohere_v1_cohere_proto protoreflect.FileDescriptor
 
 var file_cohere_v1_cohere_proto_rawDesc = []byte{
@@ -448,60 +484,81 @@ var file_cohere_v1_cohere_proto_rawDesc = []byte{
 	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x68,
 	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
 	0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0a, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0x41, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x42,
-	0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x7d, 0x0a, 0x14, 0x43,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88,
-	0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61,
-	0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0c, 0x66, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08,
-	0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f,
-	0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45,
-	0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44,
-	0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44,
-	0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54,
-	0x10, 0x02, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44,
-	0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54,
-	0x4c, 0x59, 0x10, 0x03, 0x12, 0x26, 0x0a, 0x22, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d,
-	0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47,
-	0x48, 0x54, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a,
-	0x13, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x21, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43,
-	0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43,
-	0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10,
-	0x01, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e,
-	0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32,
-	0xb7, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70,
-	0x74, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
-	0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f,
-	0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f,
-	0x6d, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68,
-	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e,
-	0x64, 0x2d, 0x61, 0x69, 0x2f, 0x6d, 0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65,
-	0x6e, 0x2f, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x2e, 0x56, 0x31, 0xca, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2,
-	0x02, 0x15, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xe4, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01,
+	0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01,
+	0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01,
+	0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x17, 0x0a, 0x15,
+	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22,
+	0xa0, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73,
+	0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01,
+	0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x88, 0x01,
+	0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48,
+	0x02, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01,
+	0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x10, 0x0a,
+	0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x42,
+	0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
+	0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44,
+	0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c,
+	0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x43, 0x4f,
+	0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41,
+	0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x10, 0x02, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f,
+	0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41,
+	0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x26, 0x0a, 0x22,
+	0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d,
+	0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54,
+	0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x21,
+	0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f,
+	0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x45, 0x42,
+	0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48,
+	0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32, 0xb7, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d,
+	0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d,
+	0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0c,
+	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x63,
+	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
+	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63,
+	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
+	0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65,
+	0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x2d, 0x61, 0x69, 0x2f, 0x6d, 0x6f, 0x6e,
+	0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa,
+	0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x09, 0x43, 0x6f,
+	0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/gen/ts/cohere/v1/cohere.d.ts b/gen/ts/cohere/v1/cohere.d.ts
index 4b7c86a4..ccee2e06 100644
--- a/gen/ts/cohere/v1/cohere.d.ts
+++ b/gen/ts/cohere/v1/cohere.d.ts
@@ -95,6 +95,18 @@ export interface CoherePromptResponse {
      * @generated from protobuf field: optional string content = 1;
      */
     content?: string;
+    /**
+     * Count of the request tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 request_tokens_count = 2;
+     */
+    requestTokensCount?: number;
+    /**
+     * Count of the response tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 response_tokens_count = 3;
+     */
+    responseTokensCount?: number;
 }
 /**
  * The CohereStreamResponse contains the data that is streamed from the Cohere API.
@@ -114,6 +126,18 @@ export interface CohereStreamResponse {
      * @generated from protobuf field: optional string finish_reason = 2;
      */
     finishReason?: string;
+    /**
+     * Count of the request tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 request_tokens_count = 3;
+     */
+    requestTokensCount?: number;
+    /**
+     * Count of the response tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 response_tokens_count = 4;
+     */
+    responseTokensCount?: number;
 }
 /**
  * Type of Cohere Model
diff --git a/gen/ts/cohere/v1/cohere.js b/gen/ts/cohere/v1/cohere.js
index 1cc40ab2..7b6c871d 100644
--- a/gen/ts/cohere/v1/cohere.js
+++ b/gen/ts/cohere/v1/cohere.js
@@ -105,7 +105,9 @@ export const CoherePromptRequest = new CoherePromptRequest$Type();
 class CoherePromptResponse$Type extends MessageType {
     constructor() {
         super("cohere.v1.CoherePromptResponse", [
-            { no: 1, name: "content", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "content", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "request_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 3, name: "response_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
@@ -118,7 +120,9 @@ class CohereStreamResponse$Type extends MessageType {
     constructor() {
         super("cohere.v1.CohereStreamResponse", [
             { no: 1, name: "content", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "finish_reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 2, name: "finish_reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "request_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 4, name: "response_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
diff --git a/proto/cohere/v1/cohere.proto b/proto/cohere/v1/cohere.proto
index effab560..b83052ad 100644
--- a/proto/cohere/v1/cohere.proto
+++ b/proto/cohere/v1/cohere.proto
@@ -80,6 +80,10 @@ message CoherePromptRequest {
 message CoherePromptResponse {
   // Prompt Content
   optional string content = 1;
+  // Count of the request tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 request_tokens_count = 2;
+  // Count of the response tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 response_tokens_count = 3;
 }
 
 // The CohereStreamResponse contains the data that is streamed from the Cohere API.
@@ -88,4 +92,8 @@ message CohereStreamResponse {
   optional string content = 1;
   // Finish reason, if this is the last message
   optional string finish_reason = 2;
+  // Count of the request tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 request_tokens_count = 3;
+  // Count of the response tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 response_tokens_count = 4;
 }

From 99250db880e6f25b1e9da42c30dc99ca8d825a10 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sat, 30 Dec 2023 22:29:49 +0100
Subject: [PATCH 10/15] chore: updated cohere connector

---
 gen/go/cohere/v1/cohere.pb.go                 | 146 +++++++++--------
 gen/ts/cohere/v1/cohere.d.ts                  |   8 +-
 gen/ts/cohere/v1/cohere.js                    |   4 +-
 proto/cohere/v1/cohere.proto                  |   4 +-
 services/cohere-connector/src/client.ts       |   7 +-
 .../cohere-connector/src/handlers.spec.ts     | 150 +++++++++++-------
 services/cohere-connector/src/handlers.ts     | 136 ++++++++++++----
 services/cohere-connector/src/utils.ts        |  13 +-
 8 files changed, 300 insertions(+), 168 deletions(-)

diff --git a/gen/go/cohere/v1/cohere.pb.go b/gen/go/cohere/v1/cohere.pb.go
index 74b3f28a..fc2860ee 100644
--- a/gen/go/cohere/v1/cohere.pb.go
+++ b/gen/go/cohere/v1/cohere.pb.go
@@ -315,9 +315,9 @@ type CoherePromptResponse struct {
 	// Prompt Content
 	Content *string `protobuf:"bytes,1,opt,name=content,proto3,oneof" json:"content,omitempty"`
 	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
-	RequestTokensCount *uint32 `protobuf:"varint,2,opt,name=request_tokens_count,json=requestTokensCount,proto3,oneof" json:"request_tokens_count,omitempty"`
+	RequestTokensCount uint32 `protobuf:"varint,2,opt,name=request_tokens_count,json=requestTokensCount,proto3" json:"request_tokens_count,omitempty"`
 	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
-	ResponseTokensCount *uint32 `protobuf:"varint,3,opt,name=response_tokens_count,json=responseTokensCount,proto3,oneof" json:"response_tokens_count,omitempty"`
+	ResponseTokensCount uint32 `protobuf:"varint,3,opt,name=response_tokens_count,json=responseTokensCount,proto3" json:"response_tokens_count,omitempty"`
 }
 
 func (x *CoherePromptResponse) Reset() {
@@ -360,15 +360,15 @@ func (x *CoherePromptResponse) GetContent() string {
 }
 
 func (x *CoherePromptResponse) GetRequestTokensCount() uint32 {
-	if x != nil && x.RequestTokensCount != nil {
-		return *x.RequestTokensCount
+	if x != nil {
+		return x.RequestTokensCount
 	}
 	return 0
 }
 
 func (x *CoherePromptResponse) GetResponseTokensCount() uint32 {
-	if x != nil && x.ResponseTokensCount != nil {
-		return *x.ResponseTokensCount
+	if x != nil {
+		return x.ResponseTokensCount
 	}
 	return 0
 }
@@ -484,81 +484,77 @@ var file_cohere_v1_cohere_proto_rawDesc = []byte{
 	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x68,
 	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
 	0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0a, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xe4, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x68,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x68,
 	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
 	0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01,
-	0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
-	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01,
-	0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43,
-	0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01,
-	0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x17, 0x0a, 0x15,
-	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22,
-	0xa0, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e,
-	0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73,
-	0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01,
-	0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x88, 0x01,
-	0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48,
-	0x02, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01,
-	0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x10, 0x0a,
-	0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x42,
-	0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
-	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
-	0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44,
-	0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c,
-	0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x43, 0x4f,
-	0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41,
-	0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x10, 0x02, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f,
-	0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41,
-	0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x26, 0x0a, 0x22,
-	0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d,
-	0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54,
-	0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x21,
+	0x12, 0x30, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75,
+	0x6e, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0d, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x22, 0xa0, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63,
+	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07,
+	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x48, 0x01, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f,
+	0x6e, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0d, 0x48, 0x02, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x13, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73,
+	0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f,
+	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
+	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f,
+	0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f,
+	0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x1e, 0x0a,
+	0x1a, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f,
+	0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x10, 0x02, 0x12, 0x20, 0x0a,
+	0x1c, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f,
+	0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x03, 0x12,
+	0x26, 0x0a, 0x22, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f,
+	0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x4e, 0x49,
+	0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x25, 0x0a, 0x21, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43,
+	0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45,
+	0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x57, 0x45, 0x42, 0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18,
 	0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f,
-	0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x45, 0x42,
-	0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48,
-	0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32, 0xb7, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x68,
-	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d,
-	0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d,
-	0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0c,
-	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x63,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32, 0xb7, 0x01, 0x0a, 0x0d, 0x43,
+	0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0c,
+	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x12, 0x1e, 0x2e, 0x63,
 	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
 	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
-	0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x2d, 0x61, 0x69, 0x2f, 0x6d, 0x6f, 0x6e,
-	0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa,
-	0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x09, 0x43, 0x6f,
-	0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
+	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x53, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
+	0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x2d, 0x61, 0x69, 0x2f,
+	0x6d, 0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x03, 0x43,
+	0x58, 0x58, 0xaa, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02,
+	0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x43, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/gen/ts/cohere/v1/cohere.d.ts b/gen/ts/cohere/v1/cohere.d.ts
index ccee2e06..8c260421 100644
--- a/gen/ts/cohere/v1/cohere.d.ts
+++ b/gen/ts/cohere/v1/cohere.d.ts
@@ -98,15 +98,15 @@ export interface CoherePromptResponse {
     /**
      * Count of the request tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: optional uint32 request_tokens_count = 2;
+     * @generated from protobuf field: uint32 request_tokens_count = 2;
      */
-    requestTokensCount?: number;
+    requestTokensCount: number;
     /**
      * Count of the response tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: optional uint32 response_tokens_count = 3;
+     * @generated from protobuf field: uint32 response_tokens_count = 3;
      */
-    responseTokensCount?: number;
+    responseTokensCount: number;
 }
 /**
  * The CohereStreamResponse contains the data that is streamed from the Cohere API.
diff --git a/gen/ts/cohere/v1/cohere.js b/gen/ts/cohere/v1/cohere.js
index 7b6c871d..641f7b9c 100644
--- a/gen/ts/cohere/v1/cohere.js
+++ b/gen/ts/cohere/v1/cohere.js
@@ -106,8 +106,8 @@ class CoherePromptResponse$Type extends MessageType {
     constructor() {
         super("cohere.v1.CoherePromptResponse", [
             { no: 1, name: "content", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "request_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "response_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
+            { no: 2, name: "request_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 3, name: "response_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
diff --git a/proto/cohere/v1/cohere.proto b/proto/cohere/v1/cohere.proto
index b83052ad..e9e7adb3 100644
--- a/proto/cohere/v1/cohere.proto
+++ b/proto/cohere/v1/cohere.proto
@@ -81,9 +81,9 @@ message CoherePromptResponse {
   // Prompt Content
   optional string content = 1;
   // Count of the request tokens, as returned by the Cohere /tokenize endpoint
-  optional uint32 request_tokens_count = 2;
+  uint32 request_tokens_count = 2;
   // Count of the response tokens, as returned by the Cohere /tokenize endpoint
-  optional uint32 response_tokens_count = 3;
+  uint32 response_tokens_count = 3;
 }
 
 // The CohereStreamResponse contains the data that is streamed from the Cohere API.
diff --git a/services/cohere-connector/src/client.ts b/services/cohere-connector/src/client.ts
index aee7ffd3..644fe4fa 100644
--- a/services/cohere-connector/src/client.ts
+++ b/services/cohere-connector/src/client.ts
@@ -10,7 +10,7 @@ const ref: { instance: BasemindCohereClient | null } = { instance: null };
 /*
  * The client class wraps the Cohere client because the Cohere client doesn't support streaming for the time being.
  * */
-class BasemindCohereClient {
+export class BasemindCohereClient {
 	private readonly token: string;
 	private readonly client: CohereClient;
 	constructor({ token, ...rest }: { token: string } & CohereClient.Options) {
@@ -18,6 +18,11 @@ class BasemindCohereClient {
 		this.client = new CohereClient({ token, ...rest });
 	}
 
+	async tokenize(text: string, model: string): Promise<number> {
+		const result = await this.client.tokenize({ model, text });
+		return result.tokens.length;
+	}
+
 	/**
 	 * The generate function takes a GenerateRequest and returns a Generation
 	 *
diff --git a/services/cohere-connector/src/handlers.spec.ts b/services/cohere-connector/src/handlers.spec.ts
index e258f3ac..0e55fea1 100644
--- a/services/cohere-connector/src/handlers.spec.ts
+++ b/services/cohere-connector/src/handlers.spec.ts
@@ -1,11 +1,13 @@
 /* eslint-disable unicorn/consistent-function-scoping */
+
+import { PassThrough } from 'node:stream';
+
 import {
 	Metadata,
 	sendUnaryData,
 	ServerUnaryCall,
 	ServerWritableStream,
 } from '@grpc/grpc-js';
-import * as cohere from 'cohere-ai';
 import {
 	CohereModel,
 	CoherePromptRequest,
@@ -14,10 +16,31 @@ import {
 } from 'gen/cohere/v1/cohere';
 import { StreamFinishReason } from 'shared/constants';
 import { GrpcError } from 'shared/grpc';
-import { Mock, MockInstance } from 'vitest';
+import { wait } from 'shared/time';
+import { beforeEach, Mock, MockInstance } from 'vitest';
 
 import { coherePrompt, cohereStream } from '@/handlers';
 
+const mockGenerate = vi.fn();
+const mockTokenize = vi.fn();
+
+vi.mock(
+	'cohere-ai',
+	async (importOriginal: () => Promise<Record<string, any>>) => {
+		const { CohereClient, ...original } = await importOriginal();
+
+		class MockCohereClient extends CohereClient {
+			generate = mockGenerate;
+			tokenize = mockTokenize;
+		}
+
+		return {
+			...original,
+			CohereClient: MockCohereClient,
+		};
+	},
+);
+
 describe('handlers tests', () => {
 	const openAPIKey = (process.env.COHERE_API_KEY =
 		process.env.COHERE_API_KEY ?? 'abc');
@@ -26,9 +49,17 @@ describe('handlers tests', () => {
 		process.env.COHERE_API_KEY = openAPIKey;
 	});
 
+	beforeEach(() => {
+		mockGenerate.mockReset();
+		mockTokenize.mockReset();
+
+		mockTokenize.mockImplementation(() =>
+			Promise.resolve({ tokens: ['te', 'st'] }),
+		);
+	});
+
 	describe('coherePrompt', () => {
-		// @ts-expect-error - MockInstance is not typed correctly
-		const generateSpy = vi.spyOn(cohere, 'generate');
+		mockTokenize.mockResolvedValue({ tokens: ['te', 'st'] } as any);
 
 		const makeMockUnaryCall = (
 			request: CoherePromptRequest,
@@ -53,21 +84,34 @@ describe('handlers tests', () => {
 			});
 			const callback: sendUnaryData<CoherePromptResponse> = vi.fn();
 
-			generateSpy.mockResolvedValueOnce({
-				// @ts-expect-error - MockInstance is not typed correctly
+			mockGenerate.mockResolvedValueOnce({
 				generations: [{ id: 'def', text: 'Generated response' }],
 				id: 'abc',
 			});
 
 			await coherePrompt(call, callback);
-			expect(generateSpy).toHaveBeenCalledWith({
+			expect(mockGenerate).toHaveBeenCalledWith({
 				model: 'command',
 				prompt: 'test',
 				temperature: 0.8,
 			});
 
+			expect(mockTokenize).toHaveBeenCalledTimes(2);
+
+			expect(mockTokenize).toHaveBeenNthCalledWith(1, {
+				model: 'command',
+				text: 'test',
+			});
+
+			expect(mockTokenize).toHaveBeenNthCalledWith(2, {
+				model: 'command',
+				text: 'Generated response',
+			});
+
 			expect(callback).toHaveBeenCalledWith(null, {
 				content: 'Generated response',
+				requestTokensCount: 2,
+				responseTokensCount: 2,
 			});
 		});
 
@@ -82,10 +126,10 @@ describe('handlers tests', () => {
 			const callback: sendUnaryData<CoherePromptResponse> = vi.fn();
 
 			const error = new Error('Cohere error');
-			generateSpy.mockRejectedValueOnce(error);
+			mockGenerate.mockRejectedValueOnce(error);
 
 			await coherePrompt(call, callback);
-			expect(generateSpy).toHaveBeenCalledWith({
+			expect(mockGenerate).toHaveBeenCalledWith({
 				model: 'command',
 				prompt: 'test',
 				temperature: 0.8,
@@ -99,10 +143,12 @@ describe('handlers tests', () => {
 	});
 
 	describe('cohereStream', () => {
+		const stream = new PassThrough();
+
 		global.fetch = vi.fn().mockResolvedValue({
-			body: {
-				getReader: vi.fn().mockReturnValue(createStreamReader()),
-			},
+			body: stream,
+			ok: true,
+			status: 200,
 		});
 
 		const makeServerWritableStream = (
@@ -121,47 +167,6 @@ describe('handlers tests', () => {
 			>;
 		};
 
-		function createStreamReader(): ReadableStreamDefaultReader {
-			let count = 0;
-			const encoder = new TextEncoder();
-
-			return {
-				cancel(): Promise<void> {
-					return Promise.resolve(undefined);
-				},
-				closed: Promise.resolve(undefined),
-				async read() {
-					if (count === 11) {
-						return { done: true, value: undefined };
-					}
-					if (count === 10) {
-						count++;
-						return {
-							done: false,
-							value: encoder.encode(
-								JSON.stringify({
-									finish_reason: 'COMPLETE',
-									is_finished: true,
-								}),
-							),
-						};
-					}
-					const value = {
-						is_finished: false,
-						text: `${count}`,
-					};
-					count++;
-					return {
-						done: false,
-						value: encoder.encode(JSON.stringify(value)),
-					};
-				},
-				releaseLock(): void {
-					return;
-				},
-			};
-		}
-
 		it('should successfully create an Cohere stream request and write the response to the call', async () => {
 			const call = makeServerWritableStream({
 				message: 'test',
@@ -171,8 +176,35 @@ describe('handlers tests', () => {
 				},
 			});
 
+			const encoder = new TextEncoder();
+
+			for (let i = 0; i < 11; i++) {
+				if (i === 10) {
+					stream.end(
+						encoder.encode(
+							JSON.stringify({
+								finish_reason: 'COMPLETE',
+								is_finished: true,
+							}),
+						),
+					);
+				} else {
+					stream.push(
+						encoder.encode(
+							JSON.stringify({
+								text: i.toString(),
+							}),
+						),
+					);
+				}
+			}
+
 			await cohereStream(call);
 
+			await wait(2000);
+
+			expect(call.write).toHaveBeenCalled();
+
 			expect((call.write as Mock).mock.calls).toEqual([
 				[
 					{
@@ -227,9 +259,21 @@ describe('handlers tests', () => {
 				[
 					{
 						finishReason: StreamFinishReason.DONE,
+						requestTokensCount: 2,
+						responseTokensCount: 2,
 					},
 				],
 			]);
+
+			expect(mockTokenize).toHaveBeenNthCalledWith(1, {
+				model: 'command',
+				text: 'test',
+			});
+
+			expect(mockTokenize).toHaveBeenNthCalledWith(2, {
+				model: 'command',
+				text: '0123456789',
+			});
 		});
 
 		it.each([''])('should handle errors', async () => {
diff --git a/services/cohere-connector/src/handlers.ts b/services/cohere-connector/src/handlers.ts
index 5d63e1ff..d88c3ac4 100644
--- a/services/cohere-connector/src/handlers.ts
+++ b/services/cohere-connector/src/handlers.ts
@@ -16,12 +16,60 @@ import {
 } from 'shared/grpc';
 import logger from 'shared/logger';
 
-import { createOrDefaultClient } from '@/client';
-import { createCohereRequest, getFinishReason } from '@/utils';
+import { BasemindCohereClient, createOrDefaultClient } from '@/client';
+import { createCohereRequest, getFinishReason, getModel } from '@/utils';
 
 const COMMUNICATION_ERROR_MESSAGE = 'error communicating with Cohere';
 const DECODER = new TextDecoder();
 
+export async function getTokensCount({
+	client,
+	requestText,
+	responseText,
+	model,
+}: {
+	client: BasemindCohereClient;
+	model: CoherePromptRequest['model'];
+	requestText: string;
+	responseText: string;
+}): Promise<{
+	requestTokensCount: number;
+	responseTokensCount: number;
+}> {
+	const cohereModel = getModel(model);
+
+	logger.debug(
+		{
+			cohereModel,
+			requestTextLength: requestText.length,
+			responseText: responseText.length,
+		},
+		'requesting tokenization from Cohere',
+	);
+
+	const [requestTokensCount, responseTokensCount] = await Promise.all([
+		requestText.trim().length
+			? client.tokenize(requestText, cohereModel)
+			: Promise.resolve(0),
+		responseText.trim().length
+			? client.tokenize(responseText, cohereModel)
+			: Promise.resolve(0),
+	]);
+
+	logger.debug(
+		{
+			requestTokensCount,
+			responseTokensCount,
+		},
+		'received tokenization from Cohere',
+	);
+
+	return {
+		requestTokensCount,
+		responseTokensCount,
+	};
+}
+
 /**
  * The coherePrompt function is a gRPC handler function.
  *
@@ -43,10 +91,20 @@ export async function coherePrompt(
 
 	try {
 		logger.debug('making Cohere prompt request');
+
 		const startTime = Date.now();
 		const { generations } = await client.generate(
 			createCohereRequest(call.request),
 		);
+		const response = generations[0]?.text ?? '';
+
+		const { requestTokensCount, responseTokensCount } =
+			await getTokensCount({
+				client,
+				model: call.request.model,
+				requestText: call.request.message,
+				responseText: response,
+			});
 		const finishTime = Date.now();
 
 		logger.debug(
@@ -54,7 +112,9 @@ export async function coherePrompt(
 			'Cohere request completed',
 		);
 		callback(null, {
-			content: generations[0]?.text ?? '',
+			content: response,
+			requestTokensCount,
+			responseTokensCount,
 		} satisfies CoherePromptResponse);
 	} catch (error: unknown) {
 		logger.error(error as Error, COMMUNICATION_ERROR_MESSAGE);
@@ -87,39 +147,55 @@ export async function cohereStream(
 			createCohereRequest(call.request),
 		);
 
+		const messages: string[] = [];
+
 		stream.on('error', (error: Error) => {
 			call.destroy(createInternalGrpcError(error));
 			logger.error(error, COMMUNICATION_ERROR_MESSAGE);
 		});
 
 		stream.on('data', (data: Uint8Array) => {
-			const {
-				is_finished: isFinished,
-				finish_reason: finishReason,
-				text: content,
-			} = JSON.parse(DECODER.decode(data)) as {
-				finish_reason?:
-					| 'COMPLETE'
-					| 'MAX_TOKENS'
-					| 'ERROR'
-					| 'ERROR_TOXIC';
-				is_finished: boolean;
-				response?: Generation;
-				text: string;
-			};
-			if (isFinished) {
-				const finishTime = Date.now();
-				logger.debug(
-					{ finishTime, startTime },
-					'Cohere streaming request completed',
-				);
-				call.write({
-					finishReason: getFinishReason(finishReason!),
-				});
-			} else {
-				logger.debug('writing Cohere stream response', content);
-				call.write({ content });
-			}
+			(async () => {
+				const {
+					is_finished: isFinished,
+					finish_reason: finishReason,
+					text: content,
+				} = JSON.parse(DECODER.decode(data)) as {
+					finish_reason?:
+						| 'COMPLETE'
+						| 'MAX_TOKENS'
+						| 'ERROR'
+						| 'ERROR_TOXIC';
+					is_finished: boolean;
+					response?: Generation;
+					text: string;
+				};
+				if (isFinished) {
+					const { requestTokensCount, responseTokensCount } =
+						await getTokensCount({
+							client,
+							model: call.request.model,
+							requestText: call.request.message,
+							responseText: messages.join(''),
+						});
+
+					const finishTime = Date.now();
+					logger.debug(
+						{ finishTime, startTime },
+						'Cohere streaming request completed',
+					);
+					call.write({
+						finishReason: getFinishReason(finishReason!),
+						requestTokensCount,
+						responseTokensCount,
+					});
+				} else {
+					messages.push(content);
+
+					logger.debug('writing Cohere stream response', content);
+					call.write({ content });
+				}
+			})();
 		});
 		stream.on('end', () => {
 			logger.debug('Cohere stream ended, closing');
diff --git a/services/cohere-connector/src/utils.ts b/services/cohere-connector/src/utils.ts
index f9058f11..2af93d8a 100644
--- a/services/cohere-connector/src/utils.ts
+++ b/services/cohere-connector/src/utils.ts
@@ -22,6 +22,17 @@ export const finishReasonMapping: Record<
 	[ChatStreamEndEventFinishReason.ErrorToxic]: StreamFinishReason.ERROR,
 };
 
+/**
+ * The getModel function takes a CohereModel and returns a string
+ *
+ * @param model CohereModel
+ *
+ * @return A string
+ */
+export function getModel(model: CoherePromptRequest['model']): string {
+	return modelMapping[model];
+}
+
 /**
  * The createCohereRequest function takes a CoherePromptRequest and returns a Cohere client.CoherePromptRequest
  *
@@ -33,7 +44,7 @@ export function createCohereRequest(
 	grpcRequest: CoherePromptRequest,
 ): GenerateRequest {
 	return {
-		model: modelMapping[grpcRequest.model],
+		model: getModel(grpcRequest.model),
 		prompt: grpcRequest.message,
 		...grpcRequest.parameters,
 	} satisfies GenerateRequest;

From 023221ac8543317835dd592415e64d8fc4e452de Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sun, 31 Dec 2023 17:06:13 +0100
Subject: [PATCH 11/15] feat: implemented tokenization logic for cohere

---
 .../internal/connectors/cohere/request.go     | 14 +++++--
 .../internal/connectors/cohere/stream.go      |  4 +-
 .../internal/connectors/cohere/utils.go       | 25 ++++++++++++
 .../internal/connectors/openai/request.go     |  8 ++--
 .../internal/connectors/openai/stream.go      |  8 ++--
 .../internal/connectors/openai/utils.go       | 38 +++++++++----------
 .../internal/connectors/openai/utils_test.go  |  8 ++--
 7 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/services/api-gateway/internal/connectors/cohere/request.go b/services/api-gateway/internal/connectors/cohere/request.go
index c3ac429f..76aac044 100644
--- a/services/api-gateway/internal/connectors/cohere/request.go
+++ b/services/api-gateway/internal/connectors/cohere/request.go
@@ -41,10 +41,16 @@ func (c *Client) RequestPrompt(
 	if requestErr == nil {
 		promptResult.Content = response.Content
 
-		recordParams.RequestTokens = 0                                               // TODO: implement token cost
-		recordParams.ResponseTokens = 0                                              // TODO: implement token cost
-		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric("0.0"))  // TODO: implement token cost
-		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric("0.0")) // TODO: implement token cost
+		recordParams.RequestTokens = int32(response.RequestTokensCount)
+		recordParams.ResponseTokens = int32(response.ResponseTokensCount)
+
+		costs := CalculateCosts(
+			recordParams.RequestTokens,
+			recordParams.ResponseTokens,
+			requestConfiguration.ProviderModelPricing,
+		)
+		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
+		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
 	} else {
 		log.Debug().Err(requestErr).Msg("request error")
 		promptResult.Error = requestErr
diff --git a/services/api-gateway/internal/connectors/cohere/stream.go b/services/api-gateway/internal/connectors/cohere/stream.go
index cdaf15fc..188ebd99 100644
--- a/services/api-gateway/internal/connectors/cohere/stream.go
+++ b/services/api-gateway/internal/connectors/cohere/stream.go
@@ -67,8 +67,8 @@ func (c *Client) RequestStream(
 			parseMessage,
 		)
 
-		recordParams.RequestTokens = 0                                               // TODO: implement token cost
-		recordParams.ResponseTokens = 0                                              // TODO: implement token cost
+		recordParams.RequestTokens = int32(response.RequestTokensCount)
+		recordParams.ResponseTokens = int32(response.ResponseTokensCount)
 		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric("0.0"))  // TODO: implement token cost
 		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric("0.0")) // TODO: implement token cost
 	}
diff --git a/services/api-gateway/internal/connectors/cohere/utils.go b/services/api-gateway/internal/connectors/cohere/utils.go
index 902f22d3..781ca2b7 100644
--- a/services/api-gateway/internal/connectors/cohere/utils.go
+++ b/services/api-gateway/internal/connectors/cohere/utils.go
@@ -9,6 +9,7 @@ import (
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/ptr"
+	"github.com/shopspring/decimal"
 )
 
 var ModelTypeMap = map[models.ModelType]cohereconnector.CohereModel{
@@ -116,3 +117,27 @@ func CreatePromptRequest(
 
 	return promptRequest, nil
 }
+
+type TokenCostResult struct {
+	RequestTokenCost  decimal.Decimal
+	ResponseTokenCost decimal.Decimal
+}
+
+// CalculateCosts calculates the input and output tokens count and costs for a given model type / vendor.
+func CalculateCosts(
+	requestTokenCount int32,
+	responseTokenCount int32,
+	modelPricing datatypes.ProviderModelPricingDTO,
+) TokenCostResult {
+	// The unit size is the number of token per which we calculate the price. E.g. 0.002$ for 1000 tokens.
+	unitSize := decimal.NewFromInt32(modelPricing.TokenUnitSize)
+
+	return TokenCostResult{
+		RequestTokenCost: decimal.NewFromInt32(requestTokenCount).
+			Div(unitSize).
+			Mul(modelPricing.InputTokenPrice),
+		ResponseTokenCost: decimal.NewFromInt32(responseTokenCount).
+			Div(unitSize).
+			Mul(modelPricing.OutputTokenPrice),
+	}
+}
diff --git a/services/api-gateway/internal/connectors/openai/request.go b/services/api-gateway/internal/connectors/openai/request.go
index acd5c85b..0f85398c 100644
--- a/services/api-gateway/internal/connectors/openai/request.go
+++ b/services/api-gateway/internal/connectors/openai/request.go
@@ -47,16 +47,16 @@ func (c *Client) RequestPrompt(
 			requestConfiguration.ProviderModelPricing,
 			requestConfiguration.PromptConfigData.ModelType,
 		)
-		recordParams.RequestTokens = tokenCountAndCost.InputTokenCount
-		recordParams.ResponseTokens = tokenCountAndCost.OutputTokenCount
+		recordParams.RequestTokens = tokenCountAndCost.RequestTokenCount
+		recordParams.ResponseTokens = tokenCountAndCost.ResponseTokenCount
 
 		requestTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.InputTokenCost.String()),
+			db.StringToNumeric(tokenCountAndCost.RequestTokenCost.String()),
 		)
 		recordParams.RequestTokensCost = *requestTokenCost
 
 		responseTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.OutputTokenCost.String()),
+			db.StringToNumeric(tokenCountAndCost.ResponseTokenCost.String()),
 		)
 		recordParams.ResponseTokensCost = *responseTokenCost
 	} else {
diff --git a/services/api-gateway/internal/connectors/openai/stream.go b/services/api-gateway/internal/connectors/openai/stream.go
index b34ee53c..79fafa7d 100644
--- a/services/api-gateway/internal/connectors/openai/stream.go
+++ b/services/api-gateway/internal/connectors/openai/stream.go
@@ -63,16 +63,16 @@ func (c *Client) RequestStream(
 			requestConfiguration.ProviderModelPricing,
 			requestConfiguration.PromptConfigData.ModelType,
 		)
-		recordParams.RequestTokens = tokenCountAndCost.InputTokenCount
-		recordParams.ResponseTokens = tokenCountAndCost.OutputTokenCount
+		recordParams.RequestTokens = tokenCountAndCost.RequestTokenCount
+		recordParams.ResponseTokens = tokenCountAndCost.ResponseTokenCount
 
 		requestTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.InputTokenCost.String()),
+			db.StringToNumeric(tokenCountAndCost.RequestTokenCost.String()),
 		)
 		recordParams.RequestTokensCost = *requestTokenCost
 
 		responseTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.OutputTokenCost.String()),
+			db.StringToNumeric(tokenCountAndCost.ResponseTokenCost.String()),
 		)
 		recordParams.ResponseTokensCost = *responseTokenCost
 	}
diff --git a/services/api-gateway/internal/connectors/openai/utils.go b/services/api-gateway/internal/connectors/openai/utils.go
index 021c2842..9bdb1612 100644
--- a/services/api-gateway/internal/connectors/openai/utils.go
+++ b/services/api-gateway/internal/connectors/openai/utils.go
@@ -181,42 +181,42 @@ func GetStringTokenCount(value string, modelType models.ModelType) int32 {
 }
 
 type TokenCountCostResult struct {
-	InputTokenCount  int32
-	OutputTokenCount int32
-	InputTokenCost   decimal.Decimal
-	OutputTokenCost  decimal.Decimal
+	RequestTokenCount  int32
+	ResponseTokenCount int32
+	RequestTokenCost   decimal.Decimal
+	ResponseTokenCost  decimal.Decimal
 }
 
-// CalculateTokenCountsAndCosts calculates the input and output tokens count and costs for a given model type / vendor.
+// CalculateTokenCountsAndCosts calculates the request and response tokens count and costs for a given model type / vendor.
 func CalculateTokenCountsAndCosts(
-	promptInputValue string,
-	promptOutputValue string,
+	promptRequestValue string,
+	promptResponseValue string,
 	modelPricing datatypes.ProviderModelPricingDTO,
 	modelType models.ModelType,
 ) TokenCountCostResult {
 	// The unit size is the number of token per which we calculate the price. E.g. 0.002$ for 1000 tokens.
 	unitSize := decimal.NewFromInt32(modelPricing.TokenUnitSize)
 
-	// inputTokensCount is the count of tokens in the input string. Their cost is lower than that of output.
-	inputTokensCount := GetStringTokenCount(promptInputValue, modelType)
+	// requestTokensCount is the count of tokens in the request string. Their cost is lower than that of response.
+	requestTokensCount := GetStringTokenCount(promptRequestValue, modelType)
 
-	// outputTokensCount is the count of tokens in the output string. Their cost is higher than that of input.
-	outputTokensCount := GetStringTokenCount(promptOutputValue, modelType)
+	// responseTokensCount is the count of tokens in the response string. Their cost is higher than that of request.
+	responseTokensCount := GetStringTokenCount(promptResponseValue, modelType)
 
-	// priceInput is the cost of the input tokens.
-	priceInput := decimal.NewFromInt32(inputTokensCount).
+	// priceRequest is the cost of the request tokens.
+	priceRequest := decimal.NewFromInt32(requestTokensCount).
 		Div(unitSize).
 		Mul(modelPricing.InputTokenPrice)
 
-	// priceOutput is the cost of the output tokens.
-	priceOutput := decimal.NewFromInt32(outputTokensCount).
+	// priceResponse is the cost of the response tokens.
+	priceResponse := decimal.NewFromInt32(responseTokensCount).
 		Div(unitSize).
 		Mul(modelPricing.OutputTokenPrice)
 
 	return TokenCountCostResult{
-		InputTokenCount:  inputTokensCount,
-		OutputTokenCount: outputTokensCount,
-		InputTokenCost:   priceInput,
-		OutputTokenCost:  priceOutput,
+		RequestTokenCount:  requestTokensCount,
+		ResponseTokenCount: responseTokensCount,
+		RequestTokenCost:   priceRequest,
+		ResponseTokenCost:  priceResponse,
 	}
 }
diff --git a/services/api-gateway/internal/connectors/openai/utils_test.go b/services/api-gateway/internal/connectors/openai/utils_test.go
index 28a31a41..40563679 100644
--- a/services/api-gateway/internal/connectors/openai/utils_test.go
+++ b/services/api-gateway/internal/connectors/openai/utils_test.go
@@ -377,17 +377,17 @@ func TestUtils(t *testing.T) {
 					testCase.modelType,
 				)
 
-				assert.Equal(t, expectedInputTokenCount, result.InputTokenCount)
-				assert.Equal(t, expectedOutputTokenCount, result.OutputTokenCount)
+				assert.Equal(t, expectedInputTokenCount, result.RequestTokenCount)
+				assert.Equal(t, expectedOutputTokenCount, result.ResponseTokenCount)
 				assert.Equal(
 					t,
 					testCase.expectedInputTokenCost.String(),
-					result.InputTokenCost.String(),
+					result.RequestTokenCost.String(),
 				)
 				assert.Equal(
 					t,
 					testCase.expectedOutputTokenCost.String(),
-					result.OutputTokenCost.String(),
+					result.ResponseTokenCost.String(),
 				)
 			})
 		}

From 87591156e735b7adecc744f9c8f1b6d64488eb64 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Sun, 31 Dec 2023 21:06:31 +0100
Subject: [PATCH 12/15] chore: updated openai service to handle token count
 calculations

---
 gen/go/cohere/v1/cohere.pb.go                 | 153 ++++++++-------
 gen/go/openai/v1/openai.pb.go                 | 176 ++++++++++--------
 gen/ts/cohere/v1/cohere.d.ts                  |  14 +-
 gen/ts/cohere/v1/cohere.js                    |   7 +-
 gen/ts/openai/v1/openai.d.ts                  |  30 ++-
 gen/ts/openai/v1/openai.js                    |  10 +-
 go.mod                                        |   2 -
 go.sum                                        |   4 -
 go.work.sum                                   |   1 +
 package.json                                  |   4 +-
 pnpm-lock.yaml                                |  94 +++++-----
 proto/cohere/v1/cohere.proto                  |   8 +-
 proto/openai/v1/openai.proto                  |  16 +-
 .../internal/connectors/cohere/request.go     |   6 +-
 .../internal/connectors/cohere/stream.go      |  32 ++--
 .../internal/connectors/cohere/utils.go       |  25 ---
 .../internal/connectors/openai/request.go     |  26 +--
 .../connectors/openai/request_test.go         |   8 +-
 .../internal/connectors/openai/stream.go      |  36 ++--
 .../internal/connectors/openai/utils.go       |  59 ------
 .../internal/connectors/openai/utils_test.go  |  91 ---------
 services/api-gateway/internal/dto/dto.go      |   3 +-
 services/api-gateway/internal/utils/stream.go |  47 +++--
 services/api-gateway/internal/utils/token.go  |  30 +++
 .../cohere-connector/src/handlers.spec.ts     |   1 +
 services/cohere-connector/src/handlers.ts     |   1 +
 services/openai-connector/package.json        |   3 +-
 services/openai-connector/src/handlers.ts     |  57 +++++-
 services/openai-connector/src/utils.ts        |  20 +-
 shared/go/db/models/models.go                 |  44 +++++
 .../go/db/models/prompt-request-record.sql.go |  10 +-
 shared/ts/src/constants.ts                    |   6 +-
 .../20231231194456_add-finish-reason.sql      |   4 +
 sql/migrations/atlas.sum                      |   3 +-
 sql/queries/prompt-request-record.sql         |   5 +-
 sql/schema.sql                                |   8 +
 36 files changed, 561 insertions(+), 483 deletions(-)
 create mode 100644 services/api-gateway/internal/utils/token.go
 create mode 100644 sql/migrations/20231231194456_add-finish-reason.sql

diff --git a/gen/go/cohere/v1/cohere.pb.go b/gen/go/cohere/v1/cohere.pb.go
index fc2860ee..416dbe46 100644
--- a/gen/go/cohere/v1/cohere.pb.go
+++ b/gen/go/cohere/v1/cohere.pb.go
@@ -313,11 +313,13 @@ type CoherePromptResponse struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Prompt Content
-	Content *string `protobuf:"bytes,1,opt,name=content,proto3,oneof" json:"content,omitempty"`
+	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+	// Finish reason, if this is the last message
+	FinishReason string `protobuf:"bytes,2,opt,name=finish_reason,json=finishReason,proto3" json:"finish_reason,omitempty"`
 	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
-	RequestTokensCount uint32 `protobuf:"varint,2,opt,name=request_tokens_count,json=requestTokensCount,proto3" json:"request_tokens_count,omitempty"`
+	RequestTokensCount uint32 `protobuf:"varint,3,opt,name=request_tokens_count,json=requestTokensCount,proto3" json:"request_tokens_count,omitempty"`
 	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
-	ResponseTokensCount uint32 `protobuf:"varint,3,opt,name=response_tokens_count,json=responseTokensCount,proto3" json:"response_tokens_count,omitempty"`
+	ResponseTokensCount uint32 `protobuf:"varint,4,opt,name=response_tokens_count,json=responseTokensCount,proto3" json:"response_tokens_count,omitempty"`
 }
 
 func (x *CoherePromptResponse) Reset() {
@@ -353,8 +355,15 @@ func (*CoherePromptResponse) Descriptor() ([]byte, []int) {
 }
 
 func (x *CoherePromptResponse) GetContent() string {
-	if x != nil && x.Content != nil {
-		return *x.Content
+	if x != nil {
+		return x.Content
+	}
+	return ""
+}
+
+func (x *CoherePromptResponse) GetFinishReason() string {
+	if x != nil {
+		return x.FinishReason
 	}
 	return ""
 }
@@ -484,77 +493,78 @@ var file_cohere_v1_cohere_proto_rawDesc = []byte{
 	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x68,
 	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64,
 	0x65, 0x6c, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0a, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x68,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x68,
 	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x66,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e,
 	0x12, 0x30, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
-	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
+	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
 	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75,
 	0x6e, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
 	0x0d, 0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x22, 0xa0, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1d, 0x0a, 0x07, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07,
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69,
-	0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x01, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f,
-	0x6e, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0d, 0x48, 0x02, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x13, 0x72, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73,
-	0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65,
-	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f,
-	0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x1e, 0x0a,
-	0x1a, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x10, 0x02, 0x12, 0x20, 0x0a,
-	0x1c, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x03, 0x12,
-	0x26, 0x0a, 0x22, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f,
-	0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x4e, 0x49,
-	0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x25, 0x0a, 0x21, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43,
-	0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45,
-	0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x57, 0x45, 0x42, 0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18,
-	0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32, 0xb7, 0x01, 0x0a, 0x0d, 0x43,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0c,
-	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x12, 0x1e, 0x2e, 0x63,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
-	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63,
-	0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50,
-	0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x53, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
-	0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68, 0x65,
-	0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x68,
-	0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x2d, 0x61, 0x69, 0x2f,
-	0x6d, 0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x68,
-	0x65, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x03, 0x43,
-	0x58, 0x58, 0xaa, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02,
-	0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x43, 0x6f, 0x68,
-	0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xa0, 0x02, 0x0a, 0x14, 0x43, 0x6f, 0x68, 0x65, 0x72,
+	0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x28,
+	0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
+	0x65, 0x61, 0x73, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12,
+	0x37, 0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03,
+	0x52, 0x13, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f,
+	0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42,
+	0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xaf, 0x01, 0x0a, 0x0b, 0x43, 0x6f,
+	0x68, 0x65, 0x72, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48,
+	0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x48, 0x45, 0x52,
+	0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10,
+	0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x10,
+	0x02, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c,
+	0x59, 0x10, 0x03, 0x12, 0x26, 0x0a, 0x22, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x4d, 0x4f,
+	0x44, 0x45, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x4c, 0x49, 0x47, 0x48,
+	0x54, 0x5f, 0x4e, 0x49, 0x47, 0x48, 0x54, 0x4c, 0x59, 0x10, 0x04, 0x2a, 0x80, 0x01, 0x0a, 0x13,
+	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x21, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f,
+	0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
+	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x43, 0x4f,
+	0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x57, 0x45, 0x42, 0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x10, 0x01,
+	0x12, 0x1c, 0x0a, 0x18, 0x43, 0x4f, 0x48, 0x45, 0x52, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45,
+	0x43, 0x54, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x10, 0x02, 0x32, 0xb7,
+	0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74,
+	0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x68,
+	0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0c, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e,
+	0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d,
+	0x2e, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x68, 0x65,
+	0x72, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64,
+	0x2d, 0x61, 0x69, 0x2f, 0x6d, 0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e,
+	0x2f, 0x63, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72,
+	0xa2, 0x02, 0x03, 0x43, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x2e,
+	0x56, 0x31, 0xca, 0x02, 0x09, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02,
+	0x15, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x43, 0x6f, 0x68, 0x65, 0x72, 0x65, 0x3a,
+	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -649,7 +659,6 @@ func file_cohere_v1_cohere_proto_init() {
 		}
 	}
 	file_cohere_v1_cohere_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_cohere_v1_cohere_proto_msgTypes[2].OneofWrappers = []interface{}{}
 	file_cohere_v1_cohere_proto_msgTypes[3].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
diff --git a/gen/go/openai/v1/openai.pb.go b/gen/go/openai/v1/openai.pb.go
index 87bb4c51..cf1dfd45 100644
--- a/gen/go/openai/v1/openai.pb.go
+++ b/gen/go/openai/v1/openai.pb.go
@@ -445,12 +445,12 @@ type OpenAIPromptResponse struct {
 
 	// Prompt Content
 	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
-	// Number of tokens used for the prompt
-	PromptTokens uint32 `protobuf:"varint,2,opt,name=prompt_tokens,json=promptTokens,proto3" json:"prompt_tokens,omitempty"`
-	// Number of tokens used to generate the completion
-	CompletionTokens uint32 `protobuf:"varint,3,opt,name=completion_tokens,json=completionTokens,proto3" json:"completion_tokens,omitempty"`
-	// Total number of tokens used to generate the response
-	TotalTokens uint32 `protobuf:"varint,4,opt,name=total_tokens,json=totalTokens,proto3" json:"total_tokens,omitempty"`
+	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
+	RequestTokensCount uint32 `protobuf:"varint,2,opt,name=request_tokens_count,json=requestTokensCount,proto3" json:"request_tokens_count,omitempty"`
+	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
+	ResponseTokensCount uint32 `protobuf:"varint,3,opt,name=response_tokens_count,json=responseTokensCount,proto3" json:"response_tokens_count,omitempty"`
+	// Finish reason
+	FinishReason string `protobuf:"bytes,4,opt,name=finish_reason,json=finishReason,proto3" json:"finish_reason,omitempty"`
 }
 
 func (x *OpenAIPromptResponse) Reset() {
@@ -492,25 +492,25 @@ func (x *OpenAIPromptResponse) GetContent() string {
 	return ""
 }
 
-func (x *OpenAIPromptResponse) GetPromptTokens() uint32 {
+func (x *OpenAIPromptResponse) GetRequestTokensCount() uint32 {
 	if x != nil {
-		return x.PromptTokens
+		return x.RequestTokensCount
 	}
 	return 0
 }
 
-func (x *OpenAIPromptResponse) GetCompletionTokens() uint32 {
+func (x *OpenAIPromptResponse) GetResponseTokensCount() uint32 {
 	if x != nil {
-		return x.CompletionTokens
+		return x.ResponseTokensCount
 	}
 	return 0
 }
 
-func (x *OpenAIPromptResponse) GetTotalTokens() uint32 {
+func (x *OpenAIPromptResponse) GetFinishReason() string {
 	if x != nil {
-		return x.TotalTokens
+		return x.FinishReason
 	}
-	return 0
+	return ""
 }
 
 // An OpenAI Streaming Response Message
@@ -523,6 +523,10 @@ type OpenAIStreamResponse struct {
 	Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
 	// Finish reason, if this is the last message
 	FinishReason *string `protobuf:"bytes,2,opt,name=finish_reason,json=finishReason,proto3,oneof" json:"finish_reason,omitempty"`
+	// Count of the request tokens, as returned by the Cohere /tokenize endpoint
+	RequestTokensCount *uint32 `protobuf:"varint,3,opt,name=request_tokens_count,json=requestTokensCount,proto3,oneof" json:"request_tokens_count,omitempty"`
+	// Count of the response tokens, as returned by the Cohere /tokenize endpoint
+	ResponseTokensCount *uint32 `protobuf:"varint,4,opt,name=response_tokens_count,json=responseTokensCount,proto3,oneof" json:"response_tokens_count,omitempty"`
 }
 
 func (x *OpenAIStreamResponse) Reset() {
@@ -571,6 +575,20 @@ func (x *OpenAIStreamResponse) GetFinishReason() string {
 	return ""
 }
 
+func (x *OpenAIStreamResponse) GetRequestTokensCount() uint32 {
+	if x != nil && x.RequestTokensCount != nil {
+		return *x.RequestTokensCount
+	}
+	return 0
+}
+
+func (x *OpenAIStreamResponse) GetResponseTokensCount() uint32 {
+	if x != nil && x.ResponseTokensCount != nil {
+		return *x.ResponseTokensCount
+	}
+	return 0
+}
+
 var File_openai_v1_openai_proto protoreflect.FileDescriptor
 
 var file_openai_v1_openai_proto_rawDesc = []byte{
@@ -630,69 +648,81 @@ var file_openai_v1_openai_proto_rawDesc = []byte{
 	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01,
 	0x28, 0x09, 0x48, 0x00, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x61, 0x70, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0xa5, 0x01, 0x0a, 0x14, 0x4f, 0x70,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0xbb, 0x01, 0x0a, 0x14, 0x4f, 0x70,
 	0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d,
-	0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x63, 0x6f,
-	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x21,
-	0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x73, 0x22, 0x6c, 0x0a, 0x14, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
-	0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65,
-	0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x69,
-	0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a,
-	0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x2a,
-	0xaa, 0x01, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12,
-	0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x21,
-	0x0a, 0x1d, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f,
-	0x47, 0x50, 0x54, 0x33, 0x5f, 0x35, 0x5f, 0x54, 0x55, 0x52, 0x42, 0x4f, 0x5f, 0x34, 0x4b, 0x10,
-	0x01, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44,
-	0x45, 0x4c, 0x5f, 0x47, 0x50, 0x54, 0x33, 0x5f, 0x35, 0x5f, 0x54, 0x55, 0x52, 0x42, 0x4f, 0x5f,
-	0x31, 0x36, 0x4b, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49,
-	0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x47, 0x50, 0x54, 0x34, 0x5f, 0x38, 0x4b, 0x10, 0x03,
-	0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
-	0x4c, 0x5f, 0x47, 0x50, 0x54, 0x34, 0x5f, 0x33, 0x32, 0x4b, 0x10, 0x04, 0x2a, 0xc0, 0x01, 0x0a,
-	0x11, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x6f,
-	0x6c, 0x65, 0x12, 0x24, 0x0a, 0x20, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45,
-	0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x50, 0x45, 0x4e,
-	0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
-	0x5f, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x45,
-	0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c,
-	0x45, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x50, 0x45, 0x4e,
-	0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45,
-	0x5f, 0x41, 0x53, 0x53, 0x49, 0x53, 0x54, 0x41, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x21, 0x0a, 0x1d,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x14,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x32,
+	0x0a, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75,
+	0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61,
+	0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73,
+	0x68, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x8f, 0x02, 0x0a, 0x14, 0x4f, 0x70, 0x65, 0x6e,
+	0x41, 0x49, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x61, 0x73, 0x6f,
+	0x6e, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0d, 0x48, 0x01, 0x52, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x15, 0x72,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x13, 0x72, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x5f,
+	0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42,
+	0x18, 0x0a, 0x16, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xaa, 0x01, 0x0a, 0x0b, 0x4f, 0x70,
+	0x65, 0x6e, 0x41, 0x49, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x45,
+	0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x21, 0x0a, 0x1d, 0x4f, 0x50, 0x45, 0x4e,
+	0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x47, 0x50, 0x54, 0x33, 0x5f, 0x35,
+	0x5f, 0x54, 0x55, 0x52, 0x42, 0x4f, 0x5f, 0x34, 0x4b, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x4f,
+	0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x47, 0x50, 0x54,
+	0x33, 0x5f, 0x35, 0x5f, 0x54, 0x55, 0x52, 0x42, 0x4f, 0x5f, 0x31, 0x36, 0x4b, 0x10, 0x02, 0x12,
+	0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c,
+	0x5f, 0x47, 0x50, 0x54, 0x34, 0x5f, 0x38, 0x4b, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50,
+	0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x4c, 0x5f, 0x47, 0x50, 0x54, 0x34,
+	0x5f, 0x33, 0x32, 0x4b, 0x10, 0x04, 0x2a, 0xc0, 0x01, 0x0a, 0x11, 0x4f, 0x70, 0x65, 0x6e, 0x41,
+	0x49, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x24, 0x0a, 0x20,
 	0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f,
-	0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x04, 0x32,
-	0xb7, 0x01, 0x0a, 0x0d, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x51, 0x0a, 0x0c, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70,
-	0x74, 0x12, 0x1e, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70,
-	0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x1f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70,
-	0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0c, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31,
-	0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31,
-	0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f,
-	0x6d, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4f, 0x70, 0x65,
-	0x6e, 0x61, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e,
-	0x64, 0x2d, 0x61, 0x69, 0x2f, 0x6d, 0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65,
-	0x6e, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0xa2, 0x02, 0x03, 0x4f, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69,
-	0x2e, 0x56, 0x31, 0xca, 0x02, 0x09, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x5c, 0x56, 0x31, 0xe2,
-	0x02, 0x15, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69,
-	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
+	0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45,
+	0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x53, 0x59, 0x53, 0x54, 0x45,
+	0x4d, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d,
+	0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x53, 0x45, 0x52,
+	0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41, 0x49, 0x5f, 0x4d, 0x45,
+	0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x41, 0x53, 0x53, 0x49, 0x53,
+	0x54, 0x41, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x21, 0x0a, 0x1d, 0x4f, 0x50, 0x45, 0x4e, 0x5f, 0x41,
+	0x49, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x46,
+	0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x04, 0x32, 0xb7, 0x01, 0x0a, 0x0d, 0x4f, 0x70,
+	0x65, 0x6e, 0x41, 0x49, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0c, 0x4f,
+	0x70, 0x65, 0x6e, 0x41, 0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x12, 0x1e, 0x2e, 0x6f, 0x70,
+	0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x50, 0x72,
+	0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6f, 0x70,
+	0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x50, 0x72,
+	0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x53,
+	0x0a, 0x0c, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x49, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1e,
+	0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41,
+	0x49, 0x50, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f,
+	0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x41,
+	0x49, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x30, 0x01, 0x42, 0x98, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
+	0x61, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x48, 0x03, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x2d, 0x61, 0x69, 0x2f, 0x6d,
+	0x6f, 0x6e, 0x6f, 0x72, 0x65, 0x70, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x70, 0x65, 0x6e,
+	0x61, 0x69, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x03, 0x4f, 0x58,
+	0x58, 0xaa, 0x02, 0x09, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x09,
+	0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x4f, 0x70, 0x65, 0x6e,
+	0x61, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0xea, 0x02, 0x0a, 0x4f, 0x70, 0x65, 0x6e, 0x61, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/gen/ts/cohere/v1/cohere.d.ts b/gen/ts/cohere/v1/cohere.d.ts
index 8c260421..acda9ea4 100644
--- a/gen/ts/cohere/v1/cohere.d.ts
+++ b/gen/ts/cohere/v1/cohere.d.ts
@@ -92,19 +92,25 @@ export interface CoherePromptResponse {
     /**
      * Prompt Content
      *
-     * @generated from protobuf field: optional string content = 1;
+     * @generated from protobuf field: string content = 1;
      */
-    content?: string;
+    content: string;
+    /**
+     * Finish reason, if this is the last message
+     *
+     * @generated from protobuf field: string finish_reason = 2;
+     */
+    finishReason: string;
     /**
      * Count of the request tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: uint32 request_tokens_count = 2;
+     * @generated from protobuf field: uint32 request_tokens_count = 3;
      */
     requestTokensCount: number;
     /**
      * Count of the response tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: uint32 response_tokens_count = 3;
+     * @generated from protobuf field: uint32 response_tokens_count = 4;
      */
     responseTokensCount: number;
 }
diff --git a/gen/ts/cohere/v1/cohere.js b/gen/ts/cohere/v1/cohere.js
index 641f7b9c..f8dda273 100644
--- a/gen/ts/cohere/v1/cohere.js
+++ b/gen/ts/cohere/v1/cohere.js
@@ -105,9 +105,10 @@ export const CoherePromptRequest = new CoherePromptRequest$Type();
 class CoherePromptResponse$Type extends MessageType {
     constructor() {
         super("cohere.v1.CoherePromptResponse", [
-            { no: 1, name: "content", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "request_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "response_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
+            { no: 1, name: "content", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "finish_reason", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "request_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 4, name: "response_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
diff --git a/gen/ts/openai/v1/openai.d.ts b/gen/ts/openai/v1/openai.d.ts
index 41fcce0b..9d75c7e1 100644
--- a/gen/ts/openai/v1/openai.d.ts
+++ b/gen/ts/openai/v1/openai.d.ts
@@ -133,23 +133,23 @@ export interface OpenAIPromptResponse {
      */
     content: string;
     /**
-     * Number of tokens used for the prompt
+     * Count of the request tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: uint32 prompt_tokens = 2;
+     * @generated from protobuf field: uint32 request_tokens_count = 2;
      */
-    promptTokens: number;
+    requestTokensCount: number;
     /**
-     * Number of tokens used to generate the completion
+     * Count of the response tokens, as returned by the Cohere /tokenize endpoint
      *
-     * @generated from protobuf field: uint32 completion_tokens = 3;
+     * @generated from protobuf field: uint32 response_tokens_count = 3;
      */
-    completionTokens: number;
+    responseTokensCount: number;
     /**
-     * Total number of tokens used to generate the response
+     * Finish reason
      *
-     * @generated from protobuf field: uint32 total_tokens = 4;
+     * @generated from protobuf field: string finish_reason = 4;
      */
-    totalTokens: number;
+    finishReason: string;
 }
 /**
  * An OpenAI Streaming Response Message
@@ -169,6 +169,18 @@ export interface OpenAIStreamResponse {
      * @generated from protobuf field: optional string finish_reason = 2;
      */
     finishReason?: string;
+    /**
+     * Count of the request tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 request_tokens_count = 3;
+     */
+    requestTokensCount?: number;
+    /**
+     * Count of the response tokens, as returned by the Cohere /tokenize endpoint
+     *
+     * @generated from protobuf field: optional uint32 response_tokens_count = 4;
+     */
+    responseTokensCount?: number;
 }
 /**
  * Type of OpenAI Model
diff --git a/gen/ts/openai/v1/openai.js b/gen/ts/openai/v1/openai.js
index 19eb22be..cf86373b 100644
--- a/gen/ts/openai/v1/openai.js
+++ b/gen/ts/openai/v1/openai.js
@@ -146,9 +146,9 @@ class OpenAIPromptResponse$Type extends MessageType {
     constructor() {
         super("openai.v1.OpenAIPromptResponse", [
             { no: 1, name: "content", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "prompt_tokens", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "completion_tokens", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 4, name: "total_tokens", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
+            { no: 2, name: "request_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 3, name: "response_tokens_count", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 4, name: "finish_reason", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -161,7 +161,9 @@ class OpenAIStreamResponse$Type extends MessageType {
     constructor() {
         super("openai.v1.OpenAIStreamResponse", [
             { no: 1, name: "content", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "finish_reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 2, name: "finish_reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "request_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 4, name: "response_tokens_count", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
diff --git a/go.mod b/go.mod
index 5f43c76c..a22ff250 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,6 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.27.0
-	github.com/tiktoken-go/tokenizer v0.1.0
 	golang.org/x/sync v0.5.0
 	google.golang.org/grpc v1.60.1
 	google.golang.org/protobuf v1.32.0
@@ -57,7 +56,6 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/distribution/reference v0.5.0 // indirect
-	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/docker/cli v24.0.7+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker v24.0.7+incompatible // indirect
diff --git a/go.sum b/go.sum
index 744d0a86..dc4fa6a2 100644
--- a/go.sum
+++ b/go.sum
@@ -705,8 +705,6 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
 github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
-github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg=
 github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
@@ -1122,8 +1120,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk=
 github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U=
-github.com/tiktoken-go/tokenizer v0.1.0 h1:c1fXriHSR/NmhMDTwUDLGiNhHwTV+ElABGvqhCWLRvY=
-github.com/tiktoken-go/tokenizer v0.1.0/go.mod h1:7SZW3pZUKWLJRilTvWCa86TOVIiiJhYj3FQ5V3alWcg=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
 github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
 github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
diff --git a/go.work.sum b/go.work.sum
index 8d1f04bc..c8874d63 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -520,6 +520,7 @@ github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyX
 github.com/bufbuild/protovalidate-go v0.2.1 h1:pJr07sYhliyfj/STAM7hU4J3FKpVeLVKvOBmOTN8j+s=
 github.com/bufbuild/protovalidate-go v0.2.1/go.mod h1:e7XXDtlxj5vlEyAgsrxpzayp4cEMKCSSb8ZCkin+MVA=
 github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
diff --git a/package.json b/package.json
index dbc3ce14..88fc11de 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 		"@types/webpack-node-externals": "^3.0.4",
 		"@typescript-eslint/eslint-plugin": "^6.16.0",
 		"@typescript-eslint/parser": "^6.16.0",
-		"@vitest/coverage-v8": "^1.1.0",
+		"@vitest/coverage-v8": "^1.1.1",
 		"eslint": "^8.56.0",
 		"eslint-import-resolver-typescript": "^3.6.1",
 		"eslint-plugin-vitest": "^0.3.20",
@@ -40,7 +40,7 @@
 		"tsconfig-paths-webpack-plugin": "^4.1.0",
 		"typescript": "^5.3.3",
 		"vite-tsconfig-paths": "^4.2.3",
-		"vitest": "^1.1.0",
+		"vitest": "^1.1.1",
 		"vitest-mock-extended": "^1.3.1",
 		"webpack": "^5.89.0",
 		"webpack-cli": "^5.1.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d501c795..7d9bf78e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -47,8 +47,8 @@ importers:
                 specifier: ^6.16.0
                 version: 6.16.0(eslint@8.56.0)(typescript@5.3.3)
             '@vitest/coverage-v8':
-                specifier: ^1.1.0
-                version: 1.1.0(vitest@1.1.0)
+                specifier: ^1.1.1
+                version: 1.1.1(vitest@1.1.1)
             eslint:
                 specifier: ^8.56.0
                 version: 8.56.0
@@ -57,7 +57,7 @@ importers:
                 version: 3.6.1(@typescript-eslint/parser@6.16.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
             eslint-plugin-vitest:
                 specifier: ^0.3.20
-                version: 0.3.20(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.3.3)(vitest@1.1.0)
+                version: 0.3.20(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.3.3)(vitest@1.1.1)
             fork-ts-checker-webpack-plugin:
                 specifier: ^9.0.2
                 version: 9.0.2(typescript@5.3.3)(webpack@5.89.0)
@@ -101,11 +101,11 @@ importers:
                 specifier: ^4.2.3
                 version: 4.2.3(typescript@5.3.3)
             vitest:
-                specifier: ^1.1.0
-                version: 1.1.0(@types/node@20.10.6)
+                specifier: ^1.1.1
+                version: 1.1.1(@types/node@20.10.6)
             vitest-mock-extended:
                 specifier: ^1.3.1
-                version: 1.3.1(typescript@5.3.3)(vitest@1.1.0)
+                version: 1.3.1(typescript@5.3.3)(vitest@1.1.1)
             webpack:
                 specifier: ^5.89.0
                 version: 5.89.0(webpack-cli@5.1.4)
@@ -199,7 +199,7 @@ importers:
                 version: 9.3.3
             '@testing-library/jest-dom':
                 specifier: ^6.1.6
-                version: 6.1.6(vitest@1.1.0)
+                version: 6.1.6(vitest@1.1.1)
             '@testing-library/react':
                 specifier: ^14.1.2
                 version: 14.1.2(react-dom@18.2.0)(react@18.2.0)
@@ -284,6 +284,9 @@ importers:
             pino:
                 specifier: ^8.17.2
                 version: 8.17.2
+            tiktoken:
+                specifier: ^1.0.11
+                version: 1.0.11
 
 packages:
     /@aashutoshrathi/word-wrap@1.2.6:
@@ -5708,7 +5711,7 @@ packages:
             pretty-format: 27.5.1
         dev: true
 
-    /@testing-library/jest-dom@6.1.6(vitest@1.1.0):
+    /@testing-library/jest-dom@6.1.6(vitest@1.1.1):
         resolution:
             {
                 integrity: sha512-YwuiOdYEcxhfC2u5iNKlvg2Q5MgbutovP6drq7J1HrCbvR+G58BbtoCoq+L/kNlrNFsu2Kt3jaFAviLVxYHJZg==,
@@ -5737,7 +5740,7 @@ packages:
             dom-accessibility-api: 0.5.16
             lodash: 4.17.21
             redent: 3.0.0
-            vitest: 1.1.0(@types/node@20.10.6)
+            vitest: 1.1.1(@types/node@20.10.6)
         dev: true
 
     /@testing-library/react@14.1.2(react-dom@18.2.0)(react@18.2.0):
@@ -5860,7 +5863,7 @@ packages:
             '@babel/types': 7.23.6
             '@types/babel__generator': 7.6.8
             '@types/babel__template': 7.4.4
-            '@types/babel__traverse': 7.20.4
+            '@types/babel__traverse': 7.20.5
         dev: true
 
     /@types/babel__generator@7.6.8:
@@ -5882,10 +5885,10 @@ packages:
             '@babel/types': 7.23.6
         dev: true
 
-    /@types/babel__traverse@7.20.4:
+    /@types/babel__traverse@7.20.5:
         resolution:
             {
-                integrity: sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==,
+                integrity: sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==,
             }
         dependencies:
             '@babel/types': 7.23.6
@@ -6366,10 +6369,10 @@ packages:
             - supports-color
         dev: true
 
-    /@vitest/coverage-v8@1.1.0(vitest@1.1.0):
+    /@vitest/coverage-v8@1.1.1(vitest@1.1.1):
         resolution:
             {
-                integrity: sha512-kHQRk70vTdXAyQY2C0vKOHPyQD/R6IUzcGdO4vCuyr4alE5Yg1+Sk2jSdjlIrTTXdcNEs+ReWVM09mmSFJpzyQ==,
+                integrity: sha512-TCXSh6sA92t7D5p7HJ64sPCi+szP8E3NiKTsR3YR8vVEVZB9yclQu2btktCthxahKBl7PwheP5OuejYg13xccg==,
             }
         peerDependencies:
             vitest: ^1.0.0
@@ -6387,37 +6390,37 @@ packages:
             std-env: 3.7.0
             test-exclude: 6.0.0
             v8-to-istanbul: 9.2.0
-            vitest: 1.1.0(@types/node@20.10.6)
+            vitest: 1.1.1(@types/node@20.10.6)
         transitivePeerDependencies:
             - supports-color
         dev: true
 
-    /@vitest/expect@1.1.0:
+    /@vitest/expect@1.1.1:
         resolution:
             {
-                integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==,
+                integrity: sha512-Qpw01C2Hyb3085jBkOJLQ7HRX0Ncnh2qV4p+xWmmhcIUlMykUF69zsnZ1vPmAjZpomw9+5tWEGOQ0GTfR8U+kA==,
             }
         dependencies:
-            '@vitest/spy': 1.1.0
-            '@vitest/utils': 1.1.0
+            '@vitest/spy': 1.1.1
+            '@vitest/utils': 1.1.1
             chai: 4.3.10
         dev: true
 
-    /@vitest/runner@1.1.0:
+    /@vitest/runner@1.1.1:
         resolution:
             {
-                integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==,
+                integrity: sha512-8HokyJo1SnSi3uPFKfWm/Oq1qDwLC4QDcVsqpXIXwsRPAg3gIDh8EbZ1ri8cmQkBxdOu62aOF9B4xcqJhvt4xQ==,
             }
         dependencies:
-            '@vitest/utils': 1.1.0
+            '@vitest/utils': 1.1.1
             p-limit: 5.0.0
             pathe: 1.1.1
         dev: true
 
-    /@vitest/snapshot@1.1.0:
+    /@vitest/snapshot@1.1.1:
         resolution:
             {
-                integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==,
+                integrity: sha512-WnMHjv4VdHLbFGgCdVVvyRkRPnOKN75JJg+LLTdr6ah7YnL75W+7CTIMdzPEPzaDxA8r5yvSVlc1d8lH3yE28w==,
             }
         dependencies:
             magic-string: 0.30.5
@@ -6425,19 +6428,19 @@ packages:
             pretty-format: 29.7.0
         dev: true
 
-    /@vitest/spy@1.1.0:
+    /@vitest/spy@1.1.1:
         resolution:
             {
-                integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==,
+                integrity: sha512-hDU2KkOTfFp4WFFPWwHFauddwcKuGQ7gF6Un/ZZkCogoAiTMN7/7YKvUDbywPZZ754iCQGjdUmXN3t4k0jm1IQ==,
             }
         dependencies:
             tinyspy: 2.2.0
         dev: true
 
-    /@vitest/utils@1.1.0:
+    /@vitest/utils@1.1.1:
         resolution:
             {
-                integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==,
+                integrity: sha512-E9LedH093vST/JuBSyHLFMpxJKW3dLhe/flUSPFedoyj4wKiFX7Jm8gYLtOIiin59dgrssfmFv0BJ1u8P/LC/A==,
             }
         dependencies:
             diff-sequences: 29.6.3
@@ -8771,7 +8774,7 @@ packages:
             eslint-rule-composer: 0.3.0
         dev: true
 
-    /eslint-plugin-vitest@0.3.20(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.3.3)(vitest@1.1.0):
+    /eslint-plugin-vitest@0.3.20(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.3.3)(vitest@1.1.1):
         resolution:
             {
                 integrity: sha512-O05k4j9TGMOkkghj9dRgpeLDyOSiVIxQWgNDPfhYPm5ioJsehcYV/zkRLekQs+c8+RBCVXucSED3fYOyy2EoWA==,
@@ -8790,7 +8793,7 @@ packages:
             '@typescript-eslint/eslint-plugin': 6.16.0(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)(typescript@5.3.3)
             '@typescript-eslint/utils': 6.16.0(eslint@8.56.0)(typescript@5.3.3)
             eslint: 8.56.0
-            vitest: 1.1.0(@types/node@20.10.6)
+            vitest: 1.1.1(@types/node@20.10.6)
         transitivePeerDependencies:
             - supports-color
             - typescript
@@ -13314,6 +13317,13 @@ packages:
         dependencies:
             real-require: 0.2.0
 
+    /tiktoken@1.0.11:
+        resolution:
+            {
+                integrity: sha512-aMJcn9NGmb6zDXkCweJLnACyIyjdiYIk1odAfnCUvin7O1QsV1rQP1hatGDMhQovxkeSJhFeU7QuGkbDHGciDQ==,
+            }
+        dev: false
+
     /tiny-hashes@1.0.1:
         resolution:
             {
@@ -13896,10 +13906,10 @@ packages:
         engines: { node: '>= 0.10' }
         dev: false
 
-    /vite-node@1.1.0(@types/node@20.10.6):
+    /vite-node@1.1.1(@types/node@20.10.6):
         resolution:
             {
-                integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==,
+                integrity: sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==,
             }
         engines: { node: ^18.0.0 || >=20.0.0 }
         hasBin: true
@@ -13993,7 +14003,7 @@ packages:
             fsevents: 2.3.3
         dev: true
 
-    /vitest-mock-extended@1.3.1(typescript@5.3.3)(vitest@1.1.0):
+    /vitest-mock-extended@1.3.1(typescript@5.3.3)(vitest@1.1.1):
         resolution:
             {
                 integrity: sha512-OpghYjh4BDuQ/Mzs3lFMQ1QRk9D8/2O9T47MLUA5eLn7K4RWIy+MfIivYOWEyxjTENjsBnzgMihDjyNalN/K0Q==,
@@ -14004,13 +14014,13 @@ packages:
         dependencies:
             ts-essentials: 9.4.1(typescript@5.3.3)
             typescript: 5.3.3
-            vitest: 1.1.0(@types/node@20.10.6)
+            vitest: 1.1.1(@types/node@20.10.6)
         dev: true
 
-    /vitest@1.1.0(@types/node@20.10.6):
+    /vitest@1.1.1(@types/node@20.10.6):
         resolution:
             {
-                integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==,
+                integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==,
             }
         engines: { node: ^18.0.0 || >=20.0.0 }
         hasBin: true
@@ -14036,11 +14046,11 @@ packages:
                 optional: true
         dependencies:
             '@types/node': 20.10.6
-            '@vitest/expect': 1.1.0
-            '@vitest/runner': 1.1.0
-            '@vitest/snapshot': 1.1.0
-            '@vitest/spy': 1.1.0
-            '@vitest/utils': 1.1.0
+            '@vitest/expect': 1.1.1
+            '@vitest/runner': 1.1.1
+            '@vitest/snapshot': 1.1.1
+            '@vitest/spy': 1.1.1
+            '@vitest/utils': 1.1.1
             acorn-walk: 8.3.1
             cac: 6.7.14
             chai: 4.3.10
@@ -14055,7 +14065,7 @@ packages:
             tinybench: 2.5.1
             tinypool: 0.8.1
             vite: 5.0.10(@types/node@20.10.6)(sass@1.69.6)
-            vite-node: 1.1.0(@types/node@20.10.6)
+            vite-node: 1.1.1(@types/node@20.10.6)
             why-is-node-running: 2.2.2
         transitivePeerDependencies:
             - less
diff --git a/proto/cohere/v1/cohere.proto b/proto/cohere/v1/cohere.proto
index e9e7adb3..43b7e16d 100644
--- a/proto/cohere/v1/cohere.proto
+++ b/proto/cohere/v1/cohere.proto
@@ -79,11 +79,13 @@ message CoherePromptRequest {
 // The CoherePromptResponse contains the data that is returned from the Cohere API.
 message CoherePromptResponse {
   // Prompt Content
-  optional string content = 1;
+  string content = 1;
+  // Finish reason, if this is the last message
+  string finish_reason = 2;
   // Count of the request tokens, as returned by the Cohere /tokenize endpoint
-  uint32 request_tokens_count = 2;
+  uint32 request_tokens_count = 3;
   // Count of the response tokens, as returned by the Cohere /tokenize endpoint
-  uint32 response_tokens_count = 3;
+  uint32 response_tokens_count = 4;
 }
 
 // The CohereStreamResponse contains the data that is streamed from the Cohere API.
diff --git a/proto/openai/v1/openai.proto b/proto/openai/v1/openai.proto
index 647d0cdd..0f3c6544 100644
--- a/proto/openai/v1/openai.proto
+++ b/proto/openai/v1/openai.proto
@@ -90,12 +90,12 @@ message OpenAIPromptRequest {
 message OpenAIPromptResponse {
   // Prompt Content
   string content = 1;
-  // Number of tokens used for the prompt
-  uint32 prompt_tokens = 2;
-  // Number of tokens used to generate the completion
-  uint32 completion_tokens = 3;
-  // Total number of tokens used to generate the response
-  uint32 total_tokens = 4;
+  // Count of the request tokens, as returned by the Cohere /tokenize endpoint
+  uint32 request_tokens_count = 2;
+  // Count of the response tokens, as returned by the Cohere /tokenize endpoint
+  uint32 response_tokens_count = 3;
+  // Finish reason
+  string finish_reason = 4;
 }
 
 // An OpenAI Streaming Response Message
@@ -104,4 +104,8 @@ message OpenAIStreamResponse {
   string content = 1;
   // Finish reason, if this is the last message
   optional string finish_reason = 2;
+  // Count of the request tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 request_tokens_count = 3;
+  // Count of the response tokens, as returned by the Cohere /tokenize endpoint
+  optional uint32 response_tokens_count = 4;
 }
diff --git a/services/api-gateway/internal/connectors/cohere/request.go b/services/api-gateway/internal/connectors/cohere/request.go
index 76aac044..51af594d 100644
--- a/services/api-gateway/internal/connectors/cohere/request.go
+++ b/services/api-gateway/internal/connectors/cohere/request.go
@@ -3,6 +3,7 @@ package cohere
 import (
 	"context"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
+	"github.com/basemind-ai/monorepo/services/api-gateway/internal/utils"
 	"github.com/basemind-ai/monorepo/shared/go/db"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/exc"
@@ -39,12 +40,13 @@ func (c *Client) RequestPrompt(
 	recordParams.FinishTime = pgtype.Timestamptz{Time: time.Now(), Valid: true}
 
 	if requestErr == nil {
-		promptResult.Content = response.Content
+		promptResult.Content = &response.Content
+		recordParams.FinishReason = models.PromptFinishReason(response.FinishReason)
 
 		recordParams.RequestTokens = int32(response.RequestTokensCount)
 		recordParams.ResponseTokens = int32(response.ResponseTokensCount)
 
-		costs := CalculateCosts(
+		costs := utils.CalculateCosts(
 			recordParams.RequestTokens,
 			recordParams.ResponseTokens,
 			requestConfiguration.ProviderModelPricing,
diff --git a/services/api-gateway/internal/connectors/cohere/stream.go b/services/api-gateway/internal/connectors/cohere/stream.go
index 188ebd99..6f9ba1b1 100644
--- a/services/api-gateway/internal/connectors/cohere/stream.go
+++ b/services/api-gateway/internal/connectors/cohere/stream.go
@@ -13,14 +13,13 @@ import (
 	"time"
 )
 
-func parseMessage(msg *cohereconnector.CohereStreamResponse) string {
-	content := ""
-
-	if msg != nil {
-		content = *msg.Content
+func parseMessage(msg *cohereconnector.CohereStreamResponse) *utils.StreamMessage {
+	return &utils.StreamMessage{
+		Content:            msg.Content,
+		FinishReason:       msg.FinishReason,
+		RequestTokenCount:  msg.RequestTokensCount,
+		ResponseTokenCount: msg.ResponseTokensCount,
 	}
-
-	return content
 }
 
 func (c *Client) RequestStream(
@@ -57,8 +56,7 @@ func (c *Client) RequestStream(
 	finalResult.Error = streamErr
 
 	if streamErr == nil {
-		// TODO: implement token cost, until then result is unused
-		_ = utils.StreamFromClient[cohereconnector.CohereStreamResponse](
+		streamFinish := utils.StreamFromClient[cohereconnector.CohereStreamResponse](
 			channel,
 			finalResult,
 			recordParams,
@@ -67,10 +65,18 @@ func (c *Client) RequestStream(
 			parseMessage,
 		)
 
-		recordParams.RequestTokens = int32(response.RequestTokensCount)
-		recordParams.ResponseTokens = int32(response.ResponseTokensCount)
-		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric("0.0"))  // TODO: implement token cost
-		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric("0.0")) // TODO: implement token cost
+		recordParams.FinishReason = streamFinish.FinishReason
+
+		recordParams.RequestTokens = int32(streamFinish.RequestTokenCount)
+		recordParams.ResponseTokens = int32(streamFinish.ResponseTokenCount)
+
+		costs := utils.CalculateCosts(
+			recordParams.RequestTokens,
+			recordParams.ResponseTokens,
+			requestConfiguration.ProviderModelPricing,
+		)
+		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
+		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
 	}
 
 	if finalResult.Error != nil {
diff --git a/services/api-gateway/internal/connectors/cohere/utils.go b/services/api-gateway/internal/connectors/cohere/utils.go
index 781ca2b7..902f22d3 100644
--- a/services/api-gateway/internal/connectors/cohere/utils.go
+++ b/services/api-gateway/internal/connectors/cohere/utils.go
@@ -9,7 +9,6 @@ import (
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/ptr"
-	"github.com/shopspring/decimal"
 )
 
 var ModelTypeMap = map[models.ModelType]cohereconnector.CohereModel{
@@ -117,27 +116,3 @@ func CreatePromptRequest(
 
 	return promptRequest, nil
 }
-
-type TokenCostResult struct {
-	RequestTokenCost  decimal.Decimal
-	ResponseTokenCost decimal.Decimal
-}
-
-// CalculateCosts calculates the input and output tokens count and costs for a given model type / vendor.
-func CalculateCosts(
-	requestTokenCount int32,
-	responseTokenCount int32,
-	modelPricing datatypes.ProviderModelPricingDTO,
-) TokenCostResult {
-	// The unit size is the number of token per which we calculate the price. E.g. 0.002$ for 1000 tokens.
-	unitSize := decimal.NewFromInt32(modelPricing.TokenUnitSize)
-
-	return TokenCostResult{
-		RequestTokenCost: decimal.NewFromInt32(requestTokenCount).
-			Div(unitSize).
-			Mul(modelPricing.InputTokenPrice),
-		ResponseTokenCost: decimal.NewFromInt32(responseTokenCount).
-			Div(unitSize).
-			Mul(modelPricing.OutputTokenPrice),
-	}
-}
diff --git a/services/api-gateway/internal/connectors/openai/request.go b/services/api-gateway/internal/connectors/openai/request.go
index 0f85398c..c5b1e49b 100644
--- a/services/api-gateway/internal/connectors/openai/request.go
+++ b/services/api-gateway/internal/connectors/openai/request.go
@@ -3,6 +3,7 @@ package openai
 import (
 	"context"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
+	"github.com/basemind-ai/monorepo/services/api-gateway/internal/utils"
 	"github.com/basemind-ai/monorepo/shared/go/db"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/exc"
@@ -40,25 +41,18 @@ func (c *Client) RequestPrompt(
 
 	if requestErr == nil {
 		promptResult.Content = &response.Content
+		recordParams.FinishReason = models.PromptFinishReason(response.FinishReason)
 
-		tokenCountAndCost := CalculateTokenCountsAndCosts(
-			GetRequestPromptString(promptRequest.Messages),
-			response.Content,
-			requestConfiguration.ProviderModelPricing,
-			requestConfiguration.PromptConfigData.ModelType,
-		)
-		recordParams.RequestTokens = tokenCountAndCost.RequestTokenCount
-		recordParams.ResponseTokens = tokenCountAndCost.ResponseTokenCount
+		recordParams.RequestTokens = int32(response.RequestTokensCount)
+		recordParams.ResponseTokens = int32(response.ResponseTokensCount)
 
-		requestTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.RequestTokenCost.String()),
-		)
-		recordParams.RequestTokensCost = *requestTokenCost
-
-		responseTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.ResponseTokenCost.String()),
+		costs := utils.CalculateCosts(
+			recordParams.RequestTokens,
+			recordParams.ResponseTokens,
+			requestConfiguration.ProviderModelPricing,
 		)
-		recordParams.ResponseTokensCost = *responseTokenCost
+		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
+		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
 	} else {
 		log.Debug().Err(requestErr).Msg("request error")
 		promptResult.Error = requestErr
diff --git a/services/api-gateway/internal/connectors/openai/request_test.go b/services/api-gateway/internal/connectors/openai/request_test.go
index 89ae29e7..3e48d63d 100644
--- a/services/api-gateway/internal/connectors/openai/request_test.go
+++ b/services/api-gateway/internal/connectors/openai/request_test.go
@@ -68,10 +68,10 @@ func TestRequestPrompt(t *testing.T) {
 		client, mockService := CreateClientAndService(t)
 
 		mockService.Response = &openaiconnector.OpenAIPromptResponse{
-			Content:          "Response content",
-			CompletionTokens: 2,
-			TotalTokens:      2,
-			PromptTokens:     2,
+			Content:             "Response content",
+			ResponseTokensCount: 2,
+			RequestTokensCount:  2,
+			FinishReason:        "DONE",
 		}
 
 		systemMessage := "You are a helpful chat bot."
diff --git a/services/api-gateway/internal/connectors/openai/stream.go b/services/api-gateway/internal/connectors/openai/stream.go
index 79fafa7d..3c027cb0 100644
--- a/services/api-gateway/internal/connectors/openai/stream.go
+++ b/services/api-gateway/internal/connectors/openai/stream.go
@@ -13,7 +13,14 @@ import (
 	"time"
 )
 
-func parseMessage(msg *openaiconnector.OpenAIStreamResponse) string { return msg.Content }
+func parseMessage(msg *openaiconnector.OpenAIStreamResponse) *utils.StreamMessage {
+	return &utils.StreamMessage{
+		Content:            &msg.Content,
+		FinishReason:       msg.FinishReason,
+		RequestTokenCount:  msg.RequestTokensCount,
+		ResponseTokenCount: msg.ResponseTokensCount,
+	}
+}
 
 func (c *Client) RequestStream(
 	ctx context.Context,
@@ -49,7 +56,7 @@ func (c *Client) RequestStream(
 	finalResult.Error = streamErr
 
 	if streamErr == nil {
-		promptContent := utils.StreamFromClient[openaiconnector.OpenAIStreamResponse](
+		streamFinish := utils.StreamFromClient[openaiconnector.OpenAIStreamResponse](
 			channel,
 			finalResult,
 			recordParams,
@@ -57,24 +64,19 @@ func (c *Client) RequestStream(
 			stream,
 			parseMessage,
 		)
-		tokenCountAndCost := CalculateTokenCountsAndCosts(
-			GetRequestPromptString(promptRequest.Messages),
-			promptContent,
-			requestConfiguration.ProviderModelPricing,
-			requestConfiguration.PromptConfigData.ModelType,
-		)
-		recordParams.RequestTokens = tokenCountAndCost.RequestTokenCount
-		recordParams.ResponseTokens = tokenCountAndCost.ResponseTokenCount
 
-		requestTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.RequestTokenCost.String()),
-		)
-		recordParams.RequestTokensCost = *requestTokenCost
+		recordParams.FinishReason = streamFinish.FinishReason
+
+		recordParams.RequestTokens = int32(streamFinish.RequestTokenCount)
+		recordParams.ResponseTokens = int32(streamFinish.ResponseTokenCount)
 
-		responseTokenCost := exc.MustResult(
-			db.StringToNumeric(tokenCountAndCost.ResponseTokenCost.String()),
+		costs := utils.CalculateCosts(
+			recordParams.RequestTokens,
+			recordParams.ResponseTokens,
+			requestConfiguration.ProviderModelPricing,
 		)
-		recordParams.ResponseTokensCost = *responseTokenCost
+		recordParams.RequestTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
+		recordParams.ResponseTokensCost = *exc.MustResult(db.StringToNumeric(costs.RequestTokenCost.String()))
 	}
 
 	if finalResult.Error != nil {
diff --git a/services/api-gateway/internal/connectors/openai/utils.go b/services/api-gateway/internal/connectors/openai/utils.go
index 9bdb1612..a1b0c194 100644
--- a/services/api-gateway/internal/connectors/openai/utils.go
+++ b/services/api-gateway/internal/connectors/openai/utils.go
@@ -7,10 +7,7 @@ import (
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/utils"
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
-	"github.com/basemind-ai/monorepo/shared/go/exc"
 	"github.com/basemind-ai/monorepo/shared/go/ptr"
-	"github.com/shopspring/decimal"
-	"github.com/tiktoken-go/tokenizer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"strings"
@@ -164,59 +161,3 @@ func GetRequestPromptString(messages []*openaiconnector.OpenAIMessage) string {
 
 	return strings.TrimRight(promptMessages, "\n")
 }
-
-var modelEncodingMap = map[models.ModelType]tokenizer.Encoding{
-	models.ModelTypeGpt35Turbo:    tokenizer.Cl100kBase,
-	models.ModelTypeGpt35Turbo16k: tokenizer.Cl100kBase,
-	models.ModelTypeGpt4:          tokenizer.Cl100kBase,
-	models.ModelTypeGpt432k:       tokenizer.Cl100kBase,
-}
-
-// GetStringTokenCount returns the number of tokens in a given string.
-func GetStringTokenCount(value string, modelType models.ModelType) int32 {
-	encoding := modelEncodingMap[modelType]
-	enc := exc.MustResult(tokenizer.Get(encoding))
-	ids, _, _ := enc.Encode(value)
-	return int32(len(ids))
-}
-
-type TokenCountCostResult struct {
-	RequestTokenCount  int32
-	ResponseTokenCount int32
-	RequestTokenCost   decimal.Decimal
-	ResponseTokenCost  decimal.Decimal
-}
-
-// CalculateTokenCountsAndCosts calculates the request and response tokens count and costs for a given model type / vendor.
-func CalculateTokenCountsAndCosts(
-	promptRequestValue string,
-	promptResponseValue string,
-	modelPricing datatypes.ProviderModelPricingDTO,
-	modelType models.ModelType,
-) TokenCountCostResult {
-	// The unit size is the number of token per which we calculate the price. E.g. 0.002$ for 1000 tokens.
-	unitSize := decimal.NewFromInt32(modelPricing.TokenUnitSize)
-
-	// requestTokensCount is the count of tokens in the request string. Their cost is lower than that of response.
-	requestTokensCount := GetStringTokenCount(promptRequestValue, modelType)
-
-	// responseTokensCount is the count of tokens in the response string. Their cost is higher than that of request.
-	responseTokensCount := GetStringTokenCount(promptResponseValue, modelType)
-
-	// priceRequest is the cost of the request tokens.
-	priceRequest := decimal.NewFromInt32(requestTokensCount).
-		Div(unitSize).
-		Mul(modelPricing.InputTokenPrice)
-
-	// priceResponse is the cost of the response tokens.
-	priceResponse := decimal.NewFromInt32(responseTokensCount).
-		Div(unitSize).
-		Mul(modelPricing.OutputTokenPrice)
-
-	return TokenCountCostResult{
-		RequestTokenCount:  requestTokensCount,
-		ResponseTokenCount: responseTokensCount,
-		RequestTokenCost:   priceRequest,
-		ResponseTokenCost:  priceResponse,
-	}
-}
diff --git a/services/api-gateway/internal/connectors/openai/utils_test.go b/services/api-gateway/internal/connectors/openai/utils_test.go
index 40563679..a55350e2 100644
--- a/services/api-gateway/internal/connectors/openai/utils_test.go
+++ b/services/api-gateway/internal/connectors/openai/utils_test.go
@@ -6,12 +6,10 @@ import (
 	"fmt"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/connectors/openai"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
-	"github.com/basemind-ai/monorepo/services/api-gateway/internal/services"
 	"github.com/basemind-ai/monorepo/shared/go/datatypes"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
 	"github.com/basemind-ai/monorepo/shared/go/ptr"
 	"github.com/basemind-ai/monorepo/shared/go/serialization"
-	"github.com/shopspring/decimal"
 	"testing"
 
 	"github.com/basemind-ai/monorepo/e2e/factories"
@@ -303,93 +301,4 @@ func TestUtils(t *testing.T) {
 			)
 		})
 	})
-	t.Run("GetStringTokenCount", func(t *testing.T) {
-		testCases := []struct {
-			input    string
-			expected int32
-		}{
-			{
-				input:    "Hello world!",
-				expected: 3,
-			},
-			{
-				input:    "",
-				expected: 0,
-			},
-			{
-				input:    "Goodbye world!",
-				expected: 4,
-			},
-		}
-
-		for _, testCase := range testCases {
-			t.Run(fmt.Sprintf("Test: '%d' token count", testCase.expected), func(t *testing.T) {
-				count := openai.GetStringTokenCount(testCase.input, models.ModelTypeGpt35Turbo)
-				assert.Equal(t, testCase.expected, count)
-			})
-		}
-	})
-
-	t.Run("CalculateTokenCountsAndCosts", func(t *testing.T) {
-		promptInputValue := "you are a helpful chatbot."
-		promptOutputValue := "trees are green, sky is blue, i am a machine, and so are you."
-		expectedInputTokenCount := int32(7)
-		expectedOutputTokenCount := int32(18)
-		testCases := []struct {
-			modelType               models.ModelType
-			expectedInputTokenCost  decimal.Decimal
-			expectedOutputTokenCost decimal.Decimal
-		}{
-			{
-				modelType:               models.ModelTypeGpt35Turbo,
-				expectedInputTokenCost:  decimal.RequireFromString("0.0000105"),
-				expectedOutputTokenCost: decimal.RequireFromString("0.000036"),
-			},
-			{
-				modelType:               models.ModelTypeGpt35Turbo16k,
-				expectedInputTokenCost:  decimal.RequireFromString("0.000021"),
-				expectedOutputTokenCost: decimal.RequireFromString("0.000072"),
-			},
-			{
-				modelType:               models.ModelTypeGpt4,
-				expectedInputTokenCost:  decimal.RequireFromString("0.00021"),
-				expectedOutputTokenCost: decimal.RequireFromString("0.000108"),
-			},
-			{
-				modelType:               models.ModelTypeGpt432k,
-				expectedInputTokenCost:  decimal.RequireFromString("0.00042"),
-				expectedOutputTokenCost: decimal.RequireFromString("0.000216"),
-			},
-		}
-
-		for _, testCase := range testCases {
-			t.Run(fmt.Sprintf("Test: '%s'", testCase.modelType), func(t *testing.T) {
-				modelPricingDTO := services.RetrieveProviderModelPricing(
-					context.TODO(),
-					testCase.modelType,
-					models.ModelVendorOPENAI,
-				)
-
-				result := openai.CalculateTokenCountsAndCosts(
-					promptInputValue,
-					promptOutputValue,
-					modelPricingDTO,
-					testCase.modelType,
-				)
-
-				assert.Equal(t, expectedInputTokenCount, result.RequestTokenCount)
-				assert.Equal(t, expectedOutputTokenCount, result.ResponseTokenCount)
-				assert.Equal(
-					t,
-					testCase.expectedInputTokenCost.String(),
-					result.RequestTokenCost.String(),
-				)
-				assert.Equal(
-					t,
-					testCase.expectedOutputTokenCost.String(),
-					result.ResponseTokenCost.String(),
-				)
-			})
-		}
-	})
 }
diff --git a/services/api-gateway/internal/dto/dto.go b/services/api-gateway/internal/dto/dto.go
index e9f2c95e..da370965 100644
--- a/services/api-gateway/internal/dto/dto.go
+++ b/services/api-gateway/internal/dto/dto.go
@@ -9,8 +9,9 @@ import (
 // PromptResultDTO is a data type used to encapsulate the result of a prompt request.
 type PromptResultDTO struct { // skipcq: TCV-001
 	Content       *string
-	RequestRecord *models.PromptRequestRecord
 	Error         error
+	FinishReason  *string
+	RequestRecord *models.PromptRequestRecord
 }
 
 // RequestConfigurationDTO is a data type used encapsulate the current application prompt configuration.
diff --git a/services/api-gateway/internal/utils/stream.go b/services/api-gateway/internal/utils/stream.go
index cca608e4..c0023743 100644
--- a/services/api-gateway/internal/utils/stream.go
+++ b/services/api-gateway/internal/utils/stream.go
@@ -4,27 +4,42 @@ import (
 	"errors"
 	"github.com/basemind-ai/monorepo/services/api-gateway/internal/dto"
 	"github.com/basemind-ai/monorepo/shared/go/db/models"
-	"github.com/basemind-ai/monorepo/shared/go/exc"
+	"github.com/basemind-ai/monorepo/shared/go/ptr"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/rs/zerolog/log"
 	"io"
-	"strings"
 	"time"
 )
 
+// Stream is an interface for a gRPC stream.
 type Stream[T any] interface {
 	Recv() (*T, error)
 }
 
+// StreamMessage is a generic data type used to encapsulate the result of a streaming response from a connector.
+type StreamMessage struct {
+	Content            *string
+	FinishReason       *string
+	RequestTokenCount  *uint32
+	ResponseTokenCount *uint32
+}
+
+type StreamFinishResult struct {
+	FinishReason       models.PromptFinishReason
+	RequestTokenCount  uint32
+	ResponseTokenCount uint32
+}
+
+// StreamFromClient is a generic function that handles the streaming response from an LLM API.
 func StreamFromClient[T any]( //nolint: revive
 	channel chan<- dto.PromptResultDTO,
-	promptResult *dto.PromptResultDTO,
+	finalResult *dto.PromptResultDTO,
 	recordParams *models.CreatePromptRequestRecordParams,
 	startTime time.Time,
 	stream Stream[T],
-	parseMessage func(*T) string,
-) string {
-	var builder strings.Builder
+	parseMessage func(*T) *StreamMessage,
+) *StreamFinishResult {
+	var streamResult *StreamFinishResult
 
 	for {
 		msg, receiveErr := stream.Recv()
@@ -34,7 +49,7 @@ func StreamFromClient[T any]( //nolint: revive
 
 			if !errors.Is(receiveErr, io.EOF) {
 				log.Debug().Err(receiveErr).Msg("received stream error")
-				promptResult.Error = receiveErr
+				finalResult.Error = receiveErr
 			}
 
 			break
@@ -45,11 +60,21 @@ func StreamFromClient[T any]( //nolint: revive
 			recordParams.DurationMs = pgtype.Int4{Int32: duration, Valid: true}
 		}
 
-		content := parseMessage(msg)
+		parsedMessage := parseMessage(msg)
 
-		exc.LogIfErr(exc.ReturnAnyErr(builder.WriteString(content)))
-		channel <- dto.PromptResultDTO{Content: &content}
+		channel <- dto.PromptResultDTO{
+			Content: parsedMessage.Content,
+		}
+
+		if parsedMessage.FinishReason != nil {
+			streamResult = &StreamFinishResult{
+				FinishReason:       models.PromptFinishReason(*parsedMessage.FinishReason),
+				RequestTokenCount:  ptr.Deref(parsedMessage.RequestTokenCount, 0),
+				ResponseTokenCount: ptr.Deref(parsedMessage.ResponseTokenCount, 0),
+			}
+			break
+		}
 	}
 
-	return builder.String()
+	return streamResult
 }
diff --git a/services/api-gateway/internal/utils/token.go b/services/api-gateway/internal/utils/token.go
new file mode 100644
index 00000000..35ecbd5a
--- /dev/null
+++ b/services/api-gateway/internal/utils/token.go
@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"github.com/basemind-ai/monorepo/shared/go/datatypes"
+	"github.com/shopspring/decimal"
+)
+
+type TokenCostResult struct {
+	RequestTokenCost  decimal.Decimal
+	ResponseTokenCost decimal.Decimal
+}
+
+// CalculateCosts calculates the input and output tokens count and costs for a given model type / vendor.
+func CalculateCosts(
+	requestTokenCount int32,
+	responseTokenCount int32,
+	modelPricing datatypes.ProviderModelPricingDTO,
+) TokenCostResult {
+	// The unit size is the number of token per which we calculate the price. E.g. 0.002$ for 1000 tokens.
+	unitSize := decimal.NewFromInt32(modelPricing.TokenUnitSize)
+
+	return TokenCostResult{
+		RequestTokenCost: decimal.NewFromInt32(requestTokenCount).
+			Div(unitSize).
+			Mul(modelPricing.InputTokenPrice),
+		ResponseTokenCost: decimal.NewFromInt32(responseTokenCount).
+			Div(unitSize).
+			Mul(modelPricing.OutputTokenPrice),
+	}
+}
diff --git a/services/cohere-connector/src/handlers.spec.ts b/services/cohere-connector/src/handlers.spec.ts
index 0e55fea1..6cc2e289 100644
--- a/services/cohere-connector/src/handlers.spec.ts
+++ b/services/cohere-connector/src/handlers.spec.ts
@@ -110,6 +110,7 @@ describe('handlers tests', () => {
 
 			expect(callback).toHaveBeenCalledWith(null, {
 				content: 'Generated response',
+				finishReason: StreamFinishReason.DONE,
 				requestTokensCount: 2,
 				responseTokensCount: 2,
 			});
diff --git a/services/cohere-connector/src/handlers.ts b/services/cohere-connector/src/handlers.ts
index d88c3ac4..0da16fb2 100644
--- a/services/cohere-connector/src/handlers.ts
+++ b/services/cohere-connector/src/handlers.ts
@@ -113,6 +113,7 @@ export async function coherePrompt(
 		);
 		callback(null, {
 			content: response,
+			finishReason: getFinishReason('COMPLETE'),
 			requestTokensCount,
 			responseTokensCount,
 		} satisfies CoherePromptResponse);
diff --git a/services/openai-connector/package.json b/services/openai-connector/package.json
index 2b78e2c8..dcd65107 100644
--- a/services/openai-connector/package.json
+++ b/services/openai-connector/package.json
@@ -15,6 +15,7 @@
 		"@protobuf-ts/runtime-rpc": "^2.9.3",
 		"grpc-health-check": "^2.0.0",
 		"openai": "^4.24.1",
-		"pino": "^8.17.2"
+		"pino": "^8.17.2",
+		"tiktoken": "^1.0.11"
 	}
 }
diff --git a/services/openai-connector/src/handlers.ts b/services/openai-connector/src/handlers.ts
index 8dd2de4e..0f2ae9f7 100644
--- a/services/openai-connector/src/handlers.ts
+++ b/services/openai-connector/src/handlers.ts
@@ -16,7 +16,13 @@ import {
 import logger from 'shared/logger';
 
 import { createOrDefaultClient } from '@/client';
-import { createOpenAIRequest, finishReasonMap } from '@/utils';
+import {
+	createOpenAIRequest,
+	getFinishReason,
+	getOpenAIModel,
+	getTokenCount,
+	OpenAIFinishReason,
+} from '@/utils';
 
 /**
  * The openAIPrompt function is a gRPC handler function.
@@ -49,11 +55,26 @@ export async function openAIPrompt(
 			{ choices, finishTime, startTime },
 			'OpenAI request completed',
 		);
+
+		const promptResponseContent = choices[0]?.message.content ?? '';
+		const requestTokensCount =
+			usage?.prompt_tokens ??
+			getTokenCount(
+				call.request.messages.map((m) => m.content ?? '').join(''),
+				getOpenAIModel(call.request.model),
+			);
+		const responseTokensCount =
+			usage?.completion_tokens ??
+			getTokenCount(
+				promptResponseContent,
+				getOpenAIModel(call.request.model),
+			);
+
 		callback(null, {
-			completionTokens: usage?.completion_tokens ?? 0,
-			content: choices[0]?.message.content ?? '',
-			promptTokens: usage?.prompt_tokens ?? 0,
-			totalTokens: usage?.total_tokens ?? 0,
+			content: promptResponseContent,
+			finishReason: getFinishReason(choices[0]?.finish_reason),
+			requestTokensCount,
+			responseTokensCount,
 		} satisfies OpenAIPromptResponse);
 	} catch (error: unknown) {
 		callback(createInternalGrpcError(error as Error), null);
@@ -87,17 +108,35 @@ export async function openAIStream(
 		const request = createOpenAIRequest(call.request, true);
 		const stream = await client.chat.completions.create(request);
 
+		let responseContent = '';
+		let finishReason: OpenAIFinishReason | undefined;
+
 		for await (const message of stream) {
 			const choice = message.choices[0];
 
+			const content = choice?.delta?.content ?? '';
+
+			responseContent += content;
+			finishReason = choice?.finish_reason ?? undefined;
+
 			call.write({
-				content: choice?.delta?.content ?? '',
-				finishReason: choice?.finish_reason
-					? finishReasonMap[choice.finish_reason]
-					: undefined,
+				content,
 			} satisfies OpenAIStreamResponse);
 		}
 
+		call.end({
+			content: '',
+			finishReason: getFinishReason(finishReason),
+			requestTokensCount: getTokenCount(
+				call.request.messages.map((m) => m.content ?? '').join(''),
+				getOpenAIModel(call.request.model),
+			),
+			responseTokensCount: getTokenCount(
+				responseContent,
+				getOpenAIModel(call.request.model),
+			),
+		});
+
 		const finishTime = Date.now();
 		logger.debug(
 			{ finishTime, startTime },
diff --git a/services/openai-connector/src/utils.ts b/services/openai-connector/src/utils.ts
index be27c4da..1883dc33 100644
--- a/services/openai-connector/src/utils.ts
+++ b/services/openai-connector/src/utils.ts
@@ -9,6 +9,7 @@ import {
 	ChatCompletionMessageParam,
 } from 'openai/src/resources/chat/completions';
 import { StreamFinishReason } from 'shared/constants';
+import { encoding_for_model as encodingForModel } from 'tiktoken';
 
 type OpenAIModels =
 	| 'gpt-4-0613'
@@ -35,7 +36,7 @@ const messageRoleMap: Record<
 	[OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_FUNCTION]: 'function',
 };
 
-type OpenAIFinishReason =
+export type OpenAIFinishReason =
 	| 'stop'
 	| 'length'
 	| 'tool_calls'
@@ -50,6 +51,15 @@ export const finishReasonMap: Record<OpenAIFinishReason, StreamFinishReason> = {
 	tool_calls: StreamFinishReason.DONE,
 };
 
+/*
+ * Get the finish reason from the OpenAI response
+ * */
+export function getFinishReason(
+	finishReason?: OpenAIFinishReason,
+): StreamFinishReason {
+	return finishReasonMap[finishReason ?? 'stop'];
+}
+
 /**
  * The getOpenAIModel function takes in a string that represents the OpenAI model
  * and returns the corresponding Hugging Face model.
@@ -123,3 +133,11 @@ export function createOpenAIRequest(
 		user: applicationId,
 	};
 }
+
+/*
+ * Helper function to count the OpenAI tokens in a given string.
+ * */
+export function getTokenCount(text: string, model: OpenAIModels): number {
+	const encoding = encodingForModel(model);
+	return encoding.encode(text).length;
+}
diff --git a/shared/go/db/models/models.go b/shared/go/db/models/models.go
index 68cf1c4b..ec753f47 100644
--- a/shared/go/db/models/models.go
+++ b/shared/go/db/models/models.go
@@ -143,6 +143,49 @@ func (ns NullModelVendor) Value() (driver.Value, error) {
 	return string(ns.ModelVendor), nil
 }
 
+type PromptFinishReason string
+
+const (
+	PromptFinishReasonDONE  PromptFinishReason = "DONE"
+	PromptFinishReasonERROR PromptFinishReason = "ERROR"
+	PromptFinishReasonLIMIT PromptFinishReason = "LIMIT"
+)
+
+func (e *PromptFinishReason) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = PromptFinishReason(s)
+	case string:
+		*e = PromptFinishReason(s)
+	default:
+		return fmt.Errorf("unsupported scan type for PromptFinishReason: %T", src)
+	}
+	return nil
+}
+
+type NullPromptFinishReason struct {
+	PromptFinishReason PromptFinishReason `json:"promptFinishReason"`
+	Valid              bool               `json:"valid"` // Valid is true if PromptFinishReason is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullPromptFinishReason) Scan(value interface{}) error {
+	if value == nil {
+		ns.PromptFinishReason, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.PromptFinishReason.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullPromptFinishReason) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.PromptFinishReason), nil
+}
+
 type ApiKey struct {
 	ID            pgtype.UUID        `json:"id"`
 	Name          string             `json:"name"`
@@ -197,6 +240,7 @@ type PromptRequestRecord struct {
 	ResponseTokensCost     pgtype.Numeric     `json:"responseTokensCost"`
 	StartTime              pgtype.Timestamptz `json:"startTime"`
 	FinishTime             pgtype.Timestamptz `json:"finishTime"`
+	FinishReason           PromptFinishReason `json:"finishReason"`
 	DurationMs             pgtype.Int4        `json:"durationMs"`
 	PromptConfigID         pgtype.UUID        `json:"promptConfigId"`
 	ErrorLog               pgtype.Text        `json:"errorLog"`
diff --git a/shared/go/db/models/prompt-request-record.sql.go b/shared/go/db/models/prompt-request-record.sql.go
index 865beaf7..56049ce4 100644
--- a/shared/go/db/models/prompt-request-record.sql.go
+++ b/shared/go/db/models/prompt-request-record.sql.go
@@ -24,10 +24,11 @@ INSERT INTO prompt_request_record (
     duration_ms,
     prompt_config_id,
     provider_model_pricing_id,
-    error_log
+    error_log,
+    finish_reason
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
-RETURNING id, is_stream_response, request_tokens, response_tokens, request_tokens_cost, response_tokens_cost, start_time, finish_time, duration_ms, prompt_config_id, error_log, created_at, deleted_at, provider_model_pricing_id
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+RETURNING id, is_stream_response, request_tokens, response_tokens, request_tokens_cost, response_tokens_cost, start_time, finish_time, finish_reason, duration_ms, prompt_config_id, error_log, created_at, deleted_at, provider_model_pricing_id
 `
 
 type CreatePromptRequestRecordParams struct {
@@ -42,6 +43,7 @@ type CreatePromptRequestRecordParams struct {
 	PromptConfigID         pgtype.UUID        `json:"promptConfigId"`
 	ProviderModelPricingID pgtype.UUID        `json:"providerModelPricingId"`
 	ErrorLog               pgtype.Text        `json:"errorLog"`
+	FinishReason           PromptFinishReason `json:"finishReason"`
 }
 
 // -- prompt request record
@@ -58,6 +60,7 @@ func (q *Queries) CreatePromptRequestRecord(ctx context.Context, arg CreatePromp
 		arg.PromptConfigID,
 		arg.ProviderModelPricingID,
 		arg.ErrorLog,
+		arg.FinishReason,
 	)
 	var i PromptRequestRecord
 	err := row.Scan(
@@ -69,6 +72,7 @@ func (q *Queries) CreatePromptRequestRecord(ctx context.Context, arg CreatePromp
 		&i.ResponseTokensCost,
 		&i.StartTime,
 		&i.FinishTime,
+		&i.FinishReason,
 		&i.DurationMs,
 		&i.PromptConfigID,
 		&i.ErrorLog,
diff --git a/shared/ts/src/constants.ts b/shared/ts/src/constants.ts
index ef79e8c3..39018b0e 100644
--- a/shared/ts/src/constants.ts
+++ b/shared/ts/src/constants.ts
@@ -1,9 +1,9 @@
 /* c8 ignore next */
 export enum StreamFinishReason {
 	// Stream is done and finished without issues
-	DONE = 'done',
+	DONE = 'DONE',
 	// Stream finished due to an error
-	ERROR = 'error',
+	ERROR = 'ERROR',
 	// Stream finished because it reached the token limit of the model
-	LIMIT = 'limit',
+	LIMIT = 'LIMIT',
 }
diff --git a/sql/migrations/20231231194456_add-finish-reason.sql b/sql/migrations/20231231194456_add-finish-reason.sql
new file mode 100644
index 00000000..040d755d
--- /dev/null
+++ b/sql/migrations/20231231194456_add-finish-reason.sql
@@ -0,0 +1,4 @@
+-- Create enum type "prompt_finish_reason"
+CREATE TYPE "prompt_finish_reason" AS ENUM ('DONE', 'ERROR', 'LIMIT');
+-- Modify "prompt_request_record" table
+ALTER TABLE "prompt_request_record" ADD COLUMN "finish_reason" "prompt_finish_reason" NOT NULL DEFAULT 'DONE';
diff --git a/sql/migrations/atlas.sum b/sql/migrations/atlas.sum
index 389aa54c..6b9e7472 100644
--- a/sql/migrations/atlas.sum
+++ b/sql/migrations/atlas.sum
@@ -1,3 +1,4 @@
-h1:oaGrwtqEJyHI9XrJmBVR1b2RraTorUQ0TARU3wUIh8M=
+h1:WmrJ5pnDYPoZ9hrMwF0861UsuhDD+PYTeg2acRovmJw=
 20231122075154_initial.sql h1:wyBe9b0uXMyWXJ+XlPKlOM32jEtkDhwTfIQASfh7GKc=
 20231224132418_add-credits-to-project-table.sql h1:AQx+tWzFvypfW3sKbGOoCVgDKbfd/34QgfFSLdEsznE=
+20231231194456_add-finish-reason.sql h1:Ej7b2pGIXAWESpSjzt6afX9G8xkByea5FGEwbPxZCWw=
diff --git a/sql/queries/prompt-request-record.sql b/sql/queries/prompt-request-record.sql
index 6bef0efd..8e42d031 100644
--- a/sql/queries/prompt-request-record.sql
+++ b/sql/queries/prompt-request-record.sql
@@ -12,7 +12,8 @@ INSERT INTO prompt_request_record (
     duration_ms,
     prompt_config_id,
     provider_model_pricing_id,
-    error_log
+    error_log,
+    finish_reason
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
 RETURNING *;
diff --git a/sql/schema.sql b/sql/schema.sql
index 02b495ef..b1921db3 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -125,6 +125,13 @@ CREATE INDEX idx_provider_model_pricing_active_to_date ON provider_model_pricing
 CREATE INDEX idx_provider_model_pricing_model_type ON provider_model_pricing (model_type);
 CREATE INDEX idx_provider_model_pricing_model_vendor ON provider_model_pricing (model_vendor);
 
+-- prompt-finish-reason
+CREATE TYPE prompt_finish_reason AS ENUM (
+    'DONE',
+    'ERROR',
+    'LIMIT'
+);
+
 -- prompt-request-record
 CREATE TABLE prompt_request_record
 (
@@ -136,6 +143,7 @@ CREATE TABLE prompt_request_record
     response_tokens_cost numeric NOT NULL,
     start_time timestamptz NOT NULL,
     finish_time timestamptz NOT NULL,
+    finish_reason prompt_finish_reason NOT NULL DEFAULT 'DONE',
     duration_ms int NULL,
     prompt_config_id uuid NULL,
     error_log text NULL,

From 9576849ce44c8f59aab667bda34d7375729fe9b5 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Mon, 1 Jan 2024 09:52:21 +0100
Subject: [PATCH 13/15] chore: fixed validation error

---
 e2e/factories/factories.go                    |  1 +
 .../connectors/cohere/request_test.go         |  5 ++-
 .../internal/connectors/cohere/stream.go      | 17 ++++----
 .../internal/connectors/cohere/stream_test.go | 15 ++++++-
 .../internal/connectors/openai/stream.go      | 17 ++++----
 .../internal/connectors/openai/stream_test.go | 14 ++++++-
 services/api-gateway/internal/dto/dto.go      |  1 -
 .../internal/services/integration_test.go     | 37 +++++++++++++----
 .../api-gateway/internal/services/utils.go    | 29 ++++++-------
 .../internal/services/utils_test.go           | 14 ++++---
 services/api-gateway/internal/utils/stream.go | 32 +++++++++------
 services/cohere-connector/src/utils.ts        |  1 -
 .../internal/api/prompttestrecords_test.go    |  1 +
 .../openai-connector/src/handlers.spec.ts     | 41 ++++++++-----------
 services/openai-connector/src/handlers.ts     |  6 +--
 15 files changed, 141 insertions(+), 90 deletions(-)

diff --git a/e2e/factories/factories.go b/e2e/factories/factories.go
index ee2391f2..3c4e1c39 100644
--- a/e2e/factories/factories.go
+++ b/e2e/factories/factories.go
@@ -201,6 +201,7 @@ func CreatePromptRequestRecord(
 			ResponseTokens:     18,
 			RequestTokensCost:  *requestTokenCost,
 			ResponseTokensCost: *responseTokenCost,
+			FinishReason:       models.PromptFinishReasonDONE,
 			StartTime:          pgtype.Timestamptz{Time: promptStartTime, Valid: true},
 			FinishTime:         pgtype.Timestamptz{Time: promptFinishTime, Valid: true},
 			DurationMs:         pgtype.Int4{Int32: 0, Valid: true},
diff --git a/services/api-gateway/internal/connectors/cohere/request_test.go b/services/api-gateway/internal/connectors/cohere/request_test.go
index 7834028c..561c8903 100644
--- a/services/api-gateway/internal/connectors/cohere/request_test.go
+++ b/services/api-gateway/internal/connectors/cohere/request_test.go
@@ -70,7 +70,10 @@ func TestRequestPrompt(t *testing.T) {
 		content := "Response content"
 
 		mockService.Response = &cohereconnector.CoherePromptResponse{
-			Content: &content,
+			Content:             content,
+			FinishReason:        "DONE",
+			RequestTokensCount:  10,
+			ResponseTokensCount: 10,
 		}
 
 		mockService.ExpectedRequest = &cohereconnector.CoherePromptRequest{
diff --git a/services/api-gateway/internal/connectors/cohere/stream.go b/services/api-gateway/internal/connectors/cohere/stream.go
index 6f9ba1b1..c12cca51 100644
--- a/services/api-gateway/internal/connectors/cohere/stream.go
+++ b/services/api-gateway/internal/connectors/cohere/stream.go
@@ -14,6 +14,13 @@ import (
 )
 
 func parseMessage(msg *cohereconnector.CohereStreamResponse) *utils.StreamMessage {
+	errorFinish := "ERROR"
+	if msg == nil {
+		return &utils.StreamMessage{
+			FinishReason: &errorFinish,
+		}
+	}
+
 	return &utils.StreamMessage{
 		Content:            msg.Content,
 		FinishReason:       msg.FinishReason,
@@ -55,7 +62,7 @@ func (c *Client) RequestStream(
 	stream, streamErr := c.client.CohereStream(ctx, promptRequest)
 	finalResult.Error = streamErr
 
-	if streamErr == nil {
+	if finalResult.Error == nil {
 		streamFinish := utils.StreamFromClient[cohereconnector.CohereStreamResponse](
 			channel,
 			finalResult,
@@ -83,15 +90,11 @@ func (c *Client) RequestStream(
 		recordParams.ErrorLog = pgtype.Text{String: finalResult.Error.Error(), Valid: true}
 	}
 
-	promptRecord, createRequestRecordErr := db.GetQueries().
+	promptRecord := exc.MustResult(db.GetQueries().
 		CreatePromptRequestRecord(
 			ctx,
 			*recordParams,
-		)
-
-	if finalResult.Error == nil {
-		finalResult.Error = createRequestRecordErr
-	}
+		))
 
 	finalResult.RequestRecord = &promptRecord
 
diff --git a/services/api-gateway/internal/connectors/cohere/stream_test.go b/services/api-gateway/internal/connectors/cohere/stream_test.go
index 895e187f..1caab1db 100644
--- a/services/api-gateway/internal/connectors/cohere/stream_test.go
+++ b/services/api-gateway/internal/connectors/cohere/stream_test.go
@@ -54,14 +54,25 @@ func TestRequestStream(t *testing.T) {
 
 		channel := make(chan dto.PromptResultDTO)
 
-		finishReason := "done"
+		finishReason := "DONE"
+		tokens := uint32(10)
+
 		one := "1"
 		two := "2"
 		three := "3"
+		empty := ""
 		mockService.Stream = []*cohereconnector.CohereStreamResponse{
 			{Content: &one},
 			{Content: &two},
-			{Content: &three, FinishReason: &finishReason},
+			{
+				Content: &three,
+			},
+			{
+				Content:             &empty,
+				FinishReason:        &finishReason,
+				RequestTokensCount:  &tokens,
+				ResponseTokensCount: &tokens,
+			},
 		}
 
 		go func() {
diff --git a/services/api-gateway/internal/connectors/openai/stream.go b/services/api-gateway/internal/connectors/openai/stream.go
index 3c027cb0..05a53dc4 100644
--- a/services/api-gateway/internal/connectors/openai/stream.go
+++ b/services/api-gateway/internal/connectors/openai/stream.go
@@ -14,6 +14,13 @@ import (
 )
 
 func parseMessage(msg *openaiconnector.OpenAIStreamResponse) *utils.StreamMessage {
+	errorFinish := "ERROR"
+	if msg == nil {
+		return &utils.StreamMessage{
+			FinishReason: &errorFinish,
+		}
+	}
+
 	return &utils.StreamMessage{
 		Content:            &msg.Content,
 		FinishReason:       msg.FinishReason,
@@ -55,7 +62,7 @@ func (c *Client) RequestStream(
 	stream, streamErr := c.client.OpenAIStream(ctx, promptRequest)
 	finalResult.Error = streamErr
 
-	if streamErr == nil {
+	if finalResult.Error == nil {
 		streamFinish := utils.StreamFromClient[openaiconnector.OpenAIStreamResponse](
 			channel,
 			finalResult,
@@ -83,15 +90,11 @@ func (c *Client) RequestStream(
 		recordParams.ErrorLog = pgtype.Text{String: finalResult.Error.Error(), Valid: true}
 	}
 
-	promptRecord, createRequestRecordErr := db.GetQueries().
+	promptRecord := exc.MustResult(db.GetQueries().
 		CreatePromptRequestRecord(
 			ctx,
 			*recordParams,
-		)
-
-	if finalResult.Error == nil {
-		finalResult.Error = createRequestRecordErr
-	}
+		))
 
 	finalResult.RequestRecord = &promptRecord
 
diff --git a/services/api-gateway/internal/connectors/openai/stream_test.go b/services/api-gateway/internal/connectors/openai/stream_test.go
index b865cd62..c4d11adb 100644
--- a/services/api-gateway/internal/connectors/openai/stream_test.go
+++ b/services/api-gateway/internal/connectors/openai/stream_test.go
@@ -53,11 +53,20 @@ func TestRequestStream(t *testing.T) {
 
 		channel := make(chan dto.PromptResultDTO)
 
-		finishReason := "done"
+		finishReason := "DONE"
+		tokens := uint32(10)
 		mockService.Stream = []*openaiconnector.OpenAIStreamResponse{
 			{Content: "1"},
 			{Content: "2"},
-			{Content: "3", FinishReason: &finishReason},
+			{
+				Content: "3",
+			},
+			{
+				Content:             "",
+				FinishReason:        &finishReason,
+				RequestTokensCount:  &tokens,
+				ResponseTokensCount: &tokens,
+			},
 		}
 
 		go func() {
@@ -88,6 +97,7 @@ func TestRequestStream(t *testing.T) {
 		assert.Nil(t, chunks[3].Content)
 		assert.Nil(t, chunks[3].Error)
 		assert.NotNil(t, chunks[3].RequestRecord)
+		assert.NotNil(t, chunks[3].RequestRecord.FinishReason)
 	})
 
 	t.Run("returns an error if the request fails", func(t *testing.T) {
diff --git a/services/api-gateway/internal/dto/dto.go b/services/api-gateway/internal/dto/dto.go
index da370965..beed322b 100644
--- a/services/api-gateway/internal/dto/dto.go
+++ b/services/api-gateway/internal/dto/dto.go
@@ -10,7 +10,6 @@ import (
 type PromptResultDTO struct { // skipcq: TCV-001
 	Content       *string
 	Error         error
-	FinishReason  *string
 	RequestRecord *models.PromptRequestRecord
 }
 
diff --git a/services/api-gateway/internal/services/integration_test.go b/services/api-gateway/internal/services/integration_test.go
index 99758746..b0b6ba69 100644
--- a/services/api-gateway/internal/services/integration_test.go
+++ b/services/api-gateway/internal/services/integration_test.go
@@ -131,7 +131,10 @@ func TestIntegration(t *testing.T) { //nolint: revive
 				expectedResponseContent := "Response content"
 
 				openaiService.Response = &openaiconnector.OpenAIPromptResponse{
-					Content: expectedResponseContent,
+					Content:             expectedResponseContent,
+					FinishReason:        "DONE",
+					RequestTokensCount:  10,
+					ResponseTokensCount: 20,
 				}
 
 				mockRedis.ExpectGet(db.UUIDToString(&requestConfigurationDTO.ApplicationID)).
@@ -238,12 +241,21 @@ func TestIntegration(t *testing.T) { //nolint: revive
 					db.UUIDToString(&requestConfigurationDTO.ApplicationID),
 				)
 
-				finishReason := "done"
+				finishReason := "DONE"
+				tokens := uint32(10)
 
 				openaiService.Stream = []*openaiconnector.OpenAIStreamResponse{
 					{Content: "1"},
 					{Content: "2"},
-					{Content: "3", FinishReason: &finishReason},
+					{
+						Content: "3",
+					},
+					{
+						Content:             "",
+						FinishReason:        &finishReason,
+						RequestTokensCount:  &tokens,
+						ResponseTokensCount: &tokens,
+					},
 				}
 
 				expectedCacheValue, marshalErr := cacheClient.Marshal(requestConfigurationDTO)
@@ -298,9 +310,9 @@ func TestIntegration(t *testing.T) { //nolint: revive
 				assert.Equal(t, "1", chunks[0].Content)
 				assert.Equal(t, "2", chunks[1].Content)
 				assert.Equal(t, "3", chunks[2].Content)
-				assert.Equal(t, "done", *chunks[3].FinishReason)
-				assert.Equal(t, 1, int(*chunks[3].ResponseTokens))
-				assert.Equal(t, 16, int(*chunks[3].RequestTokens))
+				assert.Equal(t, "DONE", *chunks[3].FinishReason)
+				assert.Equal(t, 10, int(*chunks[3].ResponseTokens))
+				assert.Equal(t, 10, int(*chunks[3].RequestTokens))
 			})
 		})
 	})
@@ -312,12 +324,21 @@ func TestIntegration(t *testing.T) { //nolint: revive
 
 				client := createPromptTestingServiceClient(t)
 
-				finishReason := "done"
+				finishReason := "DONE"
+				tokens := uint32(10)
 
 				openaiService.Stream = []*openaiconnector.OpenAIStreamResponse{
 					{Content: "1"},
 					{Content: "2"},
-					{Content: "3", FinishReason: &finishReason},
+					{
+						Content: "3",
+					},
+					{
+						Content:             "",
+						FinishReason:        &finishReason,
+						RequestTokensCount:  &tokens,
+						ResponseTokensCount: &tokens,
+					},
 				}
 
 				outgoingContext := metadata.AppendToOutgoingContext(
diff --git a/services/api-gateway/internal/services/utils.go b/services/api-gateway/internal/services/utils.go
index 4f1b7735..71ae0902 100644
--- a/services/api-gateway/internal/services/utils.go
+++ b/services/api-gateway/internal/services/utils.go
@@ -276,18 +276,20 @@ func CreateAPIGatewayStreamMessage(
 	result dto.PromptResultDTO,
 ) (*gateway.StreamingPromptResponse, bool) {
 	msg := &gateway.StreamingPromptResponse{}
+
+	isFinished := false
+
 	if result.Error != nil {
-		reason := "error"
+		isFinished = true
+		reason := "ERROR"
+		msg.FinishReason = &reason
+	} else if result.RequestRecord != nil {
+		isFinished = true
+		reason := string(result.RequestRecord.FinishReason)
 		msg.FinishReason = &reason
 	}
 
-	isFinished := msg.FinishReason != nil || result.RequestRecord != nil
-
 	if result.RequestRecord != nil {
-		if msg.FinishReason == nil {
-			reason := "done"
-			msg.FinishReason = &reason
-		}
 		requestTokens := uint32(result.RequestRecord.RequestTokens)
 		responseTokens := uint32(result.RequestRecord.ResponseTokens)
 		streamDuration := uint32(
@@ -302,9 +304,8 @@ func CreateAPIGatewayStreamMessage(
 		go DeductCredit(ctx, result.RequestRecord)
 	}
 
-	if result.Content != nil {
-		contentCopy := *result.Content
-		msg.Content = contentCopy
+	if content := ptr.Deref(result.Content, ""); len(content) > 0 {
+		msg.Content = content
 	}
 
 	return msg, isFinished
@@ -320,15 +321,15 @@ func DeductCredit(
 		return
 	}
 
-	totalCost := exc.MustResult(db.NumericToDecimal(requestRecord.RequestTokensCost)).Add(
-		*exc.MustResult(db.NumericToDecimal(requestRecord.ResponseTokensCost)),
-	)
+	requestCost := *exc.MustResult(db.NumericToDecimal(requestRecord.RequestTokensCost))
+	responseCost := exc.MustResult(db.NumericToDecimal(requestRecord.ResponseTokensCost))
+	totalCost := responseCost.Add(requestCost).Mul(decimal.NewFromInt(-1))
 
 	exc.LogIfErr(
 		db.GetQueries().
 			UpdateProjectCredits(context.Background(), models.UpdateProjectCreditsParams{
 				ID:      projectID,
-				Credits: *exc.MustResult(db.StringToNumeric(totalCost.Mul(decimal.NewFromInt(-1)).String())),
+				Credits: *exc.MustResult(db.StringToNumeric(totalCost.String())),
 			}),
 	)
 }
diff --git a/services/api-gateway/internal/services/utils_test.go b/services/api-gateway/internal/services/utils_test.go
index 4552ba91..286f3ee1 100644
--- a/services/api-gateway/internal/services/utils_test.go
+++ b/services/api-gateway/internal/services/utils_test.go
@@ -644,24 +644,26 @@ func TestUtils(t *testing.T) { //nolint:revive
 			assert.False(t, isFinished)
 		})
 
-		t.Run("set finish reason to error", func(t *testing.T) {
+		t.Run("set finish reason to ERROR", func(t *testing.T) {
 			result := dto.PromptResultDTO{
 				Error: errors.New("an error occurred"),
 			}
 			msg, _ := services.CreateAPIGatewayStreamMessage(context.TODO(), result)
 
 			assert.NotNil(t, msg)
-			assert.Equal(t, "error", *msg.FinishReason)
+			assert.Equal(t, "ERROR", *msg.FinishReason)
 		})
 
-		t.Run("set finish reason to done", func(t *testing.T) {
+		t.Run("set finish reason to request record reason", func(t *testing.T) {
 			result := dto.PromptResultDTO{
-				RequestRecord: &models.PromptRequestRecord{},
+				RequestRecord: &models.PromptRequestRecord{
+					FinishReason: models.PromptFinishReasonDONE,
+				},
 			}
 			msg, _ := services.CreateAPIGatewayStreamMessage(context.TODO(), result)
 
 			assert.NotNil(t, msg)
-			assert.Equal(t, "done", *msg.FinishReason)
+			assert.Equal(t, "DONE", *msg.FinishReason)
 		})
 
 		t.Run("finish reason is nil when request record is nil", func(t *testing.T) {
@@ -679,7 +681,7 @@ func TestUtils(t *testing.T) { //nolint:revive
 			msg, _ := services.CreateAPIGatewayStreamMessage(context.TODO(), result)
 
 			assert.NotNil(t, msg)
-			assert.Equal(t, "error", *msg.FinishReason)
+			assert.Equal(t, "ERROR", *msg.FinishReason)
 		})
 	})
 
diff --git a/services/api-gateway/internal/utils/stream.go b/services/api-gateway/internal/utils/stream.go
index c0023743..3cef2202 100644
--- a/services/api-gateway/internal/utils/stream.go
+++ b/services/api-gateway/internal/utils/stream.go
@@ -44,15 +44,26 @@ func StreamFromClient[T any]( //nolint: revive
 	for {
 		msg, receiveErr := stream.Recv()
 
-		if receiveErr != nil {
-			recordParams.FinishTime = pgtype.Timestamptz{Time: time.Now(), Valid: true}
+		isFinished := false
 
+		parsedMessage := parseMessage(msg)
+		if parsedMessage.FinishReason != nil {
+			streamResult = &StreamFinishResult{
+				FinishReason:       models.PromptFinishReason(*parsedMessage.FinishReason),
+				RequestTokenCount:  ptr.Deref(parsedMessage.RequestTokenCount, 0),
+				ResponseTokenCount: ptr.Deref(parsedMessage.ResponseTokenCount, 0),
+			}
+
+			isFinished = true
+		}
+
+		if receiveErr != nil {
 			if !errors.Is(receiveErr, io.EOF) {
 				log.Debug().Err(receiveErr).Msg("received stream error")
 				finalResult.Error = receiveErr
 			}
 
-			break
+			isFinished = true
 		}
 
 		if recordParams.DurationMs.Int32 == 0 {
@@ -60,21 +71,16 @@ func StreamFromClient[T any]( //nolint: revive
 			recordParams.DurationMs = pgtype.Int4{Int32: duration, Valid: true}
 		}
 
-		parsedMessage := parseMessage(msg)
+		if isFinished {
+			break
+		}
 
 		channel <- dto.PromptResultDTO{
 			Content: parsedMessage.Content,
 		}
-
-		if parsedMessage.FinishReason != nil {
-			streamResult = &StreamFinishResult{
-				FinishReason:       models.PromptFinishReason(*parsedMessage.FinishReason),
-				RequestTokenCount:  ptr.Deref(parsedMessage.RequestTokenCount, 0),
-				ResponseTokenCount: ptr.Deref(parsedMessage.ResponseTokenCount, 0),
-			}
-			break
-		}
 	}
 
+	recordParams.FinishTime = pgtype.Timestamptz{Time: time.Now(), Valid: true}
+
 	return streamResult
 }
diff --git a/services/cohere-connector/src/utils.ts b/services/cohere-connector/src/utils.ts
index 2af93d8a..420bf41d 100644
--- a/services/cohere-connector/src/utils.ts
+++ b/services/cohere-connector/src/utils.ts
@@ -56,7 +56,6 @@ export function createCohereRequest(
  *
  * @return A StreamFinishReason
  */
-
 export function getFinishReason(
 	finishReason: 'COMPLETE' | 'MAX_TOKENS' | 'ERROR' | 'ERROR_TOXIC',
 ) {
diff --git a/services/dashboard-backend/internal/api/prompttestrecords_test.go b/services/dashboard-backend/internal/api/prompttestrecords_test.go
index 2aa1303a..9c1fc286 100644
--- a/services/dashboard-backend/internal/api/prompttestrecords_test.go
+++ b/services/dashboard-backend/internal/api/prompttestrecords_test.go
@@ -68,6 +68,7 @@ func TestPromptTestRecordsAPI(t *testing.T) {
 				ResponseTokens:     20,
 				RequestTokensCost:  *exc.MustResult(db.StringToNumeric("0.000012")),
 				ResponseTokensCost: *exc.MustResult(db.StringToNumeric("0.000062")),
+				FinishReason:       models.PromptFinishReasonDONE,
 				StartTime: pgtype.Timestamptz{
 					Time:  time.Now().Add(-10 * time.Second),
 					Valid: true,
diff --git a/services/openai-connector/src/handlers.spec.ts b/services/openai-connector/src/handlers.spec.ts
index 9c30d909..a032c657 100644
--- a/services/openai-connector/src/handlers.spec.ts
+++ b/services/openai-connector/src/handlers.spec.ts
@@ -106,10 +106,10 @@ describe('handlers tests', () => {
 			});
 
 			expect(callback).toHaveBeenCalledWith(null, {
-				completionTokens: 20,
 				content: 'Generated response',
-				promptTokens: 10,
-				totalTokens: 30,
+				finishReason: StreamFinishReason.DONE,
+				requestTokensCount: 10,
+				responseTokensCount: 20,
 			});
 		});
 
@@ -151,10 +151,10 @@ describe('handlers tests', () => {
 			});
 
 			expect(callback).toHaveBeenCalledWith(null, {
-				completionTokens: 0,
 				content: '',
-				promptTokens: 10,
-				totalTokens: 10,
+				finishReason: StreamFinishReason.DONE,
+				requestTokensCount: 10,
+				responseTokensCount: 0,
 			});
 		});
 
@@ -243,10 +243,10 @@ describe('handlers tests', () => {
 			});
 
 			expect(callback).toHaveBeenCalledWith(null, {
-				completionTokens: 20,
 				content: 'Generated response',
-				promptTokens: 10,
-				totalTokens: 30,
+				finishReason: StreamFinishReason.LIMIT,
+				requestTokensCount: 10,
+				responseTokensCount: 20,
 			});
 		});
 	});
@@ -330,70 +330,61 @@ describe('handlers tests', () => {
 				[
 					{
 						content: '0',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '1',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '2',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '3',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '4',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '5',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '6',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '7',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '8',
-						finishReason: undefined,
 					},
 				],
 				[
 					{
 						content: '9',
-						finishReason: undefined,
-					},
-				],
-				[
-					{
-						content: '',
-						finishReason: StreamFinishReason.DONE,
 					},
 				],
 			]);
+
+			expect(call.end).toHaveBeenCalledWith({
+				content: '',
+				finishReason: StreamFinishReason.DONE,
+				requestTokensCount: 1,
+				responseTokensCount: 4,
+			});
 		});
 
 		it('should handle errors', async () => {
diff --git a/services/openai-connector/src/handlers.ts b/services/openai-connector/src/handlers.ts
index 0f2ae9f7..13ae86b5 100644
--- a/services/openai-connector/src/handlers.ts
+++ b/services/openai-connector/src/handlers.ts
@@ -119,9 +119,9 @@ export async function openAIStream(
 			responseContent += content;
 			finishReason = choice?.finish_reason ?? undefined;
 
-			call.write({
-				content,
-			} satisfies OpenAIStreamResponse);
+			if (content) {
+				call.write({ content } satisfies OpenAIStreamResponse);
+			}
 		}
 
 		call.end({

From 58941d7f257b616314aaa25d5be4e72fe0dc0e25 Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Mon, 1 Jan 2024 11:25:45 +0100
Subject: [PATCH 14/15] chore: updated dependencies

---
 ...emind_ai_monorepo_services_api_gateway_internal_services.xml | 1 -
 go.mod                                                          | 2 +-
 go.sum                                                          | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_api_gateway_internal_services.xml b/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_api_gateway_internal_services.xml
index e43d08cd..871b6037 100644
--- a/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_api_gateway_internal_services.xml
+++ b/.idea/runConfigurations/go_test_github_com_basemind_ai_monorepo_services_api_gateway_internal_services.xml
@@ -5,7 +5,6 @@
 		type="GoTestRunConfiguration"
 		factoryName="Go Test"
 	>
-    <module name="BaseMind.AI" />
     <working_directory value="$PROJECT_DIR$" />
     <kind value="PACKAGE" />
     <package
diff --git a/go.mod b/go.mod
index a22ff250..6abb2199 100644
--- a/go.mod
+++ b/go.mod
@@ -107,7 +107,7 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
 	github.com/sendgrid/rest v2.6.9+incompatible // indirect
 	github.com/sendgrid/sendgrid-go v3.14.0+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/objx v0.5.1 // indirect
diff --git a/go.sum b/go.sum
index dc4fa6a2..92e637ff 100644
--- a/go.sum
+++ b/go.sum
@@ -1089,6 +1089,8 @@ github.com/sethvargo/go-envconfig v0.9.0 h1:Q6FQ6hVEeTECULvkJZakq3dZMeBQ3JUpcKMf
 github.com/sethvargo/go-envconfig v0.9.0/go.mod h1:Iz1Gy1Sf3T64TQlJSvee81qDhf7YIlt8GMUX6yyNFs0=
 github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
 github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
+github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4=
+github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=

From c22cab97c747e2a45de67351820356cf0401698b Mon Sep 17 00:00:00 2001
From: Na'aman Hirschfeld <nhirschfeld@gmail.com>
Date: Mon, 1 Jan 2024 12:08:58 +0100
Subject: [PATCH 15/15] chore: ui fixes

---
 .../[applicationId]/config-create-wizard/page.tsx  |  1 +
 .../prompt-config-testing-form.tsx                 |  2 +-
 frontend/src/styles/globals.scss                   | 14 +++-----------
 services/openai-connector/src/handlers.ts          |  1 -
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/[locale]/projects/[projectId]/applications/[applicationId]/config-create-wizard/page.tsx b/frontend/src/app/[locale]/projects/[projectId]/applications/[applicationId]/config-create-wizard/page.tsx
index 669f2e48..52012e8d 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/applications/[applicationId]/config-create-wizard/page.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/applications/[applicationId]/config-create-wizard/page.tsx
@@ -233,6 +233,7 @@ export default function PromptConfigCreateWizard({
 										<button
 											data-testid="config-create-wizard-cancel-button"
 											onClick={() => {
+												store.resetState();
 												router.push(
 													setRouteParams(
 														Navigation.ApplicationDetail,
diff --git a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/prompt-config-testing-form.tsx b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/prompt-config-testing-form.tsx
index 5eeba6f9..16d86abc 100644
--- a/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/prompt-config-testing-form.tsx
+++ b/frontend/src/components/projects/[projectId]/applications/[applicationId]/config-create-wizard/prompt-config-testing-form.tsx
@@ -178,7 +178,7 @@ export function PromptConfigTestingForm<T extends ModelVendor>({
 					<span className="text-info">
 						{modelResponses
 							.map((message) => message.content)
-							.join(' ')}
+							.join('')}
 					</span>
 				</div>
 				<div className="card-section-divider" />
diff --git a/frontend/src/styles/globals.scss b/frontend/src/styles/globals.scss
index 77a0d193..09ade422 100644
--- a/frontend/src/styles/globals.scss
+++ b/frontend/src/styles/globals.scss
@@ -48,29 +48,21 @@ div#__next > div {
 
 @layer components {
 	.custom-table {
-		@apply table border-white w-full;
+		@apply border-white table-auto p-4 border-b;
 
 		th {
-			@apply font-medium text-neutral-content;
-		}
-
-		th + th {
-			@apply text-center;
+			@apply text-sm text-neutral-content font-bold pb-2 text-center;
 		}
 
 		tbody {
 			tr {
-				@apply border-b-neutral border-b;
+				@apply text-center text-xs;
 			}
 		}
 
 		td {
 			@apply text-neutral-content;
 		}
-
-		td + td {
-			@apply text-center;
-		}
 	}
 
 	.card-divider {
diff --git a/services/openai-connector/src/handlers.ts b/services/openai-connector/src/handlers.ts
index 13ae86b5..04047438 100644
--- a/services/openai-connector/src/handlers.ts
+++ b/services/openai-connector/src/handlers.ts
@@ -147,5 +147,4 @@ export async function openAIStream(
 		logger.error(error as Error, 'error communicating with OpenAI');
 		return;
 	}
-	call.end();
 }