feat(tools): remove feature flag for tools and use env variable instead (#1433)

.env

@@ -175,4 +175,5 @@ BODY_SIZE_LIMIT=15728640
 HF_ORG_ADMIN=
 HF_ORG_EARLY_ACCESS=
 
-PUBLIC_SMOOTH_UPDATES=false
+PUBLIC_SMOOTH_UPDATES=false
+COMMUNITY_TOOLS=false

chart/env/prod.yaml

@@ -30,6 +30,7 @@ envVars:
   ADDRESS_HEADER: 'X-Forwarded-For'
   ALTERNATIVE_REDIRECT_URLS: '["huggingchat://login/callback"]'
   APP_BASE: "/chat"
+  COMMUNITY_TOOLS: "true"
   ENABLE_ASSISTANTS: "true"
   ENABLE_ASSISTANTS_RAG: "true"
   EXPOSE_API: "true"

src/lib/components/NavMenu.svelte

@@ -136,8 +136,7 @@
 			Assistants
 		</a>
 	{/if}
-	<!-- XXX: feature_flag_tools -->
-	{#if $page.data.user?.isEarlyAccess}
+	{#if $page.data.enableCommunityTools}
 		<a
 			href="{base}/tools"
 			class="flex h-9 flex-none items-center gap-1.5 rounded-lg pl-2.5 pr-2 text-gray-500 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-700"

src/lib/components/ToolsMenu.svelte

@@ -84,8 +84,7 @@
 					{/if}
 				</button>
 			</div>
-			<!-- XXX: feature_flag_tools -->
-			{#if $page.data.user?.isEarlyAccess}
+			{#if $page.data.enableCommunityTools}
 				<a
 					href="{base}/tools"
 					class="col-span-2 my-1 h-fit w-fit items-center justify-center rounded-full bg-purple-500/20 px-2.5 py-1.5 text-sm hover:bg-purple-500/30"

src/routes/+layout.server.ts

@@ -240,6 +240,7 @@ export const load: LayoutServerLoad = async ({ locals, depends, request }) => {
 		assistant,
 		enableAssistants,
 		enableAssistantsRAG: env.ENABLE_ASSISTANTS_RAG === "true",
+		enableCommunityTools: env.COMMUNITY_TOOLS === "true",
 		loginRequired,
 		loginEnabled: requiresUser,
 		guestMode: requiresUser && messagesBeforeLogin > 0,

src/routes/api/spaces-config/+server.ts

@@ -1,9 +1,9 @@
+import { env } from "$env/dynamic/private";
 import { Client } from "@gradio/client";
 
-export async function GET({ url, locals }) {
-	// XXX: feature_flag_tools
-	if (!locals.user?.isEarlyAccess) {
-		return new Response("Not early access", { status: 403 });
+export async function GET({ url }) {
+	if (env.COMMUNITY_TOOLS !== "true") {
+		return new Response("Community tools are not enabled", { status: 403 });
 	}
 
 	const space = url.searchParams.get("space");

src/routes/api/tools/[toolId]/+server.ts

@@ -1,12 +1,12 @@
+import { env } from "$env/dynamic/private";
 import { collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
 import type { CommunityToolDB } from "$lib/types/Tool.js";
 import { ObjectId } from "mongodb";
 
-export async function GET({ params, locals }) {
-	// XXX: feature_flag_tools
-	if (!locals.user?.isEarlyAccess) {
-		return new Response("Not early access", { status: 403 });
+export async function GET({ params }) {
+	if (env.COMMUNITY_TOOLS !== "true") {
+		return new Response("Community tools are not enabled", { status: 403 });
 	}
 
 	const toolId = params.toolId;

src/routes/api/tools/search/+server.ts

@@ -1,13 +1,13 @@
+import { env } from "$env/dynamic/private";
 import { collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
 import type { BaseTool, CommunityToolDB } from "$lib/types/Tool.js";
 import { generateQueryTokens, generateSearchTokens } from "$lib/utils/searchTokens.js";
 import type { Filter } from "mongodb";
 
-export async function GET({ url, locals }) {
-	// XXX: feature_flag_tools
-	if (!locals.user?.isEarlyAccess) {
-		return new Response("Not early access", { status: 403 });
+export async function GET({ url }) {
+	if (env.COMMUNITY_TOOLS !== "true") {
+		return new Response("Community tools are not enabled", { status: 403 });
 	}
 
 	const query = url.searchParams.get("q")?.trim() ?? null;

src/routes/settings/(nav)/+server.ts

@@ -22,14 +22,6 @@ export async function POST({ request, locals }) {
 		})
 		.parse(body) satisfies SettingsEditable;
 
-	// only allow tools to be set to community tools if user is early access
-	// XXX: feature_flag_tools
-	if (!locals.user?.isEarlyAccess) {
-		settings.tools = settings.tools?.filter((toolId) => {
-			return toolFromConfigs.some((tool) => tool._id.toString() === toolId);
-		});
-	}
-
 	// make sure all tools exist
 	// either in db or in config
 	if (settings.tools) {

src/routes/settings/(nav)/assistants/[assistantId]/edit/+page.server.ts

@@ -171,8 +171,7 @@ export const actions: Actions = {
 						allowedDomains: parse.data.ragDomainList,
 						allowAllDomains: parse.data.ragAllowAll,
 					},
-					// XXX: feature_flag_tools
-					tools: locals.user?.isEarlyAccess ? parse.data.tools : undefined,
+					tools: parse.data.tools,
 					dynamicPrompt: parse.data.dynamicPrompt,
 					searchTokens: generateSearchTokens(parse.data.name),
 					generateSettings: {

src/routes/settings/(nav)/assistants/new/+page.server.ts

@@ -142,8 +142,7 @@ export const actions: Actions = {
 			createdById,
 			createdByName: locals.user?.username ?? locals.user?.name,
 			...parse.data,
-			// XXX: feature_flag_tools
-			tools: locals.user?.isEarlyAccess ? parse.data.tools : undefined,
+			tools: parse.data.tools,
 			exampleInputs,
 			avatar: hash,
 			createdAt: new Date(),

src/routes/tools/+layout.ts

@@ -1,13 +1,10 @@
-// check if user is earlyAccess else redirect to base
-
 import { base } from "$app/paths";
 import { redirect } from "@sveltejs/kit";
 
-// XXX: feature_flag_tools
 export async function load({ parent }) {
-	const { user } = await parent();
+	const { enableCommunityTools } = await parent();
 
-	if (user?.isEarlyAccess) {
+	if (enableCommunityTools) {
 		return {};
 	}
 

src/routes/tools/+page.server.ts

@@ -1,3 +1,4 @@
+import { env } from "$env/dynamic/private";
 import { authCondition } from "$lib/server/auth.js";
 import { Database, collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
@@ -11,9 +12,8 @@ import { ObjectId, type Filter } from "mongodb";
 const NUM_PER_PAGE = 16;
 
 export const load = async ({ url, locals }) => {
-	// XXX: feature_flag_tools
-	if (!locals.user?.isEarlyAccess) {
-		error(403, "You need to be an early access user to view tools");
+	if (env.COMMUNITY_TOOLS !== "true") {
+		error(403, "Community tools are not enabled");
 	}
 
 	const username = url.searchParams.get("user");

src/routes/tools/new/+page.server.ts

@@ -1,3 +1,4 @@
+import { env } from "$env/dynamic/private";
 import { authCondition, requiresUser } from "$lib/server/auth.js";
 import { collections } from "$lib/server/database.js";
 import { editableToolSchema } from "$lib/server/tools/index.js";
@@ -8,9 +9,8 @@ import { ObjectId } from "mongodb";
 
 export const actions = {
 	default: async ({ request, locals }) => {
-		// XXX: feature_flag_tools
-		if (!locals.user?.isEarlyAccess) {
-			error(403, "You need to be an early access user to create tools");
+		if (env.COMMUNITY_TOOLS !== "true") {
+			error(403, "Community tools are not enabled");
 		}
 
 		const body = await request.formData();
@@ -66,9 +66,7 @@ export const actions = {
 			updatedAt: new Date(),
 			last24HoursUseCount: 0,
 			useCount: 0,
-			// XXX: feature_flag_tools
-			// since this is scoped to internal team members only, we can assume that they should all be public
-			featured: true,
+			featured: locals.user?.isAdmin ?? false, // admin tools are featured by default
 			searchTokens: generateSearchTokens(parse.data.displayName),
 		});