Address issues with accounting integration (#83)

* Resolve routing conflict for accounting service

* Add other fixes

Author: pgetta

src/app/api/accounting/reservation/oneshot/[reservationId]/route.ts renamed to src/app/api/public-accounting/reservation/oneshot/[reservationId]/route.ts

@@ -2,7 +2,7 @@ import { convertObjectKeystoCamelCase } from '@/util/object-keys-format';
 import { auth } from '@/auth';
 import { accountingBaseUrl } from '@/config';
 import authFetch from '@/authFetch';
-import { assertApiResponse } from '@/util/utils';
+import { assertApiResponse, RemoteAPIErrorResponse } from '@/util/utils';
 
 export const DELETE = async (
   request: Request,
@@ -25,15 +25,10 @@ export const DELETE = async (
       headers: { 'Content-Type': 'application/json' },
     });
 
-    const resObj = assertApiResponse(res);
+    const resObj = await assertApiResponse(res);
 
     return Response.json(convertObjectKeystoCamelCase(resObj));
   } catch (error: unknown) {
-    const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
-
-    return new Response('Failed to cancel oneshot reservation', {
-      status: 502,
-      statusText: errorMessage,
-    });
+    return RemoteAPIErrorResponse(error);
   }
 };

src/app/api/accounting/reservation/oneshot/route.ts renamed to src/app/api/public-accounting/reservation/oneshot/route.ts

@@ -1,12 +1,9 @@
 import { OneshotReservation, ServiceType } from '@/types/accounting';
-import {
-  convertObjectKeystoCamelCase,
-  convertObjectKeysToSnakeCase,
-} from '@/util/object-keys-format';
+import { convertObjectKeystoCamelCase } from '@/util/object-keys-format';
 import { auth } from '@/auth';
 import { accountingBaseUrl } from '@/config';
 import authFetch from '@/authFetch';
-import { assertApiResponse } from '@/util/utils';
+import { assertApiResponse, RemoteAPIErrorResponse } from '@/util/utils';
 import { getVirtualLabProjectUsers } from '@/services/virtual-lab/projects';
 
 export const POST = async (request: Request) => {
@@ -35,24 +32,19 @@ export const POST = async (request: Request) => {
     const res = await authFetch(`${accountingBaseUrl}/reservation/oneshot`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(
-        convertObjectKeysToSnakeCase({
-          ...reservationRequest,
-          userId: session.user.id,
-          type: ServiceType.Oneshot,
-        })
-      ),
+      body: JSON.stringify({
+        proj_id: projectId,
+        user_id: session.user.id,
+        type: ServiceType.Oneshot,
+        subtype: reservationRequest.subtype,
+        count: reservationRequest.count,
+      }),
     });
 
-    const resObj = assertApiResponse(res);
+    const resObj = await assertApiResponse(res);
 
     return Response.json(convertObjectKeystoCamelCase(resObj));
-  } catch (error: unknown) {
-    const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
-
-    return new Response('Failed to create oneshot reservation', {
-      status: 502,
-      statusText: errorMessage,
-    });
+  } catch (error) {
+    return RemoteAPIErrorResponse(error);
   }
 };

src/app/api/accounting/usage/oneshot/route.ts renamed to src/app/api/public-accounting/usage/oneshot/route.ts

@@ -1,12 +1,9 @@
-import { OneshotUsage } from '@/types/accounting';
-import {
-  convertObjectKeystoCamelCase,
-  convertObjectKeysToSnakeCase,
-} from '@/util/object-keys-format';
+import { OneshotUsage, ServiceType } from '@/types/accounting';
+import { convertObjectKeystoCamelCase } from '@/util/object-keys-format';
 import { auth } from '@/auth';
 import { accountingBaseUrl } from '@/config';
 import authFetch from '@/authFetch';
-import { assertApiResponse } from '@/util/utils';
+import { assertApiResponse, RemoteAPIErrorResponse } from '@/util/utils';
 
 export const POST = async (request: Request) => {
   const usage = (await request.json()) as OneshotUsage;
@@ -23,18 +20,20 @@ export const POST = async (request: Request) => {
     const res = await authFetch(`${accountingBaseUrl}/usage/oneshot`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(convertObjectKeysToSnakeCase(usage)),
+      body: JSON.stringify({
+        type: ServiceType.Oneshot,
+        subtype: usage.subtype,
+        proj_id: usage.projectId,
+        count: usage.count,
+        job_id: usage.jobId,
+        timestamp: usage.timestamp,
+      }),
     });
 
-    const resObj = assertApiResponse(res);
+    const resObj = await assertApiResponse(res);
 
     return Response.json(convertObjectKeystoCamelCase(resObj));
   } catch (error: unknown) {
-    const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
-
-    return new Response('Failed to send oneshot usage', {
-      status: 502,
-      statusText: errorMessage,
-    });
+    return RemoteAPIErrorResponse(error);
   }
 };

src/app/app/virtual-lab/lab/[virtualLabId]/project/[projectId]/(secondary)/build/me-model/new/configure/page.tsx

@@ -25,6 +25,11 @@ import { queryAtom } from '@/state/explore-section/list-view-atoms';
 import { ExploreDataScope } from '@/types/explore-section/application';
 import { DataType } from '@/constants/explore-section/list-views';
 
