@jterrats/open-orchestra 0.5.2 → 0.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/gemini-provider.js
CHANGED
|
@@ -21,19 +21,15 @@ export class GeminiModelProvider {
|
|
|
21
21
|
if (!apiKey) {
|
|
22
22
|
throw new Error("GEMINI_API_KEY is required for provider gemini");
|
|
23
23
|
}
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
signal: AbortSignal.timeout(request.timeoutMs ?? this.capabilities.timeoutMs),
|
|
32
|
-
});
|
|
33
|
-
if (!response.ok) {
|
|
34
|
-
throw new Error(`Gemini API returned HTTP ${response.status}`);
|
|
24
|
+
const endpoint = geminiGenerateContentEndpoint(this.env.GEMINI_BASE_URL, request.model);
|
|
25
|
+
const response = await this.sendRequest(endpoint, apiKey, request, geminiRequestBody(request));
|
|
26
|
+
const finalResponse = response.status === 403 && request.jsonMode
|
|
27
|
+
? await this.sendRequest(endpoint, apiKey, request, geminiRequestBody(request, { responseMimeType: false }))
|
|
28
|
+
: response;
|
|
29
|
+
if (!finalResponse.ok) {
|
|
30
|
+
throw new Error(`Gemini API returned HTTP ${finalResponse.status}`);
|
|
35
31
|
}
|
|
36
|
-
const payload = (await
|
|
32
|
+
const payload = (await finalResponse.json());
|
|
37
33
|
return {
|
|
38
34
|
id: stringFrom(payload.responseId, "gemini-response"),
|
|
39
35
|
provider: this.id,
|
|
@@ -46,6 +42,17 @@ export class GeminiModelProvider {
|
|
|
46
42
|
finishReason: geminiFinishReason(payload),
|
|
47
43
|
};
|
|
48
44
|
}
|
|
45
|
+
async sendRequest(endpoint, apiKey, request, body) {
|
|
46
|
+
return this.fetchFn(endpoint, {
|
|
47
|
+
method: "POST",
|
|
48
|
+
headers: {
|
|
49
|
+
"x-goog-api-key": apiKey,
|
|
50
|
+
"content-type": "application/json",
|
|
51
|
+
},
|
|
52
|
+
body: JSON.stringify(body),
|
|
53
|
+
signal: AbortSignal.timeout(request.timeoutMs ?? this.capabilities.timeoutMs),
|
|
54
|
+
});
|
|
55
|
+
}
|
|
49
56
|
}
|
|
50
57
|
function geminiApiKey(env) {
|
|
51
58
|
const inlineKey = env.GEMINI_API_KEY ?? env.GOOGLE_API_KEY;
|
|
@@ -68,7 +75,7 @@ function geminiGenerateContentEndpoint(baseUrl, model) {
|
|
|
68
75
|
}
|
|
69
76
|
return new URL(joinUrlPath(url.pathname, `v1beta/models/${model}:generateContent`), url.origin).toString();
|
|
70
77
|
}
|
|
71
|
-
function geminiRequestBody(request) {
|
|
78
|
+
function geminiRequestBody(request, { responseMimeType = true } = {}) {
|
|
72
79
|
const systemText = request.messages
|
|
73
80
|
.filter((message) => message.role === "system")
|
|
74
81
|
.map((message) => message.content)
|
|
@@ -102,7 +109,9 @@ function geminiRequestBody(request) {
|
|
|
102
109
|
...(request.temperature !== undefined
|
|
103
110
|
? { temperature: request.temperature }
|
|
104
111
|
: {}),
|
|
105
|
-
...(request.jsonMode
|
|
112
|
+
...(request.jsonMode && responseMimeType
|
|
113
|
+
? { responseMimeType: "application/json" }
|
|
114
|
+
: {}),
|
|
106
115
|
},
|
|
107
116
|
};
|
|
108
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini-provider.js","sourceRoot":"","sources":["../src/gemini-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAShD,MAAM,OAAO,mBAAmB;IACrB,EAAE,GAAG,QAAQ,CAAC;IACd,YAAY,GAA8B;QACjD,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,IAAI;QACd,gBAAgB,EAAE,CAAC;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;IACe,OAAO,CAAe;IACtB,GAAG,CAAoB;IAExC,YAAY,EACV,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,OAAO,CAAC,GAAG,MAIf,EAAE;QACJ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAqB;QAClC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"gemini-provider.js","sourceRoot":"","sources":["../src/gemini-provider.ts"],"names":[],"mappings":"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"}
|