diff --git a/.github/workflows/anthropic.yml b/.github/workflows/anthropic.yml index 7779163ce444fb0bd0909ce209047b96497fa90c..94a96d78f6d70162c8bd598ceb8867571d746644 100644 --- a/.github/workflows/anthropic.yml +++ b/.github/workflows/anthropic.yml @@ -7,7 +7,7 @@ on: - main pull_request: paths: - - providers/anthropic/** + - anthropic/** - .github/workflows/anthropic.yml jobs: @@ -18,14 +18,14 @@ jobs: runs-on: ${{ matrix.os }} defaults: run: - working-directory: ./providers/anthropic + working-directory: ./anthropic steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: ./providers/anthropic/go.mod + go-version-file: ./anthropic/go.mod cache: true - cache-dependency-path: ./providers/anthropic/go.sum + cache-dependency-path: ./anthropic/go.sum - run: go build -v ./... - run: go test -race -v ./... @@ -51,6 +51,6 @@ jobs: lint: uses: charmbracelet/meta/.github/workflows/lint.yml@main with: - directory: ./providers/anthropic/... + directory: ./anthropic/... golangci_path: .golangci.yml diff --git a/.github/workflows/openai.yml b/.github/workflows/openai.yml index 5aa12b2904173a45bb32b9b0840b123d5bffe2d7..1276fe922aa9b43d2283905e1f8b0586b42ad12e 100644 --- a/.github/workflows/openai.yml +++ b/.github/workflows/openai.yml @@ -7,7 +7,7 @@ on: - main pull_request: paths: - - providers/openai/** + - openai/** - .github/workflows/openai.yml jobs: @@ -18,14 +18,14 @@ jobs: runs-on: ${{ matrix.os }} defaults: run: - working-directory: ./providers/openai + working-directory: ./openai steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: ./providers/openai/go.mod + go-version-file: ./openai/go.mod cache: true - cache-dependency-path: ./providers/openai/go.sum + cache-dependency-path: ./openai/go.sum - run: go build -v ./... - run: go test -race -v ./... @@ -51,6 +51,6 @@ jobs: lint: uses: charmbracelet/meta/.github/workflows/lint.yml@main with: - directory: ./providers/openai/... + directory: ./openai/... golangci_path: .golangci.yml diff --git a/Taskfile.yaml b/Taskfile.yaml index e428c1dfd9a3a07b33a884661652ceaf58b7559c..03be3c9f73cba310bb424e18e67629d226915a66 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -6,9 +6,9 @@ env: vars: PACKAGES: - ./ai + - ./anthropic - ./examples - - ./providers/anthropic - - ./providers/openai + - ./openai tasks: fmt: diff --git a/providers/anthropic/anthropic.go b/anthropic/anthropic.go similarity index 100% rename from providers/anthropic/anthropic.go rename to anthropic/anthropic.go diff --git a/providers/anthropic/go.mod b/anthropic/go.mod similarity index 78% rename from providers/anthropic/go.mod rename to anthropic/go.mod index 774383a3516951cf74450983c382d13b4ebccbb6..9ff361f2a7835947c4a14a69bc339eb10535e428 100644 --- a/providers/anthropic/go.mod +++ b/anthropic/go.mod @@ -1,4 +1,4 @@ -module github.com/charmbracelet/ai/providers/anthropic +module github.com/charmbracelet/ai/anthropic go 1.24.5 @@ -15,4 +15,4 @@ require ( github.com/tidwall/sjson v1.2.5 // indirect ) -replace github.com/charmbracelet/ai/ai => ../../ai +replace github.com/charmbracelet/ai/ai => ../ai diff --git a/providers/anthropic/go.sum b/anthropic/go.sum similarity index 100% rename from providers/anthropic/go.sum rename to anthropic/go.sum diff --git a/providers/anthropic/provider_options.go b/anthropic/provider_options.go similarity index 100% rename from providers/anthropic/provider_options.go rename to anthropic/provider_options.go diff --git a/examples/agent/main.go b/examples/agent/main.go index c91ba5868a90e719464eb33c723d11466bfaa045..04c4e89d05d7bccb7c373448296c3c2e1a629869 100644 --- a/examples/agent/main.go +++ b/examples/agent/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/charmbracelet/ai/ai" - "github.com/charmbracelet/ai/providers/openai" + "github.com/charmbracelet/ai/openai" ) func main() { diff --git a/examples/go.mod b/examples/go.mod index aaabfa1618a8ed3e9be6d953df77caefb4edd1da..4d8e86af3644dca6f3202a41afca62e8548a509a 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -4,8 +4,8 @@ go 1.24.5 require ( github.com/charmbracelet/ai/ai v0.0.0-00010101000000-000000000000 - github.com/charmbracelet/ai/providers/anthropic v0.0.0-00010101000000-000000000000 - github.com/charmbracelet/ai/providers/openai v0.0.0-00010101000000-000000000000 + github.com/charmbracelet/ai/anthropic v0.0.0-00010101000000-000000000000 + github.com/charmbracelet/ai/openai v0.0.0-00010101000000-000000000000 ) require ( @@ -21,6 +21,6 @@ require ( replace github.com/charmbracelet/ai/ai => ../ai -replace github.com/charmbracelet/ai/providers/anthropic => ../providers/anthropic +replace github.com/charmbracelet/ai/anthropic => ../anthropic -replace github.com/charmbracelet/ai/providers/openai => ../providers/openai +replace github.com/charmbracelet/ai/openai => ../openai diff --git a/examples/simple/main.go b/examples/simple/main.go index b3f950e1c910fa50229b0ff61d7f7ca921df49d4..c84aaa503cfcc78cdc3b71ad53a9958ae3215289 100644 --- a/examples/simple/main.go +++ b/examples/simple/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/charmbracelet/ai/ai" - "github.com/charmbracelet/ai/providers/anthropic" + "github.com/charmbracelet/ai/anthropic" ) func main() { diff --git a/examples/stream/main.go b/examples/stream/main.go index f141594d59ee57c28a773b063eb7c0e7578ad25f..d33576893d423f6646de8b633389db299d1123f9 100644 --- a/examples/stream/main.go +++ b/examples/stream/main.go @@ -7,7 +7,7 @@ import ( "os" "github.com/charmbracelet/ai/ai" - "github.com/charmbracelet/ai/providers/openai" + "github.com/charmbracelet/ai/openai" ) func main() { diff --git a/examples/streaming-agent-simple/main.go b/examples/streaming-agent-simple/main.go index 46dbb041e2f83b3e67a195e23c68bc92be51ab69..830493095956356e58896f7480df97dc46815b50 100644 --- a/examples/streaming-agent-simple/main.go +++ b/examples/streaming-agent-simple/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/charmbracelet/ai/ai" - "github.com/charmbracelet/ai/providers/openai" + "github.com/charmbracelet/ai/openai" ) func main() { diff --git a/examples/streaming-agent/main.go b/examples/streaming-agent/main.go index f009753e49d4d817162eb5df8818c41e70c95c15..2513e9a12a2d7cb32356eaa30859dbf27917c02c 100644 --- a/examples/streaming-agent/main.go +++ b/examples/streaming-agent/main.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/charmbracelet/ai/ai" - "github.com/charmbracelet/ai/providers/anthropic" + "github.com/charmbracelet/ai/anthropic" ) func main() { diff --git a/go.work b/go.work index a8728af5f4dd9d45362aea5fe8c0ab42b44f7061..3cc1bbc7f334e2f60e496c62ca05209f4d0cb8ef 100644 --- a/go.work +++ b/go.work @@ -2,7 +2,7 @@ go 1.24.5 use ( ./ai + ./anthropic ./examples - ./providers/anthropic - ./providers/openai + ./openai ) diff --git a/providers/openai/go.mod b/openai/go.mod similarity index 85% rename from providers/openai/go.mod rename to openai/go.mod index aa3b70b4283ad9d8e323b3723e902426036d77f8..97d3bcfae837797219497325c352eeadfcbf90dd 100644 --- a/providers/openai/go.mod +++ b/openai/go.mod @@ -1,4 +1,4 @@ -module github.com/charmbracelet/ai/providers/openai +module github.com/charmbracelet/ai/openai go 1.24.5 @@ -20,4 +20,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/charmbracelet/ai/ai => ../../ai +replace github.com/charmbracelet/ai/ai => ../ai diff --git a/providers/openai/go.sum b/openai/go.sum similarity index 96% rename from providers/openai/go.sum rename to openai/go.sum index 9086ebefd1af847e023d67697926776c32752d7a..d5724e364ff8c5f8deaf7698b5114859d6cc33da 100644 --- a/providers/openai/go.sum +++ b/openai/go.sum @@ -12,6 +12,7 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= +github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= diff --git a/providers/openai/json.go b/openai/json.go similarity index 100% rename from providers/openai/json.go rename to openai/json.go diff --git a/providers/openai/openai.go b/openai/openai.go similarity index 100% rename from providers/openai/openai.go rename to openai/openai.go diff --git a/providers/openai/openai_test.go b/openai/openai_test.go similarity index 100% rename from providers/openai/openai_test.go rename to openai/openai_test.go diff --git a/providers/openai/provider_options.go b/openai/provider_options.go similarity index 100% rename from providers/openai/provider_options.go rename to openai/provider_options.go