From 2a1ddac0464cf4d4166de07f45ccf1574e785ae9 Mon Sep 17 00:00:00 2001 From: Koosha Paridehpour Date: Thu, 26 Feb 2026 23:50:43 -0700 Subject: [PATCH] fix(sdk): align cliproxy import paths to kooshapari module - replace router-for-me module imports under sdk/cliproxy - unblock missing-module failures in PR 515 build lane Co-authored-by: Codex --- sdk/cliproxy/auth/api_key_model_alias_test.go | 2 +- sdk/cliproxy/auth/conductor.go | 12 +++++----- .../auth/conductor_executor_replace_test.go | 2 +- sdk/cliproxy/auth/oauth_model_alias.go | 4 ++-- sdk/cliproxy/auth/oauth_model_alias_test.go | 2 +- sdk/cliproxy/auth/selector.go | 4 ++-- sdk/cliproxy/auth/selector_test.go | 2 +- sdk/cliproxy/auth/types.go | 2 +- sdk/cliproxy/builder.go | 12 +++++----- sdk/cliproxy/executor/types.go | 2 +- sdk/cliproxy/model_registry.go | 2 +- sdk/cliproxy/pipeline/context.go | 6 ++--- sdk/cliproxy/pprof_server.go | 2 +- sdk/cliproxy/providers.go | 4 ++-- sdk/cliproxy/rtprovider.go | 2 +- sdk/cliproxy/service.go | 24 +++++++++---------- .../service_codex_executor_binding_test.go | 4 ++-- sdk/cliproxy/service_excluded_models_test.go | 4 ++-- .../service_oauth_model_alias_test.go | 2 +- sdk/cliproxy/types.go | 6 ++--- sdk/cliproxy/watcher.go | 6 ++--- 21 files changed, 53 insertions(+), 53 deletions(-) diff --git a/sdk/cliproxy/auth/api_key_model_alias_test.go b/sdk/cliproxy/auth/api_key_model_alias_test.go index 70915d9e37..1e7aa6568c 100644 --- a/sdk/cliproxy/auth/api_key_model_alias_test.go +++ b/sdk/cliproxy/auth/api_key_model_alias_test.go @@ -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) { diff --git a/sdk/cliproxy/auth/conductor.go b/sdk/cliproxy/auth/conductor.go index c922a5fb01..1c0435626a 100644 --- a/sdk/cliproxy/auth/conductor.go +++ b/sdk/cliproxy/auth/conductor.go @@ -15,12 +15,12 @@ import ( "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" + "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/logging" + "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/registry" + "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/thinking" + "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/util" + cliproxyexecutor "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor" log "github.com/sirupsen/logrus" ) diff --git a/sdk/cliproxy/auth/conductor_executor_replace_test.go b/sdk/cliproxy/auth/conductor_executor_replace_test.go index 2ee91a87c1..c17df456d0 100644 --- a/sdk/cliproxy/auth/conductor_executor_replace_test.go +++ b/sdk/cliproxy/auth/conductor_executor_replace_test.go @@ -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 { diff --git a/sdk/cliproxy/auth/oauth_model_alias.go b/sdk/cliproxy/auth/oauth_model_alias.go index 992dcadadc..12bf9e67ca 100644 --- a/sdk/cliproxy/auth/oauth_model_alias.go +++ b/sdk/cliproxy/auth/oauth_model_alias.go @@ -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 { diff --git a/sdk/cliproxy/auth/oauth_model_alias_test.go b/sdk/cliproxy/auth/oauth_model_alias_test.go index e12b65975f..5678020e14 100644 --- a/sdk/cliproxy/auth/oauth_model_alias_test.go +++ b/sdk/cliproxy/auth/oauth_model_alias_test.go @@ -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) { diff --git a/sdk/cliproxy/auth/selector.go b/sdk/cliproxy/auth/selector.go index 54f63a08b4..7d6de71dc5 100644 --- a/sdk/cliproxy/auth/selector.go +++ b/sdk/cliproxy/auth/selector.go @@ -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. diff --git a/sdk/cliproxy/auth/selector_test.go b/sdk/cliproxy/auth/selector_test.go index 79431a9ada..9c004f6016 100644 --- a/sdk/cliproxy/auth/selector_test.go +++ b/sdk/cliproxy/auth/selector_test.go @@ -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) { diff --git a/sdk/cliproxy/auth/types.go b/sdk/cliproxy/auth/types.go index f7175d54c7..42819b0b42 100644 --- a/sdk/cliproxy/auth/types.go +++ b/sdk/cliproxy/auth/types.go @@ -12,7 +12,7 @@ import ( "sync" "time" - baseauth "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/auth" + baseauth "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/auth" ) // PostAuthHook defines a function that is called after an Auth record is created diff --git a/sdk/cliproxy/builder.go b/sdk/cliproxy/builder.go index 5d5738134a..b48055556e 100644 --- a/sdk/cliproxy/builder.go +++ b/sdk/cliproxy/builder.go @@ -7,12 +7,12 @@ import ( "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" + "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. diff --git a/sdk/cliproxy/executor/types.go b/sdk/cliproxy/executor/types.go index 4ea8103947..3e5d9cbf8e 100644 --- a/sdk/cliproxy/executor/types.go +++ b/sdk/cliproxy/executor/types.go @@ -4,7 +4,7 @@ import ( "net/http" "net/url" - sdktranslator "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator" + sdktranslator "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator" ) // RequestedModelMetadataKey stores the client-requested model name in Options.Metadata. diff --git a/sdk/cliproxy/model_registry.go b/sdk/cliproxy/model_registry.go index 919f0a2d9b..63dc4a63f2 100644 --- a/sdk/cliproxy/model_registry.go +++ b/sdk/cliproxy/model_registry.go @@ -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 diff --git a/sdk/cliproxy/pipeline/context.go b/sdk/cliproxy/pipeline/context.go index fc6754eb97..dbb557aee4 100644 --- a/sdk/cliproxy/pipeline/context.go +++ b/sdk/cliproxy/pipeline/context.go @@ -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. diff --git a/sdk/cliproxy/pprof_server.go b/sdk/cliproxy/pprof_server.go index 3fafef4cd4..de2a943021 100644 --- a/sdk/cliproxy/pprof_server.go +++ b/sdk/cliproxy/pprof_server.go @@ -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" ) diff --git a/sdk/cliproxy/providers.go b/sdk/cliproxy/providers.go index a8a1b01375..2e286c5031 100644 --- a/sdk/cliproxy/providers.go +++ b/sdk/cliproxy/providers.go @@ -3,8 +3,8 @@ package cliproxy 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" + "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config" ) // NewFileTokenClientProvider returns the default token-backed client loader. diff --git a/sdk/cliproxy/rtprovider.go b/sdk/cliproxy/rtprovider.go index dad4fc2387..5c44be2b40 100644 --- a/sdk/cliproxy/rtprovider.go +++ b/sdk/cliproxy/rtprovider.go @@ -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" ) diff --git a/sdk/cliproxy/service.go b/sdk/cliproxy/service.go index 95ae789c7e..f8e0d40436 100644 --- a/sdk/cliproxy/service.go +++ b/sdk/cliproxy/service.go @@ -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" ) diff --git a/sdk/cliproxy/service_codex_executor_binding_test.go b/sdk/cliproxy/service_codex_executor_binding_test.go index bb4fc84e10..2dbb8bda6e 100644 --- a/sdk/cliproxy/service_codex_executor_binding_test.go +++ b/sdk/cliproxy/service_codex_executor_binding_test.go @@ -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) { diff --git a/sdk/cliproxy/service_excluded_models_test.go b/sdk/cliproxy/service_excluded_models_test.go index 198a5bed73..f897889be6 100644 --- a/sdk/cliproxy/service_excluded_models_test.go +++ b/sdk/cliproxy/service_excluded_models_test.go @@ -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) { diff --git a/sdk/cliproxy/service_oauth_model_alias_test.go b/sdk/cliproxy/service_oauth_model_alias_test.go index 2f90d1dfb0..b676c1d1ab 100644 --- a/sdk/cliproxy/service_oauth_model_alias_test.go +++ b/sdk/cliproxy/service_oauth_model_alias_test.go @@ -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) { diff --git a/sdk/cliproxy/types.go b/sdk/cliproxy/types.go index 0f63276de1..8b37f9375a 100644 --- a/sdk/cliproxy/types.go +++ b/sdk/cliproxy/types.go @@ -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. diff --git a/sdk/cliproxy/watcher.go b/sdk/cliproxy/watcher.go index ee94cbdc1d..1d5500f2d0 100644 --- a/sdk/cliproxy/watcher.go +++ b/sdk/cliproxy/watcher.go @@ -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) {