plumbing for cli context and loader, stash before picking up initializers

apiv2/config.go

@@ -59,6 +59,10 @@ func (sc SpecificConfig[RequestModel]) GetRequestDefaults() interface{} {
 	return sc.RequestDefaults
 }
 
+func (sc SpecificConfig[RequestModel]) GetRequest() RequestModel {
+	return sc.RequestDefaults
+}
+
 func (sc SpecificConfig[RequestModel]) GetLocalPaths() ConfigLocalPaths {
 	return sc.LocalPaths
 }
@@ -90,7 +94,6 @@ func (cm *ConfigManager) loadConfigFile(path string) (*Config, error) {
 		return nil, fmt.Errorf("cannot unmarshal config file: %w", err)
 	}
 	fmt.Printf("RAW STUB: %+v\n", stub)
-	// fmt.Printf("DUMB SHIT: %+v\n%T\n", EndpointToRequestBodyMap[rawConfig.Registration.Endpoint], EndpointToRequestBodyMap[rawConfig.Registration.Endpoint])
 
 	endpoint := stub.Registration.Endpoint
 

apiv2/localai.go

@@ -5,14 +5,16 @@ import (
 	"fmt"
 	"strings"
 
+	model "github.com/go-skynet/LocalAI/pkg/model"
 	"github.com/mitchellh/mapstructure"
 )
 
 type LocalAIServer struct {
 	configManager *ConfigManager
+	loader        *model.ModelLoader
 }
 
-func combineRequestAndConfig[RequestType any](configManager *ConfigManager, model string, requestFromInput *RequestType) (*RequestType, error) {
+func combineRequestAndConfig[RequestType any](configManager *ConfigManager, model string, requestFromInput *RequestType) (*SpecificConfig[RequestType], error) {
 
 	splitFnName := strings.Split(printCurrentFunctionName(2), ".")
 
@@ -52,7 +54,17 @@ func combineRequestAndConfig[RequestType any](configManager *ConfigManager, mode
 
 	fmt.Printf("AFTER rD: %T\n%+v\n\n", request, request)
 
-	return &request, nil
+	return &SpecificConfig[RequestType]{
+		ConfigStub: ConfigStub{
+			Registration: config.GetRegistration(),
+			LocalPaths:   config.GetLocalPaths(),
+		},
+		RequestDefaults: request,
+	}, nil
+}
+
+func (las *LocalAIServer) loadModel(configStub ConfigStub) {
+
 }
 
 // CancelFineTune implements StrictServerInterface
@@ -63,13 +75,15 @@ func (*LocalAIServer) CancelFineTune(ctx context.Context, request CancelFineTune
 // CreateChatCompletion implements StrictServerInterface
 func (las *LocalAIServer) CreateChatCompletion(ctx context.Context, request CreateChatCompletionRequestObject) (CreateChatCompletionResponseObject, error) {
 
-	chatRequest, err := combineRequestAndConfig(las.configManager, request.Body.Model, request.Body)
+	chatRequestConfig, err := combineRequestAndConfig(las.configManager, request.Body.Model, request.Body)
 
 	if err != nil {
 		fmt.Printf("CreateChatCompletion ERROR combining config and input!\n%s\n", err.Error())
 		return nil, err
 	}
 
+	chatRequest := chatRequestConfig.RequestDefaults
+
 	fmt.Printf("\n===CreateChatCompletion===\n%+v\n", chatRequest)
 
 	fmt.Printf("\n\n!! TYPED CreateChatCompletion !!\ntemperature %f\n top_p %f \n %d\n", *chatRequest.Temperature, *chatRequest.TopP, *chatRequest.XLocalaiExtensions.TopK)
@@ -85,8 +99,48 @@ func (las *LocalAIServer) CreateChatCompletion(ctx context.Context, request Crea
 }
 
 // CreateCompletion implements StrictServerInterface
-func (*LocalAIServer) CreateCompletion(ctx context.Context, request CreateCompletionRequestObject) (CreateCompletionResponseObject, error) {
-	panic("unimplemented")
+func (las *LocalAIServer) CreateCompletion(ctx context.Context, request CreateCompletionRequestObject) (CreateCompletionResponseObject, error) {
+
+	modelName := request.Body.Model
+
+	config, err := combineRequestAndConfig(las.configManager, modelName, request.Body)
+
+	if err != nil {
+		fmt.Printf("CreateCompletion ERROR combining config and input!\n%s\n", err.Error())
+		return nil, err
+	}
+
+	req := config.GetRequest()
+
+	fmt.Printf("\n===CreateCompletion===\n%+v\n", req)
+
+	var choices []CreateCompletionResponseChoice
+
+	prompts, err := req.Prompt.AsCreateCompletionRequestPrompt1()
+
+	if err != nil {
+		tokenPrompt, err := req.Prompt.AsCreateCompletionRequestPrompt2()
+		if err == nil {
+			fmt.Printf("Scary token array length %d\n", len(tokenPrompt))
+			panic("Token array is scary and phase 2")
+		}
+		singlePrompt, err := req.Prompt.AsCreateCompletionRequestPrompt0()
+		if err != nil {
+			return nil, err
+		}
+		prompts = []string{singlePrompt}
+	}
+
+	// model := las.loader.LoadModel(modelName, )
+
+	for _, v := range prompts {
+		fmt.Printf("[prompt] %s\n", v)
+	}
+
+	return CreateCompletion200JSONResponse{
+		Model:   modelName,
+		Choices: choices,
+	}, nil
 }
 
 // CreateEdit implements StrictServerInterface

apiv2/localai_nethttp.go

@@ -1,16 +1,21 @@
 package apiv2
 
-import "net/http"
+import (
+	"net/http"
 
-func NewLocalAINetHTTPServer(configManager *ConfigManager) *LocalAIServer {
+	"github.com/go-skynet/LocalAI/pkg/model"
+)
+
+func NewLocalAINetHTTPServer(configManager *ConfigManager, loader *model.ModelLoader, address string) *LocalAIServer {
 	localAI := LocalAIServer{
 		configManager: configManager,
+		loader:        loader,
 	}
 
 	var middlewares []StrictMiddlewareFunc
 
 	http.Handle("/", Handler(NewStrictHandler(&localAI, middlewares)))
 
-	http.ListenAndServe(":8085", nil)
+	http.ListenAndServe(address, nil)
 	return &localAI
 }