+const DEFAULT_ERROR_MSG = 'Somethng went wrong while creating the ME-model, please try again later';
+const LOW_FUNDS_ERROR_MSG =
+  'The project does not have enough credits to create a model, please add more and try again';
+const LOW_FUNDS_ERROR_CODE = 'INSUFFICIENT_FUNDS';
+
 type Params = {
   params: {
     virtualLabId: string;
@@ -149,8 +154,15 @@ export default function NewMEModelPage({ params: { projectId, virtualLabId } }:
         setMeModelCreating(false);
         router.push(redirectionUrl);
       })
-      .catch(() => {
+      .catch((err) => {
         setMeModelCreating(false);
+        notification.error({
+          duration: 10,
+          message:
+            err?.cause?.error_code === LOW_FUNDS_ERROR_CODE
+              ? LOW_FUNDS_ERROR_MSG
+              : DEFAULT_ERROR_MSG,
+        });
       });
   };
 

src/components/LandingPage/layout/FooterPanel/NewsLetterSubscription/NewsLetterSubscription.module.css

@@ -27,7 +27,7 @@
 }
 
 .accepted {
-    max-width: max(300px, 32%);
+  max-width: max(300px, 32%);
 }
 
 .accepted > svg {

src/components/build-section/virtual-lab/synaptome/molecules/SynaptomeConfigurationForm.tsx

@@ -48,6 +48,10 @@ import { validateFormula } from '@/api/bluenaas/validateSynapseGenerationFormula
 import { OneshotSession } from '@/services/accounting';
 import { ServiceSubtype } from '@/types/accounting';
 
+const LOW_FUNDS_ERROR_MSG =
+  'The project does not have enough credits to create a model, please add more and try again';
+const LOW_FUNDS_ERROR_CODE = 'INSUFFICIENT_FUNDS';
+
 const label = (text: string) => (
   <span className="text-base font-semibold text-primary-8">{text}</span>
 );
@@ -284,16 +288,6 @@ export default function SynaptomeConfigurationForm({ org, project, resource }: P
 
       refreshSynaptomeModels();
 
-      if (!resp.ok) {
-        return notifyError(
-          CREATE_SYNAPTOME_FAIL,
-          undefined,
-          'topRight',
-          undefined,
-          'synaptome-config'
-        );
-      }
-
       form.resetFields();
       setSimulationScope(SimulationType.Synaptome);
       selectedRowsAtom.setShouldRemove(() => true); // set function to remove all
@@ -305,7 +299,11 @@ export default function SynaptomeConfigurationForm({ org, project, resource }: P
 
       navigate(generateSynaptomeUrl(newSynaptomeModel));
     } catch (error) {
-      notifyError(CREATE_SYNAPTOME_FAIL, 7, 'topRight', undefined, 'synaptome-config');
+      const errorMessage =
+        (error as any)?.cause?.error_code === LOW_FUNDS_ERROR_CODE
+          ? LOW_FUNDS_ERROR_MSG
+          : CREATE_SYNAPTOME_FAIL;
+      notifyError(errorMessage, 7, 'topRight', undefined, 'synaptome-config');
       setLoading(false);
     }
   };

src/constants/explore-section/paths.ts

@@ -1,3 +1,3 @@
-export const INTERACTIVE_PATH = `/app/explore/interactive/`;
+export const INTERACTIVE_PATH = `/explore/interactive/`;
 export const BASE_EXPERIMENTAL_EXPLORE_PATH = `${INTERACTIVE_PATH}experimental/`;
 export const BASE_MODEL_EXPLORE_PATH = `${INTERACTIVE_PATH}model/`;

src/services/accounting/index.ts

@@ -9,7 +9,7 @@ type OneshotUsageReport = Omit<OneshotUsage, 'type'>;
 async function makeOneshotReservation(
   reservation: OneShotReservationRequest
 ): Promise<OneshotReservationResponse> {
-  const res = await authFetch('/api/accounting/reservation/oneshot', {
+  const res = await authFetch('/api/public-accounting/reservation/oneshot', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(reservation),
@@ -19,15 +19,15 @@ async function makeOneshotReservation(
 }
 
 async function cancelOneshotReservation(jobId: string) {
-  const res = await authFetch(`/api/accounting/reservation/oneshot/${jobId}`, {
+  const res = await authFetch(`/api/public-accounting/reservation/oneshot/${jobId}`, {
     method: 'DELETE',
   });
 
   return assertApiResponse(res);
 }
 
 async function reportOneshotUsage(oneshotUsageReport: OneshotUsageReport) {
-  const res = await authFetch('/api/accounting/usage/oneshot', {
+  const res = await authFetch('/api/public-accounting/usage/oneshot', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(oneshotUsageReport),
@@ -65,7 +65,7 @@ export class OneshotSession {
       reportOneshotUsage({
         ...this.reservationRequest,
         jobId,
-        timestamp: new Date().toISOString(),
+        timestamp: Math.floor(Date.now() / 1000),
       });
     }
 

src/types/accounting/index.ts

@@ -94,10 +94,11 @@ export type OneshotReservationResponse = VlmResponse<{
 }>;
 
 export type OneshotUsage = {
+  virtualLabId: string;
   projectId: string;
   type: ServiceType;
   subtype: ServiceSubtype;
   count: number;
   jobId: string;
-  timestamp: string;
+  timestamp: number;
 };

src/util/utils.ts

@@ -266,13 +266,25 @@ export async function assertApiResponse(res: Response) {
     throw new Error(message || 'An error occurred while processing your request...', {
       cause: {
         ...data,
+        status: res.status,
       },
     });
   }
 
   return data;
 }
 
+export function RemoteAPIErrorResponse(error: any, status: number = 502, defaultMessage?: string) {
+  const message = error.message ?? defaultMessage;
+
+  const resData = {
+    ...(error instanceof Error && typeof error.cause === 'object' ? error.cause : null),
+    message,
+  };
+
+  return Response.json(resData, { status });
+}
+
 export function assertErrorMessage(e: any) {
   if (e instanceof Error) return e.message;
   return 'Something went wrong...';