Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/light-meals-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"server": patch
---

adds experimental gram-mode:embedding for dynamic MCP tool selection based on semantic search
4 changes: 3 additions & 1 deletion server/cmd/gram/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/sourcegraph/conc/pool"
"github.com/speakeasy-api/gram/server/internal/logs"
"github.com/speakeasy-api/gram/server/internal/productfeatures"
"github.com/speakeasy-api/gram/server/internal/rag"
"github.com/urfave/cli/v2"
"github.com/urfave/cli/v2/altsrc"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
Expand Down Expand Up @@ -516,6 +517,7 @@ func newStartCommand() *cli.Command {
shutdownFuncs = append(shutdownFuncs, shutdown)

chatClient := chat.NewChatClient(logger, tracerProvider, meterProvider, db, openRouter, baseChatClient, env, encryptionClient, cache.NewRedisCacheAdapter(redisClient), guardianPolicy, functionsOrchestrator)
ragService := rag.NewToolsetVectorStore(tracerProvider, db, baseChatClient)
mux := goahttp.NewMuxer()

mux.Use(middleware.CORSMiddleware(c.String("environment"), c.String("server-url")))
Expand Down Expand Up @@ -550,7 +552,7 @@ func newStartCommand() *cli.Command {
instances.Attach(mux, instances.NewService(logger, tracerProvider, meterProvider, db, sessionManager, env, encryptionClient, cache.NewRedisCacheAdapter(redisClient), guardianPolicy, functionsOrchestrator, billingTracker, tcm))
mcpMetadataService := mcpmetadata.NewService(logger, db, sessionManager, serverURL, siteURL, cache.NewRedisCacheAdapter(redisClient))
mcpmetadata.Attach(mux, mcpMetadataService)
mcp.Attach(mux, mcp.NewService(logger, tracerProvider, meterProvider, db, sessionManager, env, posthogClient, serverURL, encryptionClient, cache.NewRedisCacheAdapter(redisClient), guardianPolicy, functionsOrchestrator, oauthService, billingTracker, billingRepo, tcm), mcpMetadataService)
mcp.Attach(mux, mcp.NewService(logger, tracerProvider, meterProvider, db, sessionManager, env, posthogClient, serverURL, encryptionClient, cache.NewRedisCacheAdapter(redisClient), guardianPolicy, functionsOrchestrator, oauthService, billingTracker, billingRepo, tcm, ragService), mcpMetadataService)
chat.Attach(mux, chat.NewService(logger, db, sessionManager, openRouter))
if slackClient.Enabled() {
slack.Attach(mux, slack.NewService(logger, db, sessionManager, encryptionClient, redisClient, slackClient, temporalClient, slack.Configurations{
Expand Down
14 changes: 14 additions & 0 deletions server/database/sqlc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ overrides:
go_type:
import: github.com/speakeasy-api/gram/server/internal/urn
type: Tool
- db_type: "vector"
go_type:
import: github.com/pgvector/pgvector-go
type: Vector

sql:
- schema: schema.sql
Expand Down Expand Up @@ -341,3 +345,13 @@ sql:
out: "../internal/resources/repo"
sql_package: "pgx/v5"
omit_unused_structs: true

- schema: schema.sql
queries: ../internal/rag/repo/queries.sql
engine: postgresql
gen:
go:
package: "repo"
out: "../internal/rag/repo"
sql_package: "pgx/v5"
omit_unused_structs: true
3 changes: 2 additions & 1 deletion server/design/shared/toolset.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ var Toolset = Type("Toolset", func() {
Attribute("function_environment_variables", ArrayOf(FunctionEnvironmentVariable), "The function environment variables that are relevant to the toolset")
Attribute("tools", ArrayOf(Tool), "The tools in this toolset")
Attribute("tool_urns", ArrayOf(String), "The tool URNs in this toolset")
Attribute("toolset_version", Int64, "The version of the toolset (will be 0 if none exists)")
Attribute("resources", ArrayOf(Resource), "The resources in this toolset")
Attribute("resource_urns", ArrayOf(String), "The resource URNs in this toolset")

Expand All @@ -68,7 +69,7 @@ var Toolset = Type("Toolset", func() {
Description("When the toolset was last updated.")
Format(FormatDateTime)
})
Required("id", "project_id", "organization_id", "account_type", "name", "slug", "tools", "prompt_templates", "tool_urns", "resources", "resource_urns", "created_at", "updated_at")
Required("id", "project_id", "organization_id", "account_type", "name", "slug", "tools", "toolset_version", "prompt_templates", "tool_urns", "resources", "resource_urns", "created_at", "updated_at")
})

var ToolsetEntry = Type("ToolsetEntry", func() {
Expand Down
28 changes: 14 additions & 14 deletions server/gen/http/cli/gram/cli.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/gen/http/openapi.json

Large diffs are not rendered by default.

Loading
Loading