Skip to content

llama.vim : add classic vim support #9995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Oct 23, 2024
Merged

llama.vim : add classic vim support #9995

Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
90e3bdc
added classic vim support
m18coppola Oct 22, 2024
2dcbb00
fixed ring update, removed blank line
m18coppola Oct 22, 2024
09cbb43
minor
m18coppola Oct 22, 2024
1713d34
minor
m18coppola Oct 22, 2024
3402ab8
minor doc update
m18coppola Oct 22, 2024
edaa930
removed uneeded var
m18coppola Oct 22, 2024
4f6919c
minor
m18coppola Oct 22, 2024
36ab274
minor
m18coppola Oct 22, 2024
d7d18bf
fixed job_start creating new scratch buffers
Oct 22, 2024
e30b4c9
fixed job_start creating new scratch buffers
m18coppola Oct 22, 2024
66a4cd1
Merge branch 'llama.vim_classic_vim' of github.com:m18coppola/llama.c…
m18coppola Oct 22, 2024
b81721b
fixed ghost text indenting when expandtab is on
m18coppola Oct 22, 2024
39c3cd4
removed unused code
m18coppola Oct 22, 2024
b39e65f
minor
m18coppola Oct 22, 2024
bf9c4cc
unified fim_on_exit
m18coppola Oct 22, 2024
cc96196
minor
m18coppola Oct 22, 2024
5292d45
vim ghost text rendering now uses pos_x and pos_y parameters
m18coppola Oct 22, 2024
f946cbc
renamed *_hlgroup to hlgroup_*
m18coppola Oct 22, 2024
85cea66
renamed *_ghost_text to ghost_text_*, moved nvim/vim detection to lla…
m18coppola Oct 22, 2024
7d6ef40
minor
m18coppola Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 127 additions & 41 deletions examples/llama.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"
" requires:
"
" - neovim
" - neovim or vim
" - curl
" - llama.cpp server instance
" - FIM-compatible model
"
" sample config:
"
" - Tab - accept the current suggestion
" - Shift+Tab - accept just the first line of the segguestion
" - Shift+Tab - accept just the first line of the suggestion
" - Ctrl+F - toggle FIM completion manually
"
" make symlink or copy this file to ~/.config/nvim/autoload/llama.vim
Expand Down Expand Up @@ -43,8 +43,8 @@
"

" colors (adjust to your liking)
highlight llama_hl_hint guifg=#ff772f
highlight llama_hl_info guifg=#77ff2f
highlight llama_hl_hint guifg=#ff772f ctermfg=202
highlight llama_hl_info guifg=#77ff2f ctermfg=119

" general parameters:
"
Expand Down Expand Up @@ -93,6 +93,33 @@ let s:default_config = {

let g:llama_config = get(g:, 'llama_config', s:default_config)

let s:nvim_ghost_text = exists('*nvim_buf_get_mark')
let s:vim_ghost_text = has('textprop')

if s:vim_ghost_text
let s:hlgroup_hint = 'llama_hl_hint'
let s:hlgroup_info = 'llama_hl_info'

if empty(prop_type_get(s:hlgroup_hint))
call prop_type_add(s:hlgroup_hint, {'highlight': s:hlgroup_hint})
endif
if empty(prop_type_get(s:hlgroup_info))
call prop_type_add(s:hlgroup_info, {'highlight': s:hlgroup_info})
endif
endif

function! s:get_indent(str)
let l:count = 0
for i in range(len(a:str))
if a:str[i] == "\t"
let l:count += &tabstop - 1
else
break
endif
endfor
return l:count
endfunction

function! s:rand(i0, i1) abort
return a:i0 + rand() % (a:i1 - a:i0 + 1)
endfunction
Expand Down Expand Up @@ -317,13 +344,22 @@ function! s:ring_update()
\ 't_max_predict_ms': 1
\ })

let l:curl_command = printf(
\ "curl --silent --no-buffer --request POST --url %s --header \"Content-Type: application/json\" --data %s",
\ g:llama_config.endpoint, shellescape(l:request)
\ )
let l:curl_command = [
\ "curl",
\ "--silent",
\ "--no-buffer",
\ "--request", "POST",
\ "--url", g:llama_config.endpoint,
\ "--header", "Content-Type: application/json",
\ "--data", l:request
\ ]

" no callbacks because we don't need to process the response
call jobstart(l:curl_command, {})
if s:nvim_ghost_text
call jobstart(l:curl_command, {})
elseif s:vim_ghost_text
call job_start(l:curl_command, {})
endif
endfunction

" necessary for 'inoremap <expr>'
Expand Down Expand Up @@ -418,24 +454,37 @@ function! llama#fim(is_auto) abort
\ 't_max_predict_ms': g:llama_config.t_max_predict_ms
\ })

let l:curl_command = printf(
\ "curl --silent --no-buffer --request POST --url %s --header \"Content-Type: application/json\" --data %s",
\ g:llama_config.endpoint, shellescape(l:request)
\ )
let l:curl_command = [
\ "curl",
\ "--silent",
\ "--no-buffer",
\ "--request", "POST",
\ "--url", g:llama_config.endpoint,
\ "--header", "Content-Type: application/json",
\ "--data", l:request
\ ]

if s:current_job != v:null
call jobstop(s:current_job)
if s:nvim_ghost_text
call jobstop(s:current_job)
elseif s:vim_ghost_text
call job_stop(s:current_job)
endif
endif

