Merge pull request #2707 from AlpinDale/aphrodite-tokenizer fix: pass model parameter for aphrodite tokenizer
Signed| @@ -838,6 +838,7 @@ function getTextgenAPITokenizationParams(str) { | |||
| 838 | url: getTextGenServer(), | 838 | url: getTextGenServer(), |
| 839 | legacy_api: textgen_settings.legacy_api && (textgen_settings.type === OOBA || textgen_settings.type === APHRODITE), | 839 | legacy_api: textgen_settings.legacy_api && (textgen_settings.type === OOBA || textgen_settings.type === APHRODITE), |
| 840 | vllm_model: textgen_settings.vllm_model, | 840 | vllm_model: textgen_settings.vllm_model, |
| 841 | aphrodite_model: textgen_settings.aphrodite_model, | ||
| 841 | }; | 842 | }; |
| 842 | } | 843 | } |
| 843 | 844 | ||
| @@ -812,6 +812,7 @@ router.post('/remote/textgenerationwebui/encode', jsonParser, async function (re | |||
| 812 | const baseUrl = String(request.body.url); | 812 | const baseUrl = String(request.body.url); |
| 813 | const legacyApi = Boolean(request.body.legacy_api); | 813 | const legacyApi = Boolean(request.body.legacy_api); |
| 814 | const vllmModel = String(request.body.vllm_model) || ''; | 814 | const vllmModel = String(request.body.vllm_model) || ''; |
| 815 | const aphroditeModel = String(request.body.aphrodite_model) || ''; | ||
| 815 | 816 | ||
| 816 | try { | 817 | try { |
| 817 | const args = { | 818 | const args = { |
| @@ -847,7 +848,7 @@ router.post('/remote/textgenerationwebui/encode', jsonParser, async function (re | |||
| 847 | break; | 848 | break; |
| 848 | case TEXTGEN_TYPES.APHRODITE: | 849 | case TEXTGEN_TYPES.APHRODITE: |
| 849 | url += '/v1/tokenize'; | 850 | url += '/v1/tokenize'; |
| 850 | args.body = JSON.stringify({ 'prompt': text }); | 851 | args.body = JSON.stringify({ 'model': aphroditeModel, 'prompt': text }); |
| 851 | break; | 852 | break; |
| 852 | default: | 853 | default: |
| 853 | url += '/v1/internal/encode'; | 854 | url += '/v1/internal/encode'; |