Add support for GitHub Copilot #333

cloudbridgeuy · 2024-08-30T13:37:52Z

Adds support to interact with OpenAi GPT-4 Models using Copilot.

This was breaking the usage of the `--format` and `--format-as` flags for every value other than `markdown`.

caarlos0

hey, thanks for the PR!

just a couple of comments

caarlos0 · 2024-09-10T12:31:13Z

mods.go

+				fileContent := string(data)
+				re := regexp.MustCompile(`.*oauth_token...|\".*`)
+				key = re.ReplaceAllString(fileContent, "")
+				if key == "" {
+					return fmt.Errorf("No Copilot OAuth token found in %s", filePath)
+				}
+				key = strings.TrimSpace(key)


probably better to unmarshal the json here instead of string manipulating it

You are probably right. I rewrote this code from bash and never even thought of doing that.

caarlos0 · 2024-09-10T12:33:17Z

mods.go

+			var key string
+			if cfg.API == "copilot" {


these should probably be below, where there is a switch case on cfg.API

Are you sure there's a switch on cfg.API? I can't find it.

sorry, its on mod.API

Yeah, I tried to make it work inside the mod.API switch statement but rolled back the changes because I wanted to keep as much of the OpenAI logic as possible, and only change the env and http endpoint values.

I don't think that's a good idea, as the way you did it will also use the openai model from the configuration, which I don't think is correct.

Yes, it will only work if you set it to gpt-4o or one its supported variants. But there's no need to be too specific. Using gpt-4o is enough.

I currently run this only with:

copilot: base-url: https://api.githubcopilot.com

And,

default-model: gpt-4o

caarlos0 · 2024-09-11T13:56:27Z

something like this:

diff --git a/config_template.yml b/config_template.yml
index 432a580..d806436 100644
--- a/config_template.yml
+++ b/config_template.yml
@@ -92,6 +92,12 @@ apis:
         fallback:
   copilot:
     base-url: https://api.githubcopilot.com
+    models:
+      gpt-4o-2024-05-13:
+        max-input-chars: 392000
+        fallback: gpt-4
+      gpt-4:
+        max-input-chars: 392000
   anthropic:
     base-url: https://api.anthropic.com/v1
     api-key:
diff --git a/mods.go b/mods.go
index 0f2ea63..2017dc2 100644
--- a/mods.go
+++ b/mods.go
@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -351,34 +352,25 @@ func (m *Mods) startCompletionCmd(content string) tea.Cmd {
 			if mod.API == "azure-ad" {
 				ccfg.APIType = openai.APITypeAzureAD
 			}
+		case "copilot":
+			filePath := os.Getenv("HOME") + "/.config/github-copilot/hosts.json"
+			bts, err := os.ReadFile(filePath)
+			if err != nil {
+				return err
+			}
+			hosts := map[string]map[string]string{}
+			if err := json.Unmarshal(bts, &hosts); err != nil {
+				return err
+			}
+			authToken := hosts["github.com"]["oauth_token"]
+			ccfg = openai.DefaultConfig(authToken)
+			ccfg.BaseURL = api.BaseURL
 		default:
 			var key string
-			if cfg.API == "copilot" {
-				filePath := os.Getenv("HOME") + "/.config/github-copilot/hosts.json"
-				data, err := os.ReadFile(filePath)
-				if err != nil {
-					return err
-				}
-				fileContent := string(data)
-				re := regexp.MustCompile(`.*oauth_token...|\".*`)
-				key = re.ReplaceAllString(fileContent, "")
-				if key == "" {
-					return fmt.Errorf("No Copilot OAuth token found in %s", filePath)
-				}
-				key = strings.TrimSpace(key)
-				ccfg = openai.DefaultConfig(key)
-				for _, a := range cfg.APIs {
-					if "copilot" == a.Name {
-						api = a
-						break
-					}
-				}
-			} else {
-				var err error
-				key, err = m.ensureKey(api, "OPENAI_API_KEY", "https://platform.openai.com/account/api-keys")
-				if err != nil {
-					return err
-				}
+			var err error
+			key, err = m.ensureKey(api, "OPENAI_API_KEY", "https://platform.openai.com/account/api-keys")
+			if err != nil {
+				return err
 			}
 			ccfg = openai.DefaultConfig(key)
 			if api.BaseURL != "" {
@@ -447,7 +439,7 @@ func (m *Mods) handleRequestError(err error, mod Model, content string) tea.Msg
 	if errors.As(err, &ae) {
 		return m.handleAPIError(ae, mod, content)
 	}
-	return modsError{ae, fmt.Sprintf(
+	return modsError{err, fmt.Sprintf(
 		"There was a problem with the %s API request.",
 		mod.API,
 	)}

although, testing this, it doesn't seem to work...

cloudbridgeuy · 2024-09-11T14:01:45Z

Yes, that doesn't work because of the way we select the value of mod.API. At that point in the code, the value is openai, thus it never falls into that case statement.

That's why I added the check inside the default case.

caarlos0 · 2024-09-11T14:15:33Z

Yes, that doesn't work because of the way we select the value of mod.API. At that point in the code, the value is openai, thus it never falls into that case statement.

it does though

caarlos0 · 2024-09-13T16:27:46Z

tried to get it to work in #345, but I always get error responses from copilot... I think we're missing something, not sure what though

cloudbridgeuy · 2024-09-13T16:37:04Z

Mmm... I have it working on my end, albeit with my crude implementation:

I'll check that PR and see if I can make it work.

EDIT: I double-checked this by adding some fmt.Println statements to log the URL and Key being used and confirmed they are the ones required to talk to the copilot. Also, you can't see it in the image, but my default mode is set to GPT-4o.

caarlos0 · 2024-09-13T16:40:38Z

can you run something like mods --api copilot "who are you?"? Just to make sure it is really copilot replying

cloudbridgeuy · 2024-09-13T16:49:01Z

Since they are both using the same model, they tend to answer the same thing, so I added back the logs:

caarlos0 · 2024-09-13T17:33:43Z

yeah, for me both branches give the same error

cloudbridgeuy · 2024-09-13T17:56:31Z

Mmm... If you run this from your console, do you get an answer?

curl -n "https://api.githubcopilot.com/chat/completions" \
  -H "Content-Type: application/json" \
  -H "Authorization: Bearer $(cat ~/.config/github-copilot/hosts.json | sed -e 's/.*oauth_token...//;s/\".*//')" \
  -d '{
    "model": "gpt-4o",
    "messages": [
      {
        "role": "system",
        "content": "You are a helpful assistant."
      },
      {
        "role": "user",
        "content": "Who won the world series in 2020?"
      },
      {
        "role": "assistant",
        "content": "The Los Angeles Dodgers won the World Series in 2020."
      },
      {
        "role": "user",
        "content": "Where was it played?"
      }
    ]
  }'

This was the code I was trying to port to mods.

caarlos0 · 2024-09-13T18:16:09Z

I get an "unknown integration" error

cloudbridgeuy · 2024-09-13T18:46:33Z

That command work for me, I wonder what's the difference.

caarlos0 · 2024-09-13T19:03:34Z

That command work for me, I wonder what's the difference.

same... no idea, it works inside neovim apparently... dunno what's the difference 🤔

cloudbridgeuy and others added 10 commits August 26, 2024 16:58

feat(stream): Filter out System role messages for Anthropic API requests

356d625

feat(api): add support for Google API and Gemini models

4ccaa7c

refactor(google): simplify variable declarations in google.go

96a2b14

feat: add TopK parameter for token generation control

ae0137e

fix(formatter): remove redundant default FormatText assignment

7e8a42b

This was breaking the usage of the `--format` and `--format-as` flags for every value other than `markdown`.

chore(core): initialize FormatText config with default value if nil

d80a74d

Merge remote-tracking branch 'upstream/main'

94d80d8

feat(ai-completion): add support for GitHub Copilot API

a13043c

Merge branch 'main' of github.com:charmbracelet/mods

8a34829

feat(api-config): add GitHub Copilot API endpoint to fallback options

cc5fabc

cloudbridgeuy requested a review from caarlos0 as a code owner August 30, 2024 13:37

caarlos0 reviewed Sep 10, 2024

View reviewed changes

caarlos0 mentioned this pull request Sep 11, 2024

feat: copilot support #345

Merged

caarlos0 closed this in #345 Nov 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for GitHub Copilot #333

Add support for GitHub Copilot #333

cloudbridgeuy commented Aug 30, 2024

caarlos0 left a comment

caarlos0 Sep 10, 2024

cloudbridgeuy Sep 10, 2024

caarlos0 Sep 10, 2024

cloudbridgeuy Sep 10, 2024

caarlos0 Sep 11, 2024

cloudbridgeuy Sep 11, 2024

caarlos0 Sep 11, 2024

cloudbridgeuy Sep 11, 2024 •

edited

Loading

caarlos0 commented Sep 11, 2024

cloudbridgeuy commented Sep 11, 2024

caarlos0 commented Sep 11, 2024

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024 •

edited

Loading

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024 •

edited

Loading

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024

caarlos0 commented Sep 13, 2024

Add support for GitHub Copilot #333

Add support for GitHub Copilot #333

Conversation

cloudbridgeuy commented Aug 30, 2024

caarlos0 left a comment

Choose a reason for hiding this comment

caarlos0 Sep 10, 2024

Choose a reason for hiding this comment

cloudbridgeuy Sep 10, 2024

Choose a reason for hiding this comment

caarlos0 Sep 10, 2024

Choose a reason for hiding this comment

cloudbridgeuy Sep 10, 2024

Choose a reason for hiding this comment

caarlos0 Sep 11, 2024

Choose a reason for hiding this comment

cloudbridgeuy Sep 11, 2024

Choose a reason for hiding this comment

caarlos0 Sep 11, 2024

Choose a reason for hiding this comment

cloudbridgeuy Sep 11, 2024 • edited Loading

Choose a reason for hiding this comment

caarlos0 commented Sep 11, 2024

cloudbridgeuy commented Sep 11, 2024

caarlos0 commented Sep 11, 2024

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024 • edited Loading

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024 • edited Loading

caarlos0 commented Sep 13, 2024

cloudbridgeuy commented Sep 13, 2024

caarlos0 commented Sep 13, 2024

cloudbridgeuy Sep 11, 2024 •

edited

Loading

cloudbridgeuy commented Sep 13, 2024 •

edited

Loading

cloudbridgeuy commented Sep 13, 2024 •

edited

Loading