vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama.vim : fix edge cases

Browse source
This commit is contained in:
Georgi Gerganov 2024-10-10 18:31:46 +03:00
parent 6669b550db
commit 2e8c350a5f
No known key found for this signature in database
GPG key ID: BF970631944C16B7
1 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

44
examples/llama.vim
View file

@ -98,9 +98,9 @@ function! llama#fim(is_auto) abort
\ 'infill_p_eog': 0.001, \ 'infill_p_eog': 0.001,
\ 'stream': v:false, \ 'stream': v:false,
\ 'samplers': ["top_k", "infill"], \ 'samplers': ["top_k", "infill"],
"\ 'cache_prompt': v:true,
\ 't_max_prompt_ms': g:llama_config.t_max_prompt_ms, \ 't_max_prompt_ms': g:llama_config.t_max_prompt_ms,
\ 't_max_predict_ms': g:llama_config.t_max_predict_ms, \ 't_max_predict_ms': g:llama_config.t_max_predict_ms
\ 'cache_prompt': v:true
\ }) \ })
let l:curl_command = printf( let l:curl_command = printf(
@ -111,10 +111,21 @@ function! llama#fim(is_auto) abort
" send the request asynchronously " send the request asynchronously
let s:current_job = jobstart(l:curl_command, { let s:current_job = jobstart(l:curl_command, {
\ 'on_stdout': function('s:fim_on_stdout'), \ 'on_stdout': function('s:fim_on_stdout'),
\ 'on_exit': function('s:fim_on_exit'), \ 'on_exit': function('s:fim_on_exit'),
\ 'stdout_buffered': v:true, \ 'stdout_buffered': v:true,
\ 'is_auto': a:is_auto \ 'is_auto': a:is_auto
\ }) \ })
" this trick is needed to avoid the cursor shifting upon C-O when at the end of the line
if !a:is_auto
augroup llama_insert
autocmd!
augroup END
if g:llama_config.auto_fim
call timer_start(0, {-> s:fim_auto_enable()})
endif
endif
endfunction endfunction
function! llama#fim_accept() function! llama#fim_accept()
@ -151,9 +162,16 @@ function! llama#fim_cancel()
augroup llama_insert augroup llama_insert
autocmd! autocmd!
if g:llama_config.auto_fim augroup END
autocmd CursorMovedI * call s:fim_auto()
endif if g:llama_config.auto_fim
call s:fim_auto_enable()
endif
endfunction
function! s:fim_auto_enable()
augroup llama_insert
autocmd CursorMovedI * call s:fim_auto()
augroup END augroup END
endfunction endfunction
@ -176,6 +194,9 @@ endfunction
function! s:fim_on_stdout(job_id, data, event) dict function! s:fim_on_stdout(job_id, data, event) dict
let l:raw = join(a:data, "\n") let l:raw = join(a:data, "\n")
if len(l:raw) == 0
return
endif
let s:can_accept = v:true let s:can_accept = v:true
let l:has_info = v:false let l:has_info = v:false
@ -195,13 +216,6 @@ function! s:fim_on_stdout(job_id, data, event) dict
let s:can_accept = v:false let s:can_accept = v:false
endif endif
if s:can_accept && l:raw == ""
if !self.is_auto
call add(s:content, "<| empty response: is the server on? |>")
endif
let s:can_accept = v:false
endif
" get the generated suggestion " get the generated suggestion
if s:can_accept if s:can_accept
let l:response = json_decode(l:raw) let l:response = json_decode(l:raw)
@ -232,7 +246,7 @@ function! s:fim_on_stdout(job_id, data, event) dict
if len(s:content) == 0 if len(s:content) == 0
if !self.is_auto if !self.is_auto
call add(s:content, "<| nothing to suggest |>") call add(s:content, "<| EOT |>")
endif endif
let s:can_accept = v:false let s:can_accept = v:false
endif endif
@ -272,7 +286,7 @@ function! s:fim_on_stdout(job_id, data, event) dict
call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, s:pos_x - 1, { call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, s:pos_x - 1, {
\ 'virt_text': [[s:content[0], 'llama_hl_hint']], \ 'virt_text': [[s:content[0], 'llama_hl_hint']],
\ 'virt_text_win_col': s:pos_x == len(s:line_cur) ? virtcol('.') : virtcol('.') - 1 \ 'virt_text_win_col': virtcol('.') - 1
\ }) \ })
call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, 0, { call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, 0, {