Sidebar nav

docs/swagger.json

@@ -11987,7 +11987,105 @@
 						"description": "Ok",
 						"content": {
 							"application/json": {
-								"schema": {}
+								"schema": {
+									"properties": {
+										"total": {
+											"type": "number",
+											"format": "double"
+										},
+										"tax": {
+											"type": "number",
+											"format": "double",
+											"nullable": true
+										},
+										"subtotal": {
+											"type": "number",
+											"format": "double"
+										},
+										"discount": {
+											"properties": {
+												"coupon": {
+													"properties": {
+														"percent_off": {
+															"type": "number",
+															"format": "double",
+															"nullable": true
+														},
+														"name": {
+															"type": "string",
+															"nullable": true
+														}
+													},
+													"required": [
+														"percent_off",
+														"name"
+													],
+													"type": "object"
+												}
+											},
+											"required": [
+												"coupon"
+											],
+											"type": "object",
+											"nullable": true
+										},
+										"lines": {
+											"properties": {
+												"data": {
+													"items": {
+														"properties": {
+															"description": {
+																"type": "string",
+																"nullable": true
+															},
+															"amount": {
+																"type": "number",
+																"format": "double",
+																"nullable": true
+															},
+															"id": {
+																"type": "string",
+																"nullable": true
+															}
+														},
+														"required": [
+															"description",
+															"amount",
+															"id"
+														],
+														"type": "object"
+													},
+													"type": "array"
+												}
+											},
+											"required": [
+												"data"
+											],
+											"type": "object",
+											"nullable": true
+										},
+										"next_payment_attempt": {
+											"type": "number",
+											"format": "double",
+											"nullable": true
+										},
+										"currency": {
+											"type": "string",
+											"nullable": true
+										}
+									},
+									"required": [
+										"total",
+										"tax",
+										"subtotal",
+										"discount",
+										"lines",
+										"next_payment_attempt",
+										"currency"
+									],
+									"type": "object",
+									"nullable": true
+								}
 							}
 						}
 					}
@@ -12060,7 +12158,79 @@
 						"description": "Ok",
 						"content": {
 							"application/json": {
-								"schema": {}
+								"schema": {
+									"properties": {
+										"items": {
+											"items": {
+												"properties": {
+													"price": {
+														"properties": {
+															"product": {
+																"properties": {
+																	"name": {
+																		"type": "string",
+																		"nullable": true
+																	}
+																},
+																"required": [
+																	"name"
+																],
+																"type": "object",
+																"nullable": true
+															}
+														},
+														"required": [
+															"product"
+														],
+														"type": "object"
+													},
+													"quantity": {
+														"type": "number",
+														"format": "double"
+													}
+												},
+												"required": [
+													"price"
+												],
+												"type": "object"
+											},
+											"type": "array"
+										},
+										"trial_end": {
+											"type": "number",
+											"format": "double",
+											"nullable": true
+										},
+										"id": {
+											"type": "string"
+										},
+										"current_period_start": {
+											"type": "number",
+											"format": "double"
+										},
+										"current_period_end": {
+											"type": "number",
+											"format": "double"
+										},
+										"cancel_at_period_end": {
+											"type": "boolean"
+										},
+										"status": {
+											"type": "string"
+										}
+									},
+									"required": [
+										"items",
+										"trial_end",
+										"id",
+										"current_period_start",
+										"current_period_end",
+										"cancel_at_period_end",
+										"status"
+									],
+									"type": "object",
+									"nullable": true
+								}
 							}
 						}
 					}

helicone-node/api/generatedTypes/public.ts

@@ -4322,7 +4322,32 @@ export interface operations {
       /** @description Ok */
       200: {
         content: {
-          "application/json": unknown;
+          "application/json": ({
+            /** Format: double */
+            total: number;
+            /** Format: double */
+            tax: number | null;
+            /** Format: double */
+            subtotal: number;
+            discount: ({
+              coupon: {
+                /** Format: double */
+                percent_off: number | null;
+                name: string | null;
+              };
+            }) | null;
+            lines: ({
+              data: ({
+                  description: string | null;
+                  /** Format: double */
+                  amount: number | null;
+                  id: string | null;
+                })[];
+            }) | null;
+            /** Format: double */
+            next_payment_attempt: number | null;
+            currency: string | null;
+          }) | null;
         };
       };
     };
@@ -4350,7 +4375,26 @@ export interface operations {
       /** @description Ok */
       200: {
         content: {
-          "application/json": unknown;
+          "application/json": ({
+            items: ({
+                price: {
+                  product: ({
+                    name: string | null;
+                  }) | null;
+                };
+                /** Format: double */
+                quantity?: number;
+              })[];
+            /** Format: double */
+            trial_end: number | null;
+            id: string;
+            /** Format: double */
+            current_period_start: number;
+            /** Format: double */
+            current_period_end: number;
+            cancel_at_period_end: boolean;
+            status: string;
+          }) | null;
         };
       };
     };