" send the request asynchronously
let s:current_job = jobstart(l:curl_command, {
\ 'on_stdout': function('s:fim_on_stdout'),
\ 'on_exit': function('s:fim_on_exit'),
\ 'stdout_buffered': v:true,
\ 'pos_x': s:pos_x,
\ 'pos_y': s:pos_y,
\ 'is_auto': a:is_auto
\ })
if s:nvim_ghost_text
let s:current_job = jobstart(l:curl_command, {
\ 'on_stdout': function('s:fim_on_stdout', [s:pos_x, s:pos_y, a:is_auto]),
\ 'on_exit': function('s:fim_on_exit'),
\ 'stdout_buffered': v:true
\ })
elseif s:vim_ghost_text
let s:current_job = job_start(l:curl_command, {
\ 'out_cb': function('s:fim_on_stdout', [s:pos_x, s:pos_y, a:is_auto]),
\ 'exit_cb': function('s:fim_on_exit')
\ })
endif

" TODO: per-file location
let l:delta_y = abs(s:pos_y - s:pos_y_pick)
Expand Down Expand Up @@ -482,9 +531,13 @@ function! llama#fim_cancel()
" clear the virtual text
let l:bufnr = bufnr('%')

let l:id_vt_fim = nvim_create_namespace('vt_fim')

call nvim_buf_clear_namespace(l:bufnr, l:id_vt_fim, 0, -1)
if s:nvim_ghost_text
let l:id_vt_fim = nvim_create_namespace('vt_fim')
call nvim_buf_clear_namespace(l:bufnr, l:id_vt_fim, 0, -1)
elseif s:vim_ghost_text
call prop_remove({'type': s:hlgroup_hint, 'all': v:true})
call prop_remove({'type': s:hlgroup_info, 'all': v:true})
endif

" remove the mappings
silent! iunmap <buffer> <Tab>
Expand All @@ -499,13 +552,18 @@ function! s:on_move()
endfunction

" callback that processes the FIM result from the server and displays the suggestion
function! s:fim_on_stdout(job_id, data, event) dict
let l:raw = join(a:data, "\n")
function! s:fim_on_stdout(pos_x, pos_y, is_auto, job_id, data, event = v:null)
if s:nvim_ghost_text
let l:raw = join(a:data, "\n")
elseif s:vim_ghost_text
let l:raw = a:data
endif

if len(l:raw) == 0
return
endif

if self.pos_x != col('.') - 1 || self.pos_y != line('.')
if a:pos_x != col('.') - 1 || a:pos_y != line('.')
return
endif

Expand All @@ -514,14 +572,14 @@ function! s:fim_on_stdout(job_id, data, event) dict
return
endif

let s:pos_x = self.pos_x
let s:pos_y = self.pos_y
let s:pos_x = a:pos_x
let s:pos_y = a:pos_y

let s:can_accept = v:true
let l:has_info = v:false

if s:can_accept && v:shell_error
if !self.is_auto
if !a:is_auto
call add(s:content, "<| curl error: is the server on? |>")
endif
let s:can_accept = v:false
Expand Down Expand Up @@ -642,7 +700,9 @@ function! s:fim_on_stdout(job_id, data, event) dict
" display virtual text with the suggestion
let l:bufnr = bufnr('%')

let l:id_vt_fim = nvim_create_namespace('vt_fim')
if s:nvim_ghost_text
let l:id_vt_fim = nvim_create_namespace('vt_fim')
endif

" construct the info message
if g:llama_config.show_info > 0 && l:has_info
Expand Down Expand Up @@ -671,15 +731,41 @@ function! s:fim_on_stdout(job_id, data, event) dict
endif

" display the suggestion and append the info to the end of the first line
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'], [l:info, 'llama_hl_info']],
\ 'virt_text_win_col': virtcol('.') - 1
\ })
if s:nvim_ghost_text
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'], [l:info, 'llama_hl_info']],
\ 'virt_text_win_col': virtcol('.') - 1
\ })

call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, 0, {
\ 'virt_lines': map(s:content[1:], {idx, val -> [[val, 'llama_hl_hint']]}),
\ 'virt_text_win_col': virtcol('.')
\ })
call nvim_buf_set_extmark(l:bufnr, l:id_vt_fim, s:pos_y - 1, 0, {
\ 'virt_lines': map(s:content[1:], {idx, val -> [[val, 'llama_hl_hint']]}),
\ 'virt_text_win_col': virtcol('.')
\ })
elseif s:vim_ghost_text
let l:new_suffix = s:content[0]
if !empty(l:new_suffix)
call prop_add(s:pos_y, s:pos_x + 1, {
\ 'type': s:hlgroup_hint,
\ 'text': l:new_suffix
\ })
endif
for line in s:content[1:]
call prop_add(s:pos_y, 0, {
\ 'type': s:hlgroup_hint,
\ 'text': line,
\ 'text_padding_left': s:get_indent(line),
\ 'text_align': 'below'
\ })
endfor
if !empty(l:info)
call prop_add(s:pos_y, 0, {
\ 'type': s:hlgroup_info,
\ 'text': ' ' . l:info,
\ 'text_padding_left': col('$'),
\ 'text_wrap': 'truncate'
\ })
endif
endif

" setup accept shortcuts
inoremap <buffer> <Tab> <C-O>:call llama#fim_accept(v:false)<CR>
Expand All @@ -688,7 +774,7 @@ function! s:fim_on_stdout(job_id, data, event) dict
let s:hint_shown = v:true
endfunction

function! s:fim_on_exit(job_id, exit_code, event) dict
function! s:fim_on_exit(job_id, exit_code, event = v:null)
if a:exit_code != 0
echom "Job failed with exit code: " . a:exit_code
endif
Expand Down
Loading