refactor: separate models

packages/core/src/index.ts

@@ -7,10 +7,3 @@ export type {
 export { executeRequest } from './http-client.js';
 export { getAiCoreDestination } from './context.js';
 export { OpenApiRequestBuilder } from './openapi-request-builder.js';
-export type {
-  AzureOpenAiChatModel,
-  AzureOpenAiEmbeddingModel,
-  GcpVertexAiChatModel,
-  AwsBedrockChatModel,
-  ChatModel
-} from './model-types.js';

packages/core/src/internal.ts

@@ -1,4 +1,3 @@
 export * from './context.js';
 export * from './http-client.js';
 export * from './openapi-request-builder.js';
-export * from './model-types.js';

packages/foundation-models/src/index.ts

@@ -31,3 +31,7 @@ export {
   OpenAiEmbeddingClient,
   OpenAiChatCompletionResponse
 } from './openai/index.js';
+export {
+  AzureOpenAiChatModel,
+  AzureOpenAiEmbeddingModel
+} from './model-types.js';

packages/foundation-models/src/model-types.ts

@@ -0,0 +1,20 @@
+type LiteralUnion<T extends U, U = string> = T | (U & Record<never, never>);
+
+/**
+ * Azure OpenAI models for chat completion.
+ */
+export type AzureOpenAiChatModel = LiteralUnion<
+  | 'gpt-4o-mini'
+  | 'gpt-4o'
+  | 'gpt-4'
+  | 'gpt-4-32k'
+  | 'gpt-35-turbo'
+  | 'gpt-35-turbo-16k'
+>;
+
+/**
+ * Azure OpenAI models for embedding.
+ */
+export type AzureOpenAiEmbeddingModel = LiteralUnion<
+  'text-embedding-ada-002' | 'text-embedding-3-small' | 'text-embedding-3-large'
+>;

packages/foundation-models/src/openai/openai-chat-client.ts

@@ -1,12 +1,9 @@
-import {
-  type CustomRequestConfig,
-  type AzureOpenAiChatModel,
-  executeRequest
-} from '@sap-ai-sdk/core';
+import { type CustomRequestConfig, executeRequest } from '@sap-ai-sdk/core';
 import {
   getDeploymentId,
   type ModelDeployment
 } from '@sap-ai-sdk/ai-api/internal.js';
+import type { AzureOpenAiChatModel } from '../model-types.js';
 import type { OpenAiChatCompletionParameters } from './openai-types.js';
 import { OpenAiChatCompletionResponse } from './openai-response.js';
 

packages/foundation-models/src/openai/openai-embedding-client.ts

@@ -1,12 +1,9 @@
-import {
-  type CustomRequestConfig,
-  type AzureOpenAiEmbeddingModel,
-  executeRequest
-} from '@sap-ai-sdk/core';
+import { type CustomRequestConfig, executeRequest } from '@sap-ai-sdk/core';
 import {
   getDeploymentId,
   type ModelDeployment
 } from '@sap-ai-sdk/ai-api/internal.js';
+import type { AzureOpenAiEmbeddingModel } from '../model-types.js';
 import type {
   OpenAiEmbeddingParameters,
   OpenAiEmbeddingOutput

packages/orchestration/src/index.ts

@@ -39,3 +39,11 @@ export { OrchestrationClient } from './orchestration-client.js';
 export { azureContentFilter } from './orchestration-filter-utility.js';
 
 export { OrchestrationResponse } from './orchestration-response.js';
+
+export type {
+  AzureOpenAiChatModel,
+  AicoreOpensourceChatModel,
+  GcpVertexAiChatModel,
+  AwsBedrockChatModel,
+  ChatModel
+} from './model-types.js';

packages/core/src/model-types.ts → packages/orchestration/src/model-types.ts

@@ -4,44 +4,39 @@ type LiteralUnion<T extends U, U = string> = T | (U & Record<never, never>);
  * Azure OpenAI models for chat completion.
  */
 export type AzureOpenAiChatModel = LiteralUnion<
-  | 'gpt-4o-mini'
-  | 'gpt-4o'
-  | 'gpt-4'
-  | 'gpt-4-32k'
-  | 'gpt-35-turbo'
-  | 'gpt-35-turbo-0125'
-  | 'gpt-35-turbo-16k'
->;
-
-/**
- * Azure OpenAI models for embedding.
- */
-export type AzureOpenAiEmbeddingModel = LiteralUnion<
-  'text-embedding-ada-002' | 'text-embedding-3-small' | 'text-embedding-3-large'
+  'gpt-4o' | 'gpt-4' | 'gpt-4-32k' | 'gpt-35-turbo' | 'gpt-35-turbo-16k'
 >;
 
 /**
  * GCP Vertex AI models for chat completion.
  */
 export type GcpVertexAiChatModel = LiteralUnion<
-  'gemini-1.0-pro' | 'gemini-1.5-pro' | 'gemini-1.5-flash' | 'chat-bison'
+  'gemini-1.0-pro' | 'gemini-1.5-pro' | 'gemini-1.5-flash'
 >;
 
 /**
  * AWS Bedrock models for chat completion.
  */
 export type AwsBedrockChatModel = LiteralUnion<
-  | 'amazon--titan-text-express'
-  | 'amazon--titan-text-lite'
   | 'anthropic--claude-3-haiku'
   | 'anthropic--claude-3-opus'
   | 'anthropic--claude-3-sonnet'
   | 'anthropic--claude-3.5-sonnet'
 >;
 
 /**
- * All available models for chat completion.
+ * Aicore Opensource models for chat completion.
+ */
+export type AicoreOpensourceChatModel = LiteralUnion<
+  'mistralai--mixtral-8x7b-instruct-v01' | 'meta--llama3-70b-instruct'
+>;
+
+/**
+ * Supported chat models for orchestration.
  */
 export type ChatModel = LiteralUnion<
-  AzureOpenAiChatModel | GcpVertexAiChatModel | AwsBedrockChatModel
+  | AzureOpenAiChatModel
+  | GcpVertexAiChatModel
+  | AwsBedrockChatModel
+  | AicoreOpensourceChatModel
 >;

packages/orchestration/src/orchestration-types.ts

@@ -1,4 +1,4 @@
-import { ChatModel } from '@sap-ai-sdk/core';
+import { ChatModel } from './model-types.js';
 import {
   ChatMessages,
   FilteringModuleConfig,

tests/type-tests/test/openai.test-d.ts

@@ -5,7 +5,8 @@ import {
   OpenAiChatClient,
   OpenAiEmbeddingClient,
   OpenAiChatCompletionResponse,
-  OpenAiUsage
+  OpenAiUsage,
+  AzureOpenAiChatModel
 } from '@sap-ai-sdk/foundation-models';
 
 /**
@@ -126,3 +127,6 @@ expectType<Promise<OpenAiEmbeddingOutput>>(
     }
   )
 );
+
+expect<AzureOpenAiChatModel>('custom-model');
+expect<AzureOpenAiChatModel>('gpt-4-32k');

tests/type-tests/test/orchestration.test-d.ts

@@ -3,7 +3,8 @@ import {
   OrchestrationClient,
   CompletionPostResponse,
   OrchestrationResponse,
-  TokenUsage
+  TokenUsage,
+  ChatModel
 } from '@sap-ai-sdk/orchestration';
 
 /**
@@ -191,3 +192,6 @@ expectType<Promise<OrchestrationResponse>>(
     }
   }).chatCompletion()
 );
+
+expect<ChatModel>('custom-model');
+expect<ChatModel>('gemini-1.0-pro');