jippity 5
| @@ -2919,6 +2919,15 @@ | |||
| 2919 | <div> | 2919 | <div> |
| 2920 | <h4 data-i18n="OpenAI Model">OpenAI Model</h4> | 2920 | <h4 data-i18n="OpenAI Model">OpenAI Model</h4> |
| 2921 | <select id="model_openai_select"> | 2921 | <select id="model_openai_select"> |
| 2922 | <optgroup label="GPT-5"> | ||
| 2923 | <option value="gpt-5">gpt-5</option> | ||
| 2924 | <option value="gpt-5-2025-08-07">gpt-5-2025-08-07</option> | ||
| 2925 | <option value="gpt-5-chat-latest">gpt-5-chat-latest</option> | ||
| 2926 | <option value="gpt-5-mini">gpt-5-mini</option> | ||
| 2927 | <option value="gpt-5-mini-2025-08-07">gpt-5-mini-2025-08-07</option> | ||
| 2928 | <option value="gpt-5-nano">gpt-5-nano</option> | ||
| 2929 | <option value="gpt-5-nano-2025-08-07">gpt-5-nano-2025-08-07</option> | ||
| 2930 | </optgroup> | ||
| 2922 | <optgroup label="GPT-4o"> | 2931 | <optgroup label="GPT-4o"> |
| 2923 | <option value="gpt-4o">gpt-4o</option> | 2932 | <option value="gpt-4o">gpt-4o</option> |
| 2924 | <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option> | 2933 | <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option> |
| @@ -56,6 +56,13 @@ | |||
| 56 | <option data-type="moonshot" value="moonshot-v1-8k-vision-preview">moonshot-v1-8k-vision-preview</option> | 56 | <option data-type="moonshot" value="moonshot-v1-8k-vision-preview">moonshot-v1-8k-vision-preview</option> |
| 57 | <option data-type="moonshot" value="moonshot-v1-32k-vision-preview">moonshot-v1-32k-vision-preview</option> | 57 | <option data-type="moonshot" value="moonshot-v1-32k-vision-preview">moonshot-v1-32k-vision-preview</option> |
| 58 | <option data-type="moonshot" value="moonshot-v1-128k-vision-preview">moonshot-v1-128k-vision-preview</option> | 58 | <option data-type="moonshot" value="moonshot-v1-128k-vision-preview">moonshot-v1-128k-vision-preview</option> |
| 59 | <option data-type="openai" value="gpt-5">gpt-5</option> | ||
| 60 | <option data-type="openai" value="gpt-5-2025-08-07">gpt-5-2025-08-07</option> | ||
| 61 | <option data-type="openai" value="gpt-5-chat-latest">gpt-5-chat-latest</option> | ||
| 62 | <option data-type="openai" value="gpt-5-mini">gpt-5-mini</option> | ||
| 63 | <option data-type="openai" value="gpt-5-mini-2025-08-07">gpt-5-mini-2025-08-07</option> | ||
| 64 | <option data-type="openai" value="gpt-5-nano">gpt-5-nano</option> | ||
| 65 | <option data-type="openai" value="gpt-5-nano-2025-08-07">gpt-5-nano-2025-08-07</option> | ||
| 59 | <option data-type="openai" value="gpt-4.1">gpt-4.1</option> | 66 | <option data-type="openai" value="gpt-4.1">gpt-4.1</option> |
| 60 | <option data-type="openai" value="gpt-4.1-2025-04-14">gpt-4.1-2025-04-14</option> | 67 | <option data-type="openai" value="gpt-4.1-2025-04-14">gpt-4.1-2025-04-14</option> |
| 61 | <option data-type="openai" value="gpt-4.1-mini">gpt-4.1-mini</option> | 68 | <option data-type="openai" value="gpt-4.1-mini">gpt-4.1-mini</option> |
| @@ -125,6 +125,7 @@ const max_64k = 65535; | |||
| 125 | const max_128k = 128 * 1000; | 125 | const max_128k = 128 * 1000; |
| 126 | const max_200k = 200 * 1000; | 126 | const max_200k = 200 * 1000; |
| 127 | const max_256k = 256 * 1000; | 127 | const max_256k = 256 * 1000; |
| 128 | const max_400k = 400 * 1000; | ||
| 128 | const max_1mil = 1000 * 1000; | 129 | const max_1mil = 1000 * 1000; |
| 129 | const max_2mil = 2000 * 1000; | 130 | const max_2mil = 2000 * 1000; |
| 130 | const claude_max = 9000; // We have a proper tokenizer, so theoretically could be larger (up to 9k) | 131 | const claude_max = 9000; // We have a proper tokenizer, so theoretically could be larger (up to 9k) |
| @@ -2275,6 +2276,19 @@ async function sendOpenAIRequest(type, messages, signal, { jsonSchema = null } = | |||
| 2275 | } | 2276 | } |
| 2276 | } | 2277 | } |
| 2277 | 2278 | ||
| 2279 | if (isOAI && /^gpt-5/.test(oai_settings.openai_model)) { | ||
| 2280 | generate_data.max_completion_tokens = generate_data.max_tokens; | ||
| 2281 | delete generate_data.max_tokens; | ||
| 2282 | delete generate_data.logprobs; | ||
| 2283 | delete generate_data.top_logprobs; | ||
| 2284 | delete generate_data.temperature; | ||
| 2285 | delete generate_data.top_p; | ||
| 2286 | delete generate_data.frequency_penalty; | ||
| 2287 | delete generate_data.presence_penalty; | ||
| 2288 | delete generate_data.logit_bias; | ||
| 2289 | delete generate_data.stop; | ||
| 2290 | } | ||
| 2291 | |||
| 2278 | if (jsonSchema) { | 2292 | if (jsonSchema) { |
| 2279 | generate_data.json_schema = jsonSchema; | 2293 | generate_data.json_schema = jsonSchema; |
| 2280 | } | 2294 | } |
| @@ -4271,6 +4285,9 @@ function getMaxContextOpenAI(value) { | |||
| 4271 | if (oai_settings.max_context_unlocked) { | 4285 | if (oai_settings.max_context_unlocked) { |
| 4272 | return unlocked_max; | 4286 | return unlocked_max; |
| 4273 | } | 4287 | } |
| 4288 | else if (value.startsWith('gpt-5')) { | ||
| 4289 | return max_400k; | ||
| 4290 | } | ||
| 4274 | else if (value.includes('gpt-4.1')) { | 4291 | else if (value.includes('gpt-4.1')) { |
| 4275 | return max_1mil; | 4292 | return max_1mil; |
| 4276 | } | 4293 | } |
| @@ -5264,6 +5281,7 @@ export function isImageInliningSupported() { | |||
| 5264 | 'gpt-4.1', | 5281 | 'gpt-4.1', |
| 5265 | 'gpt-4.5-preview', | 5282 | 'gpt-4.5-preview', |
| 5266 | 'gpt-4o', | 5283 | 'gpt-4o', |
| 5284 | 'gpt-5', | ||
| 5267 | 'o1', | 5285 | 'o1', |
| 5268 | 'o3', | 5286 | 'o3', |
| 5269 | 'o4-mini', | 5287 | 'o4-mini', |
| @@ -433,7 +433,7 @@ export function getTokenizerModel(requestModel) { | |||
| 433 | return 'o1'; | 433 | return 'o1'; |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | if (requestModel.includes('o3') || requestModel.includes('o4-mini')) { | 436 | if (requestModel.includes('gpt-5') || requestModel.includes('o3') || requestModel.includes('o4-mini')) { |
| 437 | return 'o1'; | 437 | return 'o1'; |
| 438 | } | 438 | } |
| 439 | 439 | ||