valhalla/jawn/src/controllers/private/organizationController.ts

@@ -93,7 +93,7 @@ export class OrganizationController extends Controller {
     @Request() request: JawnAuthenticatedRequest
   ): Promise<Result<null, string>> {
     const organizationManager = new OrganizationManager(request.authParams);
-    const memberCount = await organizationManager.getMemberCount();
+    const memberCount = await organizationManager.getMemberCount(true);
     if (memberCount.error || !memberCount.data) {
       return err(memberCount.error ?? "Error getting member count");
     }
@@ -281,7 +281,7 @@ export class OrganizationController extends Controller {
     const stripeManager = new StripeManager(request.authParams);
     const organizationManager = new OrganizationManager(request.authParams);
 
-    const memberCount = await organizationManager.getMemberCount();
+    const memberCount = await organizationManager.getMemberCount(true);
     if (memberCount.error || !memberCount.data) {
       return err(memberCount.error ?? "Error getting member count");
     }

valhalla/jawn/src/controllers/public/stripeController.ts

@@ -13,6 +13,7 @@ import {
 import Stripe from "stripe";
 import { JawnAuthenticatedRequest } from "../../types/request";
 import { StripeManager } from "../../managers/stripe/StripeManager";
+import { Result } from "../../lib/shared/result";
 
 export interface UpgradeToProRequest {
   addons?: {
@@ -148,7 +149,26 @@ export class StripeController extends Controller {
   @Get("/subscription/preview-invoice")
   public async previewInvoice(
     @Request() request: JawnAuthenticatedRequest
-  ): Promise<any> {
+  ): Promise<{
+    currency: string | null;
+    next_payment_attempt: number | null;
+    lines: {
+      data: {
+        id: string | null;
+        amount: number | null;
+        description: string | null;
+      }[];
+    } | null;
+    discount: {
+      coupon: {
+        name: string | null;
+        percent_off: number | null;
+      };
+    } | null;
+    subtotal: number;
+    tax: number | null;
+    total: number;
+  } | null> {
     const stripeManager = new StripeManager(request.authParams);
     const result = await stripeManager.getUpcomingInvoice();
 
@@ -157,7 +177,15 @@ export class StripeController extends Controller {
       throw new Error(result.error);
     }
 
-    return result.data;
+    return {
+      currency: result.data?.currency ?? null,
+      next_payment_attempt: result.data?.next_payment_attempt ?? null,
+      lines: result.data?.lines ?? null,
+      discount: result.data?.discount ?? null,
+      subtotal: result.data?.subtotal ?? 0,
+      tax: result.data?.tax ?? null,
+      total: result.data?.total ?? 0,
+    };
   }
 
   @Post("/subscription/cancel-subscription")
@@ -184,7 +212,22 @@ export class StripeController extends Controller {
   @Get("/subscription")
   public async getSubscription(
     @Request() request: JawnAuthenticatedRequest
-  ): Promise<any> {
+  ): Promise<{
+    status: string;
+    cancel_at_period_end: boolean;
+    current_period_end: number;
+    current_period_start: number;
+    id: string;
+    trial_end: number | null;
+    items: {
+      quantity?: number;
+      price: {
+        product: {
+          name: string | null;
+        } | null;
+      };
+    }[];
+  } | null> {
     const stripeManager = new StripeManager(request.authParams);
     const result = await stripeManager.getSubscription();
 
@@ -193,7 +236,24 @@ export class StripeController extends Controller {
       throw new Error(result.error);
     }
 
-    return result.data;
+    if (!result.data) return null;
+
+    return {
+      status: result.data.status,
+      cancel_at_period_end: result.data.cancel_at_period_end,
+      current_period_end: result.data.current_period_end,
+      current_period_start: result.data.current_period_start,
+      id: result.data.id,
+      trial_end: result.data.trial_end,
+      items: result.data.items.data.map((item) => ({
+        quantity: item.quantity,
+        price: {
+          product: {
+            name: ((item.price.product as any)?.name ?? null) as string | null,
+          },
+        },
+      })),
+    };
   }
 
   @Post("/webhook")

valhalla/jawn/src/managers/organization/OrganizationManager.ts

@@ -358,7 +358,9 @@ export class OrganizationManager extends BaseManager {
     return ok(layout);
   }
 
-  async getMemberCount(): Promise<Result<number, string>> {
+  async getMemberCount(
+    filterHeliconeEmails: boolean = false
+  ): Promise<Result<number, string>> {
     const { data: members, error: membersError } =
       await this.organizationStore.getOrganizationMembers(
         this.authParams.organizationId
@@ -367,7 +369,12 @@ export class OrganizationManager extends BaseManager {
     if (membersError !== null) {
       return err(membersError);
     }
-    return ok(members.length);
+    return ok(
+      members.filter(
+        (member) =>
+          !filterHeliconeEmails || !member.email.endsWith("@helicone.ai")
+      ).length
+    );
   }
 
   async getOrganizationMembers(