Refactor API

src/api/index.ts

@@ -1,13 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { ApiConfiguration, ModelInfo } from "../shared/api"
-import { AnthropicHandler } from "./anthropic"
-import { AwsBedrockHandler } from "./bedrock"
-import { OpenRouterHandler } from "./openrouter"
-import { VertexHandler } from "./vertex"
-import { OpenAiHandler } from "./openai"
-import { OllamaHandler } from "./ollama"
-import { GeminiHandler } from "./gemini"
-import { OpenAiNativeHandler } from "./openai-native"
+import { AnthropicHandler } from "./providers/anthropic"
+import { AwsBedrockHandler } from "./providers/bedrock"
+import { OpenRouterHandler } from "./providers/openrouter"
+import { VertexHandler } from "./providers/vertex"
+import { OpenAiHandler } from "./providers/openai"
+import { OllamaHandler } from "./providers/ollama"
+import { GeminiHandler } from "./providers/gemini"
+import { OpenAiNativeHandler } from "./providers/openai-native"
 
 export interface ApiHandlerMessageResponse {
 	message: Anthropic.Messages.Message

src/api/providers/anthropic.ts

@@ -1,6 +1,12 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
-import { anthropicDefaultModelId, AnthropicModelId, anthropicModels, ApiHandlerOptions, ModelInfo } from "../shared/api"
+import { ApiHandler, ApiHandlerMessageResponse } from "../index"
+import {
+	anthropicDefaultModelId,
+	AnthropicModelId,
+	anthropicModels,
+	ApiHandlerOptions,
+	ModelInfo,
+} from "../../shared/api"
 
 export class AnthropicHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/gemini.ts

@@ -6,7 +6,7 @@ import {
 	convertAnthropicMessageToGemini,
 	convertAnthropicToolToGemini,
 	convertGeminiResponseToAnthropic,
-} from "../utils/gemini-format"
+} from "./transform/gemini-format"
 
 export class GeminiHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/ollama.ts

@@ -2,7 +2,7 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { ApiHandler, ApiHandlerMessageResponse } from "."
 import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "../utils/openai-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
 
 export class OllamaHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/openai-native.ts

@@ -8,8 +8,8 @@ import {
 	OpenAiNativeModelId,
 	openAiNativeModels,
 } from "../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "../utils/openai-format"
-import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "../utils/o1-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
+import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "./transform/o1-format"
 
 export class OpenAiNativeHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/openai.ts

@@ -1,8 +1,8 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI, { AzureOpenAI } from "openai"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
-import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "../utils/openai-format"
+import { ApiHandler, ApiHandlerMessageResponse } from "../index"
+import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format"
 
 export class OpenAiHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/openrouter.ts

@@ -8,9 +8,9 @@ import {
 	OpenRouterModelId,
 	openRouterModels,
 } from "../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "../utils/openai-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
 import axios from "axios"
-import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "../utils/o1-format"
+import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "./transform/o1-format"
 
 export class OpenRouterHandler implements ApiHandler {
 	private options: ApiHandlerOptions