Refactor Model Providers to Use Shared Proxy Package + validation for OpenAI like providers

.github/workflows/package-tools.yaml

@@ -1,11 +1,9 @@
-name: Build Docker Image
+name: Package tools
 
 on:
   pull_request:
     branches:
       - main
-    paths-ignore:
-      - docs/**
 
 jobs:
   build:
@@ -15,9 +13,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          repository: github.com/obot-platform/obot
+          repository: obot-platform/obot
 
-      - name: Make packages
-        run: make package-tools
-        env:
-          TOOL_REGISTRY_REPOS: github.com/${{ github.repository }}@${{ github.sha }}
+      - name: Setup Depot
+        uses: depot/setup-action@v1
+
+      - name: Build Docker Image
+        uses: depot/build-push-action@v1
+        with:
+          project: bbqjs4tj1g
+          context: .
+          platforms: linux/amd64
+          build-args: |
+            TOOL_REGISTRY_REPOS=github.com/${{ github.event.pull_request.head.repo.full_name }}@${{ github.event.pull_request.head.sha }}

deepseek-model-provider/go.mod

@@ -2,4 +2,6 @@ module github.com/obot-platform/tools/deepseek-model-provider
 
 go 1.23.4
 
-require github.com/gptscript-ai/chat-completion-client v0.0.0-20241127005108-02b41e1cd02e
+replace github.com/obot-platform/tools/openai-model-provider => ../openai-model-provider
+
+require github.com/obot-platform/tools/openai-model-provider v0.0.0

deepseek-model-provider/go.sum

@@ -1,2 +0,0 @@
-github.com/gptscript-ai/chat-completion-client v0.0.0-20241127005108-02b41e1cd02e h1:Nj9709xPbjAPLOsdR/Ik4zaJfpU4O6AEP/R6o9h30CE=
-github.com/gptscript-ai/chat-completion-client v0.0.0-20241127005108-02b41e1cd02e/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=

deepseek-model-provider/main.go

@@ -1,34 +1,36 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
-	"github.com/obot-platform/tools/deepseek-model-provider/server"
-	"github.com/obot-platform/tools/deepseek-model-provider/validate"
+	"github.com/obot-platform/tools/openai-model-provider/proxy"
 )
 
 func main() {
 	apiKey := os.Getenv("OBOT_DEEPSEEK_MODEL_PROVIDER_API_KEY")
 	if apiKey == "" {
-		validate.PrintError("OBOT_DEEPSEEK_MODEL_PROVIDER_API_KEY environment variable not set")
+		fmt.Fprintln(os.Stderr, "OBOT_DEEPSEEK_MODEL_PROVIDER_API_KEY environment variable not set")
 		os.Exit(1)
 	}
 
-	args := os.Args[1:]
-	if len(args) == 1 && args[0] == "validate" {
-		if err := validate.Run(apiKey); err != nil {
-			validate.PrintError(err.Error())
-			os.Exit(1)
-		}
-		os.Exit(0)
+	cfg := &proxy.Config{
+		APIKey:          apiKey,
+		Port:            os.Getenv("PORT"),
+		UpstreamHost:    "api.deepseek.com",
+		UseTLS:          true,
+		RewriteModelsFn: proxy.RewriteAllModelsWithUsage("llm"),
+		Name:            "DeepSeek",
 	}
 
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "8000"
+	if len(os.Args) > 1 && os.Args[1] == "validate" {
+		if err := cfg.Validate("/tools/deepseek-model-provider/validate"); err != nil {
+			os.Exit(1)
+		}
+		return
 	}
 
-	if err := server.Run(apiKey, port); err != nil {
+	if err := proxy.Run(cfg); err != nil {
 		panic(err)
 	}
 }

groq-model-provider/go.mod

@@ -0,0 +1,7 @@
+module github.com/obot-platform/tools/groq-model-provider
+
+go 1.23.4
+
+replace github.com/obot-platform/tools/openai-model-provider => ../openai-model-provider
+
+require github.com/obot-platform/tools/openai-model-provider v0.0.0

groq-model-provider/main.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/obot-platform/tools/openai-model-provider/proxy"
+)
+
+func main() {
+	apiKey := os.Getenv("OBOT_GROQ_MODEL_PROVIDER_API_KEY")
+	if apiKey == "" {
+		fmt.Fprintln(os.Stderr, "OBOT_GROQ_MODEL_PROVIDER_API_KEY environment variable not set")
+		os.Exit(1)
+	}
+
+	cfg := &proxy.Config{
+		APIKey:          apiKey,
+		Port:            os.Getenv("PORT"),
+		UpstreamHost:    "api.groq.com",
+		UseTLS:          true,
+		RewriteModelsFn: proxy.RewriteAllModelsWithUsage("llm"),
+		PathPrefix:      "/openai",
+		Name:            "Groq",
+	}
+
+	if len(os.Args) > 1 && os.Args[1] == "validate" {
+		if err := cfg.Validate("/tools/groq-model-provider/validate"); err != nil {
+			os.Exit(1)
+		}
+		return
+	}
+
+	if err := proxy.Run(cfg); err != nil {
+		panic(err)
+	}
+}