Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .worktrees/config/m/config-build/active/cliproxyctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

cliproxycmd "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/cmd"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
cliproxycmd "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/cmd"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
)

const responseSchemaVersion = "cliproxyctl.response.v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

cliproxycmd "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/cmd"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
cliproxycmd "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/cmd"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
)

func TestRunSetupJSONResponseShape(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"syscall"
"time"

cliproxycmd "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/cmd"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
cliproxycmd "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/cmd"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
)

const responseSchemaVersion = "cliproxyctl.response.v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"testing"
"time"

cliproxycmd "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/cmd"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
cliproxycmd "github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/cmd"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
)

func TestRunSetupJSONResponseShape(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions .worktrees/config/m/config-build/active/cmd/codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type OpenAICompatibilityModel struct {
Alias string `json:"alias"`
}

const configTemplate = `// Code generated by github.com/router-for-me/CLIProxyAPI/v6/cmd/codegen; DO NOT EDIT.
const configTemplate = `// Code generated by github.com/kooshapari/cliproxyapi-plusplus/v6/cmd/codegen; DO NOT EDIT.
package config

import "strings"
Expand Down Expand Up @@ -68,11 +68,11 @@ func (cfg *Config) SanitizeGeneratedProviders() {
}
`

const synthTemplate = `// Code generated by github.com/router-for-me/CLIProxyAPI/v6/cmd/codegen; DO NOT EDIT.
const synthTemplate = `// Code generated by github.com/kooshapari/cliproxyapi-plusplus/v6/cmd/codegen; DO NOT EDIT.
package synthesizer

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

// getDedicatedProviderEntries returns the config entries for a dedicated provider.
Expand All @@ -89,7 +89,7 @@ func (s *ConfigSynthesizer) getDedicatedProviderEntries(p config.ProviderSpec, c
}
`

const registryTemplate = `// Code generated by github.com/router-for-me/CLIProxyAPI/v6/cmd/codegen; DO NOT EDIT.
const registryTemplate = `// Code generated by github.com/kooshapari/cliproxyapi-plusplus/v6/cmd/codegen; DO NOT EDIT.
package config

// AllProviders defines the registry of all supported LLM providers.
Expand Down Expand Up @@ -118,12 +118,12 @@ var AllProviders = []ProviderSpec{
}
`

const diffTemplate = `// Code generated by github.com/router-for-me/CLIProxyAPI/v6/cmd/codegen; DO NOT EDIT.
const diffTemplate = `// Code generated by github.com/kooshapari/cliproxyapi-plusplus/v6/cmd/codegen; DO NOT EDIT.
package diff

import (
"fmt"
"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
)

// BuildConfigChangeDetailsGeneratedProviders computes changes for generated dedicated providers.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

"github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/pkg/llmproxy/config"
"gopkg.in/yaml.v3"
)

Expand Down
30 changes: 15 additions & 15 deletions .worktrees/config/m/config-build/active/cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ import (
"time"

"github.com/joho/godotenv"
configaccess "github.com/router-for-me/CLIProxyAPI/v6/internal/access/config_access"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/kiro"
"github.com/router-for-me/CLIProxyAPI/v6/internal/buildinfo"
"github.com/router-for-me/CLIProxyAPI/v6/internal/cmd"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
"github.com/router-for-me/CLIProxyAPI/v6/internal/managementasset"
"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
"github.com/router-for-me/CLIProxyAPI/v6/internal/store"
_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator"
"github.com/router-for-me/CLIProxyAPI/v6/internal/tui"
"github.com/router-for-me/CLIProxyAPI/v6/internal/usage"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
configaccess "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/access/config_access"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/kiro"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/buildinfo"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/cmd"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/logging"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/managementasset"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/misc"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/store"
_ "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/translator"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/tui"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/usage"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/util"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
log "github.com/sirupsen/logrus"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/api"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
clipexec "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/logging"
sdktr "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/api"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
clipexec "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/logging"
sdktr "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/translator"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"strings"
"time"

coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
clipexec "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
clipexec "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/executor"
log "github.com/sirupsen/logrus"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

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

func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"strings"

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

// Register ensures the config-access provider is available to the access manager.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sort"
"strings"

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"

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

const defaultAPICallTimeout = 60 * time.Second
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

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

type memoryAuthStore struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/antigravity"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/claude"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/codex"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/copilot"
geminiAuth "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/gemini"
iflowauth "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/iflow"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/kilo"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/kimi"
kiroauth "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/kiro"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/qwen"
"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
"github.com/router-for-me/CLIProxyAPI/v6/internal/registry"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/antigravity"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/claude"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/codex"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/copilot"
geminiAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/gemini"
iflowauth "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/iflow"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/kilo"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/kimi"
kiroauth "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/kiro"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/qwen"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/interfaces"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/misc"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/registry"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/util"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
"golang.org/x/oauth2"
Expand Down Expand Up @@ -1917,7 +1917,7 @@ func (h *Handler) RequestGitHubToken(c *gin.Context) {
state := fmt.Sprintf("gh-%d", time.Now().UnixNano())

// Initialize Copilot auth service
// We need to import "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/copilot" first if not present
// We need to import "github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/copilot" first if not present
// Assuming copilot package is imported as "copilot"
deviceClient := copilot.NewDeviceFlowClient(h.cfg)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
sdkconfig "github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/util"
sdkconfig "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/config"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

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

// Generic helpers for list[string]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/buildinfo"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/internal/usage"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/buildinfo"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/usage"
sdkAuth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/auth"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
"golang.org/x/crypto/bcrypt"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/logging"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/registry"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/registry"
)

// GetStaticModelDefinitions returns static model metadata for a given channel.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/usage"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/usage"
)

type usageExportPayload struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/vertex"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/auth/vertex"
coreauth "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/cliproxy/auth"
)

// ImportVertexCredential handles uploading a Vertex service account JSON and saving it as an auth record.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/logging"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/util"
)

const maxErrorOnlyCapturedRequestBodyBytes int64 = 1 << 20 // 1 MiB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/interfaces"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/logging"
)

const requestBodyOverrideContextKey = "REQUEST_BODY_OVERRIDE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"sync"

"github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/api/modules"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
sdkaccess "github.com/router-for-me/CLIProxyAPI/v6/sdk/access"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/api/modules"
"github.com/kooshapari/cliproxyapi-plusplus/v6/internal/config"
sdkaccess "github.com/kooshapari/cliproxyapi-plusplus/v6/sdk/access"
log "github.com/sirupsen/logrus"
)

Expand Down
Loading
Loading