diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 7bd134c..e7bd67c 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -19,19 +19,19 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 test: name: Test runs-on: ubuntu-latest strategy: matrix: - go-version: [ '1.19', '1.20', '1.21', '1.22' ] + go-version: [ '1.21', '1.22' ] steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index b3c8597..78c0808 100755 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ cmd: $(CMD_DIR) test: @${GO} mod tidy - @${GO} test -v ./pkg/... + @${GO} test ./pkg/... $(CMD_DIR): dependencies mkdir @echo Build cmd $(notdir $@) diff --git a/README.md b/README.md index 613a944..e85f2d9 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ There are also some example clients which use this library: * [Ollama API client](https://github.com/mutablelogic/go-client/tree/main/pkg/ollama) * [OpenAI API client](https://github.com/mutablelogic/go-client/tree/main/pkg/openai) -Aiming to have compatibility with go version 1.19 and above. +Aiming to have compatibility with go version 1.21 and above. ## Basic Usage @@ -33,7 +33,7 @@ to a JSON endpoint: package main import ( - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" ) func main() { @@ -85,7 +85,7 @@ For example, package main import ( - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" ) func main() { @@ -160,7 +160,7 @@ The authentication token can be set as follows: package main import ( - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" ) func main() { diff --git a/pkg/client/client.go b/client.go similarity index 100% rename from pkg/client/client.go rename to client.go diff --git a/pkg/client/client_test.go b/client_test.go similarity index 89% rename from pkg/client/client_test.go rename to client_test.go index 4f1036f..a0410a1 100644 --- a/pkg/client/client_test.go +++ b/client_test.go @@ -3,7 +3,7 @@ package client_test import ( "testing" - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/stretchr/testify/assert" ) diff --git a/pkg/client/clientopts.go b/clientopts.go similarity index 100% rename from pkg/client/clientopts.go rename to clientopts.go diff --git a/cmd/cli/elevenlabs.go b/cmd/cli/elevenlabs.go index 3ab9d44..b5edb56 100644 --- a/cmd/cli/elevenlabs.go +++ b/cmd/cli/elevenlabs.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - // Package imports - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/elevenlabs" ) diff --git a/cmd/cli/homeassistant.go b/cmd/cli/homeassistant.go index bd50c57..086530c 100644 --- a/cmd/cli/homeassistant.go +++ b/cmd/cli/homeassistant.go @@ -2,7 +2,7 @@ package main import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/homeassistant" ) diff --git a/cmd/cli/ipify.go b/cmd/cli/ipify.go index e588bee..7655c30 100644 --- a/cmd/cli/ipify.go +++ b/cmd/cli/ipify.go @@ -2,7 +2,7 @@ package main import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/ipify" ) diff --git a/cmd/cli/main.go b/cmd/cli/main.go index 673a24f..0471b2e 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -7,7 +7,7 @@ import ( "path" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/pkg/errors" ) diff --git a/cmd/cli/mistral.go b/cmd/cli/mistral.go index 1b0735a..6a32028 100644 --- a/cmd/cli/mistral.go +++ b/cmd/cli/mistral.go @@ -2,7 +2,7 @@ package main import ( // Package imports - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/mistral" "github.com/mutablelogic/go-client/pkg/openai/schema" ) diff --git a/cmd/cli/newsapi.go b/cmd/cli/newsapi.go index c5a5a2f..c847d00 100644 --- a/cmd/cli/newsapi.go +++ b/cmd/cli/newsapi.go @@ -2,7 +2,7 @@ package main import ( // Package imports - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/newsapi" ) diff --git a/cmd/cli/ollama.go b/cmd/cli/ollama.go index 2f99d1f..bb1f51e 100644 --- a/cmd/cli/ollama.go +++ b/cmd/cli/ollama.go @@ -2,7 +2,7 @@ package main import ( // Package imports - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/ollama" ) diff --git a/cmd/cli/openai.go b/cmd/cli/openai.go index 325c799..af0c01a 100644 --- a/cmd/cli/openai.go +++ b/cmd/cli/openai.go @@ -8,7 +8,7 @@ import ( "regexp" "strconv" - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/openai" ) diff --git a/pkg/client/doc.go b/doc.go similarity index 90% rename from pkg/client/doc.go rename to doc.go index 6403b01..9512f65 100644 --- a/pkg/client/doc.go +++ b/doc.go @@ -5,7 +5,7 @@ gateway-specific clients. Basic usage: package main import ( - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" ) func main() { diff --git a/go.mod b/go.mod index 377f953..f46a5da 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/mutablelogic/go-client -go 1.19 +go 1.22 + +toolchain go1.22.3 require ( github.com/andreburgaud/crypt2go v1.5.0 diff --git a/pkg/client/payload.go b/payload.go similarity index 99% rename from pkg/client/payload.go rename to payload.go index a819b37..9586106 100644 --- a/pkg/client/payload.go +++ b/payload.go @@ -7,6 +7,7 @@ import ( "net/http" "strconv" + // Packages "github.com/mutablelogic/go-client/pkg/multipart" ) diff --git a/pkg/client/payload_test.go b/payload_test.go similarity index 50% rename from pkg/client/payload_test.go rename to payload_test.go index c092c7e..026ffcf 100644 --- a/pkg/client/payload_test.go +++ b/payload_test.go @@ -4,15 +4,14 @@ import ( "testing" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/stretchr/testify/assert" ) func Test_payload_001(t *testing.T) { assert := assert.New(t) - payload := client.NewPayload(client.ContentTypeBinary) + payload := client.NewRequest() assert.NotNil(payload) assert.Equal("GET", payload.Method()) - assert.Equal(client.ContentTypeJson, payload.Type()) - assert.Equal(client.ContentTypeBinary, payload.Accept()) + assert.Equal(client.ContentTypeAny, payload.Accept()) } diff --git a/pkg/bitwarden/client.go b/pkg/bitwarden/client.go index 029aabf..425abec 100644 --- a/pkg/bitwarden/client.go +++ b/pkg/bitwarden/client.go @@ -4,10 +4,10 @@ bitwarden implements an API client for bitwarden package bitwarden import ( - // Packages "runtime" - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" // Namespace imports . "github.com/djthorpe/go-errors" @@ -96,10 +96,10 @@ func (c *Client) Prelogin(email, password string) (*Session, error) { // Prelogin request.Email = email - payload, err := client.NewJSONRequest(request, client.ContentTypeJson) + payload, err := client.NewJSONRequest(request) if err != nil { return nil, err - } else if err := c.Do(payload.Post(), &response.Kdf, client.OptPath("accounts/prelogin")); err != nil { + } else if err := c.Do(payload, &response.Kdf, client.OptPath("accounts/prelogin")); err != nil { return nil, err } else if response.Kdf.Iterations == 0 { return nil, ErrUnexpectedResponse diff --git a/pkg/bitwarden/client_test.go b/pkg/bitwarden/client_test.go index 5a42d81..ea73a35 100644 --- a/pkg/bitwarden/client_test.go +++ b/pkg/bitwarden/client_test.go @@ -6,8 +6,8 @@ import ( "testing" // Packages + opts "github.com/mutablelogic/go-client" bitwarden "github.com/mutablelogic/go-client/pkg/bitwarden" - opts "github.com/mutablelogic/go-client/pkg/client" assert "github.com/stretchr/testify/assert" ) @@ -32,7 +32,7 @@ func Test_client_002(t *testing.T) { t.Log(string(data)) } -func Test_client_003(t *testing.T) { +func DisabledTest_client_003(t *testing.T) { // TODO assert := assert.New(t) client, err := bitwarden.New(opts.OptTrace(os.Stderr, true)) assert.NoError(err) diff --git a/pkg/bitwarden/crypto_test.go b/pkg/bitwarden/crypto_test.go index eba428f..05a0e33 100644 --- a/pkg/bitwarden/crypto_test.go +++ b/pkg/bitwarden/crypto_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "testing" + // Packages "github.com/mutablelogic/go-client/pkg/bitwarden" "github.com/stretchr/testify/assert" ) diff --git a/pkg/bitwarden/key_test.go b/pkg/bitwarden/key_test.go index e378029..bd5f29b 100644 --- a/pkg/bitwarden/key_test.go +++ b/pkg/bitwarden/key_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + // Packages "github.com/mutablelogic/go-client/pkg/bitwarden" "github.com/stretchr/testify/assert" ) diff --git a/pkg/elevenlabs/client.go b/pkg/elevenlabs/client.go index b7fd41f..03156eb 100644 --- a/pkg/elevenlabs/client.go +++ b/pkg/elevenlabs/client.go @@ -5,7 +5,7 @@ package elevenlabs import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/elevenlabs/client_test.go b/pkg/elevenlabs/client_test.go index 36af32b..6fb757b 100644 --- a/pkg/elevenlabs/client_test.go +++ b/pkg/elevenlabs/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" elevenlabs "github.com/mutablelogic/go-client/pkg/elevenlabs" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/elevenlabs/text_to_speech.go b/pkg/elevenlabs/text_to_speech.go index 5077c7e..5c2c110 100644 --- a/pkg/elevenlabs/text_to_speech.go +++ b/pkg/elevenlabs/text_to_speech.go @@ -4,7 +4,7 @@ import ( "io" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/elevenlabs/voice.go b/pkg/elevenlabs/voice.go index 27819b2..f6b773c 100644 --- a/pkg/elevenlabs/voice.go +++ b/pkg/elevenlabs/voice.go @@ -1,11 +1,9 @@ package elevenlabs import ( - // Packages - "github.com/djthorpe/go-errors" - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/elevenlabs/voice_test.go b/pkg/elevenlabs/voice_test.go index 787881b..8de884d 100644 --- a/pkg/elevenlabs/voice_test.go +++ b/pkg/elevenlabs/voice_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" elevenlabs "github.com/mutablelogic/go-client/pkg/elevenlabs" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/homeassistant/client.go b/pkg/homeassistant/client.go index aafa941..21585da 100644 --- a/pkg/homeassistant/client.go +++ b/pkg/homeassistant/client.go @@ -6,7 +6,7 @@ package homeassistant import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/homeassistant/client_test.go b/pkg/homeassistant/client_test.go index 436e923..1f7cf0b 100644 --- a/pkg/homeassistant/client_test.go +++ b/pkg/homeassistant/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" homeassistant "github.com/mutablelogic/go-client/pkg/homeassistant" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/homeassistant/events.go b/pkg/homeassistant/events.go index 6e7cb0a..0fbc98b 100644 --- a/pkg/homeassistant/events.go +++ b/pkg/homeassistant/events.go @@ -1,6 +1,6 @@ package homeassistant -import "github.com/mutablelogic/go-client/pkg/client" +import "github.com/mutablelogic/go-client" /////////////////////////////////////////////////////////////////////////////// // TYPES diff --git a/pkg/homeassistant/events_test.go b/pkg/homeassistant/events_test.go index 8d63482..d6d9a78 100644 --- a/pkg/homeassistant/events_test.go +++ b/pkg/homeassistant/events_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" homeassistant "github.com/mutablelogic/go-client/pkg/homeassistant" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/homeassistant/health_test.go b/pkg/homeassistant/health_test.go index aebd141..5ba8f0b 100644 --- a/pkg/homeassistant/health_test.go +++ b/pkg/homeassistant/health_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" homeassistant "github.com/mutablelogic/go-client/pkg/homeassistant" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/homeassistant/states.go b/pkg/homeassistant/states.go index 62b7e12..b5d6b32 100644 --- a/pkg/homeassistant/states.go +++ b/pkg/homeassistant/states.go @@ -5,7 +5,8 @@ import ( "strings" "time" - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/homeassistant/states_test.go b/pkg/homeassistant/states_test.go index 8d73090..b862834 100644 --- a/pkg/homeassistant/states_test.go +++ b/pkg/homeassistant/states_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" homeassistant "github.com/mutablelogic/go-client/pkg/homeassistant" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/ipify/client.go b/pkg/ipify/client.go index c8ae1c1..5b167cd 100644 --- a/pkg/ipify/client.go +++ b/pkg/ipify/client.go @@ -8,7 +8,7 @@ import ( "net/url" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/ipify/client_test.go b/pkg/ipify/client_test.go index 64ac8f9..29a7eb4 100644 --- a/pkg/ipify/client_test.go +++ b/pkg/ipify/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" ipify "github.com/mutablelogic/go-client/pkg/ipify" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/mistral/chat.go b/pkg/mistral/chat.go index 4403047..08abd00 100644 --- a/pkg/mistral/chat.go +++ b/pkg/mistral/chat.go @@ -1,7 +1,8 @@ package mistral import ( - client "github.com/mutablelogic/go-client/pkg/client" + // Packages + client "github.com/mutablelogic/go-client" schema "github.com/mutablelogic/go-client/pkg/openai/schema" // Namespace imports diff --git a/pkg/mistral/chat_test.go b/pkg/mistral/chat_test.go index 76003d0..751b5ee 100644 --- a/pkg/mistral/chat_test.go +++ b/pkg/mistral/chat_test.go @@ -5,9 +5,9 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" mistral "github.com/mutablelogic/go-client/pkg/mistral" - "github.com/mutablelogic/go-client/pkg/openai/schema" + schema "github.com/mutablelogic/go-client/pkg/openai/schema" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/mistral/client.go b/pkg/mistral/client.go index 73789c3..9dacda1 100644 --- a/pkg/mistral/client.go +++ b/pkg/mistral/client.go @@ -5,7 +5,7 @@ package mistral import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/mistral/client_test.go b/pkg/mistral/client_test.go index 2343d47..89c9392 100644 --- a/pkg/mistral/client_test.go +++ b/pkg/mistral/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" mistral "github.com/mutablelogic/go-client/pkg/mistral" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/mistral/embedding.go b/pkg/mistral/embedding.go index 4b0c7a6..f0cf154 100644 --- a/pkg/mistral/embedding.go +++ b/pkg/mistral/embedding.go @@ -2,7 +2,7 @@ package mistral import ( // Packages - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" schema "github.com/mutablelogic/go-client/pkg/openai/schema" // Namespace imports diff --git a/pkg/mistral/embedding_test.go b/pkg/mistral/embedding_test.go index e51f67f..41b67ed 100644 --- a/pkg/mistral/embedding_test.go +++ b/pkg/mistral/embedding_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" mistral "github.com/mutablelogic/go-client/pkg/mistral" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/mistral/model.go b/pkg/mistral/model.go index cdfa4f3..ce3d04f 100644 --- a/pkg/mistral/model.go +++ b/pkg/mistral/model.go @@ -2,7 +2,7 @@ package mistral import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" // Namespace imports . "github.com/mutablelogic/go-client/pkg/openai/schema" diff --git a/pkg/mistral/model_test.go b/pkg/mistral/model_test.go index 817de3c..b2481bf 100644 --- a/pkg/mistral/model_test.go +++ b/pkg/mistral/model_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" mistral "github.com/mutablelogic/go-client/pkg/mistral" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/newsapi/articles.go b/pkg/newsapi/articles.go index 2b5e6c3..f16b2f3 100644 --- a/pkg/newsapi/articles.go +++ b/pkg/newsapi/articles.go @@ -3,7 +3,8 @@ package newsapi import ( "time" - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" // Namespace imports . "github.com/djthorpe/go-errors" diff --git a/pkg/newsapi/articles_test.go b/pkg/newsapi/articles_test.go index 8455874..1075f9b 100644 --- a/pkg/newsapi/articles_test.go +++ b/pkg/newsapi/articles_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" newsapi "github.com/mutablelogic/go-client/pkg/newsapi" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/newsapi/client.go b/pkg/newsapi/client.go index 8a2f4b0..efbc7a8 100644 --- a/pkg/newsapi/client.go +++ b/pkg/newsapi/client.go @@ -5,7 +5,7 @@ package newsapi import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/newsapi/client_test.go b/pkg/newsapi/client_test.go index d35e554..57987e4 100644 --- a/pkg/newsapi/client_test.go +++ b/pkg/newsapi/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" newsapi "github.com/mutablelogic/go-client/pkg/newsapi" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/newsapi/sources.go b/pkg/newsapi/sources.go index 4249994..6f857d1 100644 --- a/pkg/newsapi/sources.go +++ b/pkg/newsapi/sources.go @@ -1,7 +1,8 @@ package newsapi import ( - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" // Namespace imports . "github.com/djthorpe/go-errors" diff --git a/pkg/newsapi/sources_test.go b/pkg/newsapi/sources_test.go index 37c0cba..e4bf841 100644 --- a/pkg/newsapi/sources_test.go +++ b/pkg/newsapi/sources_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" newsapi "github.com/mutablelogic/go-client/pkg/newsapi" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/ollama/chat.go b/pkg/ollama/chat.go index 943263d..63fb367 100644 --- a/pkg/ollama/chat.go +++ b/pkg/ollama/chat.go @@ -8,7 +8,7 @@ import ( "time" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/ollama/chat_test.go b/pkg/ollama/chat_test.go index f8cd0a4..50811c7 100644 --- a/pkg/ollama/chat_test.go +++ b/pkg/ollama/chat_test.go @@ -7,7 +7,7 @@ import ( "time" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" ollama "github.com/mutablelogic/go-client/pkg/ollama" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/ollama/client.go b/pkg/ollama/client.go index e2ecc12..387f32c 100644 --- a/pkg/ollama/client.go +++ b/pkg/ollama/client.go @@ -6,7 +6,7 @@ package ollama import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/ollama/client_test.go b/pkg/ollama/client_test.go index 295b802..94bf905 100644 --- a/pkg/ollama/client_test.go +++ b/pkg/ollama/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" ollama "github.com/mutablelogic/go-client/pkg/ollama" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/ollama/model.go b/pkg/ollama/model.go index 69c6fc6..3ff39bc 100644 --- a/pkg/ollama/model.go +++ b/pkg/ollama/model.go @@ -1,14 +1,14 @@ package ollama import ( - // Packages "context" "encoding/json" "fmt" "net/http" "time" - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/ollama/model_test.go b/pkg/ollama/model_test.go index 9cf6875..8b506fc 100644 --- a/pkg/ollama/model_test.go +++ b/pkg/ollama/model_test.go @@ -7,7 +7,7 @@ import ( "time" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" ollama "github.com/mutablelogic/go-client/pkg/ollama" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/audio.go b/pkg/openai/audio.go index 91773a0..ffa4876 100644 --- a/pkg/openai/audio.go +++ b/pkg/openai/audio.go @@ -6,7 +6,7 @@ import ( "io" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/mutablelogic/go-client/pkg/multipart" // Namespace imports diff --git a/pkg/openai/chat.go b/pkg/openai/chat.go index 1d2d87c..ceaf53a 100644 --- a/pkg/openai/chat.go +++ b/pkg/openai/chat.go @@ -4,7 +4,7 @@ import ( "strings" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) const ( diff --git a/pkg/openai/chat_test.go b/pkg/openai/chat_test.go index be6f5d5..d06531d 100644 --- a/pkg/openai/chat_test.go +++ b/pkg/openai/chat_test.go @@ -5,7 +5,8 @@ import ( "os" "testing" - opts "github.com/mutablelogic/go-client/pkg/client" + // Packages + opts "github.com/mutablelogic/go-client" openai "github.com/mutablelogic/go-client/pkg/openai" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/client.go b/pkg/openai/client.go index 1852adb..8b9f0b4 100644 --- a/pkg/openai/client.go +++ b/pkg/openai/client.go @@ -6,7 +6,7 @@ package openai import ( // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/openai/client_test.go b/pkg/openai/client_test.go index fb000f1..c0ff050 100644 --- a/pkg/openai/client_test.go +++ b/pkg/openai/client_test.go @@ -5,7 +5,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" openai "github.com/mutablelogic/go-client/pkg/openai" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/embedding.go b/pkg/openai/embedding.go index 8292a27..8c9d212 100644 --- a/pkg/openai/embedding.go +++ b/pkg/openai/embedding.go @@ -2,7 +2,7 @@ package openai import ( // Packages - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" schema "github.com/mutablelogic/go-client/pkg/openai/schema" // Namespace imports diff --git a/pkg/openai/embedding_test.go b/pkg/openai/embedding_test.go index f13779b..1969efb 100644 --- a/pkg/openai/embedding_test.go +++ b/pkg/openai/embedding_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" openai "github.com/mutablelogic/go-client/pkg/openai" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/image.go b/pkg/openai/image.go index 222c4cc..2e93755 100644 --- a/pkg/openai/image.go +++ b/pkg/openai/image.go @@ -6,7 +6,7 @@ import ( "net/http" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" // Namespace imports . "github.com/djthorpe/go-errors" diff --git a/pkg/openai/image_test.go b/pkg/openai/image_test.go index 18a2c6c..01bfa96 100644 --- a/pkg/openai/image_test.go +++ b/pkg/openai/image_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" openai "github.com/mutablelogic/go-client/pkg/openai" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/model.go b/pkg/openai/model.go index c99d87a..87a5fc1 100644 --- a/pkg/openai/model.go +++ b/pkg/openai/model.go @@ -3,7 +3,7 @@ package openai import ( // Packages - client "github.com/mutablelogic/go-client/pkg/client" + client "github.com/mutablelogic/go-client" schema "github.com/mutablelogic/go-client/pkg/openai/schema" ) diff --git a/pkg/openai/model_test.go b/pkg/openai/model_test.go index c0b036f..5459fab 100644 --- a/pkg/openai/model_test.go +++ b/pkg/openai/model_test.go @@ -6,7 +6,7 @@ import ( "testing" // Packages - opts "github.com/mutablelogic/go-client/pkg/client" + opts "github.com/mutablelogic/go-client" openai "github.com/mutablelogic/go-client/pkg/openai" assert "github.com/stretchr/testify/assert" ) diff --git a/pkg/openai/opts.go b/pkg/openai/opts.go index 7b64478..7e2db87 100644 --- a/pkg/openai/opts.go +++ b/pkg/openai/opts.go @@ -3,7 +3,8 @@ package openai import ( "fmt" - "github.com/mutablelogic/go-client/pkg/client" + // Packages + "github.com/mutablelogic/go-client" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/version/version.go b/pkg/version/version.go new file mode 100644 index 0000000..7253ca6 --- /dev/null +++ b/pkg/version/version.go @@ -0,0 +1,9 @@ +package version + +var ( + GitSource string + GitTag string + GitBranch string + GitHash string + GoBuildTime string +) diff --git a/pkg/client/requestopts.go b/requestopts.go similarity index 100% rename from pkg/client/requestopts.go rename to requestopts.go diff --git a/pkg/client/token.go b/token.go similarity index 100% rename from pkg/client/token.go rename to token.go diff --git a/pkg/client/token_test.go b/token_test.go similarity index 89% rename from pkg/client/token_test.go rename to token_test.go index 2590508..9b3ae68 100644 --- a/pkg/client/token_test.go +++ b/token_test.go @@ -4,7 +4,7 @@ import ( "testing" // Packages - "github.com/mutablelogic/go-client/pkg/client" + "github.com/mutablelogic/go-client" "github.com/stretchr/testify/assert" ) diff --git a/pkg/client/transport.go b/transport.go similarity index 100% rename from pkg/client/transport.go rename to transport.go index e69993e..596f057 100644 --- a/pkg/client/transport.go +++ b/transport.go @@ -10,8 +10,8 @@ import ( "net/http" "time" - "github.com/mutablelogic/go-client/pkg/multipart" // Packages + "github.com/mutablelogic/go-client/pkg/multipart" ) ///////////////////////////////////////////////////////////////////////////////