fix ollama

Author: 0xdeafcafe

libraries/ollama/models.go

@@ -28,7 +28,7 @@ type LocalModelDetails struct {
 }
 
 func (c *client) ListLocalModels(ctx context.Context) ([]*LocalModel, error) {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.endpointURL+"/models", nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.endpointURL+"/api/models", nil)
 	if err != nil {
 		return nil, err
 	}

services/airelay/README.md

@@ -47,6 +47,8 @@ This will invoke a call to an AI model, passing in a full conversation, wait for
 
 ```typescript
 interface Request {
+	conversation_id: string;
+	message_id: string;
 	owner: {
 		type: 'user';
 		identifier: string;
@@ -78,6 +80,8 @@ This will invoke a call to an AI model, passing in a full conversation, and stre
 
 ```typescript
 interface Request {
+	conversation_id: string;
+	message_id: string;
 	streaming_channel_id: string;
 	owner: {
 		type: 'user';

services/airelay/airelay.go

@@ -32,6 +32,8 @@ type ListSupportedResponseModel struct {
 }
 
 type InvokeConversationMessageRequest struct {
+	ConversationID string                                          `json:"conversation_id"`
+	MessageID      string                                          `json:"message_id"`
 	Owner          *Actor                                          `json:"owner"`
 	Messages       []*InvokeConversationMessageRequestMessage      `json:"messages"`
 	AIRelayOptions *InvokeConversationMessageRequestAIRelayOptions `json:"ai_relay_options"`
@@ -52,6 +54,8 @@ type InvokeConversationMessageResponse struct {
 	MessageContent string `json:"message_content"`
 }
 type InvokeStreamingConversationMessageRequest struct {
+	ConversationID     string                                          `json:"conversation_id"`
+	MessageID          string                                          `json:"message_id"`
 	StreamingChannelID string                                          `json:"streaming_channel_id"`
 	Owner              *Actor                                          `json:"owner"`
 	Messages           []*InvokeConversationMessageRequestMessage      `json:"messages"`

services/airelay/internal/libraries/relay/providers/ollama/ollama.go

@@ -5,9 +5,11 @@ import (
 	"github.com/0xdeafcafe/bloefish/services/airelay/internal/libraries/relay"
 )
 
-func NewProvider() relay.Provider {
+func NewProvider(
+	ollamaClient ollamaClient.Client,
+) relay.Provider {
 	return &Provider{
-		client: ollamaClient.NewClient(),
+		client: ollamaClient,
 	}
 }
 

services/airelay/internal/service.go

@@ -3,6 +3,10 @@ package internal
 import (
 	"context"
 
+	ollamaClient "github.com/0xdeafcafe/bloefish/libraries/ollama"
+	oaiClient "github.com/openai/openai-go"
+	openaiOption "github.com/openai/openai-go/option"
+
 	"github.com/0xdeafcafe/bloefish/libraries/clog"
 	"github.com/0xdeafcafe/bloefish/libraries/config"
 	"github.com/0xdeafcafe/bloefish/libraries/telemetry"
@@ -14,9 +18,6 @@ import (
 	"github.com/0xdeafcafe/bloefish/services/conversation"
 	"github.com/0xdeafcafe/bloefish/services/fileupload"
 	"github.com/0xdeafcafe/bloefish/services/stream"
-
-	oaiClient "github.com/openai/openai-go"
-	openaiOption "github.com/openai/openai-go/option"
 )
 
 type Config struct {
@@ -118,7 +119,11 @@ func Run(ctx context.Context) error {
 					Name: "o1 mini",
 				}}),
 			)),
-			relay.WithProvider(ollama.NewProvider()),
+			relay.WithProvider(ollama.NewProvider(
+				ollamaClient.NewClient(
+					ollamaClient.WithEndpointURL(cfg.AIProviders.Ollama.Endpoint),
+				),
+			)),
 		),
 
 		ConversationService: conversation.NewRPCClient(ctx, cfg.ConversationService),

services/airelay/internal/transport/rpc/invoke_conversation_message.json

@@ -3,12 +3,24 @@
 	"additionalProperties": false,
 
 	"required": [
+		"conversation_id",
+		"message_id",
 		"owner",
 		"messages",
 		"ai_relay_options"
 	],
 
 	"properties": {
+		"conversation_id": {
+			"type": "string",
+			"minLength": 1
+		},
+
+		"message_id": {
+			"type": "string",
+			"minLength": 1
+		},
+
 		"owner": {
 			"type": "object",
 			"additionalProperties": false,
@@ -76,6 +88,7 @@
 					"type": "string",
 					"minLength": 1
 				},
+
 				"model_id": {
 					"type": "string",
 					"minLength": 1

services/airelay/internal/transport/rpc/invoke_streaming_conversation_message.json

@@ -3,13 +3,25 @@
 	"additionalProperties": false,
 
 	"required": [
+		"conversation_id",
+		"message_id",
 		"streaming_channel_id",
 		"owner",
 		"messages",
 		"ai_relay_options"
 	],
 
 	"properties": {
+		"conversation_id": {
+			"type": "string",
+			"minLength": 1
+		},
+
+		"message_id": {
+			"type": "string",
+			"minLength": 1
+		},
+
 		"streaming_channel_id": {
 			"type": "string",
 			"minLength": 1