Release - Fix path traversal bug for sqlite, new clickhouse options, and support for OpenAI-like URLs

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve WhoDB.
 title: "[BUG] - {your title here}"
 labels: bug
 assignees: ''
@@ -24,15 +24,16 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+ - OS that WhoDB is running on: [e.g. Ubuntu]
+ - How you're running WhoDB: [e.g, Docker, exe, manually]
+ - Browser: [e.g. chrome, safari]
+ - Version: [e.g. 22]
 
 **Smartphone (please complete the following information):**
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+ - Browser: [e.g. stock browser, safari]
+ - Version: [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea for this project.
 title: "[FR] - {your title here}"
 labels: enhancement
 assignees: ''

README.md

@@ -68,12 +68,17 @@ Get up and running with WhoDB quickly using Docker:
 docker run -it -p 8080:8080 clidey/whodb
 ```
 
+
+To run WhoDB with an OpenAI compatible service, you should assign some environments.
+```sh
+docker run -it -e USE_CUSTOM_MODELS=1 -e CUSTOM_MODELS=gpt-4o,gpt-3.5,others -e OPENAI_BASE_URL=http://your_base_url/v1 -p 8080:8080 clidey/whodb
+```
+
 If you are using a remote Ollama server, please start Docker with Ollama Environments like this:
 ```sh
 docker run -it -e WHODB_OLLAMA_HOST=YOUR_OLLAMA_HOST -e WHODB_OLLAMA_PORT=YOUR_OLLAMA_PORT -p 8080:8080 clidey/whodb
 ```
 
-
 Or, use Docker Compose:
 ```sh
 version: "3.8"

core/graph/schema.graphqls

@@ -6,6 +6,7 @@ enum DatabaseType {
   Redis,
   ElasticSearch,
   MariaDB,
+  ClickHouse,
 }
 
 type Column {
@@ -78,6 +79,7 @@ input LoginProfileInput {
 }
 
 type LoginProfile {
+  Alias: String
   Id: String!
   Type: DatabaseType!
   Database: String

core/src/engine/plugin.go

@@ -9,6 +9,7 @@ type Credentials struct {
 	Database    string
 	Advanced    []Record
 	AccessToken *string
+	IsProfile   bool
 }
 
 type ExternalModel struct {

core/src/env/env.go

@@ -34,14 +34,16 @@ func GetClideyQuickContainerImage() string {
 }
 
 type DatabaseCredentials struct {
+	Alias    string            `json:"alias"`
 	Hostname string            `json:"host"`
 	Username string            `json:"user"`
 	Password string            `json:"password"`
 	Database string            `json:"database"`
 	Port     string            `json:"port"`
 	Config   map[string]string `json:"config"`
 
-	Type string
+	IsProfile bool
+	Type      string
 }
 
 func GetDefaultDatabaseCredentials(databaseType string) []DatabaseCredentials {

core/src/llm/chatgpt_client.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 )
 
-const chatGPTEndpoint = "https://api.openai.com/v1"
 
 func prepareChatGPTRequest(c *LLMClient, prompt string, model LLMModel, receiverChan *chan string) (string, []byte, map[string]string, error) {
 	requestBody, err := json.Marshal(map[string]interface{}{
@@ -20,7 +19,7 @@ func prepareChatGPTRequest(c *LLMClient, prompt string, model LLMModel, receiver
 	if err != nil {
 		return "", nil, nil, err
 	}
-	url := fmt.Sprintf("%v/chat/completions", chatGPTEndpoint)
+	url := fmt.Sprintf("%v/chat/completions", getOpenAICompatibleBaseURL())
 	headers := map[string]string{
 		"Authorization": fmt.Sprintf("Bearer %s", c.APIKey),
 		"Content-Type":  "application/json",
@@ -29,7 +28,7 @@ func prepareChatGPTRequest(c *LLMClient, prompt string, model LLMModel, receiver
 }
 
 func prepareChatGPTModelsRequest(apiKey string) (string, map[string]string) {
-	url := fmt.Sprintf("%v/models", chatGPTEndpoint)
+	url := fmt.Sprintf("%v/models", getOpenAICompatibleBaseURL())
 	headers := map[string]string{
 		"Authorization": fmt.Sprintf("Bearer %s", apiKey),
 		"Content-Type":  "application/json",

core/src/llm/env.go

@@ -2,7 +2,8 @@ package llm
 
 import (
 	"fmt"
-
+    "strings"
+    "os"
 	"github.com/clidey/whodb/core/src/common"
 	"github.com/clidey/whodb/core/src/env"
 )
@@ -24,3 +25,31 @@ func getOllamaEndpoint() string {
 
 	return fmt.Sprintf("http://%v:%v/api", host, port)
 }
+
+func getOpenAICompatibleBaseURL() string {
+	defaultBaseURL := "https://api.openai.com/v1"
+	baseURL := os.Getenv("OPENAI_BASE_URL")
+	if baseURL == "" {
+		baseURL = defaultBaseURL
+	}
+	return baseURL
+}
+
+func getCustomModels() ([]string, error) {
+    modelsStr := os.Getenv("CUSTOM_MODELS")
+	if modelsStr == "" {
+		return []string{}, nil
+	}
+
+	models := strings.Split(modelsStr, ",")
+
+	for i := range models {
+		models[i] = strings.TrimSpace(models[i])
+	}
+    return models, nil
+}
+
+func ShouldUseCustomModels() bool {
+	useCustomModels := os.Getenv("USE_CUSTOM_MODELS")
+	return useCustomModels == "1"
+}

core/src/llm/llm_client.go

@@ -66,6 +66,9 @@ func (c *LLMClient) GetSupportedModels() ([]string, error) {
 		url, headers = prepareOllamaModelsRequest()
 	case ChatGPT_LLMType:
 		url, headers = prepareChatGPTModelsRequest(c.APIKey)
+		if ShouldUseCustomModels() {
+		    return getCustomModels()
+		}
 	case Anthropic_LLMType:
 		return getAnthropicModels(c.APIKey)
 	default:

core/src/plugins/clickhouse/add.go

@@ -72,7 +72,7 @@
 		query += fmt.Sprintf("\nSETTINGS %s", strings.Join(settingsClauses, ", "))
 	}
 
-	err = conn.Exec(context.Background(), query)
+	_, err = conn.ExecContext(context.Background(), query)
 	if err != nil {
 		return false, fmt.Errorf("failed to create table: %w (query: %s)", err, query)
 	}
@@ -100,6 +100,6 @@
 	query := fmt.Sprintf("INSERT INTO %s.%s (%s) VALUES (%s)",
 		schema, storageUnit, strings.Join(columns, ", "), strings.Join(placeholders, ", "))
 
-	err = conn.Exec(context.Background(), query, args...)
+	_, err = conn.ExecContext(context.Background(), query, args...)
 	return err == nil, err
 }