macrocosmos 1.4.2 → 2.0.0

package/README.md

@@ -10,46 +10,6 @@ npm install macrocosmos
 
 ## Usage
 
-### Apex Client
-
-The Apex client provides an interface for accessing the Apex API for chat completions, web search and deep research.
-
-```typescript
-import { ApexClient } from 'macrocosmos';
-
-// Initialize the client
-const client = new ApexClient({ apiKey: 'your-api-key' });
-
-// Chat completions
-const response = await client.chat.completions.create({
-  messages: [
-    { role: 'system', content: 'You are a helpful assistant.' },
-    { role: 'user', content: 'Hello, how are you?' }
-  ],
-  stream: true
-});
-
-// Web retrieval
-const webResults = await client.webRetrieval({
-  query: 'latest news about AI'
-});
-
-// Deep Researcher
-
-// Submit a deep research job
-const submittedJob = await client.submitDeepResearcherJob({
-      messages: [
-      { role: "user",
-        content: `Can you propose a mechanism by which a decentralized network 
-        of AI agents could achieve provable alignment on abstract ethical principles 
-        without relying on human-defined ontologies or centralized arbitration?`},
-    ],
-    });
-
-// Get the results of a deep research job
-const polledJobResult = await client.getDeepResearcherJob({jobId: submittedJob.jobId});
-```
-
 ### Gravity Client
 
 The Gravity client provides an interface for data collection and dataset management.

package/dist/README.md

@@ -10,46 +10,6 @@ npm install macrocosmos
 
 ## Usage
 
-### Apex Client
-
-The Apex client provides an interface for accessing the Apex API for chat completions, web search and deep research.
-
-```typescript
-import { ApexClient } from 'macrocosmos';
-
-// Initialize the client
-const client = new ApexClient({ apiKey: 'your-api-key' });
-
-// Chat completions
-const response = await client.chat.completions.create({
-  messages: [
-    { role: 'system', content: 'You are a helpful assistant.' },
-    { role: 'user', content: 'Hello, how are you?' }
-  ],
-  stream: true
-});
-
-// Web retrieval
-const webResults = await client.webRetrieval({
-  query: 'latest news about AI'
-});
-
-// Deep Researcher
-
-// Submit a deep research job
-const submittedJob = await client.submitDeepResearcherJob({
-      messages: [
-      { role: "user",
-        content: `Can you propose a mechanism by which a decentralized network 
-        of AI agents could achieve provable alignment on abstract ethical principles 
-        without relying on human-defined ontologies or centralized arbitration?`},
-    ],
-    });
-
-// Get the results of a deep research job
-const polledJobResult = await client.getDeepResearcherJob({jobId: submittedJob.jobId});
-```
-
 ### Gravity Client
 
 The Gravity client provides an interface for data collection and dataset management.

