@credal/actions 0.2.42 → 0.2.43

package/dist/actions/autogen/templates.js

@@ -6197,7 +6197,7 @@ export const googleOauthSearchDriveByQueryDefinition = {
     scopes: ["drive.readonly"],
     parameters: {
         type: "object",
-        required: ["query"],
+        required: ["query", "searchDriveByDrive"],
         properties: {
             query: {
                 type: "string",
@@ -6207,6 +6207,10 @@ export const googleOauthSearchDriveByQueryDefinition = {
                 type: "number",
                 description: "The maximum number of files to return",
             },
+            searchDriveByDrive: {
+                type: "boolean",
+                description: "Whether we should search drive by drive or run a general search",
+            },
         },
     },
     output: {

package/dist/actions/autogen/types.d.ts

@@ -3303,11 +3303,14 @@ export type googleOauthSearchDriveByKeywordsFunction = ActionFunction<googleOaut
 export declare const googleOauthSearchDriveByQueryParamsSchema: z.ZodObject<{
     query: z.ZodString;
     limit: z.ZodOptional<z.ZodNumber>;
+    searchDriveByDrive: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
     query: string;
+    searchDriveByDrive: boolean;
     limit?: number | undefined;
 }, {
     query: string;
+    searchDriveByDrive: boolean;
     limit?: number | undefined;
 }>;
 export type googleOauthSearchDriveByQueryParamsType = z.infer<typeof googleOauthSearchDriveByQueryParamsSchema>;

package/dist/actions/autogen/types.js

@@ -2386,6 +2386,7 @@ export const googleOauthSearchDriveByKeywordsOutputSchema = z.object({
 export const googleOauthSearchDriveByQueryParamsSchema = z.object({
     query: z.string().describe("The query to search for in file contents."),
     limit: z.number().describe("The maximum number of files to return").optional(),
+    searchDriveByDrive: z.boolean().describe("Whether we should search drive by drive or run a general search"),
 });
 export const googleOauthSearchDriveByQueryOutputSchema = z.object({
     success: z.boolean().describe("Whether the search was successful"),

package/dist/actions/providers/github/searchRepository.js

@@ -34,12 +34,8 @@ const searchRepository = (_a) => __awaiter(void 0, [_a], void 0, function* ({ pa
     const codeResults = codeResultsResponse.data.items.slice(0, MAX_CODE_RESULTS).map(item => ({
         name: item.name,
         path: item.path,
-        sha: item.sha,
+        sha: item.sha.slice(0, 7),
         url: item.url,
-        repository: {
-            full_name: item.repository.full_name,
-            html_url: item.repository.html_url,
-        },
         score: item.score,
         textMatches: item.text_matches
             ? item.text_matches.map(match => {

package/dist/actions/providers/google-oauth/searchDriveByQuery.js

@@ -10,25 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { axiosClient } from "../../util/axiosClient.js";
 import { MISSING_AUTH_TOKEN } from "../../util/missingAuthConstants.js";
 const searchDriveByQuery = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, authParams, }) {
-    var _b;
     if (!authParams.authToken) {
         return { success: false, error: MISSING_AUTH_TOKEN, files: [] };
     }
-    const { query, limit } = params;
-    const url = `https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name,mimeType,webViewLink)&supportsAllDrives=true&includeItemsFromAllDrives=true&corpora=allDrives`;
+    const { query, limit, searchDriveByDrive } = params;
     try {
-        const res = yield axiosClient.get(url, {
-            headers: {
-                Authorization: `Bearer ${authParams.authToken}`,
-            },
-        });
-        const files = ((_b = res.data.files) === null || _b === void 0 ? void 0 : _b.map((file) => ({
-            id: file.id || "",
-            name: file.name || "",
-            mimeType: file.mimeType || "",
-            url: file.webViewLink || "",
-        }))) || [];
-        return { success: true, files: limit ? files.splice(0, limit) : files };
+        if (searchDriveByDrive) {
+            return yield searchAllDrivesIndividually(query, authParams.authToken, limit);
+        }
+        else {
+            return yield searchAllDrivesAtOnce(query, authParams.authToken, limit);
+        }
     }
     catch (error) {
         console.error("Error searching Google Drive", error);
@@ -39,4 +31,102 @@ const searchDriveByQuery = (_a) => __awaiter(void 0, [_a], void 0, function* ({
         };
     }
 });
+// Original search method - search all drives at once
+const searchAllDrivesAtOnce = (query, authToken, limit) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const url = `https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name,mimeType,webViewLink)&supportsAllDrives=true&includeItemsFromAllDrives=true&corpora=allDrives&pageSize=1000`;
+    const res = yield axiosClient.get(url, {
+        headers: {
+            Authorization: `Bearer ${authToken}`,
+        },
+    });
+    const files = ((_a = res.data.files) === null || _a === void 0 ? void 0 : _a.map((file) => ({
+        id: file.id || "",
+        name: file.name || "",
+        mimeType: file.mimeType || "",
+        url: file.webViewLink || "",
+    }))) || [];
+    return {
+        success: true,
+        files: limit ? files.slice(0, limit) : files,
+    };
+});
+// New search method - search each drive individually and aggregate results
+const searchAllDrivesIndividually = (query, authToken, limit) => __awaiter(void 0, void 0, void 0, function* () {
+    const drives = yield getAllDrives(authToken);
+    let allFiles = [];
+    // Search each drive individually
+    for (const drive of drives) {
+        try {
+            const driveFiles = yield searchSingleDrive(query, drive.id, authToken);
+            allFiles = allFiles.concat(driveFiles);
+            // If we have a limit and we've reached it, break early
+            if (limit && allFiles.length >= limit) {
+                break;
+            }
+        }
+        catch (error) {
+            console.error(`Error searching drive ${drive.name} (${drive.id}):`, error);
+        }
+    }
+    return {
+        success: true,
+        files: limit ? allFiles.slice(0, limit) : allFiles,
+    };
+});
+// Get all drives (shared drives + user's drive)
+const getAllDrives = (authToken) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const drives = [];
+    // Add user's personal drive (My Drive)
+    drives.push({ id: "root", name: "My Drive" });
+    // Get all shared drives
+    let nextPageToken;
+    do {
+        const url = `https://www.googleapis.com/drive/v3/drives?pageSize=100${nextPageToken ? `&pageToken=${nextPageToken}` : ""}`;
+        const res = yield axiosClient.get(url, {
+            headers: {
+                Authorization: `Bearer ${authToken}`,
+            },
+        });
+        const sharedDrives = ((_a = res.data.drives) === null || _a === void 0 ? void 0 : _a.map((drive) => ({
+            id: drive.id || "",
+            name: drive.name || "",
+        }))) || [];
+        drives.push(...sharedDrives);
+        nextPageToken = res.data.nextPageToken;
+    } while (nextPageToken);
+    return drives;
+});
+// Search a single drive
+const searchSingleDrive = (query, driveId, authToken) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const files = [];
+    let nextPageToken;
+    do {
+        let url;
+        if (driveId === "root") {
+            // Search in user's personal drive
+            url = `https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name,mimeType,webViewLink),nextPageToken&pageSize=1000${nextPageToken ? `&pageToken=${nextPageToken}` : ""}`;
+        }
+        else {
+            // Search in specific shared drive
+            url = `https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(`${query} and parents in '${driveId}'`)}&fields=files(id,name,mimeType,webViewLink),nextPageToken&supportsAllDrives=true&includeItemsFromAllDrives=true&corpora=drive&driveId=${driveId}&pageSize=1000${nextPageToken ? `&pageToken=${nextPageToken}` : ""}`;
+        }
+        const res = yield axiosClient.get(url, {
+            headers: {
+                Authorization: `Bearer ${authToken}`,
+            },
+        });
+        const driveFiles = ((_a = res.data.files) === null || _a === void 0 ? void 0 : _a.map((file) => ({
+            id: file.id || "",
+            name: file.name || "",
+            mimeType: file.mimeType || "",
+            url: file.webViewLink || "",
+        }))) || [];
+        files.push(...driveFiles);
+        nextPageToken = res.data.nextPageToken;
+    } while (nextPageToken);
+    return files;
+});
 export default searchDriveByQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@credal/actions",
-  "version": "0.2.42",
+  "version": "0.2.43",
   "type": "module",
   "description": "AI Actions by Credal AI",
   "sideEffects": false,