Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): give public-api a feature front door (#16797)

Nikita Kabardin15ae046cd898
diff --git a/web/src/ee/features/admin-api/server/organizations/apiKeys/apiKeyById.ts b/web/src/ee/features/admin-api/server/organizations/apiKeys/apiKeyById.ts
index 9e222a1eed..b0aa46bd53 100644
--- a/web/src/ee/features/admin-api/server/organizations/apiKeys/apiKeyById.ts
+++ b/web/src/ee/features/admin-api/server/organizations/apiKeys/apiKeyById.ts
@@ -3,7 +3,7 @@ import { prisma } from "@langfuse/shared/src/db";
import { logger, redis } from "@langfuse/shared/src/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { z } from "zod";
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
export const validateQueryParams = (
query: unknown,
diff --git a/web/src/ee/features/admin-api/server/projects/projectById/apiKeys/apiKeyById.ts b/web/src/ee/features/admin-api/server/projects/projectById/apiKeys/apiKeyById.ts
index 1c83142d19..ff259eba1d 100644
--- a/web/src/ee/features/admin-api/server/projects/projectById/apiKeys/apiKeyById.ts
+++ b/web/src/ee/features/admin-api/server/projects/projectById/apiKeys/apiKeyById.ts
@@ -1,7 +1,7 @@
import { type NextApiRequest, type NextApiResponse } from "next";
import { prisma } from "@langfuse/shared/src/db";
import { logger, redis } from "@langfuse/shared/src/server";
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { z } from "zod";
diff --git a/web/src/ee/features/admin-api/server/projects/projectById/index.ts b/web/src/ee/features/admin-api/server/projects/projectById/index.ts
index dc7bde095d..cb4ce97fc9 100644
--- a/web/src/ee/features/admin-api/server/projects/projectById/index.ts
+++ b/web/src/ee/features/admin-api/server/projects/projectById/index.ts
@@ -11,7 +11,7 @@ import { randomUUID } from "crypto";
import { projectRetentionSchema } from "@/src/features/auth/lib/projectRetentionSchema";
import { hasEntitlementBasedOnPlan } from "@/src/features/entitlements/server/hasEntitlement";
import { projectNameSchema } from "@/src/features/auth/lib/projectNameSchema";
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { emitChbProjectEvent } from "@/src/ee/features/billing/server/chb/chbProjectEvents";
diff --git a/web/src/features/annotation-queues/server/publicAnnotationQueueService.ts b/web/src/features/annotation-queues/server/publicAnnotationQueueService.ts
index d9d6a11144..21dda7709e 100644
--- a/web/src/features/annotation-queues/server/publicAnnotationQueueService.ts
+++ b/web/src/features/annotation-queues/server/publicAnnotationQueueService.ts
@@ -1,18 +1,18 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import type {
- AnnotationQueue,
- AnnotationQueueItem,
- CreateAnnotationQueueAssignmentBody,
- CreateAnnotationQueueBody,
- CreateAnnotationQueueItemBody,
- DeleteAnnotationQueueAssignmentBody,
- DeleteAnnotationQueueItemQuery,
- GetAnnotationQueueByIdQuery,
- GetAnnotationQueueItemByIdQuery,
- GetAnnotationQueueItemsQuery,
- GetAnnotationQueuesQuery,
- UpdateAnnotationQueueItemBody,
-} from "@/src/features/public-api/types/annotation-queues";
+import {
+ type AnnotationQueue,
+ type AnnotationQueueItem,
+ type CreateAnnotationQueueAssignmentBody,
+ type CreateAnnotationQueueBody,
+ type CreateAnnotationQueueItemBody,
+ type DeleteAnnotationQueueAssignmentBody,
+ type DeleteAnnotationQueueItemQuery,
+ type GetAnnotationQueueByIdQuery,
+ type GetAnnotationQueueItemByIdQuery,
+ type GetAnnotationQueueItemsQuery,
+ type GetAnnotationQueuesQuery,
+ type UpdateAnnotationQueueItemBody,
+} from "@/src/features/public-api/server";
import {
AnnotationQueueStatus,
InvalidRequestError,
diff --git a/web/src/features/comments/server/publicCommentService.ts b/web/src/features/comments/server/publicCommentService.ts
index 0d6b39ddfa..349dfbffae 100644
--- a/web/src/features/comments/server/publicCommentService.ts
+++ b/web/src/features/comments/server/publicCommentService.ts
@@ -3,11 +3,11 @@ import type { z } from "zod";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { validateCommentReferenceObject } from "@/src/features/comments/validateCommentReferenceObject";
-import type {
- GetCommentV1Query,
- GetCommentsV1Query,
- PostCommentsV1Body,
-} from "@/src/features/public-api/types/comments";
+import {
+ type GetCommentV1Query,
+ type GetCommentsV1Query,
+ type PostCommentsV1Body,
+} from "@/src/features/public-api/server";
import { InvalidRequestError, LangfuseNotFoundError } from "@langfuse/shared";
import { prisma } from "@langfuse/shared/src/db";
diff --git a/web/src/features/dashboard/server/public-dashboard-service.ts b/web/src/features/dashboard/server/public-dashboard-service.ts
index b8e18518f8..f5c9afbf16 100644
--- a/web/src/features/dashboard/server/public-dashboard-service.ts
+++ b/web/src/features/dashboard/server/public-dashboard-service.ts
@@ -16,7 +16,7 @@ import {
type PatchUnstableDashboardBody,
type PostDashboardPlacementBody,
type PostUnstableDashboardBody,
-} from "@/src/features/public-api/types/unstable-dashboards";
+} from "@/src/features/public-api/server";
import type { z } from "zod";
import { randomUUID } from "crypto";
diff --git a/web/src/features/datasets/server/publicDatasetService.ts b/web/src/features/datasets/server/publicDatasetService.ts
index d947737707..1b5fe9faa4 100644
--- a/web/src/features/datasets/server/publicDatasetService.ts
+++ b/web/src/features/datasets/server/publicDatasetService.ts
@@ -3,12 +3,10 @@ import { createHash } from "node:crypto";
import { v4 } from "uuid";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { addDatasetRunItemsToEvalQueue } from "@/src/features/evals/server/addDatasetRunItemsToEvalQueue";
-import { createOrFetchDatasetRun } from "@/src/features/public-api/server/dataset-runs";
import {
+ createOrFetchDatasetRun,
generateDatasetRunItemsForPublicApi,
getDatasetRunItemsCountForPublicApi,
-} from "@/src/features/public-api/server/dataset-run-items";
-import {
type APIDatasetRunItem,
type GetDatasetsV1Query,
type GetDatasetV1Query,
@@ -25,7 +23,7 @@ import {
transformDbDatasetItemDomainToAPIDatasetItem,
transformDbDatasetRunToAPIDatasetRun,
transformDbDatasetToAPIDataset,
-} from "@/src/features/public-api/types/datasets";
+} from "@/src/features/public-api/server";
import {
ApiError,
type JSONValue,
diff --git a/web/src/features/evals/server/unstable-public-api/adapters.ts b/web/src/features/evals/server/unstable-public-api/adapters.ts
index ec94919150..42f6f516c0 100644
--- a/web/src/features/evals/server/unstable-public-api/adapters.ts
+++ b/web/src/features/evals/server/unstable-public-api/adapters.ts
@@ -43,7 +43,7 @@ import {
type PublicEvaluatorModelConfigType,
type PublicEvaluatorOutputDefinitionType,
type PublicEvaluatorTypeType,
-} from "@/src/features/public-api/types/unstable-public-evals-contract";
+} from "@/src/features/public-api/server";
import type {
ApiEvaluatorRecord,
ApiEvaluationRuleRecord,
diff --git a/web/src/features/evals/server/unstable-public-api/evaluation-rule-service.ts b/web/src/features/evals/server/unstable-public-api/evaluation-rule-service.ts
index f058973f3d..be14fcdbd0 100644
--- a/web/src/features/evals/server/unstable-public-api/evaluation-rule-service.ts
+++ b/web/src/features/evals/server/unstable-public-api/evaluation-rule-service.ts
@@ -19,17 +19,16 @@ import {
isCodeEvalEnabled,
isCodeEvalSourceCodeLanguageSupported,
} from "@/src/features/evals/server/isCodeEvalEnabled";
-import type {
- PatchUnstableEvaluationRuleBodyType,
- PostUnstableEvaluationRuleBodyType,
-} from "@/src/features/public-api/types/unstable-evaluation-rules";
+import { createStructuredPublicApiError } from "@/src/features/public-api";
import {
PublicEvaluationRuleFilter,
+ type PatchUnstableEvaluationRuleBodyType,
+ type PostUnstableEvaluationRuleBodyType,
type PromptVariableMappingInputType,
type PromptVariableMappingReadType,
type PublicEvaluationRuleTargetType,
PUBLIC_EVALUATOR_TYPE_LLM_AS_JUDGE,
-} from "@/src/features/public-api/types/unstable-public-evals-contract";
+} from "@/src/features/public-api/server";
import {
deriveEvaluatorVariables,
toApiMappings,
@@ -60,7 +59,6 @@ import {
assertEvaluationRuleFilterValuesExistForProject,
assertEvaluatorDefinitionCanRunForPublicApi,
} from "./validation";
-import { createStructuredPublicApiError } from "@/src/features/public-api";
import { assertUnreachable } from "@/src/utils/types";
const ruleService = new RuleService(prisma, async () => undefined);
diff --git a/web/src/features/evals/server/unstable-public-api/evaluator-service.ts b/web/src/features/evals/server/unstable-public-api/evaluator-service.ts
index ec45383ba1..53b79e411a 100644
--- a/web/src/features/evals/server/unstable-public-api/evaluator-service.ts
+++ b/web/src/features/evals/server/unstable-public-api/evaluator-service.ts
@@ -25,8 +25,10 @@ import {
} from "@/src/features/evals/v2/server/evaluators/evaluatorErrors";
import { RuleService } from "@/src/features/evals/v2/server/rules/ruleService";
import { createStructuredPublicApiError } from "@/src/features/public-api";
-import type { PostUnstableEvaluatorBodyParsedType } from "@/src/features/public-api/types/unstable-evaluators";
-import { PUBLIC_EVALUATOR_TYPE_CODE } from "@/src/features/public-api/types/unstable-public-evals-contract";
+import {
+ type PostUnstableEvaluatorBodyParsedType,
+ PUBLIC_EVALUATOR_TYPE_CODE,
+} from "@/src/features/public-api/server";
import {
toApiEvaluator,
toStoredOutputDefinition,
diff --git a/web/src/features/evals/server/unstable-public-api/types.ts b/web/src/features/evals/server/unstable-public-api/types.ts
index 38aa46fb2a..067c6d34e2 100644
--- a/web/src/features/evals/server/unstable-public-api/types.ts
+++ b/web/src/features/evals/server/unstable-public-api/types.ts
@@ -21,7 +21,7 @@ import type {
PublicCodeEvaluatorSourceCodeLanguageType,
PUBLIC_EVALUATOR_TYPE_CODE,
PUBLIC_EVALUATOR_TYPE_LLM_AS_JUDGE,
-} from "@/src/features/public-api/types/unstable-public-evals-contract";
+} from "@/src/features/public-api/server";
import type {
CODE_EVAL_TEMPLATE_VARIABLES,
FilterCondition,
diff --git a/web/src/features/evals/server/unstable-public-api/validation.ts b/web/src/features/evals/server/unstable-public-api/validation.ts
index 8cb2056dae..3d10ab35cc 100644
--- a/web/src/features/evals/server/unstable-public-api/validation.ts
+++ b/web/src/features/evals/server/unstable-public-api/validation.ts
@@ -4,6 +4,7 @@ import {
} from "@langfuse/shared";
import { prisma } from "@langfuse/shared/src/db";
import { JSONPath } from "jsonpath-plus";
+import { createStructuredPublicApiError } from "@/src/features/public-api";
import {
EXPERIMENT_EVALUATION_RULE_FILTER_COLUMNS,
ExperimentPromptVariableMappingSource,
@@ -12,9 +13,8 @@ import {
type PublicEvaluationRuleFilterType,
type PromptVariableMappingInputType,
type PublicEvaluationRuleTargetType,
-} from "@/src/features/public-api/types/unstable-public-evals-contract";
+} from "@/src/features/public-api/server";
import { getEvaluatorDefinitionPreflightError } from "@/src/features/evals/server/evaluator-preflight";
-import { createStructuredPublicApiError } from "@/src/features/public-api";
// Derived from the same column lists as the request schemas, so this runtime
// check cannot drift from the documented contract.
diff --git a/web/src/features/experiments/server/public/service.ts b/web/src/features/experiments/server/public/service.ts
index ae8fc03b35..6837392b57 100644
--- a/web/src/features/experiments/server/public/service.ts
+++ b/web/src/features/experiments/server/public/service.ts
@@ -12,7 +12,7 @@ import {
encodeExperimentCursor,
type GetExperimentItemsV1QueryType,
type GetExperimentsV1QueryType,
-} from "@/src/features/public-api/types/experiments";
+} from "@/src/features/public-api/server";
import {
queryExperimentItemsForPublicApi,
queryExperimentSummariesForPublicApi,
diff --git a/web/src/features/feedback/server/FeedbackService.ts b/web/src/features/feedback/server/FeedbackService.ts
index 863144af32..53843627a7 100644
--- a/web/src/features/feedback/server/FeedbackService.ts
+++ b/web/src/features/feedback/server/FeedbackService.ts
@@ -11,11 +11,11 @@ import {
recordIncrement,
} from "@langfuse/shared/src/server";
import { env } from "@/src/env.mjs";
-import { RateLimitService } from "@/src/features/public-api/server/RateLimitService";
-import type {
- PostFeedbackBodyType,
- PostFeedbackResponseType,
-} from "@/src/features/public-api/types/feedback";
+import {
+ RateLimitService,
+ type PostFeedbackBodyType,
+ type PostFeedbackResponseType,
+} from "@/src/features/public-api/server";
export type FeedbackSource = "langfuse-mcp" | "public-api";
diff --git a/web/src/features/in-app-agent/server/rateLimit.ts b/web/src/features/in-app-agent/server/rateLimit.ts
index f422755c99..72946bd407 100644
--- a/web/src/features/in-app-agent/server/rateLimit.ts
+++ b/web/src/features/in-app-agent/server/rateLimit.ts
@@ -9,7 +9,7 @@ import {
import type { ApiAccessScope } from "@langfuse/shared/src/server";
import { getOrganizationPlanServerSide } from "@/src/features/entitlements/server/getPlan";
-import { RateLimitService } from "@/src/features/public-api/server/RateLimitService";
+import { RateLimitService } from "@/src/features/public-api/server";
type SessionUser = NonNullable<Session["user"]>;
diff --git a/web/src/features/mcp/server/annotationQueues/schema.ts b/web/src/features/mcp/server/annotationQueues/schema.ts
index 2faa04a3b9..0f52268ad3 100644
--- a/web/src/features/mcp/server/annotationQueues/schema.ts
+++ b/web/src/features/mcp/server/annotationQueues/schema.ts
@@ -6,7 +6,7 @@ import {
DeleteAnnotationQueueAssignmentBody,
GetAnnotationQueueItemByIdQuery,
UpdateAnnotationQueueItemBody,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
export const CreateAnnotationQueueItemToolSchema = z
.object({
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
index 50dc45e942..9129a08c5e 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
@@ -2,7 +2,7 @@ import { createAnnotationQueueForApi } from "@/src/features/annotation-queues/se
import {
CreateAnnotationQueueBody,
CreateAnnotationQueueResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
index 9b55ca5aac..c8b1bd83ed 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
@@ -1,5 +1,5 @@
import { createAnnotationQueueAssignmentForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-import { CreateAnnotationQueueAssignmentResponse } from "@/src/features/public-api/types/annotation-queues";
+import { CreateAnnotationQueueAssignmentResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { CreateAnnotationQueueAssignmentToolSchema } from "../schema";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
index add58fe539..b27ad7c93b 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
@@ -1,5 +1,5 @@
import { createAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-import { CreateAnnotationQueueItemResponse } from "@/src/features/public-api/types/annotation-queues";
+import { CreateAnnotationQueueItemResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
index aa4dd4fdfd..aa3db329ef 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
@@ -1,5 +1,5 @@
import { deleteAnnotationQueueAssignment } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-import { DeleteAnnotationQueueAssignmentResponse } from "@/src/features/public-api/types/annotation-queues";
+import { DeleteAnnotationQueueAssignmentResponse } from "@/src/features/public-api/server";
import { LangfuseNotFoundError, Prisma } from "@langfuse/shared";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
index 363f45565b..a4d3dcaf94 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
@@ -2,7 +2,7 @@ import { deleteAnnotationQueueItemForApi } from "@/src/features/annotation-queue
import {
DeleteAnnotationQueueItemQuery,
DeleteAnnotationQueueItemResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
index 2fbd47b482..155eb7aef1 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
@@ -1,7 +1,7 @@
import {
GetAnnotationQueueByIdQuery,
GetAnnotationQueueByIdResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { getAnnotationQueueForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
index 64353f82c8..5e7b290dab 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
@@ -1,7 +1,7 @@
import {
GetAnnotationQueueItemByIdQuery,
GetAnnotationQueueItemByIdResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { getAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
index d57baffac7..9792c3534f 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
@@ -1,7 +1,7 @@
import {
GetAnnotationQueueItemsQuery,
GetAnnotationQueueItemsResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { listAnnotationQueueItemsForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
index dfc51c577c..a00f306fba 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
@@ -1,7 +1,7 @@
import {
GetAnnotationQueuesQuery,
GetAnnotationQueuesResponse,
-} from "@/src/features/public-api/types/annotation-queues";
+} from "@/src/features/public-api/server";
import { listAnnotationQueuesForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
index 996eb89d78..271e642c29 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
@@ -1,5 +1,5 @@
import { updateAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-import { UpdateAnnotationQueueItemResponse } from "@/src/features/public-api/types/annotation-queues";
+import { UpdateAnnotationQueueItemResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/comments/tools/createComment.ts b/web/src/features/mcp/server/comments/tools/createComment.ts
index 45eee2148b..10616f3ab5 100644
--- a/web/src/features/mcp/server/comments/tools/createComment.ts
+++ b/web/src/features/mcp/server/comments/tools/createComment.ts
@@ -4,7 +4,7 @@ import { createCommentForApi } from "@/src/features/comments/server/publicCommen
import {
PostCommentsV1Body,
PostCommentsV1Response,
-} from "@/src/features/public-api/types/comments";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildCommentObjectUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/comments/tools/getComment.ts b/web/src/features/mcp/server/comments/tools/getComment.ts
index 1ea416fb87..fe81f082f2 100644
--- a/web/src/features/mcp/server/comments/tools/getComment.ts
+++ b/web/src/features/mcp/server/comments/tools/getComment.ts
@@ -2,7 +2,7 @@ import { getCommentForApi } from "@/src/features/comments/server/publicCommentSe
import {
GetCommentV1Query,
GetCommentV1Response,
-} from "@/src/features/public-api/types/comments";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildCommentObjectUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/comments/tools/listComments.ts b/web/src/features/mcp/server/comments/tools/listComments.ts
index 988153f71a..7947f62fb4 100644
--- a/web/src/features/mcp/server/comments/tools/listComments.ts
+++ b/web/src/features/mcp/server/comments/tools/listComments.ts
@@ -4,7 +4,7 @@ import { listCommentsForApi } from "@/src/features/comments/server/publicComment
import {
GetCommentsV1Query,
GetCommentsV1Response,
-} from "@/src/features/public-api/types/comments";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildCommentObjectUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts b/web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts
index ab0e359b04..084bebef68 100644
--- a/web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts
+++ b/web/src/features/mcp/server/dashboardWidgets/tools/createDashboardWidget.ts
@@ -8,11 +8,11 @@ import { defineTool } from "@/src/features/mcp/core/define-tool";
import { runMcpTool } from "@/src/features/mcp/core/run-mcp-tool";
import { createPublicDashboardWidget } from "@/src/features/widgets/server/public-dashboard-widget-service";
import { getWidgetImportFilterConfig } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { StructuredPublicApiError } from "@/src/features/public-api";
import {
PostUnstableDashboardWidgetBody,
PostUnstableDashboardWidgetView,
-} from "@/src/features/public-api/types/unstable-dashboard-widgets";
-import { StructuredPublicApiError } from "@/src/features/public-api";
+} from "@/src/features/public-api/server";
import { buildDashboardWidgetUrl } from "@langfuse/shared/src/server";
export const DashboardWidgetFilterBaseSchema = z
diff --git a/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
index 2964065c36..2b8e775d70 100644
--- a/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
+++ b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
@@ -15,19 +15,17 @@ import {
GetUnstableDashboardWidgetsQuery,
DashboardWidgetIdQuery,
PatchUnstableDashboardWidgetBody,
-} from "@/src/features/public-api/types/unstable-dashboard-widgets";
+ DashboardIdQuery,
+ GetUnstableDashboardsQuery,
+ PatchUnstableDashboardBody,
+ PostUnstableDashboardBody,
+} from "@/src/features/public-api/server";
import {
deletePublicDashboardWidget,
getPublicDashboardWidget,
listPublicDashboardWidgets,
updatePublicDashboardWidget,
} from "@/src/features/widgets/server/public-dashboard-widget-service";
-import {
- DashboardIdQuery,
- GetUnstableDashboardsQuery,
- PatchUnstableDashboardBody,
- PostUnstableDashboardBody,
-} from "@/src/features/public-api/types/unstable-dashboards";
import {
addPublicDashboardPlacement,
createPublicDashboard,
diff --git a/web/src/features/mcp/server/datasets/schema.ts b/web/src/features/mcp/server/datasets/schema.ts
index 44e9d09546..d6a05c28a7 100644
--- a/web/src/features/mcp/server/datasets/schema.ts
+++ b/web/src/features/mcp/server/datasets/schema.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { publicApiIdSchema } from "@/src/features/public-api/types/datasets";
+import { publicApiIdSchema } from "@/src/features/public-api/server";
const paginationSchema = {
page: z.number().int().positive().default(1),
diff --git a/web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts b/web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts
index ab70db3d76..bc9b348862 100644
--- a/web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts
+++ b/web/src/features/mcp/server/datasets/tools/createDatasetRunItem.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { PostDatasetRunItemsV1Body } from "@/src/features/public-api/types/datasets";
+import { PostDatasetRunItemsV1Body } from "@/src/features/public-api/server";
import { createDatasetRunItemForApi } from "@/src/features/datasets/server/publicDatasetService";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts
index ed19b8d8e7..80cef59ef8 100644
--- a/web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts
+++ b/web/src/features/mcp/server/datasets/tools/deleteDatasetItem.ts
@@ -2,7 +2,7 @@ import { deleteDatasetItemForApi } from "@/src/features/datasets/server/publicDa
import {
DeleteDatasetItemV1Query,
DeleteDatasetItemV1Response,
-} from "@/src/features/public-api/types/datasets";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts b/web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts
index 1971966630..82bbba3497 100644
--- a/web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts
+++ b/web/src/features/mcp/server/datasets/tools/deleteDatasetRun.ts
@@ -1,5 +1,5 @@
import { deleteDatasetRunByIdForApi } from "@/src/features/datasets/server/publicDatasetService";
-import { DeleteDatasetRunV1Response } from "@/src/features/public-api/types/datasets";
+import { DeleteDatasetRunV1Response } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { rejectDatasetRunToolsInEventsOnlyMode } from "../events-only-guard";
diff --git a/web/src/features/mcp/server/datasets/tools/getDataset.ts b/web/src/features/mcp/server/datasets/tools/getDataset.ts
index 16070ce51a..8363159376 100644
--- a/web/src/features/mcp/server/datasets/tools/getDataset.ts
+++ b/web/src/features/mcp/server/datasets/tools/getDataset.ts
@@ -1,4 +1,4 @@
-import { GetDatasetV2Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetV2Response } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/datasets/tools/getDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/getDatasetItem.ts
index 7ed6a8625d..d263f47f59 100644
--- a/web/src/features/mcp/server/datasets/tools/getDatasetItem.ts
+++ b/web/src/features/mcp/server/datasets/tools/getDatasetItem.ts
@@ -1,7 +1,7 @@
import {
GetDatasetItemV1Query,
GetDatasetItemV1Response,
-} from "@/src/features/public-api/types/datasets";
+} from "@/src/features/public-api/server";
import { getDatasetItemForApi } from "@/src/features/datasets/server/publicDatasetService";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/datasets/tools/getDatasetRun.ts b/web/src/features/mcp/server/datasets/tools/getDatasetRun.ts
index 4e65e2019b..d7925f1584 100644
--- a/web/src/features/mcp/server/datasets/tools/getDatasetRun.ts
+++ b/web/src/features/mcp/server/datasets/tools/getDatasetRun.ts
@@ -1,4 +1,4 @@
-import { GetDatasetRunV1Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetRunV1Response } from "@/src/features/public-api/server";
import { getDatasetRunByIdForApi } from "@/src/features/datasets/server/publicDatasetService";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetRunUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/datasets/tools/listDatasetItems.ts b/web/src/features/mcp/server/datasets/tools/listDatasetItems.ts
index 4b1532aba5..7f3ffae002 100644
--- a/web/src/features/mcp/server/datasets/tools/listDatasetItems.ts
+++ b/web/src/features/mcp/server/datasets/tools/listDatasetItems.ts
@@ -1,4 +1,4 @@
-import { GetDatasetItemsV1Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetItemsV1Response } from "@/src/features/public-api/server";
import { listDatasetItemsForApi } from "@/src/features/datasets/server/publicDatasetService";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts b/web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts
index 394ceb1206..b87a4d8b20 100644
--- a/web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts
+++ b/web/src/features/mcp/server/datasets/tools/listDatasetRunItems.ts
@@ -1,5 +1,5 @@
import { listDatasetRunItemsByRunIdForApi } from "@/src/features/datasets/server/publicDatasetService";
-import { GetDatasetRunItemsV1Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetRunItemsV1Response } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetRunUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts b/web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts
index 5e6f3a171f..f52fa4cf8d 100644
--- a/web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts
+++ b/web/src/features/mcp/server/datasets/tools/listDatasetRuns.ts
@@ -1,4 +1,4 @@
-import { GetDatasetRunsV1Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetRunsV1Response } from "@/src/features/public-api/server";
import { listDatasetRunsByDatasetIdForApi } from "@/src/features/datasets/server/publicDatasetService";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetRunUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/datasets/tools/listDatasets.ts b/web/src/features/mcp/server/datasets/tools/listDatasets.ts
index ef02b2272a..693f91dade 100644
--- a/web/src/features/mcp/server/datasets/tools/listDatasets.ts
+++ b/web/src/features/mcp/server/datasets/tools/listDatasets.ts
@@ -1,4 +1,4 @@
-import { GetDatasetsV2Response } from "@/src/features/public-api/types/datasets";
+import { GetDatasetsV2Response } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/datasets/tools/upsertDataset.ts b/web/src/features/mcp/server/datasets/tools/upsertDataset.ts
index d705b96cba..548b914816 100644
--- a/web/src/features/mcp/server/datasets/tools/upsertDataset.ts
+++ b/web/src/features/mcp/server/datasets/tools/upsertDataset.ts
@@ -3,7 +3,7 @@ import { createDatasetForApi } from "@/src/features/datasets/server/publicDatase
import {
PostDatasetsV2Body,
PostDatasetsV2Response,
-} from "@/src/features/public-api/types/datasets";
+} from "@/src/features/public-api/server";
import {
DatasetJSONSchema,
buildDatasetUrl,
diff --git a/web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts b/web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts
index 3d44eef040..147d7705d0 100644
--- a/web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts
+++ b/web/src/features/mcp/server/datasets/tools/upsertDatasetItem.ts
@@ -1,5 +1,5 @@
import { createDatasetItemForApi } from "@/src/features/datasets/server/publicDatasetService";
-import { PostDatasetItemsV1Response } from "@/src/features/public-api/types/datasets";
+import { PostDatasetItemsV1Response } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildDatasetItemUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/evals/rule-schema.ts b/web/src/features/mcp/server/evals/rule-schema.ts
index 4d13fc117b..4b4ef80005 100644
--- a/web/src/features/mcp/server/evals/rule-schema.ts
+++ b/web/src/features/mcp/server/evals/rule-schema.ts
@@ -12,7 +12,7 @@ import {
ObservationPromptVariableMappingInput,
PromptVariableMappingRead,
PublicEvaluatorType,
-} from "@/src/features/public-api/types/unstable-public-evals-contract";
+} from "@/src/features/public-api/server";
import { McpAdvancedFilterBaseSchema } from "../../core/filter-schema";
const RuleFilterBaseSchema = McpAdvancedFilterBaseSchema.describe(
diff --git a/web/src/features/mcp/server/experiments/schema.ts b/web/src/features/mcp/server/experiments/schema.ts
index 25d39c1fd9..274a5aacc6 100644
--- a/web/src/features/mcp/server/experiments/schema.ts
+++ b/web/src/features/mcp/server/experiments/schema.ts
@@ -5,7 +5,7 @@ import {
GetExperimentItemsV1ParsedQueryBase,
GetExperimentItemsV1ParsedQuery,
GetExperimentsV1ParsedQuery,
-} from "@/src/features/public-api/types/experiments";
+} from "@/src/features/public-api/server";
import { z } from "zod";
import { McpAdvancedFilterBaseSchema } from "../../core/filter-schema";
diff --git a/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts b/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
index 40fe9279de..c46d4c96f2 100644
--- a/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
+++ b/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
@@ -1,5 +1,5 @@
import { listExperimentItemsForPublicApi } from "@/src/features/experiments/server/public/service";
-import { GetExperimentItemsV1Response } from "@/src/features/public-api/types/experiments";
+import { GetExperimentItemsV1Response } from "@/src/features/public-api/server";
import { buildObservationUrl } from "@langfuse/shared/src/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/experiments/tools/listExperiments.ts b/web/src/features/mcp/server/experiments/tools/listExperiments.ts
index 3787731939..378c4473b7 100644
--- a/web/src/features/mcp/server/experiments/tools/listExperiments.ts
+++ b/web/src/features/mcp/server/experiments/tools/listExperiments.ts
@@ -1,5 +1,5 @@
import { listExperimentsForPublicApi } from "@/src/features/experiments/server/public/service";
-import { GetExperimentsV1Response } from "@/src/features/public-api/types/experiments";
+import { GetExperimentsV1Response } from "@/src/features/public-api/server";
import { buildExperimentUrl } from "@langfuse/shared/src/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/feedback/tools/submitFeedback.ts b/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
index 30f1291238..97e59e73b7 100644
--- a/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
+++ b/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
@@ -1,5 +1,5 @@
import { submitFeedback } from "@/src/features/feedback/server/FeedbackService";
-import { PostFeedbackBody } from "@/src/features/public-api/types/feedback";
+import { PostFeedbackBody } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/health/tools/getHealth.ts b/web/src/features/mcp/server/health/tools/getHealth.ts
index 384abe1985..0114b5bc35 100644
--- a/web/src/features/mcp/server/health/tools/getHealth.ts
+++ b/web/src/features/mcp/server/health/tools/getHealth.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { runHealthCheck } from "@/src/features/public-api/server/health-service";
+import { runHealthCheck } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts b/web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts
index f4b7da271e..5dec2259db 100644
--- a/web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts
+++ b/web/src/features/mcp/server/metrics/tools/getMetricsSchema.ts
@@ -4,7 +4,7 @@ import {
viewDeclarations,
} from "@langfuse/shared/query";
import { filterOperators } from "@langfuse/shared";
-import { publicGranularities } from "@/src/features/public-api/types/metrics";
+import { publicGranularities } from "@/src/features/public-api/server";
import { z } from "zod";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/metrics/tools/queryMetrics.ts b/web/src/features/mcp/server/metrics/tools/queryMetrics.ts
index 98b8cfe2d0..50b57cd9d3 100644
--- a/web/src/features/mcp/server/metrics/tools/queryMetrics.ts
+++ b/web/src/features/mcp/server/metrics/tools/queryMetrics.ts
@@ -10,7 +10,7 @@ import {
import {
MetricsQueryObjectV2,
publicGranularities,
-} from "@/src/features/public-api/types/metrics";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { McpAdvancedFilterBaseSchema } from "../../../core/filter-schema";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/models/tools/createModel.ts b/web/src/features/mcp/server/models/tools/createModel.ts
index 2a72ce22bf..81be15f112 100644
--- a/web/src/features/mcp/server/models/tools/createModel.ts
+++ b/web/src/features/mcp/server/models/tools/createModel.ts
@@ -1,7 +1,7 @@
import {
PostModelsV1Body,
PostModelsV1Response,
-} from "@/src/features/public-api/types/models";
+} from "@/src/features/public-api/server";
import { createModelForApi } from "@/src/features/models/server/publicApiModelService";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/models/tools/deleteModel.ts b/web/src/features/mcp/server/models/tools/deleteModel.ts
index 6cab58c219..528c694574 100644
--- a/web/src/features/mcp/server/models/tools/deleteModel.ts
+++ b/web/src/features/mcp/server/models/tools/deleteModel.ts
@@ -1,7 +1,7 @@
import {
DeleteModelV1Query,
DeleteModelV1Response,
-} from "@/src/features/public-api/types/models";
+} from "@/src/features/public-api/server";
import { deleteModelForApi } from "@/src/features/models/server/publicApiModelService";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/models/tools/getModel.ts b/web/src/features/mcp/server/models/tools/getModel.ts
index 8a5bb4893d..9d1628fb7c 100644
--- a/web/src/features/mcp/server/models/tools/getModel.ts
+++ b/web/src/features/mcp/server/models/tools/getModel.ts
@@ -1,7 +1,7 @@
import {
GetModelV1Query,
GetModelV1Response,
-} from "@/src/features/public-api/types/models";
+} from "@/src/features/public-api/server";
import { getModelForApi } from "@/src/features/models/server/publicApiModelService";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/models/tools/listModels.ts b/web/src/features/mcp/server/models/tools/listModels.ts
index 1cea8c147a..00a30ab9f6 100644
--- a/web/src/features/mcp/server/models/tools/listModels.ts
+++ b/web/src/features/mcp/server/models/tools/listModels.ts
@@ -1,7 +1,7 @@
import {
GetModelsV1Query,
GetModelsV1Response,
-} from "@/src/features/public-api/types/models";
+} from "@/src/features/public-api/server";
import { listModelsForApi } from "@/src/features/models/server/publicApiModelService";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/observations/tools/listObservations.ts b/web/src/features/mcp/server/observations/tools/listObservations.ts
index 62a35a57f5..e12ae117bd 100644
--- a/web/src/features/mcp/server/observations/tools/listObservations.ts
+++ b/web/src/features/mcp/server/observations/tools/listObservations.ts
@@ -26,7 +26,7 @@ import {
EncodedObservationsCursorV2,
EncodedObservationsCursorV2String,
encodeCursor,
-} from "@/src/features/public-api/types/observations";
+} from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { clampToDataAccessDays } from "@/src/features/entitlements/server/hasEntitlementLimit";
diff --git a/web/src/features/mcp/server/scores/tools/createScore.ts b/web/src/features/mcp/server/scores/tools/createScore.ts
index 26f414e7bb..00747a178f 100644
--- a/web/src/features/mcp/server/scores/tools/createScore.ts
+++ b/web/src/features/mcp/server/scores/tools/createScore.ts
@@ -6,7 +6,7 @@ import {
PostScoresResponseV1,
UnauthorizedError,
} from "@langfuse/shared";
-import { ScoresApiService } from "@/src/features/public-api/server/scores-api-service";
+import { ScoresApiService } from "@/src/features/public-api/server";
import {
createUnknownSdkIngestionAttribution,
buildScoreTargetUrl,
diff --git a/web/src/features/mcp/server/scores/tools/createScoreConfig.ts b/web/src/features/mcp/server/scores/tools/createScoreConfig.ts
index 5226e42427..7d6f726820 100644
--- a/web/src/features/mcp/server/scores/tools/createScoreConfig.ts
+++ b/web/src/features/mcp/server/scores/tools/createScoreConfig.ts
@@ -1,7 +1,9 @@
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { createScoreConfig } from "@/src/features/public-api/server/score-configs-api-service";
-import { PostScoreConfigBody } from "@/src/features/public-api/types/score-configs";
+import {
+ createScoreConfig,
+ PostScoreConfigBody,
+} from "@/src/features/public-api/server";
import { z } from "zod";
import {
McpScoreConfigCategoricalCategoriesSchema,
diff --git a/web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts b/web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts
index 8902787cb3..87b938abc7 100644
--- a/web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts
+++ b/web/src/features/mcp/server/scores/tools/deleteScoreConfig.ts
@@ -1,7 +1,9 @@
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { updateScoreConfig } from "@/src/features/public-api/server/score-configs-api-service";
-import { PutScoreConfigQuery } from "@/src/features/public-api/types/score-configs";
+import {
+ updateScoreConfig,
+ PutScoreConfigQuery,
+} from "@/src/features/public-api/server";
export const [deleteScoreConfigTool, handleDeleteScoreConfig] = defineTool({
name: "deleteScoreConfig",
diff --git a/web/src/features/mcp/server/scores/tools/getScore.ts b/web/src/features/mcp/server/scores/tools/getScore.ts
index c79f0191f9..a492fbab96 100644
--- a/web/src/features/mcp/server/scores/tools/getScore.ts
+++ b/web/src/features/mcp/server/scores/tools/getScore.ts
@@ -2,7 +2,7 @@ import { LangfuseNotFoundError, SCORE_FIELD_GROUPS_V3 } from "@langfuse/shared";
import { z } from "zod";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { listScoresV3ForPublicApi } from "@/src/features/public-api/server/scores-api-v3";
+import { listScoresV3ForPublicApi } from "@/src/features/public-api/server";
import { buildScoreSubjectUrl } from "@langfuse/shared/src/server";
const GetScoreInputSchema = z.object({ scoreId: z.string() }).strict();
diff --git a/web/src/features/mcp/server/scores/tools/getScoreConfig.ts b/web/src/features/mcp/server/scores/tools/getScoreConfig.ts
index 150b33ab37..a446e2b66c 100644
--- a/web/src/features/mcp/server/scores/tools/getScoreConfig.ts
+++ b/web/src/features/mcp/server/scores/tools/getScoreConfig.ts
@@ -1,7 +1,9 @@
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { getScoreConfig } from "@/src/features/public-api/server/score-configs-api-service";
-import { GetScoreConfigQuery } from "@/src/features/public-api/types/score-configs";
+import {
+ getScoreConfig,
+ GetScoreConfigQuery,
+} from "@/src/features/public-api/server";
export const [getScoreConfigTool, handleGetScoreConfig] = defineTool({
name: "getScoreConfig",
diff --git a/web/src/features/mcp/server/scores/tools/listScoreConfigs.ts b/web/src/features/mcp/server/scores/tools/listScoreConfigs.ts
index 58bdea2748..565469d05d 100644
--- a/web/src/features/mcp/server/scores/tools/listScoreConfigs.ts
+++ b/web/src/features/mcp/server/scores/tools/listScoreConfigs.ts
@@ -1,7 +1,9 @@
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { listScoreConfigs } from "@/src/features/public-api/server/score-configs-api-service";
-import { GetScoreConfigsQuery } from "@/src/features/public-api/types/score-configs";
+import {
+ listScoreConfigs,
+ GetScoreConfigsQuery,
+} from "@/src/features/public-api/server";
export const [listScoreConfigsTool, handleListScoreConfigs] = defineTool({
name: "listScoreConfigs",
diff --git a/web/src/features/mcp/server/scores/tools/listScores.ts b/web/src/features/mcp/server/scores/tools/listScores.ts
index ffecfe598b..d9d4aa2b4a 100644
--- a/web/src/features/mcp/server/scores/tools/listScores.ts
+++ b/web/src/features/mcp/server/scores/tools/listScores.ts
@@ -8,8 +8,10 @@ import { z } from "zod";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { clampToDataAccessDays } from "@/src/features/entitlements/server/hasEntitlementLimit";
-import { listScoresV3ForPublicApi } from "@/src/features/public-api/server/scores-api-v3";
-import { EncodedScoresCursorV3 } from "@/src/features/public-api/types/scores";
+import {
+ listScoresV3ForPublicApi,
+ EncodedScoresCursorV3,
+} from "@/src/features/public-api/server";
import { buildScoreSubjectUrl } from "@langfuse/shared/src/server";
const ListScoresBaseSchema = z
diff --git a/web/src/features/mcp/server/scores/tools/updateScoreConfig.ts b/web/src/features/mcp/server/scores/tools/updateScoreConfig.ts
index 9e6e598dde..258c3d35c8 100644
--- a/web/src/features/mcp/server/scores/tools/updateScoreConfig.ts
+++ b/web/src/features/mcp/server/scores/tools/updateScoreConfig.ts
@@ -1,7 +1,9 @@
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
-import { updateScoreConfig } from "@/src/features/public-api/server/score-configs-api-service";
-import { PutScoreConfigBodyWithoutArchived } from "@/src/features/public-api/types/score-configs";
+import {
+ updateScoreConfig,
+ PutScoreConfigBodyWithoutArchived,
+} from "@/src/features/public-api/server";
import { z } from "zod";
import {
McpScoreConfigCategoricalCategoriesSchema,
diff --git a/web/src/features/media/server/datasetItemMediaReferences.ts b/web/src/features/media/server/datasetItemMediaReferences.ts
index e674cf23f9..1830352e11 100644
--- a/web/src/features/media/server/datasetItemMediaReferences.ts
+++ b/web/src/features/media/server/datasetItemMediaReferences.ts
@@ -1,6 +1,6 @@
import { env } from "@/src/env.mjs";
import { getMediaStorageServiceClient } from "@/src/features/media/server/getMediaStorageClient";
-import { type APIDatasetItemMediaReference } from "@/src/features/public-api/types/datasets";
+import { type APIDatasetItemMediaReference } from "@/src/features/public-api/server";
import { logger } from "@langfuse/shared/src/server";
import { prisma } from "@langfuse/shared/src/db";
diff --git a/web/src/features/models/server/publicApiModelService.ts b/web/src/features/models/server/publicApiModelService.ts
index 4a5b91c0ea..6f0f08b4f7 100644
--- a/web/src/features/models/server/publicApiModelService.ts
+++ b/web/src/features/models/server/publicApiModelService.ts
@@ -6,7 +6,7 @@ import {
type GetModelsV1Query,
type PostModelsV1Body,
prismaToApiModelDefinition,
-} from "@/src/features/public-api/types/models";
+} from "@/src/features/public-api/server";
import { InvalidRequestError, LangfuseNotFoundError } from "@langfuse/shared";
import { Prisma, prisma } from "@langfuse/shared/src/db";
import { clearModelCacheForProject } from "@langfuse/shared/src/server";
diff --git a/web/src/features/organizations/server/organizationRouter.ts b/web/src/features/organizations/server/organizationRouter.ts
index 84314be0ca..8594620bf1 100644
--- a/web/src/features/organizations/server/organizationRouter.ts
+++ b/web/src/features/organizations/server/organizationRouter.ts
@@ -11,7 +11,7 @@ import {
import * as z from "zod";
import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import { TRPCError } from "@trpc/server";
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
import {
getLastTraceTimestampsByProjects,
isLangfuseAITracingConfigured,
diff --git a/web/src/features/projects/server/projectsRouter.ts b/web/src/features/projects/server/projectsRouter.ts
index fbd156b6d6..5e454fcf31 100644
--- a/web/src/features/projects/server/projectsRouter.ts
+++ b/web/src/features/projects/server/projectsRouter.ts
@@ -12,7 +12,7 @@ import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEnti
import { TRPCError } from "@trpc/server";
import { projectNameSchema } from "@/src/features/auth/lib/projectNameSchema";
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
import {
QueueJobs,
redis,
diff --git a/web/src/features/prompts/server/handlers/promptNameHandler.ts b/web/src/features/prompts/server/handlers/promptNameHandler.ts
index a46a7f876c..eaadb1226f 100644
--- a/web/src/features/prompts/server/handlers/promptNameHandler.ts
+++ b/web/src/features/prompts/server/handlers/promptNameHandler.ts
@@ -2,14 +2,16 @@ import type { NextApiRequest, NextApiResponse } from "next";
import { getPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
import { deletePrompt } from "@/src/features/prompts/server/actions/deletePrompt";
-import { withMiddlewares } from "@/src/features/public-api/server/withMiddlewares";
+import {
+ withMiddlewares,
+ RateLimitService,
+} from "@/src/features/public-api/server";
import { authorizePromptRequestOrThrow } from "../utils/authorizePromptRequest";
import {
GetPromptByNameSchema,
LangfuseNotFoundError,
PRODUCTION_LABEL,
} from "@langfuse/shared";
-import { RateLimitService } from "@/src/features/public-api/server/RateLimitService";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { prisma } from "@langfuse/shared/src/db";
diff --git a/web/src/features/prompts/server/handlers/promptVersionHandler.ts b/web/src/features/prompts/server/handlers/promptVersionHandler.ts
index d99f8c7828..32d66853c3 100644
--- a/web/src/features/prompts/server/handlers/promptVersionHandler.ts
+++ b/web/src/features/prompts/server/handlers/promptVersionHandler.ts
@@ -1,8 +1,10 @@
import { z } from "zod";
import { LATEST_PROMPT_LABEL } from "@langfuse/shared";
-import { withMiddlewares } from "@/src/features/public-api/server/withMiddlewares";
-import { createAuthedProjectAPIRoute } from "@/src/features/public-api/server/createAuthedProjectAPIRoute";
+import {
+ withMiddlewares,
+ createAuthedProjectAPIRoute,
+} from "@/src/features/public-api/server";
import { updatePromptLabelsForApi } from "@/src/features/prompts/server/prompt-api-service";
const UpdatePromptBodySchema = z.object({
diff --git a/web/src/features/prompts/server/handlers/promptsHandler.ts b/web/src/features/prompts/server/handlers/promptsHandler.ts
index e18e8d3b92..7fa6f34bc8 100644
--- a/web/src/features/prompts/server/handlers/promptsHandler.ts
+++ b/web/src/features/prompts/server/handlers/promptsHandler.ts
@@ -4,9 +4,11 @@ import {
createPromptForApi,
listPromptsForApi,
} from "@/src/features/prompts/server/prompt-api-service";
-import { withMiddlewares } from "@/src/features/public-api/server/withMiddlewares";
+import {
+ withMiddlewares,
+ RateLimitService,
+} from "@/src/features/public-api/server";
import { authorizePromptRequestOrThrow } from "../utils/authorizePromptRequest";
-import { RateLimitService } from "@/src/features/public-api/server/RateLimitService";
import { CreatePromptSchema, GetPromptsMetaSchema } from "@langfuse/shared";
const getPromptsHandler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/web/src/features/prompts/server/utils/authorizePromptRequest.ts b/web/src/features/prompts/server/utils/authorizePromptRequest.ts
index d169e500ca..68eb4bb904 100644
--- a/web/src/features/prompts/server/utils/authorizePromptRequest.ts
+++ b/web/src/features/prompts/server/utils/authorizePromptRequest.ts
@@ -1,4 +1,4 @@
-import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
+import { ApiAuthService } from "@/src/features/public-api/server";
import { type NextApiRequest } from "next";
import { UnauthorizedError, ForbiddenError } from "@langfuse/shared";
import { prisma } from "@langfuse/shared/src/db";
diff --git a/web/src/features/public-api/server/index.ts b/web/src/features/public-api/server/index.ts
index 1e1b70fb86..bfd55769fb 100644
--- a/web/src/features/public-api/server/index.ts
+++ b/web/src/features/public-api/server/index.ts
@@ -1,10 +1,200 @@
-export { evaluationRulesApiHandler } from "./evaluation/evaluationRulesApiHandler";
+export { ApiAuthService } from "./apiAuth";
+export { createAuthedProjectAPIRoute } from "./createAuthedProjectAPIRoute";
+export { createOrFetchDatasetRun } from "./dataset-runs";
+export {
+ generateDatasetRunItemsForPublicApi,
+ getDatasetRunItemsCountForPublicApi,
+} from "./dataset-run-items";
export { evaluationRuleApiHandler } from "./evaluation/evaluationRuleApiHandler";
-export { evaluatorsApiHandler } from "./evaluation/evaluatorsApiHandler";
+export { evaluationRulesApiHandler } from "./evaluation/evaluationRulesApiHandler";
export { evaluatorApiHandler } from "./evaluation/evaluatorApiHandler";
+export { evaluatorsApiHandler } from "./evaluation/evaluatorsApiHandler";
export { evaluatorVersionsApiHandler } from "./evaluation/evaluatorVersionsApiHandler";
+export { runHealthCheck } from "./health-service";
+export { RateLimitService } from "./RateLimitService";
+export {
+ createScoreConfig,
+ getScoreConfig,
+ listScoreConfigs,
+ updateScoreConfig,
+} from "./score-configs-api-service";
+export { ScoresApiService } from "./scores-api-service";
+export { listScoresV3ForPublicApi } from "./scores-api-v3";
export {
createStructuredPublicApiRateLimitError,
structuredPublicApiErrorContract,
toStructuredPublicApiError,
} from "./structuredPublicApiErrorContract";
+export { withMiddlewares } from "./withMiddlewares";
+export type {
+ AnnotationQueue,
+ AnnotationQueueItem,
+} from "../types/annotation-queues";
+export {
+ AnnotationQueueAssignmentQuery,
+ CreateAnnotationQueueAssignmentBody,
+ CreateAnnotationQueueAssignmentResponse,
+ CreateAnnotationQueueBody,
+ CreateAnnotationQueueItemBody,
+ CreateAnnotationQueueItemResponse,
+ CreateAnnotationQueueResponse,
+ DeleteAnnotationQueueAssignmentBody,
+ DeleteAnnotationQueueAssignmentResponse,
+ DeleteAnnotationQueueItemQuery,
+ DeleteAnnotationQueueItemResponse,
+ GetAnnotationQueueByIdQuery,
+ GetAnnotationQueueByIdResponse,
+ GetAnnotationQueueItemByIdQuery,
+ GetAnnotationQueueItemByIdResponse,
+ GetAnnotationQueueItemsQuery,
+ GetAnnotationQueueItemsResponse,
+ GetAnnotationQueuesQuery,
+ GetAnnotationQueuesResponse,
+ UpdateAnnotationQueueItemBody,
+ UpdateAnnotationQueueItemResponse,
+} from "../types/annotation-queues";
+export {
+ GetCommentsV1Query,
+ GetCommentsV1Response,
+ GetCommentV1Query,
+ GetCommentV1Response,
+ PostCommentsV1Body,
+ PostCommentsV1Response,
+} from "../types/comments";
+export type {
+ APIDatasetItemMediaReference,
+ APIDatasetRunItem,
+} from "../types/datasets";
+export {
+ DeleteDatasetItemV1Query,
+ DeleteDatasetItemV1Response,
+ DeleteDatasetRunV1Response,
+ GetDatasetItemsV1Query,
+ GetDatasetItemsV1Response,
+ GetDatasetItemV1Query,
+ GetDatasetItemV1Response,
+ GetDatasetRunItemsV1Response,
+ GetDatasetRunsV1Query,
+ GetDatasetRunsV1Response,
+ GetDatasetRunV1Query,
+ GetDatasetRunV1Response,
+ GetDatasetsV1Query,
+ GetDatasetsV2Query,
+ GetDatasetsV2Response,
+ GetDatasetV1Query,
+ GetDatasetV2Response,
+ PostDatasetItemsV1Body,
+ PostDatasetItemsV1Response,
+ PostDatasetRunItemsV1Body,
+ PostDatasetRunItemsV1Response,
+ PostDatasetsV1Body,
+ PostDatasetsV2Body,
+ PostDatasetsV2Response,
+ publicApiIdSchema,
+ transformDbDatasetItemDomainToAPIDatasetItem,
+ transformDbDatasetRunToAPIDatasetRun,
+ transformDbDatasetToAPIDataset,
+} from "../types/datasets";
+export type {
+ GetExperimentItemsV1QueryType,
+ GetExperimentsV1QueryType,
+} from "../types/experiments";
+export {
+ EncodedExperimentsCursorString,
+ encodeExperimentCursor,
+ EXPERIMENT_FILTER_COLUMNS,
+ EXPERIMENT_ITEM_FILTER_COLUMNS,
+ GetExperimentItemsV1ParsedQuery,
+ GetExperimentItemsV1ParsedQueryBase,
+ GetExperimentItemsV1Response,
+ GetExperimentsV1ParsedQuery,
+ GetExperimentsV1Response,
+} from "../types/experiments";
+export type {
+ PostFeedbackBodyType,
+ PostFeedbackResponseType,
+} from "../types/feedback";
+export { PostFeedbackBody } from "../types/feedback";
+export { MetricsQueryObjectV2, publicGranularities } from "../types/metrics";
+export {
+ DeleteModelV1Query,
+ DeleteModelV1Response,
+ GetModelsV1Query,
+ GetModelsV1Response,
+ GetModelV1Query,
+ GetModelV1Response,
+ PostModelsV1Body,
+ PostModelsV1Response,
+ prismaToApiModelDefinition,
+} from "../types/models";
+export {
+ encodeCursor,
+ EncodedObservationsCursorV2,
+ EncodedObservationsCursorV2String,
+} from "../types/observations";
+export {
+ GetScoreConfigQuery,
+ GetScoreConfigsQuery,
+ PostScoreConfigBody,
+ PutScoreConfigBodyWithoutArchived,
+ PutScoreConfigQuery,
+} from "../types/score-configs";
+export { EncodedScoresCursorV3 } from "../types/scores";
+export type {
+ DashboardWidgetViewOutputType,
+ PostUnstableDashboardWidgetBodyType,
+} from "../types/unstable-dashboard-widgets";
+export {
+ DashboardWidgetIdQuery,
+ GetUnstableDashboardWidgetsQuery,
+ PatchUnstableDashboardWidgetBody,
+ PostUnstableDashboardWidgetBody,
+ PostUnstableDashboardWidgetResponse,
+ PostUnstableDashboardWidgetView,
+} from "../types/unstable-dashboard-widgets";
+export {
+ DashboardIdQuery,
+ DashboardPlacementSchema,
+ DashboardSchema,
+ GetUnstableDashboardsQuery,
+ PatchDashboardPlacementBody,
+ PatchUnstableDashboardBody,
+ PostDashboardPlacementBody,
+ PostUnstableDashboardBody,
+} from "../types/unstable-dashboards";
+export type {
+ PatchUnstableEvaluationRuleBodyType,
+ PostUnstableEvaluationRuleBodyType,
+} from "../types/unstable-evaluation-rules";
+export type { PostUnstableEvaluatorBodyParsedType } from "../types/unstable-evaluators";
+export type {
+ LegacyPromptVariableMappingType,
+ PromptVariableMappingInputType,
+ PromptVariableMappingReadType,
+ PublicCodeEvaluatorSourceCodeLanguageType,
+ PublicEvaluationRuleEvaluatorReferenceType,
+ PublicEvaluationRuleEvaluatorType,
+ PublicEvaluationRuleFilterType,
+ PublicEvaluationRuleReadFilterType,
+ PublicEvaluationRuleLegacyTargetType,
+ PublicEvaluationRuleReadTargetType,
+ PublicEvaluationRuleStatusType,
+ PublicEvaluationRuleTargetType,
+ PublicEvaluatorModelConfigType,
+ PublicEvaluatorOutputDefinitionType,
+ PublicEvaluatorTypeType,
+} from "../types/unstable-public-evals-contract";
+export {
+ EXPERIMENT_EVALUATION_RULE_FILTER_COLUMNS,
+ ExperimentPromptVariableMappingSource,
+ LegacyPromptVariableMapping,
+ OBSERVATION_EVALUATION_RULE_FILTER_COLUMNS,
+ ObservationPromptVariableMappingInput,
+ ObservationPromptVariableMappingSource,
+ PromptVariableMappingRead,
+ PUBLIC_EVALUATOR_TYPE_CODE,
+ PUBLIC_EVALUATOR_TYPE_LLM_AS_JUDGE,
+ PublicEvaluationRuleFilter,
+ PublicEvaluationRuleReadFilter,
+ PublicEvaluatorType,
+} from "../types/unstable-public-evals-contract";
diff --git a/web/src/features/widgets/server/public-dashboard-widget-service.ts b/web/src/features/widgets/server/public-dashboard-widget-service.ts
index d6a6fea15e..cddb2b11de 100644
--- a/web/src/features/widgets/server/public-dashboard-widget-service.ts
+++ b/web/src/features/widgets/server/public-dashboard-widget-service.ts
@@ -19,7 +19,7 @@ import {
PostUnstableDashboardWidgetResponse,
type DashboardWidgetViewOutputType,
type PostUnstableDashboardWidgetBodyType,
-} from "@/src/features/public-api/types/unstable-dashboard-widgets";
+} from "@/src/features/public-api/server";
import { ChartConfigSchema, LangfuseNotFoundError } from "@langfuse/shared";
import {
getWidgetImportFilterConfig,