wip: templates reloaded

Signed-off-by: Nick Hale <[email protected]>

Author: njhale

apiclient/types/template.go

@@ -2,7 +2,6 @@ package types
 
 type ProjectTemplate struct {
 	Metadata
-	ProjectTemplateManifest
 	ProjectSnapshot ThreadManifest `json:"projectSnapshot,omitempty"`
 	MCPServers      []string       `json:"mcpServers,omitempty"`
 	AssistantID     string         `json:"assistantID,omitempty"`
@@ -11,10 +10,4 @@ type ProjectTemplate struct {
 	Ready           bool           `json:"ready,omitempty"`
 }
 
-type ProjectTemplateManifest struct {
-	Name     string `json:"name,omitempty"`
-	Public   bool   `json:"public,omitempty"`
-	Featured bool   `json:"featured,omitempty"`
-}
-
 type ProjectTemplateList List[ProjectTemplate]

apiclient/types/zz_generated.deepcopy.go

@@ -108,11 +108,9 @@ var apiResources = []string{
 	"GET    /api/assistants/{assistant_id}/projects/{project_id}/tasks/{task_id}/runs/{run_id}/files/{file...}",
 	"POST   /api/assistants/{assistant_id}/projects/{project_id}/tasks/{task_id}/runs/{run_id}/files/{file...}",
 	"POST   /api/assistants/{assistant_id}/projects/{project_id}/tasks/{task_id}/runs/{run_id}/steps/{step_id}/run",
-	"PUT    /api/assistants/{assistant_id}/projects/{project_id}/templates/{template_id}",
-	"DELETE /api/assistants/{assistant_id}/projects/{project_id}/templates/{template_id}",
-	"GET    /api/assistants/{assistant_id}/projects/{project_id}/templates/{template_id}",
-	"POST   /api/assistants/{assistant_id}/projects/{project_id}/templates",
-	"GET    /api/assistants/{assistant_id}/projects/{project_id}/templates",
+	"POST   /api/assistants/{assistant_id}/projects/{project_id}/template",
+	"GET    /api/assistants/{assistant_id}/projects/{project_id}/template",
+	"DELETE /api/assistants/{assistant_id}/projects/{project_id}/template",
 	"GET    /api/assistants/{assistant_id}/projects/{project_id}/threads",
 	"POST   /api/assistants/{assistant_id}/projects/{project_id}/threads",
 	"DELETE /api/assistants/{assistant_id}/projects/{project_id}/threads/{thread_id}",
@@ -149,6 +147,7 @@ var apiResources = []string{
 	"GET    /api/assistants/{assistant_id}/projects/{project_id}/tools/{tool_id}/local-authenticate",
 	"DELETE /api/assistants/{assistant_id}/projects/{project_id}/tools/{tool_id}/local-deauthenticate",
 	"POST   /api/assistants/{assistant_id}/projects/{project_id}/tools/{tool_id}/test",
+	"POST   /api/assistants/{assistant_id}/projects/{project_id}/template-upgrade",
 	"GET    /api/mcp-server-instances",
 	"GET    /api/mcp-server-instances/{mcp_server_instance_id}",
 	"POST   /api/mcp-server-instances",
@@ -265,6 +264,7 @@ func (a *Authorizer) evaluateResources(req *http.Request, vars GetVar, user user
 		MCPID:                  vars("mcp_id"), // this will be either a server ID or a server instance ID
 		PendingAuthorizationID: vars("pending_authorization_id"),
 		ThreadShareID:          vars("share_public_id"),
+		TemplateID:             vars("template_public_id"), // for /api/templates/{template_public_id} routes
 		ToolID:                 vars("tool_id"),
 	}
 

pkg/api/authz/resources.go

@@ -9,13 +9,18 @@ import (
 )
 
 func (a *Authorizer) checkTemplate(req *http.Request, resources *Resources) (bool, error) {
+	// For project-scoped template routes (/api/assistants/{assistant_id}/projects/{project_id}/template),
+	// authorization is handled by the project check, not a separate template check
 	if resources.TemplateID == "" {
 		return true, nil
 	}
 
+	// For global template routes (/api/templates/{template_public_id}),
+	// check if the template exists and is publicly accessible
 	var templateShareList v1.ThreadShareList
 	err := a.cache.List(req.Context(), &templateShareList, kclient.InNamespace(system.DefaultNamespace), kclient.MatchingFields{
 		"spec.publicID": resources.TemplateID,
+		"spec.template": "true",
 	})
 
 	return len(templateShareList.Items) > 0, err

pkg/api/authz/template.go

@@ -247,6 +247,44 @@ func (h *ProjectsHandler) GetProject(req api.Context) error {
 	return req.Write(convertProject(&thread, nil))
 }
 
+func (h *ProjectsHandler) TemplateUpgrade(req api.Context) error {
+	var (
+		projectID = strings.Replace(req.PathValue("project_id"), system.ProjectPrefix, system.ThreadPrefix, 1)
+		thread    v1.Thread
+	)
+
+	if err := req.Get(&thread, projectID); err != nil {
+		return err
+	}
+
+	if thread.Spec.SourceThreadName == "" || !thread.Spec.Project {
+		return types.NewErrBadRequest("project was not created from a template")
+	}
+
+	// Get the source thread to verify it's a template
+	var source v1.Thread
+	if err := req.Get(&source, thread.Spec.SourceThreadName); err != nil {
+		return err
+	}
+
+	// Verify the source is actually a template
+	if !source.Spec.Template {
+		return types.NewErrBadRequest("source project is not a template")
+	}
+
+	if thread.Annotations == nil {
+		thread.Annotations = map[string]string{}
+	}
+	// Trigger project refresh in controller to re-copy tools and MCP servers
+	thread.Annotations["obot.obot.ai/copy-source"] = "true"
+
+	if err := req.Update(&thread); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (h *ProjectsHandler) ListProjects(req api.Context) error {
 	var (
 		assistantID = req.PathValue("assistant_id")