Merge pull request #138 from rjmacarthy/improvement/ollama-openai-api

Update ollama chat to use openapi specification

package.json

@@ -247,8 +247,8 @@
         "twinny.chatApiPath": {
           "order": 3,
           "type": "string",
-          "default": "/api/generate",
-          "description": "Endpoint path for chat completions. Defaults to '/api/generate' for Ollama and '/completion' for llama.cpp.",
+          "default": "/v1/chat/completions",
+          "description": "Endpoint path for chat completions.",
           "required": true
         },
         "twinny.chatApiPort": {
@@ -269,7 +269,7 @@
           "order": 6,
           "type": "string",
           "default": "/api/generate",
-          "description": "Endpoint path for FIM completions. Defaults to '/api/generate' for Ollama and '/completion' for llama.cpp.",
+          "description": "Endpoint path for FIM completions.",
           "required": true
         },
         "twinny.chatModelName": {
@@ -385,7 +385,7 @@
         "twinny.enableLogging": {
           "order": 23,
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "Enable twinny debug mode"
         }
       }

src/common/constants.ts

@@ -100,12 +100,12 @@ export const STOP_STABLECODE = ['<|endoftext|>']
 export const API_PROVIDER: ApiProviders = {
   ollama: {
     fimApiPath: '/api/generate',
-    chatApiPath: '/api/generate',
+    chatApiPath: '/v1/chat/completions',
     port: 11434
   },
   ollamawebui: {
     fimApiPath: '/ollama/api/generate',
-    chatApiPath: '/ollama/api/generate',
+    chatApiPath: '/ollama/v1/chat/completions',
     port: 8080
   },
   llamacpp: {

src/common/types.ts

@@ -3,7 +3,6 @@ import { CodeLanguageDetails } from './languages'
 import { ALL_BRACKETS } from './constants'
 
 export interface StreamBodyBase {
-  prompt: string
   stream: boolean
   n_predict?: number
   temperature?: number
@@ -12,6 +11,8 @@ export interface StreamBodyBase {
 export interface StreamOptionsOllama extends StreamBodyBase {
   model: string
   keep_alive?: string | number
+  messages?: MessageType[] | MessageRoleContent
+  prompt: string
   options: Record<string, unknown>
 }
 

src/extension/model-options.ts

@@ -24,6 +24,7 @@ export function createStreamRequestBody(
         model: options.model,
         prompt,
         stream: true,
+        messages: options.messages,
         keep_alive: options.keepAlive,
         options: {
           temperature: options.temperature,

src/extension/utils.ts

@@ -122,7 +122,10 @@ export const getChatDataFromProvider = (
 ) => {
   switch (provider) {
     case ApiProviders.Ollama:
-      return data?.response
+    case ApiProviders.OllamaWebUi:
+      return data?.choices[0].delta?.content
+        ? data?.choices[0].delta.content
+        : ''
     case ApiProviders.LlamaCpp:
       return data?.content
     default: