Merge remote-tracking branch 'origin/main' into kc-upgrade-26

Author: priyachandran

.cursor/rules/go-api-handlers.mdc

@@ -0,0 +1,21 @@
+---
+description: Use authorization functions for apps
+globs: api/pkg/server/*.go
+alwaysApply: false
+---
+Act as a security conscious senior software developer. When implementing handlers think about whether handlers need authentication and authorization. 
+- Do not reimplement logic that is in the authz.go
+- When editing or adding new handlers, use existing functions such as `authorizeUserToApp` or `authorizeUserToResource`
+- When editing or adding handlers, always include doc string such as
+```
+// createApp godoc
+// @Summary Create new app
+// @Description Create new app. Helix apps are configured with tools and knowledge.
+// @Tags    apps
+
+// @Success 200 {object} types.App
+// @Param request    body types.App true "Request body with app configuration.")
+// @Router /api/v1/apps [post]
+// @Security BearerAuth
+```
+as this then generates the Swagger/OpenAPI definitions

.cursor/rules/helix.mdc

@@ -3,4 +3,11 @@ description: Everything
 globs: *
 alwaysApply: false
 ---
-Don't make unrelated changes
+Act as an expert senior Golang (or Python when editing Python files) engineers
+
+Stack: Golang API server, Docker, Postgres, PGVector or Typesense for RAG, NATS (embedded into Golang server) for messaging pubsub 
+
+- Don't make unrelated changes
+- Don't ever declare types as map[string]interface{} for JSON marshalling. Declare a regular struct oustide of the function and use it to marshal JSON
+- If a function returns multiple parameters such as `*SomeStruct, error`, don't return `nil, nil` from within the function, if the struct is nil, return an error to avoid extra checking that the struct is nil if the error is nil
+- For logging use `"github.com/rs/zerolog/log"` library

.cursor/rules/use-gorm-for-database.mdc

@@ -0,0 +1,7 @@
+---
+description: Database interactions should be using Gorm
+globs: api/pkg/store/*.go
+alwaysApply: false
+---
+- When adding methods to interact with Postgres database, use Gorm client `s.gdb.WithContext(ctx).Where(xx).First(xx)`, etc.
+- If a query is more complex where joins are needed, then use the "Raw" feature of gorm client such as `s.gdb.WithContext(ctx).Raw("some query").Scan(&result)`

.drone.yml

@@ -27,6 +27,7 @@ steps:
 - name: run-linter
   image: golangci/golangci-lint:v1.62-alpine
   commands:
+    - golangci-lint cache clean
     - golangci-lint run
   when:
     event:

.golangci.yml

@@ -13,10 +13,41 @@ linters:
     - tparallel
     - errcheck
     - revive
+    - forbidigo
+    # - gocritic
 
 issues:
   exlude-dirs:
     - vendor
+  exclude-rules:
+    - path: 'api/cmd'
+      linters:
+        - forbidigo
+    - path: 'api/pkg/cli'
+      linters:
+        - forbidigo
+    - path: 'demos'
+      linters:
+        - forbidigo
+    - path: '.*_test.go'
+      linters:
+        - forbidigo
 
 run:
   timeout: 10m
+
+linters-settings:
+  forbidigo:
+    forbid:
+      - ^fmt\.Print.*
+      - ^print(ln)?$
+    rules:
+      - name: error-strings
+        disabled: false
+      - name: error-naming
+        disabled: false
+
+  gocritic:
+    enabled-tags:
+      - diagnostic
+      - style

Dockerfile.runner

@@ -45,7 +45,7 @@ FROM registry.helix.ml/helix/runner-base:${TAG}
 
 # Install ollama
 RUN TEMP_DIR=$(mktemp -d /tmp/ollama_install_XXXXXX) && \
-    curl --retry 5 -L https://github.com/ollama/ollama/releases/download/v0.5.1/ollama-linux-amd64.tgz -o $TEMP_DIR/ollama.tgz && \
+    curl --retry 5 -L https://github.com/ollama/ollama/releases/download/v0.6.1-rc0/ollama-linux-amd64.tgz -o $TEMP_DIR/ollama.tgz && \
     tar -xzf $TEMP_DIR/ollama.tgz -C $TEMP_DIR && \
     mv $TEMP_DIR/bin/ollama /usr/bin/ollama && \
     chmod +x /usr/bin/ollama && \

api/cmd/helix/gptscript.go

@@ -37,9 +37,6 @@ func newGptScriptCmd() *cobra.Command {
 }
 
 func gptscriptServer(_ *cobra.Command) error {
-
-	// this is populated by a testfaster secret which is written into /root/secrets and then hoisted
-	// as the environment file for the gptscript systemd service which runs this
 	if os.Getenv("OPENAI_API_KEY") == "" {
 		log.Fatal().Msg("missing API key for OpenAI")
 	}

api/cmd/helix/serve.go

@@ -243,15 +243,11 @@ func serve(cmd *cobra.Command, cfg *config.ServerConfig) error {
 		return err
 	}
 
-	var gse gptscript.Executor
-
 	if cfg.GPTScript.TestFaster.URL != "" {
-		log.Info().Msg("using firecracker based GPTScript executor")
-		gse = gptscript.NewTestFasterExecutor(cfg)
-	} else {
-		log.Info().Msg("using runner based GPTScript executor")
-		gse = gptscript.NewExecutor(cfg, ps)
+		return fmt.Errorf("HELIX_TESTFASTER_URL is deprecated, please use runner based GPTScript executor")
 	}
+	log.Info().Msg("using runner based GPTScript executor")
+	gse := gptscript.NewExecutor(cfg, ps)
 
 	var extractor extract.Extractor
 
@@ -324,6 +320,10 @@ func serve(cmd *cobra.Command, cfg *config.ServerConfig) error {
 
 	providerManager := manager.NewProviderManager(cfg, postgresStore, helixInference, logStores...)
 
+	// Connect the runner controller to the provider manager
+	providerManager.SetRunnerController(runnerController)
+	log.Info().Msg("Connected runner controller to provider manager to enable hiding Helix provider when no runners are available")
+
 	// Will run async and watch for changes in the API keys, non-blocking
 	providerManager.StartRefresh(ctx)
 

api/cmd/helix/test.go

@@ -385,8 +385,8 @@ var htmlTemplate = `
                                 <td>{{.Model}}</td>
                                 <td>{{printf "%.2f" .InferenceTime.Seconds}}s</td>
                                 <td>{{printf "%.2f" .EvaluationTime.Seconds}}s</td>
-                                <td><a href="#" onclick="openLink('{{$.HelixURL}}/session/{{.SessionID}}'); return false;">Session</a></td>
-                                <td><a href="#" onclick="openLink('{{$.HelixURL}}/dashboard?tab=llm_calls&filter_sessions={{.SessionID}}'); return false;">Debug</a></td>
+                                <td><a href="{{$.HelixURL}}/session/{{.SessionID}}" onclick="openLink('{{$.HelixURL}}/session/{{.SessionID}}'); return false;">Session</a></td>
+                                <td><a href="{{$.HelixURL}}/dashboard?tab=llm_calls&filter_sessions={{.SessionID}}" onclick="openLink('{{$.HelixURL}}/dashboard?tab=llm_calls&filter_sessions={{.SessionID}}'); return false;">Debug</a></td>
                             </tr>
                             {{end}}
                         </tbody>
@@ -1443,7 +1443,6 @@ func deployApp(namespacedAppName string, yamlFile string) (string, error) {
 	app := &types.App{
 		AppSource: types.AppSourceHelix,
 		Global:    false,
-		Shared:    false,
 		Config: types.AppConfig{
 			AllowedDomains: []string{},
 			Helix:          *parsedAppConfig,

api/pkg/cli/app/apply.go

@@ -18,7 +18,6 @@ func init() {
 	rootCmd.AddCommand(applyCmd)
 
 	applyCmd.Flags().StringP("filename", "f", "", "Filename to apply")
-	applyCmd.Flags().Bool("shared", false, "Shared application")
 	applyCmd.Flags().Bool("global", false, "Global application")
 	applyCmd.Flags().Bool("refresh-knowledge", false, "Refresh knowledge, re-index all knowledge for the app")
 	applyCmd.Flags().StringVarP(&organization, "organization", "o", "", "Organization ID or name")
@@ -51,11 +50,6 @@ var applyCmd = &cobra.Command{
 			return err
 		}
 
-		shared, err := cmd.Flags().GetBool("shared")
-		if err != nil {
-			return err
-		}
-
 		global, err := cmd.Flags().GetBool("global")
 		if err != nil {
 			return err
@@ -117,12 +111,12 @@ var applyCmd = &cobra.Command{
 		}
 
 		if existingApp != nil {
-			err = updateApp(cmd.Context(), apiClient, existingApp, appConfig.GetAppConfig(), shared, global)
+			err = updateApp(cmd.Context(), apiClient, existingApp, appConfig.GetAppConfig(), global)
 			if err != nil {
 				return err
 			}
 		} else {
-			appID, err = createApp(cmd.Context(), apiClient, organization, appConfig.GetAppConfig(), shared, global)
+			appID, err = createApp(cmd.Context(), apiClient, organization, appConfig.GetAppConfig(), global)
 			if err != nil {
 				return err
 			}
@@ -195,9 +189,8 @@ func RefreshAppKnowledge(ctx context.Context, apiClient client.Client, appID str
 	return nil
 }
 
-func updateApp(ctx context.Context, apiClient client.Client, app *types.App, appConfig *types.AppHelixConfig, shared, global bool) error {
+func updateApp(ctx context.Context, apiClient client.Client, app *types.App, appConfig *types.AppHelixConfig, global bool) error {
 	app.Config.Helix = *appConfig
-	app.Shared = shared
 	app.Global = global
 
 	app, err := apiClient.UpdateApp(ctx, app)
@@ -210,11 +203,10 @@ func updateApp(ctx context.Context, apiClient client.Client, app *types.App, app
 	return nil
 }
 
-func createApp(ctx context.Context, apiClient client.Client, orgID string, appConfig *types.AppHelixConfig, shared, global bool) (string, error) {
+func createApp(ctx context.Context, apiClient client.Client, orgID string, appConfig *types.AppHelixConfig, global bool) (string, error) {
 	app := &types.App{
 		AppSource: types.AppSourceHelix,
 		Global:    global,
-		Shared:    shared,
 		Config: types.AppConfig{
 			AllowedDomains: []string{}, // TODO: make configurable
 			Helix:          *appConfig,

api/pkg/cli/app/inspect.go

@@ -41,6 +41,11 @@ var inspectCmd = &cobra.Command{
 		// only show app.Config.Helix since that is the thing that roundtrips with helix apply -f
 		appConfig := app.Config.Helix
 
+		// Remove tools section from all assistants
+		for i := range appConfig.Assistants {
+			appConfig.Assistants[i].Tools = nil
+		}
+
 		// Convert to CRD format for both JSON and YAML output
 		crd := types.AppHelixConfigCRD{
 			APIVersion: "app.aispec.org/v1alpha1",
@@ -50,6 +55,7 @@ var inspectCmd = &cobra.Command{
 			},
 			Spec: appConfig,
 		}
+
 		// Clear the name from the spec since it's now in metadata
 		crd.Spec.Name = ""
 

api/pkg/cli/knowledge/search.go

@@ -12,6 +12,7 @@ func init() {
 	searchCmd.Flags().String("app", "", "App ID to search within")
 	searchCmd.Flags().String("knowledge", "", "Knowledge ID to search within")
 	searchCmd.Flags().String("prompt", "", "Search prompt")
+	searchCmd.Flags().String("document", "", "Document ID to search within")
 
 	_ = searchCmd.MarkFlagRequired("app")
 	_ = searchCmd.MarkFlagRequired("prompt")
@@ -32,11 +33,13 @@ var searchCmd = &cobra.Command{
 		appID, _ := cmd.Flags().GetString("app")
 		knowledgeID, _ := cmd.Flags().GetString("knowledge")
 		prompt, _ := cmd.Flags().GetString("prompt")
+		documentID, _ := cmd.Flags().GetString("document")
 
 		results, err := apiClient.SearchKnowledge(cmd.Context(), &client.KnowledgeSearchQuery{
 			AppID:       appID,
 			KnowledgeID: knowledgeID,
 			Prompt:      prompt,
+			DocumentID:  documentID,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to search knowledge: %w", err)