@liquidmetal-ai/raindrop 0.3.5 → 0.4.0

package/dist/commands/query/chunk-search.js

@@ -18,6 +18,18 @@ Run a RAG search query against a Smart Bucket.
     ];
     static flags = {
         ...BaseCommand.HIDDEN_FLAGS,
+        buckets: Flags.string({
+            char: 'b',
+            description: 'Bucket names to search in, version can be specified with @, e.g. my-bucket@versionId',
+            multiple: true,
+            required: false,
+        }),
+        moduleIds: Flags.string({
+            char: 'm',
+            description: 'Module IDs to search in',
+            multiple: true,
+            required: false,
+        }),
         output: Flags.string({
             char: 'o',
             description: 'output format',
@@ -31,7 +43,7 @@ Run a RAG search query against a Smart Bucket.
             hidden: true,
         }),
         manifest: Flags.string({
-            char: 'm',
+            char: 'M',
             description: 'project manifest',
             required: false,
             default: 'raindrop.manifest',
@@ -39,12 +51,36 @@ Run a RAG search query against a Smart Bucket.
         }),
     };
     async searchAgent(query) {
+        // Check if both buckets and moduleIds flags are set
+        if (this.flags.buckets?.length && this.flags.moduleIds?.length) {
+            this.error('Cannot specify both --buckets and --moduleIds flags. Please use only one type of filter.');
+        }
         const { client: searchAgentService, userId, organizationId } = await this.searchAgentService();
         // Run the RAG search
         const response = await searchAgentService.ragSearch({
             userId,
             organizationId,
-            bucketIds: [],
+            bucketLocations: [
+                ...(this.flags.buckets || []).map((bucket) => {
+                    //string split on @ to get bucket name and version
+                    const [bucketName, version] = bucket.split('@');
+                    return {
+                        bucketLocation: {
+                            case: 'bucket',
+                            value: {
+                                name: bucketName,
+                                version: version || '',
+                            },
+                        },
+                    };
+                }),
+                ...(this.flags.moduleIds || []).map((moduleId) => ({
+                    bucketLocation: {
+                        case: 'moduleId',
+                        value: moduleId,
+                    },
+                })),
+            ],
             requestId: ulid(),
             input: query,
         });

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

@@ -7,6 +7,7 @@ export default class AgentSearch extends BaseCommand<typeof AgentSearch> {
     static examples: string[];
     static flags: {
         buckets: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        moduleIds: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         requestId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;

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;;;;;;;;;;;;;MAoCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoF3B"}
+{"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;;;;;;;;;;;;;;MA0CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsG3B"}

package/dist/commands/query/search.js

@@ -21,7 +21,13 @@ Get page 2 of previous search results.
         ...BaseCommand.HIDDEN_FLAGS,
         buckets: Flags.string({
             char: 'b',
-            description: 'bucket IDs to search in',
+            description: 'Bucket names to search in, version can be specified with @, e.g. my-bucket@versionId',
+            multiple: true,
+            required: false,
+        }),
+        moduleIds: Flags.string({
+            char: 'm',
+            description: 'Module IDs to search in',
             multiple: true,
             required: false,
         }),
@@ -47,7 +53,7 @@ Get page 2 of previous search results.
             hidden: true,
         }),
         manifest: Flags.string({
-            char: 'm',
+            char: 'M',
             description: 'project manifest',
             required: false,
             default: 'raindrop.manifest',
@@ -55,6 +61,10 @@ Get page 2 of previous search results.
         }),
     };
     async run() {
+        // Check if both buckets and moduleIds flags are set
+        if (this.flags.buckets?.length && this.flags.moduleIds?.length) {
+            this.error('Cannot specify both --buckets and --moduleIds flags. Please use only one type of filter.');
+        }
         const { args, flags } = await this.parse(AgentSearch);
         const { client: searchAgentService, userId, organizationId } = await this.searchAgentService();
         let response;
@@ -84,16 +94,31 @@ Get page 2 of previous search results.
                 this.error('Search query is required when not using requestId');
                 return;
             }
-            // Check if buckets were provided
-            if (!flags.buckets || flags.buckets.length === 0) {
-                this.error('At least one bucket ID must be specified using --buckets');
-                return;
-            }
             requestId = ulid();
             response = await searchAgentService.runSupervisorAgent({
                 requestId,
                 input: args.query,
-                bucketIds: [...flags.buckets],
+                bucketLocations: [
+                    ...(this.flags.buckets || []).map((bucket) => {
+                        //string split on @ to get bucket name and version
+                        const [bucketName, version] = bucket.split('@');
+                        return {
+                            bucketLocation: {
+                                case: 'bucket',
+                                value: {
+                                    name: bucketName,
+                                    version: version || '',
+                                },
+                            },
+                        };
+                    }),
+                    ...(this.flags.moduleIds || []).map((moduleId) => ({
+                        bucketLocation: {
+                            case: 'moduleId',
+                            value: moduleId,
+                        },
+                    })),
+                ],
                 userId,
                 organizationId,
             });
@@ -111,7 +136,7 @@ Get page 2 of previous search results.
                 console.log('----------------------------------------');
                 console.log(`Type: ${result.type || 'N/A'}`);
                 console.log(`Score: ${result.score || 0}`);
-                console.log(`Source: ${result.source ? `${result.source.bucket}/${result.source.object}` : 'N/A'}`);
+                console.log(`Source: ${result.source ? `${result.source.bucket?.bucketName}/${result.source.object}` : 'N/A'}`);
                 console.log(`Content: ${result.text || 'N/A'}`);
                 console.log('----------------------------------------\n');
             }