Skip to content
Open
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
114 changes: 114 additions & 0 deletions bifrost/lib/clients/jawnTypes/private.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,16 @@ export interface paths {
/** @description Update a saved query for admin (stored under admin org ID) */
patch: operations["UpdateAdminSavedQuery"];
};
<<<<<<< HEAD
"/v1/admin/pricing-analytics/segments": {
get: operations["GetPricingSegments"];
};
"/v1/admin/pricing-analytics/cohorts": {
get: operations["GetPricingCohorts"];
};
"/v1/admin/pricing-analytics/revenue-summary": {
get: operations["GetRevenueSummary"];
=======
"/v1/credits/balance": {
get: operations["GetCreditsBalance"];
Comment on lines +646 to 657
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Git merge conflict markers present - file cannot be merged in this state

Prompt To Fix With AI
This is a comment left during a code review.
Path: bifrost/lib/clients/jawnTypes/private.ts
Line: 646:657

Comment:
**logic:** Git merge conflict markers present - file cannot be merged in this state

How can I resolve this? If you propose a fix, please make it concise.

};
Expand All @@ -660,6 +670,7 @@ export interface paths {
};
"/v1/credits/discounts": {
get: operations["GetDiscounts"];
>>>>>>> origin/main
};
"/v1/admin/wallet/gateway/dashboard_data": {
post: operations["GetGatewayDashboardData"];
Expand Down Expand Up @@ -16323,6 +16334,48 @@ Json: JsonObject;
error: null;
};
"Result__rows-Record_string.any_-Array--elapsedMilliseconds-number--size-number--rowCount-number_.string_": components["schemas"]["ResultSuccess__rows-Record_string.any_-Array--elapsedMilliseconds-number--size-number--rowCount-number__"] | components["schemas"]["ResultError_string_"];
<<<<<<< HEAD
OrganizationSegment: {
id: string;
name: string;
tier: string;
created_at: string;
/** Format: double */
seats: number;
/** Format: double */
active_users_30d: number;
/** Format: double */
requests_30d: number;
/** Format: double */
llm_cost_30d: number;
/** Format: double */
prompts_created: number;
/** Format: double */
prompts_used_30d: number;
/** Format: double */
mrr: number;
stripe_customer_id: string;
is_ptb: boolean;
is_byok: boolean;
/** Format: double */
bytes_total: number;
/** Format: double */
hours_tracked: number;
};
"ResultSuccess_OrganizationSegment-Array_": {
data: components["schemas"]["OrganizationSegment"][];
/** @enum {number|null} */
error: null;
};
"Result_OrganizationSegment-Array.string_": components["schemas"]["ResultSuccess_OrganizationSegment-Array_"] | components["schemas"]["ResultError_string_"];
"ResultSuccess__high_inference_low_seats-Array_any_--low_inference_high_seats-Array_any_--ptb_customers-Array_any_--byok_customers-Array_any_--free_power_users-Array_any___": {
data: {
free_power_users: unknown[];
byok_customers: unknown[];
ptb_customers: unknown[];
low_inference_high_seats: unknown[];
high_inference_low_seats: unknown[];
=======
CreditBalanceResponse: {
/** Format: double */
totalCreditsPurchased: number;
Expand Down Expand Up @@ -16362,10 +16415,43 @@ Json: JsonObject;
data: {
/** Format: double */
totalSpend: number;
>>>>>>> origin/main
};
/** @enum {number|null} */
error: null;
};
<<<<<<< HEAD
"Result__high_inference_low_seats-Array_any_--low_inference_high_seats-Array_any_--ptb_customers-Array_any_--byok_customers-Array_any_--free_power_users-Array_any__.string_": components["schemas"]["ResultSuccess__high_inference_low_seats-Array_any_--low_inference_high_seats-Array_any_--ptb_customers-Array_any_--byok_customers-Array_any_--free_power_users-Array_any___"] | components["schemas"]["ResultError_string_"];
"ResultSuccess__mrr_by_tier_58__free-number--pro-number--team-number--enterprise-number_--total_mrr-number--addon_adoption_58__prompts-number--experiments-number--evals-number_--gross_margin-number__": {
data: {
/** Format: double */
gross_margin: number;
addon_adoption: {
/** Format: double */
evals: number;
/** Format: double */
experiments: number;
/** Format: double */
prompts: number;
};
/** Format: double */
total_mrr: number;
mrr_by_tier: {
/** Format: double */
enterprise: number;
/** Format: double */
team: number;
/** Format: double */
pro: number;
/** Format: double */
free: number;
};
};
/** @enum {number|null} */
error: null;
};
"Result__mrr_by_tier_58__free-number--pro-number--team-number--enterprise-number_--total_mrr-number--addon_adoption_58__prompts-number--experiments-number--evals-number_--gross_margin-number_.string_": components["schemas"]["ResultSuccess__mrr_by_tier_58__free-number--pro-number--team-number--enterprise-number_--total_mrr-number--addon_adoption_58__prompts-number--experiments-number--evals-number_--gross_margin-number__"] | components["schemas"]["ResultError_string_"];
=======
"Result__totalSpend-number_.string_": components["schemas"]["ResultSuccess__totalSpend-number__"] | components["schemas"]["ResultError_string_"];
ModelSpend: {
model: string;
Expand Down Expand Up @@ -16442,6 +16528,7 @@ Json: JsonObject;
error: null;
};
"Result_OrgDiscount-Array.string_": components["schemas"]["ResultSuccess_OrgDiscount-Array_"] | components["schemas"]["ResultError_string_"];
>>>>>>> origin/main
DashboardData: {
organizations: ({
/** Format: double */
Expand Down Expand Up @@ -20493,6 +20580,12 @@ export interface operations {
};
};
};
<<<<<<< HEAD
GetPricingSegments: {
parameters: {
query?: {
bustCache?: boolean;
=======
GetCreditsBalance: {
responses: {
/** @description Ok */
Expand All @@ -20508,27 +20601,43 @@ export interface operations {
query?: {
page?: number;
pageSize?: number;
>>>>>>> origin/main
};
};
responses: {
/** @description Ok */
200: {
content: {
<<<<<<< HEAD
"application/json": components["schemas"]["Result_OrganizationSegment-Array.string_"];
=======
"application/json": components["schemas"]["Result_PaginatedPurchasedCredits.string_"];
>>>>>>> origin/main
};
};
};
};
<<<<<<< HEAD
GetPricingCohorts: {
=======
GetTotalSpend: {
>>>>>>> origin/main
responses: {
/** @description Ok */
200: {
content: {
<<<<<<< HEAD
"application/json": components["schemas"]["Result__high_inference_low_seats-Array_any_--low_inference_high_seats-Array_any_--ptb_customers-Array_any_--byok_customers-Array_any_--free_power_users-Array_any__.string_"];
=======
"application/json": components["schemas"]["Result__totalSpend-number_.string_"];
>>>>>>> origin/main
};
};
};
};
<<<<<<< HEAD
GetRevenueSummary: {
=======
GetSpendBreakdown: {
parameters: {
query?: {
Expand All @@ -20537,10 +20646,14 @@ export interface operations {
endDate?: string;
};
};
>>>>>>> origin/main
responses: {
/** @description Ok */
200: {
content: {
<<<<<<< HEAD
"application/json": components["schemas"]["Result__mrr_by_tier_58__free-number--pro-number--team-number--enterprise-number_--total_mrr-number--addon_adoption_58__prompts-number--experiments-number--evals-number_--gross_margin-number_.string_"];
=======
"application/json": components["schemas"]["Result_SpendBreakdownResponse.string_"];
};
};
Expand All @@ -20562,6 +20675,7 @@ export interface operations {
200: {
content: {
"application/json": components["schemas"]["Result_OrgDiscount-Array.string_"];
>>>>>>> origin/main
};
};
};
Expand Down
80 changes: 80 additions & 0 deletions valhalla/jawn/src/controllers/private/adminController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Setting, SettingsManager } from "../../utils/settings";
import type { SettingName } from "../../utils/settings";
import Stripe from "stripe";
import { AdminManager } from "../../managers/admin/AdminManager";
import { PricingAnalyticsManager, OrganizationSegment } from "../../managers/admin/PricingAnalyticsManager";
import {
ModelWithProvider,
clickhouseModelFilter,
Expand Down Expand Up @@ -2559,4 +2560,83 @@ export class AdminController extends Controller {
}
return ok(null);
}

@Get("/pricing-analytics/segments")
public async getPricingSegments(
@Request() request: JawnAuthenticatedRequest,
@Query() bustCache?: boolean
): Promise<Result<OrganizationSegment[], string>> {
try {
console.log("[AdminController] getPricingSegments called", { bustCache });
await authCheckThrow(request.authParams.userId);
console.log("[AdminController] Auth check passed");

const pricingAnalyticsManager = new PricingAnalyticsManager(
request.authParams
);

const result = await pricingAnalyticsManager.getSegments(bustCache);
console.log("[AdminController] getSegments result:", result.error ? `Error: ${result.error}` : `Success: ${result.data?.length} segments`);
return result;
} catch (error) {
console.error("[AdminController] Error in getPricingSegments:", error);
return err(`Controller error: ${error}`);
}
}

@Get("/pricing-analytics/cohorts")
public async getPricingCohorts(
@Request() request: JawnAuthenticatedRequest
): Promise<
Result<
{
high_inference_low_seats: Array<any>;
low_inference_high_seats: Array<any>;
ptb_customers: Array<any>;
byok_customers: Array<any>;
free_power_users: Array<any>;
},
string
>
> {
await authCheckThrow(request.authParams.userId);

const pricingAnalyticsManager = new PricingAnalyticsManager(
request.authParams
);

return await pricingAnalyticsManager.getCohorts();
}

@Get("/pricing-analytics/revenue-summary")
public async getRevenueSummary(
@Request() request: JawnAuthenticatedRequest
): Promise<
Result<
{
mrr_by_tier: {
free: number;
pro: number;
team: number;
enterprise: number;
};
total_mrr: number;
addon_adoption: {
prompts: number;
experiments: number;
evals: number;
};
gross_margin: number;
},
string
>
> {
await authCheckThrow(request.authParams.userId);

const pricingAnalyticsManager = new PricingAnalyticsManager(
request.authParams
);

return await pricingAnalyticsManager.getRevenueSummary();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export class AdminWalletController extends Controller {
validatedPageSize
);
}

return adminWalletManager.getDashboardWithPostgresSort(
search || "",
tokenUsageProductId,
Expand Down
2 changes: 2 additions & 0 deletions valhalla/jawn/src/lib/db/ClickhouseWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class ClickhouseClientWrapper {
host: clickhouseHost,
username: env.CLICKHOUSE_USER,
password: env.CLICKHOUSE_PASSWORD,
request_timeout: 60000,
});

this.clickHouseHqlClient = createClient({
Expand Down Expand Up @@ -89,6 +90,7 @@ export class ClickhouseClientWrapper {
// See https://clickhouse.com/docs/en/interfaces/http/#response-buffering
clickhouse_settings: {
wait_end_of_query: 1,
max_execution_time: 60,
},
});
const raw = (await queryResult.json()) as unknown;
Expand Down
Loading
Loading