From 49ce24984c87fe7bcf55d593a53aad37b49a81e4 Mon Sep 17 00:00:00 2001 From: Aisuko Date: Tue, 30 May 2023 21:01:55 +1000 Subject: [PATCH] feat: Add more test-cases and remove dev container (#433) Signed-off-by: Aisuko Co-authored-by: Ettore Di Giacinto --- .devcontainer/Dockerfile | 3 --- .devcontainer/devcontainer.json | 46 -------------------------------- .devcontainer/docker-compose.yml | 26 ------------------ .gitignore | 4 +++ .vscode/launch.json | 2 +- Makefile | 1 + api/config_test.go | 27 +++++++++++++++++++ 7 files changed, 33 insertions(+), 76 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/docker-compose.yml create mode 100644 api/config_test.go diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index cae178f8..00000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -ARG GO_VERSION=1.20 -FROM mcr.microsoft.com/devcontainers/go:0-$GO_VERSION-bullseye -RUN apt-get update && apt-get install -y cmake diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index c36f7299..00000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,46 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose -{ - "name": "Existing Docker Compose (Extend)", - - // Update the 'dockerComposeFile' list if you have more compose files or use different names. - // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. - "dockerComposeFile": [ - "../docker-compose.yaml", - "docker-compose.yml" - ], - - // The 'service' property is the name of the service for the container that VS Code should - // use. Update this value and .devcontainer/docker-compose.yml to the real service name. - "service": "api", - - // The optional 'workspaceFolder' property is the path VS Code should open by default when - // connected. This is typically a file mount in .devcontainer/docker-compose.yml - "workspaceFolder": "/workspace", - - "features": { - "ghcr.io/devcontainers/features/go:1": {}, - "ghcr.io/azutake/devcontainer-features/go-packages-install:0": {} - }, - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Uncomment the next line if you want start specific services in your Docker Compose config. - // "runServices": [], - - // Uncomment the next line if you want to keep your containers running after VS Code shuts down. - // "shutdownAction": "none", - - // Uncomment the next line to run commands after the container is created. - "postCreateCommand": "make prepare" - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "devcontainer" -} diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 265e5189..00000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: '3.6' -services: - # Update this to the name of the service you want to work with in your docker-compose.yml file - api: - # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer - # folder. Note that the path of the Dockerfile and context is relative to the *primary* - # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile" - # array). The sample below assumes your primary file is in the root of your project. - # - build: - context: . - dockerfile: .devcontainer/Dockerfile - - volumes: - # Update this to wherever you want VS Code to mount the folder of your project - - .:/workspace:cached - - # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust. - # cap_add: - # - SYS_PTRACE - # security_opt: - # - seccomp:unconfined - - # Overrides default command so things don't shut down after the process ends. - command: /bin/sh -c "while sleep 1000; do :; done" - diff --git a/.gitignore b/.gitignore index 10f3a35e..878047ee 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,12 @@ go-llama gpt4all go-stable-diffusion +go-ggml-transformers go-gpt2 go-rwkv whisper.cpp +bloomz +go-bert # LocalAI build binary LocalAI @@ -15,6 +18,7 @@ local-ai # Ignore models models/* test-models/ +test-dir/ release/ diff --git a/.vscode/launch.json b/.vscode/launch.json index cf4fb924..2727da92 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -25,7 +25,7 @@ ], "env": { "C_INCLUDE_PATH": "${workspaceFolder}/go-llama:${workspaceFolder}/go-stable-diffusion/:${workspaceFolder}/gpt4all/gpt4all-bindings/golang/:${workspaceFolder}/go-gpt2:${workspaceFolder}/go-rwkv:${workspaceFolder}/whisper.cpp:${workspaceFolder}/go-bert:${workspaceFolder}/bloomz", - "LIBRARY_PATH": "$${workspaceFolder}/go-llama:${workspaceFolder}/go-stable-diffusion/:${workspaceFolder}/gpt4all/gpt4all-bindings/golang/:${workspaceFolder}/go-gpt2:${workspaceFolder}/go-rwkv:${workspaceFolder}/whisper.cpp:${workspaceFolder}/go-bert:${workspaceFolder}/bloomz", + "LIBRARY_PATH": "${workspaceFolder}/go-llama:${workspaceFolder}/go-stable-diffusion/:${workspaceFolder}/gpt4all/gpt4all-bindings/golang/:${workspaceFolder}/go-gpt2:${workspaceFolder}/go-rwkv:${workspaceFolder}/whisper.cpp:${workspaceFolder}/go-bert:${workspaceFolder}/bloomz", "DEBUG": "true" } } diff --git a/Makefile b/Makefile index 2d040e35..0eb790d4 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,7 @@ prepare: prepare-sources gpt4all/gpt4all-bindings/golang/libgpt4all.a $(OPTIONAL clean: ## Remove build related file rm -fr ./go-llama rm -rf ./gpt4all + rm -rf ./go-gpt2 rm -rf ./go-stable-diffusion rm -rf ./go-ggml-transformers rm -rf ./go-rwkv diff --git a/api/config_test.go b/api/config_test.go new file mode 100644 index 00000000..9950f803 --- /dev/null +++ b/api/config_test.go @@ -0,0 +1,27 @@ +package api + +import ( + "os" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("Test cases for config related functions", func() { + + var ( + configFile string + ) + + Context("Test Read configuration functions", func() { + configFile = os.Getenv("CONFIG_FILE") + It("Test ReadConfigFile", func() { + config, err := ReadConfigFile(configFile) + Expect(err).To(BeNil()) + Expect(config).ToNot(BeNil()) + // two configs in config.yaml + Expect(len(config)).To(Equal(2)) + }) + + }) +})