Update to self-hosted models

juntao · juntao · commit a0f739f21ae9 · 2024-07-12T07:45:48.000Z
Signed-off-by: Michael Yuan &lt;michael@secondstate.io&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,14 +9,14 @@ crate-type = ["cdylib"]
 
 [dependencies]
 dotenv = "0.15.0"
-github-flows = "0.5"
+github-flows = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.93"
 tokio_wasi = { version = "1.25.1", features = ["macros", "rt"] }
 anyhow = "1"
 flowsnet-platform-sdk = "0.1"
 lazy_static = "1.4.0"
 regex = "1.7.1"
-openai-flows = "0.7"
+llmservice-flows = "0.2.0"
 words-count = "0.1.4"
 log = "0.4"
diff --git a/README.md b/README.md
@@ -36,16 +36,13 @@ This flow function (or &#129302;) will be triggered when a new PR is raised in the de
 * The code review comment is updated automatically every time a new commit is pushed to this PR.
 * A new code review could be triggered when someone says a magic *trigger phrase* in the PR's comments section. The default trigger phrase is "flows summarize".
 
-## Deploy your own code review bot in 3 simple steps
+## Deploy your own code review bot in 2 simple steps
 
 1. Create a bot from a template
-2. Add your OpenAI API key
-3. Configure the bot to review PRs on a specified GitHub repo
+2. Configure the bot to review PRs on a specified GitHub repo
 
 ### 0 Prerequisites
 
-You will need to bring your own [OpenAI API key](https://openai.com/blog/openai-api). If you do not already have one, [sign up here](https://platform.openai.com/signup).
-
 You will also need to sign into [flows.network](https://flows.network/) from your GitHub account. It is free.
 
 ### 1 Create a bot from a template
@@ -56,15 +53,7 @@ Review the `trigger_phrase` variable. It is the magic words you type in a PR com
 
 Click on the **Create and Build** button.
 
-### 2 Add your OpenAI API key
-
-You will now set up OpenAI integration. Click on **Connect**, enter your key and give it a name.
-
-[<img width="450" alt="image" src="https://user-images.githubusercontent.com/45785633/222973214-ecd052dc-72c2-4711-90ec-db1ec9d5f24e.png">](https://user-images.githubusercontent.com/45785633/222973214-ecd052dc-72c2-4711-90ec-db1ec9d5f24e.png)
-
-Close the tab and go back to the flow.network page once you are done. Click on **Continue**.
-
-### 3 Configure the bot to access GitHub
+### 2 Configure the bot to access GitHub
 
 Next, you will tell the bot which GitHub repo it needs to monitor for upcoming PRs to review.
 
@@ -87,16 +76,6 @@ This is it! You are now on the flow details page waiting for the flow function t
 
 ## FAQ
 
-### Customize the bot
-
-The bot's source code is available in the GitHub repo you cloned from the template. Feel free to make changes to the source code (e.g., model, context length, API key and prompts) to fit your own needs. If you need help, [ask in Discord](https://discord.gg/ccZn9ZMfFf)!
-
-### Use GPT4
-
-By default, the bot uses GPT3.5 for code review. If your OpenAI API key has access to GPT4, you can open the `src/github-pr-review.rs` file
-in your cloned source code repo, and change `GPT35Turbo` to `GPT4` in the source code. Commit and push the change back to GitHub.
-The flows.network platform will automatically detect and rebuild the bot from your updated source code.
-
 ### Use the bot on multiple repos
 
 You can [manually create a new flow](https://flows.network/flow/new) and import the source code repo for the bot (i.e., the repo you cloned from the template). Then, you can use the flow config to specify the `github_owner` and `github_repo` to point to the target repo you need to deploy the bot on. Deploy and authorize access to that target repo.
diff --git a/src/github-pr-summary.rs b/src/github-pr-summary.rs
@@ -1,55 +1,62 @@
 use dotenv::dotenv;
 use flowsnet_platform_sdk::logger;
 use github_flows::{
-    get_octo, listen_to_event,
-    octocrab::models::events::payload::{IssueCommentEventAction, PullRequestEventAction},
+    event_handler, get_octo, listen_to_event,
+    // octocrab::models::{events::payload::EventPayload, reactions::ReactionContent},
+    octocrab::models::events::payload::{EventPayload, IssueCommentEventAction, PullRequestEventAction},
     octocrab::models::CommentId,
-    EventPayload, GithubLogin
+    GithubLogin,
 };
-use openai_flows::{
-    chat::{ChatModel, ChatOptions},
-    OpenAIFlows,
+use llmservice_flows::{
+    chat::{ChatOptions},
+    LLMServiceFlows,
 };
 use std::env;
 
 //  The soft character limit of the input context size
-//   the max token size or word count for GPT4 is 8192
-//   the max token size or word count for GPT35Turbo is 4096
-static CHAR_SOFT_LIMIT : usize = 9000;
-static MODEL : ChatModel = ChatModel::GPT35Turbo;
-// static MODEL : ChatModel = ChatModel::GPT4;
+//  THe codestral has a context length of 32k, and we allow 8k context here
+static CHAR_SOFT_LIMIT : usize = 8192;
 
 #[no_mangle]
 #[tokio::main(flavor = "current_thread")]
-pub async fn run() -> anyhow::Result<()> {
+pub async fn on_deploy() {
     dotenv().ok();
     logger::init();
     log::debug!("Running github-pr-summary/main");
 
     let owner = env::var("github_owner").unwrap_or("juntao".to_string());
     let repo = env::var("github_repo").unwrap_or("test".to_string());
-    let trigger_phrase = env::var("trigger_phrase").unwrap_or("flows summarize".to_string());
 
-    let events = vec!["pull_request", "issue_comment"];
-    listen_to_event(&GithubLogin::Default, &owner, &repo, events, |payload| {
-        handler(
-            &owner,
-            &repo,
-            &trigger_phrase,
-            payload,
-        )
-    })
-    .await;
-
-    Ok(())
+    listen_to_event(&GithubLogin::Provided(owner.clone()), &owner, &repo, vec!["pull_request", "issue_comment"]).await;
 }
 
-async fn handler(
-    owner: &str,
-    repo: &str,
-    trigger_phrase: &str,
-    payload: EventPayload,
-) {
+#[event_handler]
+async fn handler(payload: EventPayload) {
+    dotenv().ok();
+    logger::init();
+    log::debug!("Running github-pr-summary/main handler()");
+
+    let owner = env::var("github_owner").unwrap_or("juntao".to_string());
+    let repo = env::var("github_repo").unwrap_or("test".to_string());
+    let trigger_phrase = env::var("trigger_phrase").unwrap_or("flows summarize".to_string());
+    let llm_api_endpoint = env::var("llm_api_endpoint").unwrap_or("https://codestral-01-22b.us.gaianet.network/v1".to_string());
+    let llm_model_name = env::var("llm_model_name").unwrap_or("Codestral-22B-v0.1-hf-Q5_K_M".to_string());
+
+    /*
+    if let EventPayload::IssueCommentEvent(e) = payload {
+        let comment_id = e.comment.id.0;
+
+        // installed app login
+        let octo = get_octo(&GithubLogin::Provided(String::from("some_login")));
+
+        let _reaction = octo
+            .issues("some_owner", "some_repo")
+            .create_comment_reaction(comment_id, ReactionContent::Rocket)
+            .await
+            .unwrap();
+    };
+    */
+
     let mut new_commit : bool = false;
     let (title, pull_number, _contributor) = match payload {
         EventPayload::PullRequestEvent(e) => {
@@ -97,8 +104,8 @@ async fn handler(
         _ => return,
     };
 
-    let octo = get_octo(&GithubLogin::Default);
-    let issues = octo.issues(owner, repo);
+    let octo = get_octo(&GithubLogin::Provided(owner.clone()));
+    let issues = octo.issues(owner.clone(), repo.clone());
     let mut comment_id: CommentId = 0u64.into();
     if new_commit {
         // Find the first "Hello, I am a [code review bot]" comment to update
@@ -130,7 +137,7 @@ async fn handler(
     }
     if comment_id == 0u64.into() { return; }
 
-    let pulls = octo.pulls(owner, repo);
+    let pulls = octo.pulls(owner.clone(), repo.clone());
     let patch_as_text = pulls.get_patch(pull_number).await.unwrap();
     let mut current_commit = String::new();
     let mut commits: Vec<String> = Vec::new();
@@ -162,21 +169,22 @@ async fn handler(
 
     let chat_id = format!("PR#{pull_number}");
     let system = &format!("You are an experienced software developer. You will act as a reviewer for a GitHub Pull Request titled \"{}\".", title);
-    let mut openai = OpenAIFlows::new();
-    openai.set_retry_times(3);
+    let mut lf = LLMServiceFlows::new(&llm_api_endpoint);
+    lf.set_retry_times(3);
 
     let mut reviews: Vec<String> = Vec::new();
     let mut reviews_text = String::new();
     for (_i, commit) in commits.iter().enumerate() {
         let commit_hash = &commit[5..45];
         log::debug!("Sending patch to OpenAI: {}", commit_hash);
         let co = ChatOptions {
-            model: MODEL,
+            model: Some(&llm_model_name),
             restart: true,
             system_prompt: Some(system),
+            ..Default::default()
         };
         let question = "The following is a GitHub patch. Please summarize the key changes and identify potential problems. Start with the most important findings.\n\n".to_string() + truncate(commit, CHAR_SOFT_LIMIT);
-        match openai.chat_completion(&chat_id, &question, &co).await {
+        match lf.chat_completion(&chat_id, &question, &co).await {
             Ok(r) => {
                 if reviews_text.len() < CHAR_SOFT_LIMIT {
                     reviews_text.push_str("------\n");
@@ -201,12 +209,13 @@ async fn handler(
     if reviews.len() > 1 {
         log::debug!("Sending all reviews to OpenAI for summarization");
         let co = ChatOptions {
-            model: MODEL,
+            model: Some(&llm_model_name),
             restart: true,
             system_prompt: Some(system),
+            ..Default::default()
         };
         let question = "Here is a set of summaries for software source code patches. Each summary starts with a ------ line. Please write an overall summary considering all the individual summary. Please present the potential issues and errors first, following by the most important findings, in your summary.\n\n".to_string() + &reviews_text;
-        match openai.chat_completion(&chat_id, &question, &co).await {
+        match lf.chat_completion(&chat_id, &question, &co).await {
             Ok(r) => {
                 resp.push_str(&r.choice);
                 resp.push_str("\n\n## Details\n\n");
