Refactor codebase

internal/translator/gemini/gemini-cli/gemini_gemini-cli_request.go

@@ -0,0 +1,25 @@
+// Package gemini provides request translation functionality for Claude API.
+// It handles parsing and transforming Claude API requests into the internal client format,
+// extracting model information, system instructions, message contents, and tool declarations.
+// The package also performs JSON data cleaning and transformation to ensure compatibility
+// between Claude API format and the internal client's expected format.
+package geminiCLI
+
+import (
+	"github.com/tidwall/gjson"
+	"github.com/tidwall/sjson"
+)
+
+// PrepareClaudeRequest parses and transforms a Claude API request into internal client format.
+// It extracts the model name, system instruction, message contents, and tool declarations
+// from the raw JSON request and returns them in the format expected by the internal client.
+func ConvertGeminiCLIRequestToGemini(_ string, rawJSON []byte, _ bool) []byte {
+	modelResult := gjson.GetBytes(rawJSON, "model")
+	rawJSON = []byte(gjson.GetBytes(rawJSON, "request").Raw)
+	rawJSON, _ = sjson.SetBytes(rawJSON, "model", modelResult.String())
+	if gjson.GetBytes(rawJSON, "systemInstruction").Exists() {
+		rawJSON, _ = sjson.SetRawBytes(rawJSON, "system_instruction", []byte(gjson.GetBytes(rawJSON, "systemInstruction").Raw))
+		rawJSON, _ = sjson.DeleteBytes(rawJSON, "systemInstruction")
+	}
+	return rawJSON
+}

internal/translator/gemini/gemini-cli/gemini_gemini-cli_response.go

@@ -0,0 +1,50 @@
+// Package gemini_cli provides response translation functionality for Gemini API to Gemini CLI API.
+// This package handles the conversion of Gemini API responses into Gemini CLI-compatible
+// JSON format, transforming streaming events and non-streaming responses into the format
+// expected by Gemini CLI API clients.
+package geminiCLI
+
+import (
+	"bytes"
+	"context"
+
+	"github.com/tidwall/sjson"
+)
+
+// ConvertGeminiResponseToGeminiCLI converts Gemini streaming response format to Gemini CLI single-line JSON format.
+// This function processes various Gemini event types and transforms them into Gemini CLI-compatible JSON responses.
+// It handles thinking content, regular text content, and function calls, outputting single-line JSON
+// that matches the Gemini CLI API response format.
+//
+// Parameters:
+//   - ctx: The context for the request.
+//   - modelName: The name of the model.
+//   - rawJSON: The raw JSON response from the Gemini API.
+//   - param: A pointer to a parameter object for the conversion (unused).
+//
+// Returns:
+//   - []string: A slice of strings, each containing a Gemini CLI-compatible JSON response.
+func ConvertGeminiResponseToGeminiCLI(_ context.Context, _ string, rawJSON []byte, _ *any) []string {
+	if bytes.Equal(rawJSON, []byte("[DONE]")) {
+		return []string{}
+	}
+	json := `{"response": {}}`
+	rawJSON, _ = sjson.SetRawBytes([]byte(json), "response", rawJSON)
+	return []string{string(rawJSON)}
+}
+
+// ConvertGeminiResponseToGeminiCLINonStream converts a non-streaming Gemini response to a non-streaming Gemini CLI response.
+//
+// Parameters:
+//   - ctx: The context for the request.
+//   - modelName: The name of the model.
+//   - rawJSON: The raw JSON response from the Gemini API.
+//   - param: A pointer to a parameter object for the conversion (unused).
+//
+// Returns:
+//   - string: A Gemini CLI-compatible JSON response.
+func ConvertGeminiResponseToGeminiCLINonStream(_ context.Context, _ string, rawJSON []byte, _ *any) string {
+	json := `{"response": {}}`
+	rawJSON, _ = sjson.SetRawBytes([]byte(json), "response", rawJSON)
+	return string(rawJSON)
+}

internal/translator/gemini/gemini-cli/init.go

@@ -0,0 +1,19 @@
+package geminiCLI
+
+import (
+	. "github.com/luispater/CLIProxyAPI/internal/constant"
+	"github.com/luispater/CLIProxyAPI/internal/interfaces"
+	"github.com/luispater/CLIProxyAPI/internal/translator/translator"
+)
+
+func init() {
+	translator.Register(
+		GEMINICLI,
+		GEMINI,
+		ConvertGeminiCLIRequestToGemini,
+		interfaces.TranslateResponse{
+			Stream:    ConvertGeminiResponseToGeminiCLI,
+			NonStream: ConvertGeminiResponseToGeminiCLINonStream,
+		},
+	)
+}