@liquidmetal-ai/raindrop 0.2.4 → 0.2.6

package/dist/commands/query/register-retriever.js

@@ -1,4 +1,4 @@
-import { Args, Flags } from '@oclif/core';
+import { Args } from '@oclif/core';
 import { BaseCommand } from '../../base-command.js';
 export default class RegisterRetriever extends BaseCommand {
     static args = {
@@ -10,11 +10,11 @@ export default class RegisterRetriever extends BaseCommand {
             description: 'URL endpoint for the retriever',
             required: true,
         }),
-        delete_url: Args.string({
+        deleteUrl: Args.string({
             description: 'Delete endpoint for the retriever',
             required: true,
         }),
-        bucket_name: Args.string({
+        bucketName: Args.string({
             description: 'Name of the bucket',
             required: true,
         }),
@@ -26,11 +26,7 @@ Register a new retriever tool.
 `,
     ];
     static flags = {
-        raindropCatalogService: Flags.string({
-            env: 'RAINDROP_CATALOG_SERVICE',
-            description: 'URL of the catalog service',
-            hidden: true,
-        }),
+        ...BaseCommand.HIDDEN_FLAGS,
     };
     async run() {
         const { args } = await this.parse(RegisterRetriever);
@@ -39,8 +35,8 @@ Register a new retriever tool.
             const response = await searchAgentService.registerRetrieverTool({
                 bucket: args.bucket,
                 url: args.url,
-                deleteUrl: args.delete_url,
-                bucketName: args.bucket_name,
+                deleteUrl: args.deleteUrl,
+                bucketName: args.bucketName,
             });
             if (response?.message) {
                 this.log(response.message);

package/dist/commands/query/search.d.ts

@@ -11,8 +11,12 @@ export default class AgentSearch extends BaseCommand<typeof AgentSearch> {
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         rainbowAuthService: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         raindropCatalogService: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/query/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/commands/query/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IACtE,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,WAAW,SAAsE;IAExF,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAuCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuE3B"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/commands/query/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IACtE,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,WAAW,SAAsE;IAExF,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;MA8BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuE3B"}

package/dist/commands/query/search.js

@@ -18,6 +18,7 @@ Get page 2 of previous search results.
 `,
     ];
     static flags = {
+        ...BaseCommand.HIDDEN_FLAGS,
         requestId: Flags.string({
             description: 'request ID for pagination',
             required: false,
@@ -46,16 +47,6 @@ Get page 2 of previous search results.
             default: 'raindrop.manifest',
             hidden: true,
         }),
-        rainbowAuthService: Flags.string({
-            default: 'https://liquidmetal.run/api/connect',
-            hidden: true,
-            env: 'LIQUIDMETAL_RAINBOW_AUTH_SERVICE',
-        }),
-        raindropCatalogService: Flags.string({
-            env: 'RAINDROP_CATALOG_SERVICE',
-            description: 'URL of the catalog service',
-            hidden: true,
-        }),
     };
     async run() {
         const { args, flags } = await this.parse(AgentSearch);

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { ServiceType } from '@bufbuild/protobuf';
 import { Interceptor, PromiseClient } from '@connectrpc/connect';
 import { Application } from '@liquidmetal-ai/drizzle/appify/build';
 import { CatalogService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_connect';
@@ -21,44 +22,23 @@ export declare function createAuthenticateInterceptor(configDir: string, rainbow
 export declare function readState(configDir: string): Promise<RaindropState>;
 export declare function replaceState(configDir: string, state: RaindropState): Promise<void>;
 export declare function ensureDirectory(dir: string): Promise<void>;
-export declare function catalogService({ rainbowAuth, configDir, identity, overrideAuthToken, }: {
-    rainbowAuth: PromiseClient<typeof RainbowAuthService>;
-    configDir: string;
-    identity: ServiceIdentity;
-    overrideAuthToken?: string;
-}): Promise<{
-    client: PromiseClient<typeof CatalogService>;
-    userId: string;
-    organizationId: string;
-}>;
-export declare function searchAgentService({ rainbowAuth, configDir, identity, }: {
-    rainbowAuth: PromiseClient<typeof RainbowAuthService>;
-    configDir: string;
-    identity: ServiceIdentity;
-}): Promise<{
-    client: PromiseClient<typeof SearchAgentService>;
-    userId: string;
-    organizationId: string;
-}>;
 export declare function rainbowAuthService(baseUrl: string): Promise<{
     client: PromiseClient<typeof RainbowAuthService>;
 }>;
-export declare function rainbowPublicService({ baseUrl, configDir, rainbowAuth, }: {
-    baseUrl: string;
-    configDir: string;
-    rainbowAuth: PromiseClient<typeof RainbowAuthService>;
-}): Promise<{
-    client: PromiseClient<typeof RainbowPublicService>;
-    organizationId: string;
-    userId: string;
-}>;
-export declare function objectService({ rainbowAuth, configDir, identity, }: {
+export declare function catalogService(opts: ServiceClientOptions): Promise<ServiceClient<typeof CatalogService>>;
+export declare function searchAgentService(opts: ServiceClientOptions): Promise<ServiceClient<typeof SearchAgentService>>;
+export declare function rainbowPublicService(opts: ServiceClientOptions): Promise<ServiceClient<typeof RainbowPublicService>>;
+export declare function objectService(opts: ServiceClientOptions): Promise<ServiceClient<typeof ObjectService>>;
+export type ServiceClientOptions = {
     rainbowAuth: PromiseClient<typeof RainbowAuthService>;
     configDir: string;
     identity: ServiceIdentity;
-}): Promise<{
-    client: PromiseClient<typeof ObjectService>;
+    overrideAuthToken?: string;
+};
+export type ServiceClient<T extends ServiceType> = {
+    client: PromiseClient<T>;
     userId: string;
     organizationId: string;
-}>;
+};
+export declare function serviceClient<T extends ServiceType>(service: T, { rainbowAuth, configDir, identity, overrideAuthToken }: ServiceClientOptions): Promise<ServiceClient<T>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -8,6 +8,7 @@ import { RaindropState } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/rain
 import { ObjectService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/resource_interface_connect';
 import { SearchAgentService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/search_agent_connect';
 import { Mutex } from 'async-mutex';
+import { subSeconds, isAfter } from 'date-fns';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 export { run } from '@oclif/core';
@@ -40,8 +41,14 @@ async function bearerTokenAndRefresh(configDir, rainbowAuth) {
         if (!token.accessTokenExpiresAt) {
             throw new Error('accessTokenExpiresAt at not set');
         }
-        const expiresAtBuffered = new Date(token.accessTokenExpiresAt.toDate().getTime() - 1000);
-        if (expiresAtBuffered.getTime() < Date.now()) {
+        // Add 60 second buffer before expiration to ensure smooth token refresh
+        const EXPIRATION_BUFFER_SECONDS = 60; // 1 minute
+        const expirationDate = token.accessTokenExpiresAt.toDate();
+        const earlierExpirationDate = subSeconds(expirationDate, EXPIRATION_BUFFER_SECONDS);
+        const now = new Date();
+        // expired is true if the current time is after the earlier expiration date
+        const expired = isAfter(now, earlierExpirationDate);
+        if (expired) {
             const next = await rainbowAuth.refreshAccessToken({
                 ...token,
             });
@@ -120,30 +127,6 @@ export async function ensureDirectory(dir) {
         }
     }
 }
-export async function catalogService({ rainbowAuth, configDir, identity, overrideAuthToken, }) {
-    const { baseUrl, organizationId, userId } = identity;
-    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth, overrideAuthToken);
-    return {
-        client: createPromiseClient(CatalogService, createConnectTransport({
-            baseUrl,
-            interceptors: [authenticate],
-        })),
-        userId,
-        organizationId,
-    };
-}
-export async function searchAgentService({ rainbowAuth, configDir, identity, }) {
-    const { baseUrl, organizationId, userId } = identity;
-    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
-    return {
-        client: createPromiseClient(SearchAgentService, createConnectTransport({
-            baseUrl,
-            interceptors: [authenticate],
-        })),
-        userId,
-        organizationId,
-    };
-}
 export async function rainbowAuthService(baseUrl) {
     return {
         client: createPromiseClient(RainbowAuthService, createConnectTransport({
@@ -151,23 +134,23 @@ export async function rainbowAuthService(baseUrl) {
         })),
     };
 }
-export async function rainbowPublicService({ baseUrl, configDir, rainbowAuth, }) {
-    const { organizationId, userId } = await selectedOrganization(configDir);
-    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
-    return {
-        client: createPromiseClient(RainbowPublicService, createConnectTransport({
-            baseUrl,
-            interceptors: [authenticate],
-        })),
-        organizationId,
-        userId,
-    };
+export async function catalogService(opts) {
+    return serviceClient(CatalogService, opts);
+}
+export async function searchAgentService(opts) {
+    return serviceClient(SearchAgentService, opts);
 }
-export async function objectService({ rainbowAuth, configDir, identity, }) {
+export async function rainbowPublicService(opts) {
+    return serviceClient(RainbowPublicService, opts);
+}
+export async function objectService(opts) {
+    return serviceClient(ObjectService, opts);
+}
+export async function serviceClient(service, { rainbowAuth, configDir, identity, overrideAuthToken }) {
     const { baseUrl, organizationId, userId } = identity;
-    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
+    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth, overrideAuthToken);
     return {
-        client: createPromiseClient(ObjectService, createConnectTransport({
+        client: createPromiseClient(service, createConnectTransport({
             baseUrl,
             interceptors: [authenticate],
         })),