chore: fix handling of names and content in openai connector

basemind-ai · Dec 7, 2023 · e02120d · e02120d
1 parent 6ba44c6
commit e02120d
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 6 deletions.
diff --git a/...ces/cohere-connector/tests/client.spec.ts → services/cohere-connector/src/client.spec.ts b/...ces/cohere-connector/tests/client.spec.ts → services/cohere-connector/src/client.spec.ts
diff --git a/...s/cohere-connector/tests/handlers.spec.ts → ...ces/cohere-connector/src/handlers.spec.ts b/...s/cohere-connector/tests/handlers.spec.ts → ...ces/cohere-connector/src/handlers.spec.ts
diff --git a/...ices/cohere-connector/tests/utils.spec.ts → services/cohere-connector/src/utils.spec.ts b/...ices/cohere-connector/tests/utils.spec.ts → services/cohere-connector/src/utils.spec.ts
diff --git a/services/cohere-connector/tsconfig.json b/services/cohere-connector/tsconfig.json
@@ -5,8 +5,7 @@
 		"paths": {
 			"@/*": ["src/*"],
 			"gen/*": ["../../gen/ts/*"],
-			"shared/*": ["../../shared/ts/src/*"],
-			"tests/*": ["tests/*"]
+			"shared/*": ["../../shared/ts/src/*"]
 		},
 		"types": ["vitest/globals"]
 	},

diff --git a/...ces/openai-connector/tests/client.spec.ts → services/openai-connector/src/client.spec.ts b/...ces/openai-connector/tests/client.spec.ts → services/openai-connector/src/client.spec.ts
diff --git a/...s/openai-connector/tests/handlers.spec.ts → ...ces/openai-connector/src/handlers.spec.ts b/...s/openai-connector/tests/handlers.spec.ts → ...ces/openai-connector/src/handlers.spec.ts
diff --git a/...ices/openai-connector/tests/utils.spec.ts → services/openai-connector/src/utils.spec.ts b/...ices/openai-connector/tests/utils.spec.ts → services/openai-connector/src/utils.spec.ts
@@ -138,5 +138,58 @@ describe('utils tests', () => {
 			expect(result.presence_penalty).toBeUndefined();
 			expect(result.frequency_penalty).toBeUndefined();
 		});
+
+		it('should handle empty names and whitespace names by changing them to undefined', () => {
+			const request: OpenAIPromptRequest = {
+				messages: [
+					{
+						content: 'test',
+						name: '',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+					{
+						content: 'test',
+						name: ' ',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+					{
+						content: 'test',
+						name: 'a',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+				],
+				model: OpenAIModel.OPEN_AI_MODEL_GPT3_5_TURBO_4K,
+			};
+
+			const result = createOpenAIRequest(request, true);
+			expect(Reflect.get(result.messages[0], 'name')).toBeUndefined();
+			expect(Reflect.get(result.messages[1], 'name')).toBeUndefined();
+			expect(Reflect.get(result.messages[2], 'name')).toEqual('a');
+		});
+
+		it('should handle empty content and whitespace content by it to null', () => {
+			const request: OpenAIPromptRequest = {
+				messages: [
+					{
+						content: '',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+					{
+						content: ' ',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+					{
+						content: 'test',
+						role: OpenAIMessageRole.OPEN_AI_MESSAGE_ROLE_USER,
+					},
+				],
+				model: OpenAIModel.OPEN_AI_MODEL_GPT3_5_TURBO_4K,
+			};
+
+			const result = createOpenAIRequest(request, true);
+			expect(Reflect.get(result.messages[0], 'content')).toBeNull();
+			expect(Reflect.get(result.messages[1], 'content')).toBeNull();
+			expect(Reflect.get(result.messages[2], 'content')).toBe('test');
+		});
 	});
 });
diff --git a/services/openai-connector/src/utils.ts b/services/openai-connector/src/utils.ts
@@ -106,9 +106,10 @@ export function createOpenAIRequest(
 		frequency_penalty: frequencyPenalty,
 		max_tokens: !!maxTokens && maxTokens > 0 ? maxTokens : undefined,
 		messages: messages.map<ChatCompletionMessageParam>((msg) => {
-			const { content, role, ...rest } = msg;
+			const { content, role, name, ...rest } = msg;
 			return {
-				content: content ?? null,
+				content: content?.trim() ? content.trim() : null,
+				name: name?.trim() ? name.trim() : undefined,
 				role: getOpenAIMessageRole(role),
 				...rest,
 			} as ChatCompletionMessageParam;

diff --git a/services/openai-connector/tsconfig.json b/services/openai-connector/tsconfig.json
@@ -5,8 +5,7 @@
 		"paths": {
 			"@/*": ["src/*"],
 			"gen/*": ["../../gen/ts/*"],
-			"shared/*": ["../../shared/ts/src/*"],
-			"tests/*": ["tests/*"]
+			"shared/*": ["../../shared/ts/src/*"]
 		},
 		"types": ["vitest/globals"]
 	},