package/dist/__tests__/sn13/client.test.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const macrocosmos_1 = require("macrocosmos");
+const endDate = new Date();
+const startDate = new Date();
+startDate.setDate(startDate.getDate() - 7);
+// format as "YYYY-MM-DD"
+const formattedStartDate = startDate.toISOString().split("T")[0];
+const formattedEndDate = endDate.toISOString().split("T")[0];
 describe("Sn13Client", () => {
     const API_KEY = process.env.MACROCOSMOS_API_KEY;
     if (!API_KEY) {
@@ -39,8 +45,8 @@ describe("Sn13Client", () => {
             source: "x",
             usernames: ["nasa", "spacex"],
             keywords: ["photo", "space", "mars"],
-            startDate: "2024-04-01",
-            endDate: "2025-04-25",
+            startDate: formattedStartDate,
+            endDate: formattedEndDate,
             limit: 3,
         };
         // Fetch on-demand data
@@ -65,8 +71,8 @@ describe("Sn13Client", () => {
             source: "x",
             usernames: ["nasa", "spacex"],
             keywords: ["photo", "space", "mars"],
-            startDate: "2024-04-01",
-            endDate: "2025-04-25",
+            startDate: formattedStartDate,
+            endDate: formattedEndDate,
             limit: 3,
             keywordMode: "any",
         };

package/dist/constants.d.ts

@@ -1,5 +1,4 @@
 export { VERSION } from "./version";
 export declare const CLIENT_NAME = "macrocosmos-ts-sdk";
 export declare const BASE_URL: string;
-export declare const APEX_API_KEY: string | undefined;
 export declare const GRAVITY_API_KEY: string | undefined;

package/dist/constants.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GRAVITY_API_KEY = exports.APEX_API_KEY = exports.BASE_URL = exports.CLIENT_NAME = exports.VERSION = void 0;
+exports.GRAVITY_API_KEY = exports.BASE_URL = exports.CLIENT_NAME = exports.VERSION = void 0;
 var version_1 = require("./version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
 // Package name for the SDK
 exports.CLIENT_NAME = "macrocosmos-ts-sdk";
 exports.BASE_URL = process.env.MACROCOSMOS_BASE_URL || "constellation.api.cloud.macrocosmos.ai";
-exports.APEX_API_KEY = process.env.APEX_API_KEY || process.env.MACROCOSMOS_API_KEY;
 exports.GRAVITY_API_KEY = process.env.GRAVITY_API_KEY || process.env.MACROCOSMOS_API_KEY;

package/dist/generated/billing/v1/billing.d.ts

@@ -6,9 +6,9 @@ export interface GetUsageRequest {
     /** product_type: the type of the product (i.e. "gravity") */
     productType?: string | undefined;
 }
-/** ProductPlan is details of the subscription plan for a product */
+/** BillingRate is the billing rate for a product */
 export interface BillingRate {
-    /** product_type: the type of the product (i.e. "gravity") */
+    /** rate_type: the type of the billing rate (i.e. "gravity") */
     rateType: string;
     /** unit_size: the size of the unit of the subscription (e.g. 1000, 10000, 100000) */
     unitSize: number;
@@ -19,6 +19,21 @@ export interface BillingRate {
     /** currency: the currency of the subscription */
     currency: string;
 }
+/** SubscriptionInfo contains the active subscription details */
+export interface SubscriptionInfo {
+    /** external_id: the external ID of the subscription */
+    externalId: string;
+    /** plan_code: the plan code of the subscription */
+    planCode: string;
+    /** plan_tier: the tier of the plan (0=Free, 1=Astronaut, 2=Cosmonaut) */
+    planTier: number;
+    /** free_allowance_usd: the total free allowance in USD per month for the active subscription */
+    freeAllowanceUsd: number;
+    /** free_allowance_remaining_usd: the remaining free allowance in USD for the current period */
+    freeAllowanceRemainingUsd: number;
+    /** usage_in_usd: the current usage amount in USD for the billing period */
+    usageInUsd: number;
+}
 /** GetUsageResponse is the response message for getting the usage of the user's credits */
 export interface GetUsageResponse {
     /** available_credits: the number of credits available to the user */
@@ -29,13 +44,58 @@ export interface GetUsageResponse {
     remainingCredits: number;
     /** subscription: the subscription that the user has */
     billingRates: BillingRate[];
+    /** active_subscription: the currently active subscription */
+    activeSubscription?: SubscriptionInfo | undefined;
+}
+/** ChargeUserForUsageRequest is the request message for charging a user for usage */
+export interface ChargeUserForUsageRequest {
+    /** transaction_id: unique identifier for this transaction */
+    transactionId: string;
+    /** channel: the gravity service channel ("dataset" or "on_demand") */
+    channel: string;
+    /** rows: the number of rows to charge for (can be negative for refunds) */
+    rows: number;
+}
+/** ChargeUserForUsageResponse is the response message for charging a user for usage */
+export interface ChargeUserForUsageResponse {
+    /** charge_cents: the amount charged in cents */
+    chargeCents: number;
+    /** transaction_id: the transaction ID */
+    transactionId: string;
+    /** channel: the channel that was charged */
+    channel: string;
+    /** rows: the number of rows charged */
+    rows: number;
+}
+/** UserHasEnoughAllowanceAndCreditsRequest is the request message for checking if a user has enough allowance and credits */
+export interface UserHasEnoughAllowanceAndCreditsRequest {
+    /** channel: the gravity service channel ("dataset" or "on_demand") */
+    channel: string;
+    /** rows: the number of rows to check for */
+    rows: number;
+}
+/** UserHasEnoughAllowanceAndCreditsResponse is the response message for checking if a user has enough allowance and credits */
+export interface UserHasEnoughAllowanceAndCreditsResponse {
+    /** has_enough: whether the user has enough allowance and credits */
+    hasEnough: boolean;
+    /** charge_cents: the amount that would be charged in cents */
+    chargeCents: number;
+    /** channel: the channel that would be charged */
+    channel: string;
+    /** rows: the number of rows that would be charged */
+    rows: number;
 }
 export declare const GetUsageRequest: MessageFns<GetUsageRequest>;
 export declare const BillingRate: MessageFns<BillingRate>;
+export declare const SubscriptionInfo: MessageFns<SubscriptionInfo>;
 export declare const GetUsageResponse: MessageFns<GetUsageResponse>;
+export declare const ChargeUserForUsageRequest: MessageFns<ChargeUserForUsageRequest>;
+export declare const ChargeUserForUsageResponse: MessageFns<ChargeUserForUsageResponse>;
+export declare const UserHasEnoughAllowanceAndCreditsRequest: MessageFns<UserHasEnoughAllowanceAndCreditsRequest>;
+export declare const UserHasEnoughAllowanceAndCreditsResponse: MessageFns<UserHasEnoughAllowanceAndCreditsResponse>;
 export type BillingServiceService = typeof BillingServiceService;
 export declare const BillingServiceService: {
-    /** Get the usage of the user's credits */
+    /** Get the usage of the user's credits with subscription-aware billing */
     readonly getUsage: {
         readonly path: "/billing.v1.BillingService/GetUsage";
         readonly requestStream: false;
@@ -45,16 +105,48 @@ export declare const BillingServiceService: {
         readonly responseSerialize: (value: GetUsageResponse) => Buffer<ArrayBuffer>;
         readonly responseDeserialize: (value: Buffer) => GetUsageResponse;
     };
+    /** ChargeUserForUsage charges a user for gravity data usage (testing endpoint) */
+    readonly chargeUserForUsage: {
+        readonly path: "/billing.v1.BillingService/ChargeUserForUsage";
+        readonly requestStream: false;
+        readonly responseStream: false;
+        readonly requestSerialize: (value: ChargeUserForUsageRequest) => Buffer<ArrayBuffer>;
+        readonly requestDeserialize: (value: Buffer) => ChargeUserForUsageRequest;
+        readonly responseSerialize: (value: ChargeUserForUsageResponse) => Buffer<ArrayBuffer>;
+        readonly responseDeserialize: (value: Buffer) => ChargeUserForUsageResponse;
+    };
+    /** Check if a user has enough allowance and credits to cover a charge (testing endpoint) */
+    readonly userHasEnoughAllowanceAndCredits: {
+        readonly path: "/billing.v1.BillingService/UserHasEnoughAllowanceAndCredits";
+        readonly requestStream: false;
+        readonly responseStream: false;
+        readonly requestSerialize: (value: UserHasEnoughAllowanceAndCreditsRequest) => Buffer<ArrayBuffer>;
+        readonly requestDeserialize: (value: Buffer) => UserHasEnoughAllowanceAndCreditsRequest;
+        readonly responseSerialize: (value: UserHasEnoughAllowanceAndCreditsResponse) => Buffer<ArrayBuffer>;
+        readonly responseDeserialize: (value: Buffer) => UserHasEnoughAllowanceAndCreditsResponse;
+    };
 };
 export interface BillingServiceServer extends UntypedServiceImplementation {
-    /** Get the usage of the user's credits */
+    /** Get the usage of the user's credits with subscription-aware billing */
     getUsage: handleUnaryCall<GetUsageRequest, GetUsageResponse>;
+    /** ChargeUserForUsage charges a user for gravity data usage (testing endpoint) */
+    chargeUserForUsage: handleUnaryCall<ChargeUserForUsageRequest, ChargeUserForUsageResponse>;
+    /** Check if a user has enough allowance and credits to cover a charge (testing endpoint) */
+    userHasEnoughAllowanceAndCredits: handleUnaryCall<UserHasEnoughAllowanceAndCreditsRequest, UserHasEnoughAllowanceAndCreditsResponse>;
 }
 export interface BillingServiceClient extends Client {
-    /** Get the usage of the user's credits */
+    /** Get the usage of the user's credits with subscription-aware billing */
     getUsage(request: GetUsageRequest, callback: (error: ServiceError | null, response: GetUsageResponse) => void): ClientUnaryCall;
     getUsage(request: GetUsageRequest, metadata: Metadata, callback: (error: ServiceError | null, response: GetUsageResponse) => void): ClientUnaryCall;
     getUsage(request: GetUsageRequest, metadata: Metadata, options: Partial<CallOptions>, callback: (error: ServiceError | null, response: GetUsageResponse) => void): ClientUnaryCall;
+    /** ChargeUserForUsage charges a user for gravity data usage (testing endpoint) */
+    chargeUserForUsage(request: ChargeUserForUsageRequest, callback: (error: ServiceError | null, response: ChargeUserForUsageResponse) => void): ClientUnaryCall;
+    chargeUserForUsage(request: ChargeUserForUsageRequest, metadata: Metadata, callback: (error: ServiceError | null, response: ChargeUserForUsageResponse) => void): ClientUnaryCall;
+    chargeUserForUsage(request: ChargeUserForUsageRequest, metadata: Metadata, options: Partial<CallOptions>, callback: (error: ServiceError | null, response: ChargeUserForUsageResponse) => void): ClientUnaryCall;
+    /** Check if a user has enough allowance and credits to cover a charge (testing endpoint) */
+    userHasEnoughAllowanceAndCredits(request: UserHasEnoughAllowanceAndCreditsRequest, callback: (error: ServiceError | null, response: UserHasEnoughAllowanceAndCreditsResponse) => void): ClientUnaryCall;
+    userHasEnoughAllowanceAndCredits(request: UserHasEnoughAllowanceAndCreditsRequest, metadata: Metadata, callback: (error: ServiceError | null, response: UserHasEnoughAllowanceAndCreditsResponse) => void): ClientUnaryCall;
+    userHasEnoughAllowanceAndCredits(request: UserHasEnoughAllowanceAndCreditsRequest, metadata: Metadata, options: Partial<CallOptions>, callback: (error: ServiceError | null, response: UserHasEnoughAllowanceAndCreditsResponse) => void): ClientUnaryCall;
 }
 export declare const BillingServiceClient: {
     new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): BillingServiceClient;