feat: soporte Google Gemini en IA controller + UI
This commit is contained in:
@@ -89,7 +89,8 @@
|
|||||||
'bg-green-100 text-green-700': item.provider === 'openai',
|
'bg-green-100 text-green-700': item.provider === 'openai',
|
||||||
'bg-orange-100 text-orange-700': item.provider === 'anthropic',
|
'bg-orange-100 text-orange-700': item.provider === 'anthropic',
|
||||||
'bg-blue-100 text-blue-700': item.provider === 'ollama',
|
'bg-blue-100 text-blue-700': item.provider === 'ollama',
|
||||||
'bg-gray-100 text-gray-700': !['qwen','openai','anthropic','ollama'].includes(item.provider)
|
'bg-yellow-100 text-yellow-700': item.provider === 'gemini',
|
||||||
|
'bg-gray-100 text-gray-700': !['qwen','openai','anthropic','ollama','gemini'].includes(item.provider)
|
||||||
}" x-text="item.provider"></span>
|
}" x-text="item.provider"></span>
|
||||||
</td>
|
</td>
|
||||||
<td class="py-2 px-3 text-gray-500 font-mono text-xs" x-text="item.model_name || '—'"></td>
|
<td class="py-2 px-3 text-gray-500 font-mono text-xs" x-text="item.model_name || '—'"></td>
|
||||||
@@ -143,17 +144,18 @@
|
|||||||
<select x-model="form.provider" required
|
<select x-model="form.provider" required
|
||||||
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]">
|
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]">
|
||||||
<option value="">Seleccionar...</option>
|
<option value="">Seleccionar...</option>
|
||||||
<option value="qwen">Qwen (Alibaba)</option>
|
<option value="qwen">Qwen (Alibaba)</option>
|
||||||
<option value="openai">OpenAI</option>
|
<option value="openai">OpenAI</option>
|
||||||
<option value="anthropic">Anthropic</option>
|
<option value="anthropic">Anthropic</option>
|
||||||
<option value="groq">Groq</option>
|
<option value="groq">Groq</option>
|
||||||
<option value="ollama">Ollama (local)</option>
|
<option value="ollama">Ollama (local)</option>
|
||||||
|
<option value="gemini">Google Gemini</option>
|
||||||
<option value="otro">Otro</option>
|
<option value="otro">Otro</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-xs font-medium text-gray-600 mb-1">Modelo</label>
|
<label class="block text-xs font-medium text-gray-600 mb-1">Modelo</label>
|
||||||
<input x-model="form.model_name" type="text" placeholder="Ej: qwen2.5-72b-instruct"
|
<input x-model="form.model_name" type="text" placeholder="Ej: gemini-2.0-flash"
|
||||||
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]" />
|
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -170,15 +172,19 @@
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-xs font-medium text-gray-600 mb-1">Base URL
|
<label class="block text-xs font-medium text-gray-600 mb-1">Base URL
|
||||||
<span x-show="form.provider !== 'ollama'" class="text-gray-400">(opcional — dejar vacío para usar el default del provider)</span>
|
<span x-show="form.provider !== 'ollama' && form.provider !== 'gemini'" class="text-gray-400">(opcional — dejar vacío para usar el default del provider)</span>
|
||||||
<span x-show="form.provider === 'ollama'" class="text-blue-500">* requerido — incluir /v1 al final</span>
|
<span x-show="form.provider === 'ollama'" class="text-blue-500">* requerido — incluir /v1 al final</span>
|
||||||
|
<span x-show="form.provider === 'gemini'" class="text-gray-400">(fijo — no necesita)</span>
|
||||||
</label>
|
</label>
|
||||||
<input x-model="form.base_url" type="url"
|
<input x-model="form.base_url" type="url"
|
||||||
:placeholder="form.provider === 'ollama' ? 'http://10.0.1.15:11434/v1' : 'https://dashscope.aliyuncs.com/compatible-mode/v1'"
|
:placeholder="form.provider === 'ollama' ? 'http://10.0.1.15:11434/v1' : form.provider === 'gemini' ? 'https://generativelanguage.googleapis.com' : 'https://dashscope.aliyuncs.com/compatible-mode/v1'"
|
||||||
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]" />
|
class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#8eb02f]" />
|
||||||
<p x-show="form.provider === 'ollama'" x-cloak class="text-[10px] text-blue-500 mt-1">
|
<p x-show="form.provider === 'ollama'" x-cloak class="text-[10px] text-blue-500 mt-1">
|
||||||
Interna (red Coolify): <code>http://10.0.1.15:11434/v1</code> — Pública: <code>https://ollama.u-s.app/v1</code>
|
Interna (red Coolify): <code>http://10.0.1.15:11434/v1</code> — Pública: <code>https://ollama.u-s.app/v1</code>
|
||||||
</p>
|
</p>
|
||||||
|
<p x-show="form.provider === 'gemini'" x-cloak class="text-[10px] text-yellow-600 mt-1">
|
||||||
|
Usa <code>https://generativelanguage.googleapis.com/v1beta/models/{model}:streamGenerateContent?alt=sse</code>. Solo necesitas el API Key.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -49,6 +49,27 @@ type openaiChatResp struct {
|
|||||||
Choices []openaiChatChoice `json:"choices"`
|
Choices []openaiChatChoice `json:"choices"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type geminiPart struct {
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type geminiContent struct {
|
||||||
|
Parts []geminiPart `json:"parts"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type geminiReq struct {
|
||||||
|
Contents []geminiContent `json:"contents"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type geminiCandidate struct {
|
||||||
|
Content geminiContent `json:"content"`
|
||||||
|
FinishReason *string `json:"finishReason"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type geminiResp struct {
|
||||||
|
Candidates []geminiCandidate `json:"candidates"`
|
||||||
|
}
|
||||||
|
|
||||||
func GeneraTextoStream(c *fiber.Ctx) error {
|
func GeneraTextoStream(c *fiber.Ctx) error {
|
||||||
var data DataIa
|
var data DataIa
|
||||||
if err := c.BodyParser(&data); err != nil {
|
if err := c.BodyParser(&data); err != nil {
|
||||||
@@ -77,9 +98,19 @@ func GeneraTextoStream(c *fiber.Ctx) error {
|
|||||||
var endpoint string
|
var endpoint string
|
||||||
var bodyReader io.Reader
|
var bodyReader io.Reader
|
||||||
useOpenAI := provider != "ollama" || hasV1
|
useOpenAI := provider != "ollama" || hasV1
|
||||||
|
useGemini := provider == "gemini"
|
||||||
|
|
||||||
// OpenAI-compatible (openai, anthropic, qwen, o llameo con /v1)
|
if useGemini {
|
||||||
if !useOpenAI {
|
model := data.Model
|
||||||
|
endpoint = fmt.Sprintf("https://generativelanguage.googleapis.com/v1beta/models/%s:streamGenerateContent?alt=sse&key=%s", model, config.ApiKey)
|
||||||
|
gReq := geminiReq{
|
||||||
|
Contents: []geminiContent{
|
||||||
|
{Parts: []geminiPart{{Text: data.Prompt}}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
jsonData, _ := json.Marshal(gReq)
|
||||||
|
bodyReader = bytes.NewBuffer(jsonData)
|
||||||
|
} else if !useOpenAI {
|
||||||
// Native Ollama API
|
// Native Ollama API
|
||||||
endpoint = baseURL + "/api/generate"
|
endpoint = baseURL + "/api/generate"
|
||||||
jsonData, _ := json.Marshal(data)
|
jsonData, _ := json.Marshal(data)
|
||||||
@@ -108,7 +139,9 @@ func GeneraTextoStream(c *fiber.Ctx) error {
|
|||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
// Auth
|
// Auth
|
||||||
if provider == "ollama" && config.ApiKey != "" && config.ApiKey != "ollama" {
|
if useGemini {
|
||||||
|
// API key ya va en la URL
|
||||||
|
} else if provider == "ollama" && config.ApiKey != "" && config.ApiKey != "ollama" {
|
||||||
req.SetBasicAuth("ollama", config.ApiKey)
|
req.SetBasicAuth("ollama", config.ApiKey)
|
||||||
} else if config.ApiKey != "" {
|
} else if config.ApiKey != "" {
|
||||||
req.Header.Set("Authorization", "Bearer "+config.ApiKey)
|
req.Header.Set("Authorization", "Bearer "+config.ApiKey)
|
||||||
@@ -138,15 +171,38 @@ func GeneraTextoStream(c *fiber.Ctx) error {
|
|||||||
|
|
||||||
c.Context().SetBodyStreamWriter(func(w *bufio.Writer) {
|
c.Context().SetBodyStreamWriter(func(w *bufio.Writer) {
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
dec := json.NewDecoder(resp.Body)
|
scanner := bufio.NewScanner(resp.Body)
|
||||||
for {
|
scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
|
||||||
if useOpenAI {
|
for scanner.Scan() {
|
||||||
|
line := scanner.Text()
|
||||||
|
if line == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if useGemini {
|
||||||
|
if !strings.HasPrefix(line, "data: ") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var msg geminiResp
|
||||||
|
if err := json.Unmarshal([]byte(line[6:]), &msg); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(msg.Candidates) > 0 && len(msg.Candidates[0].Content.Parts) > 0 {
|
||||||
|
text := msg.Candidates[0].Content.Parts[0].Text
|
||||||
|
if text != "" {
|
||||||
|
fmt.Fprint(w, text)
|
||||||
|
w.Flush()
|
||||||
|
}
|
||||||
|
if msg.Candidates[0].FinishReason != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if useOpenAI {
|
||||||
var msg openaiChatResp
|
var msg openaiChatResp
|
||||||
if err := dec.Decode(&msg); err != nil {
|
if err := json.Unmarshal([]byte(line), &msg); err != nil {
|
||||||
if err != io.EOF {
|
if err != io.EOF {
|
||||||
log.Printf("[IA] Error decodificando respuesta OpenAI: %v", err)
|
log.Printf("[IA] Error decodificando respuesta OpenAI: %v", err)
|
||||||
}
|
}
|
||||||
break
|
continue
|
||||||
}
|
}
|
||||||
if len(msg.Choices) == 0 {
|
if len(msg.Choices) == 0 {
|
||||||
continue
|
continue
|
||||||
@@ -161,11 +217,8 @@ func GeneraTextoStream(c *fiber.Ctx) error {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var msg respuestaOllama
|
var msg respuestaOllama
|
||||||
if err := dec.Decode(&msg); err != nil {
|
if err := json.Unmarshal([]byte(line), &msg); err != nil {
|
||||||
if err != io.EOF {
|
continue
|
||||||
log.Printf("[IA] Error decodificando respuesta Ollama: %v", err)
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
if msg.Error != "" {
|
if msg.Error != "" {
|
||||||
log.Printf("[IA] Ollama error: %s", msg.Error)
|
log.Printf("[IA] Ollama error: %s", msg.Error)
|
||||||
|
|||||||
Reference in New Issue
Block a user