Skip to content

fix: sdk import-path alignment for PR 515 #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KooshaPari merged 1 commit into from
Feb 27, 2026
Merged

fix: sdk import-path alignment for PR 515 #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/api_key_model_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

internalconfig "github.com/router-for-me/CLIProxyAPI/v6/internal/config"
internalconfig "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

func TestLookupAPIKeyUpstreamModel(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions sdk/cliproxy/auth/conductor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"time"

"github.com/google/uuid"
internalconfig "github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/logging"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/registry"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/thinking"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/util"
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
internalconfig "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"

Check failure on line 18 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config; to add it:

Check failure on line 18 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/logging"

Check failure on line 19 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/logging; to add it:

Check failure on line 19 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/logging; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry"

Check failure on line 20 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry; to add it:

Check failure on line 20 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking"

Check failure on line 21 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking; to add it:

Check failure on line 21 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/util"

Check failure on line 22 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/util; to add it:

Check failure on line 22 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/util; to add it:
cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"

Check failure on line 23 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor; to add it:

Check failure on line 23 in sdk/cliproxy/auth/conductor.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor; to add it:
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/conductor_executor_replace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"testing"

cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
)

type replaceAwareExecutor struct {
Expand Down
4 changes: 2 additions & 2 deletions sdk/cliproxy/auth/oauth_model_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package auth
import (
"strings"

internalconfig "github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/thinking"
internalconfig "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking"
)

type modelAliasEntry interface {
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/oauth_model_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package auth
import (
"testing"

internalconfig "github.com/router-for-me/CLIProxyAPI/v6/internal/config"
internalconfig "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

func TestResolveOAuthUpstreamModel_SuffixPreservation(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions sdk/cliproxy/auth/selector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"sync"
"time"

"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/thinking"
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking"
cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
)

// RoundRobinSelector provides a simple provider scoped round-robin selection strategy.
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/selector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
)

func TestFillFirstSelectorPick_Deterministic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"sync"
"time"

baseauth "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/auth"
baseauth "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/auth"

Check failure on line 15 in sdk/cliproxy/auth/types.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/auth; to add it:

Check failure on line 15 in sdk/cliproxy/auth/types.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/auth; to add it:
)

// PostAuthHook defines a function that is called after an Auth record is created
Expand Down
12 changes: 6 additions & 6 deletions sdk/cliproxy/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"fmt"
"strings"

configaccess "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/access/config_access"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/api"
sdkaccess "github.com/router-for-me/CLIProxyAPI/v6/sdk/access"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
configaccess "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/access/config_access"

Check failure on line 10 in sdk/cliproxy/builder.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/access/config_access; to add it:

Check failure on line 10 in sdk/cliproxy/builder.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/access/config_access; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/api"
sdkaccess "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/access"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

// Builder constructs a Service instance with customizable providers.
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/executor/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"net/http"
"net/url"

sdktranslator "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
sdktranslator "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator"

Check failure on line 7 in sdk/cliproxy/executor/types.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator; to add it:

Check failure on line 7 in sdk/cliproxy/executor/types.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator; to add it:
)

// RequestedModelMetadataKey stores the client-requested model name in Options.Metadata.
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/model_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cliproxy

import "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/registry"
import "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry"

// ModelInfo re-exports the registry model info structure.
type ModelInfo = registry.ModelInfo
Expand Down
6 changes: 3 additions & 3 deletions sdk/cliproxy/pipeline/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

cliproxyauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
sdktranslator "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
cliproxyauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
sdktranslator "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator"
)

// Context encapsulates execution state shared across middleware, translators, and executors.
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/pprof_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions sdk/cliproxy/providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import (
"context"

"github.com/router-for-me/CLIProxyAPI/v6/internal/watcher"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/watcher"

Check failure on line 6 in sdk/cliproxy/providers.go

View workflow job for this annotation

GitHub Actions / build 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/internal/watcher; to add it:

Check failure on line 6 in sdk/cliproxy/providers.go

View workflow job for this annotation

GitHub Actions / Analyze (Go) (go) 

no required module provides package github.com/kooshapari/cliproxyapi-plusplus/v6/internal/watcher; to add it:
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

// NewFileTokenClientProvider returns the default token-backed client loader.
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/rtprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"sync"

coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
log "github.com/sirupsen/logrus"
"golang.org/x/net/proxy"
)
Expand Down
24 changes: 12 additions & 12 deletions sdk/cliproxy/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ import (
"sync"
"time"

"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/api"
kiroauth "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/auth/kiro"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/executor"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/registry"
_ "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/usage"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/watcher"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/wsrelay"
sdkaccess "github.com/router-for-me/CLIProxyAPI/v6/sdk/access"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/usage"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/api"
kiroauth "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/auth/kiro"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/executor"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry"
_ "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/usage"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/watcher"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/wsrelay"
sdkaccess "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/access"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/usage"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions sdk/cliproxy/service_codex_executor_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cliproxy
import (
"testing"

coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/config"
)

func TestEnsureExecutorsForAuth_CodexDoesNotReplaceInNormalMode(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions sdk/cliproxy/service_excluded_models_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"
"testing"

coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/config"
)

func TestRegisterModelsForAuth_UsesPreMergedExcludedModelsAttribute(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sdk/cliproxy/service_oauth_model_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cliproxy
import (
"testing"

"github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/config"
)

func TestApplyOAuthModelAlias_Rename(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions sdk/cliproxy/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package cliproxy
import (
"context"

"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/watcher"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/watcher"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

// TokenClientProvider loads clients backed by stored authentication tokens.
Expand Down
6 changes: 3 additions & 3 deletions sdk/cliproxy/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package cliproxy
import (
"context"

"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/watcher"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/watcher"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
)

func defaultWatcherFactory(configPath, authDir string, reload func(*config.Config)) (*WatcherWrapper, error) {
Expand Down