github_actions

Author: spolu

core/src/oauth/providers/github.rs

@@ -24,6 +24,21 @@ lazy_static! {
         let key = std::fs::read_to_string(path).unwrap();
         EncodingKey::from_rsa_pem(key.as_bytes()).unwrap()
     };
+    static ref OAUTH_GITHUB_APP_PLATFORM_ACTIONS_CLIENT_ID: String =
+        std::env::var("OAUTH_GITHUB_APP_PLATFORM_ACTIONS_CLIENT_ID").unwrap();
+    static ref OAUTH_GITHUB_APP_PLATFORM_ACTIONS_ENCODING_KEY: EncodingKey = {
+        let path = std::env::var("OAUTH_GITHUB_APP_PLATFORM_ACTIONS_PRIVATE_KEY_PATH").unwrap();
+        let key = std::fs::read_to_string(path).unwrap();
+        EncodingKey::from_rsa_pem(key.as_bytes()).unwrap()
+    };
+}
+
+/// We support two Github apps. Our default `connection` app (for data source connection) and a
+/// `platform_actions` app (for agent actions).
+#[derive(Debug, PartialEq, Clone)]
+pub enum GithubUseCase {
+    Connection,
+    PlatformActions,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -43,21 +58,42 @@ impl GithubConnectionProvider {
     // See https://docs.github.com/en
     //             /apps/creating-github-apps/authenticating-with-a-github-app
     //             /generating-a-json-web-token-jwt-for-a-github-app
-    fn jwt(&self) -> Result<String> {
+    fn jwt(&self, app_type: GithubUseCase) -> Result<String> {
         let header = Header::new(Algorithm::RS256);
-        let payload = JWTPayload {
-            iat: utils::now_secs() - 60,
-            exp: utils::now_secs() + 3 * 60,
-            iss: OAUTH_GITHUB_APP_CLIENT_ID.clone(),
-        };
 
-        let token = encode(&header, &payload, &OAUTH_GITHUB_APP_ENCODING_KEY)?;
+        match app_type {
+            GithubUseCase::Connection => {
+                let payload = JWTPayload {
+                    iat: utils::now_secs() - 60,
+                    exp: utils::now_secs() + 3 * 60,
+                    iss: OAUTH_GITHUB_APP_CLIENT_ID.clone(),
+                };
+
+                let token = encode(&header, &payload, &OAUTH_GITHUB_APP_ENCODING_KEY)?;
 
-        Ok(token)
+                Ok(token)
+            }
+            GithubUseCase::PlatformActions => {
+                let payload = JWTPayload {
+                    iat: utils::now_secs() - 60,
+                    exp: utils::now_secs() + 3 * 60,
+                    iss: OAUTH_GITHUB_APP_PLATFORM_ACTIONS_CLIENT_ID.clone(),
+                };
+
+                let token = encode(
+                    &header,
+                    &payload,
+                    &OAUTH_GITHUB_APP_PLATFORM_ACTIONS_ENCODING_KEY,
+                )?;
+
+                Ok(token)
+            }
+        }
     }
 
     async fn refresh_token(
         &self,
+        app_type: GithubUseCase,
         code: &str,
     ) -> Result<(String, u64, serde_json::Value), ProviderError> {
         // https://github.com/octokit/auth-app.js/blob/main/src/get-installation-authentication.ts
@@ -67,7 +103,7 @@ impl GithubConnectionProvider {
                 code
             ))
             .header("Accept", "application/vnd.github+json")
-            .header("Authorization", format!("Bearer {}", self.jwt()?))
+            .header("Authorization", format!("Bearer {}", self.jwt(app_type)?))
             .header("User-Agent", "dust/oauth")
             .header("X-GitHub-Api-Version", "2022-11-28");
 
@@ -108,12 +144,21 @@ impl Provider for GithubConnectionProvider {
 
     async fn finalize(
         &self,
-        _connection: &Connection,
+        connection: &Connection,
         code: &str,
         redirect_uri: &str,
     ) -> Result<FinalizeResult, ProviderError> {
+        let app_type = match connection.metadata()["use_case"].as_str() {
+            Some(use_case) => match use_case {
+                "connection" => GithubUseCase::Connection,
+                "platform_actions" => GithubUseCase::PlatformActions,
+                _ => Err(anyhow!("Github use_case format invalid"))?,
+            },
+            None => Err(anyhow!("Github use_case missing"))?,
+        };
+
         // `code` is the installation_id returned by Github.
-        let (token, expiry, raw_json) = self.refresh_token(code).await?;
+        let (token, expiry, raw_json) = self.refresh_token(app_type, code).await?;
 
         // We store the installation_id as `code` which will be used to refresh tokens.
         Ok(FinalizeResult {
@@ -127,13 +172,22 @@ impl Provider for GithubConnectionProvider {
     }
 
     async fn refresh(&self, connection: &Connection) -> Result<RefreshResult, ProviderError> {
+        let app_type = match connection.metadata()["use_case"].as_str() {
+            Some(use_case) => match use_case {
+                "connection" => GithubUseCase::Connection,
+                "platform_actions" => GithubUseCase::PlatformActions,
+                _ => Err(anyhow!("Github use_case format invalid"))?,
+            },
+            None => Err(anyhow!("Github use_case missing"))?,
+        };
+
         // `code` is the installation_id returned by Github.
         let code = match connection.unseal_authorization_code()? {
             Some(code) => code,
             None => Err(anyhow!("Missing installation_id in connection"))?,
         };
 
-        let (token, expiry, raw_json) = self.refresh_token(&code).await?;
+        let (token, expiry, raw_json) = self.refresh_token(app_type, &code).await?;
 
         Ok(RefreshResult {
             access_token: token.to_string(),

front/admin/db.ts

@@ -10,6 +10,8 @@ import {
   AgentDustAppRunAction,
   AgentDustAppRunConfiguration,
 } from "@app/lib/models/assistant/actions/dust_app_run";
+import { AgentGithubGetPullRequestAction } from "@app/lib/models/assistant/actions/github";
+import { AgentGithubConfiguration } from "@app/lib/models/assistant/actions/github";
 import {
   AgentProcessAction,
   AgentProcessConfiguration,
@@ -81,6 +83,7 @@ import {
   LabsTranscriptsHistoryModel,
 } from "@app/lib/resources/storage/models/labs_transcripts";
 import { MembershipModel } from "@app/lib/resources/storage/models/membership";
+import { PlatformActionsConfigurationModel } from "@app/lib/resources/storage/models/platform_actions";
 import {
   RunModel,
   RunUsageModel,
@@ -147,6 +150,7 @@ async function main() {
   await AgentProcessConfiguration.sync({ alter: true });
   await AgentWebsearchConfiguration.sync({ alter: true });
   await AgentBrowseConfiguration.sync({ alter: true });
+  await AgentGithubConfiguration.sync({ alter: true });
 
   await AgentDataSourceConfiguration.sync({ alter: true });
 
@@ -166,6 +170,7 @@ async function main() {
   await AgentBrowseAction.sync({ alter: true });
   await AgentConversationIncludeFileAction.sync({ alter: true });
   await AgentMessageContent.sync({ alter: true });
+  await AgentGithubGetPullRequestAction.sync({ alter: true });
 
   await RetrievalDocument.sync({ alter: true });
   await RetrievalDocumentChunk.sync({ alter: true });
@@ -175,6 +180,8 @@ async function main() {
 
   await ConversationClassification.sync({ alter: true });
 
+  await PlatformActionsConfigurationModel.sync({ alter: true });
+
   // Labs - Can be removed at all times if a solution is dropped
   await LabsTranscriptsConfigurationModel.sync({ alter: true });
   await LabsTranscriptsHistoryModel.sync({ alter: true });

front/components/UserMenu.tsx

@@ -2,6 +2,7 @@ import {
   Avatar,
   BookOpenIcon,
   ChevronDownIcon,
+  CloudArrowLeftRightIcon,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
@@ -100,6 +101,13 @@ export function UserMenu({
                 href={`/w/${owner.sId}/assistant/labs/trackers`}
               />
             )}
+            {featureFlags.includes("labs_github_actions") && (
+              <DropdownMenuItem
+                label="Platform Actions"
+                icon={CloudArrowLeftRightIcon}
+                href={`/w/${owner.sId}/assistant/labs/platform_actions`}
+              />
+            )}
           </>
         )}
 

front/components/actions/github/GithubGetPullRequestActionDetails.tsx

@@ -0,0 +1,25 @@
+import { GithubIcon } from "@dust-tt/sparkle";
+import type { GithubGetPullRequestActionType } from "@dust-tt/types";
+
+import { ActionDetailsWrapper } from "@app/components/actions/ActionDetailsWrapper";
+import type { ActionDetailsComponentBaseProps } from "@app/components/actions/types";
+
+export function GithubGetPullRequestActionDetails({
+  action,
+  defaultOpen,
+}: ActionDetailsComponentBaseProps<GithubGetPullRequestActionType>) {
+  const { owner, repo, pullNumber } = action.params;
+  return (
+    <ActionDetailsWrapper
+      actionName="Retrieve pull request"
+      defaultOpen={defaultOpen}
+      visual={GithubIcon}
+    >
+      <div className="flex flex-col gap-4 pl-6 pt-4">
+        <p className="text-sm font-normal text-muted-foreground">
+          {`https://github.com/${owner}/${repo}/pull/${pullNumber}`}
+        </p>
+      </div>
+    </ActionDetailsWrapper>
+  );
+}

front/components/actions/types.ts

@@ -4,6 +4,7 @@ import { ACTION_RUNNING_LABELS } from "@dust-tt/types";
 import { BrowseActionDetails } from "@app/components/actions/browse/BrowseActionDetails";
 import { ConversationIncludeFileActionDetails } from "@app/components/actions/conversation/include_file/IncludeFileActionDetails";
 import { DustAppRunActionDetails } from "@app/components/actions/dust_app_run/DustAppRunActionDetails";
+import { GithubGetPullRequestActionDetails } from "@app/components/actions/github/GithubGetPullRequestActionDetails";
 import { ProcessActionDetails } from "@app/components/actions/process/ProcessActionDetails";
 import { RetrievalActionDetails } from "@app/components/actions/retrieval/RetrievalActionDetails";
 import { TablesQueryActionDetails } from "@app/components/actions/tables_query/TablesQueryActionDetails";
@@ -61,6 +62,10 @@ const actionsSpecification: ActionSpecifications = {
     detailsComponent: ConversationIncludeFileActionDetails,
     runningLabel: ACTION_RUNNING_LABELS.conversation_include_file_action,
   },
+  github_get_pull_request_action: {
+    detailsComponent: GithubGetPullRequestActionDetails,
+    runningLabel: ACTION_RUNNING_LABELS.github_get_pull_request_action,
+  },
 };
 
 export function getActionSpecification<T extends ActionType>(

front/components/assistant/conversation/AgentMessage.tsx

@@ -247,6 +247,7 @@ export function AgentMessage({
       case "websearch_params":
       case "browse_params":
       case "conversation_include_file_params":
+      case "github_get_pull_request_params":
         setStreamedAgentMessage((m) => {
           return updateMessageWithAction(m, event.action);
         });

front/components/assistant/details/AssistantActionsSection.tsx

@@ -3,6 +3,7 @@ import {
   CommandLineIcon,
   ExternalLinkIcon,
   FolderIcon,
+  GithubIcon,
   Icon,
   IconButton,
   PlanetIcon,
@@ -24,6 +25,7 @@ import {
   GLOBAL_AGENTS_SID,
   isBrowseConfiguration,
   isDustAppRunConfiguration,
+  isGithubGetPullRequestConfiguration,
   isProcessConfiguration,
   isRetrievalConfiguration,
   isTablesQueryConfiguration,
@@ -265,13 +267,22 @@ function renderOtherAction(
           <Icon visual={PlanetIcon} size="sm" />
           <div>
             Assistant can navigate the web (browse any provided links, make a
-            google search, etc.) to answer
+            google search, etc.) to answer.
           </div>
         </div>
       </ActionSection>
     );
   } else if (isBrowseConfiguration(action)) {
     return null;
+  } else if (isGithubGetPullRequestConfiguration(action)) {
+    return (
+      <ActionSection title="Github" key={`other-${index}`}>
+        <div className="flex gap-2 text-muted-foreground">
+          <Icon visual={GithubIcon} size="sm" />
+          <div>Assistant can retrieve pull requests from Github.</div>
+        </div>
+      </ActionSection>
+    );
   } else if (
     !isRetrievalConfiguration(action) &&
     !isTablesQueryConfiguration(action)