Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Create a `.env` file and add OpenCommit config variables there like this:

```env
...
OCO_AI_PROVIDER=<openai (default), anthropic, azure, ollama, llamacpp, gemini, flowise, deepseek, aimlapi, openrouter, orcarouter>
OCO_AI_PROVIDER=<openai (default), anthropic, azure, ollama, llamacpp, gemini, flowise, deepseek, aimlapi, openrouter, orcarouter, uberllm>
OCO_API_KEY=<your OpenAI API token> // or other LLM provider API token
OCO_API_URL=<may be used to set proxy path to OpenAI api>
OCO_API_CUSTOM_HEADERS=<JSON string of custom HTTP headers to include in API requests>
Expand Down Expand Up @@ -294,6 +294,18 @@ oco config set OCO_AI_PROVIDER=orcarouter OCO_API_KEY=<your_orcarouter_api_key>

The default model is `orcarouter/auto`, which lets OrcaRouter pick the best model for your request automatically.

### Use UberLLM as the model gateway

[UberLLM](https://uberllm.dev) is an OpenAI-compatible gateway with one key for about 260 chat models (DeepSeek, Claude, GPT, Gemini, Qwen, GLM and others). Prices are per model, usually below list price, and listed at [uberllm.dev/models](https://uberllm.dev/models). `oco models` lists the same catalog.

```sh
oco config set OCO_AI_PROVIDER=uberllm OCO_API_KEY=<your_uberllm_api_key>

oco config set OCO_AI_PROVIDER=uberllm OCO_API_KEY=<your_uberllm_api_key> OCO_MODEL=anthropic/claude-haiku-4.5
```

The default model is `deepseek/deepseek-v3.2`.

### Use with Proxy

If you are behind a proxy, you can set it in the config:
Expand Down
59 changes: 54 additions & 5 deletions out/cli.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -70268,6 +70268,7 @@ var OCO_AI_PROVIDER_ENUM = /* @__PURE__ */ ((OCO_AI_PROVIDER_ENUM2) => {
OCO_AI_PROVIDER_ENUM2["AIMLAPI"] = "aimlapi";
OCO_AI_PROVIDER_ENUM2["OPENROUTER"] = "openrouter";
OCO_AI_PROVIDER_ENUM2["ORCAROUTER"] = "orcarouter";
OCO_AI_PROVIDER_ENUM2["UBERLLM"] = "uberllm";
return OCO_AI_PROVIDER_ENUM2;
})(OCO_AI_PROVIDER_ENUM || {});
var PROVIDER_CONFIG_REQUIREMENTS = {
Expand All @@ -70281,6 +70282,7 @@ var PROVIDER_CONFIG_REQUIREMENTS = {
["deepseek" /* DEEPSEEK */]: "apiKey",
["openrouter" /* OPENROUTER */]: "apiKey",
["orcarouter" /* ORCAROUTER */]: "apiKey",
["uberllm" /* UBERLLM */]: "apiKey",
["aimlapi" /* AIMLAPI */]: "apiKey",
["azure" /* AZURE */]: "apiKey",
["mlx" /* MLX */]: "model",
Expand Down Expand Up @@ -70854,7 +70856,10 @@ var MODEL_LIST = {
],
// OrcaRouter available models
// https://api.orcarouter.ai/v1/models
orcarouter: ["orcarouter/auto"]
orcarouter: ["orcarouter/auto"],
// UberLLM available models
// https://api.uberllm.dev/v1/models
uberllm: ["deepseek/deepseek-v3.2"]
};
var getDefaultModel = (provider) => {
switch (provider) {
Expand All @@ -70880,6 +70885,8 @@ var getDefaultModel = (provider) => {
return MODEL_LIST.openrouter[0];
case "orcarouter":
return MODEL_LIST.orcarouter[0];
case "uberllm":
return MODEL_LIST.uberllm[0];
default:
return MODEL_LIST.openai[0];
}
Expand Down Expand Up @@ -70914,7 +70921,7 @@ var configValidators = {
validateConfig(
"OCO_API_KEY",
value,
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter" or "uberllm". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
);
return value;
},
Expand Down Expand Up @@ -71062,9 +71069,10 @@ var configValidators = {
"deepseek",
"aimlapi",
"openrouter",
"orcarouter"
"orcarouter",
"uberllm"
].includes(value) || value.startsWith("ollama") || value.startsWith("llamacpp"),
`${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter' or 'openai' (default)`
`${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter', 'uberllm' or 'openai' (default)`
);
return value;
},
Expand Down Expand Up @@ -71135,6 +71143,7 @@ var PROVIDER_API_KEY_URLS = {
["deepseek" /* DEEPSEEK */]: "https://platform.deepseek.com/api_keys",
["openrouter" /* OPENROUTER */]: "https://openrouter.ai/keys",
["orcarouter" /* ORCAROUTER */]: "https://www.orcarouter.ai",
["uberllm" /* UBERLLM */]: "https://uberllm.dev/dashboard/keys",
["aimlapi" /* AIMLAPI */]: "https://aimlapi.com/app/keys",
["azure" /* AZURE */]: "https://portal.azure.com/",
["ollama" /* OLLAMA */]: null,
Expand All @@ -71152,6 +71161,7 @@ var RECOMMENDED_MODELS = {
["deepseek" /* DEEPSEEK */]: "deepseek-v4-flash",
["openrouter" /* OPENROUTER */]: "openai/gpt-4o-mini",
["orcarouter" /* ORCAROUTER */]: "orcarouter/auto",
["uberllm" /* UBERLLM */]: "deepseek/deepseek-v3.2",
["aimlapi" /* AIMLAPI */]: "gpt-4o-mini"
};
var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit");
Expand Down Expand Up @@ -79694,6 +79704,7 @@ var PROVIDER_BILLING_URLS = {
["deepseek" /* DEEPSEEK */]: "https://platform.deepseek.com/usage",
["openrouter" /* OPENROUTER */]: "https://openrouter.ai/credits",
["orcarouter" /* ORCAROUTER */]: "https://www.orcarouter.ai",
["uberllm" /* UBERLLM */]: "https://uberllm.dev/dashboard/credits",
["aimlapi" /* AIMLAPI */]: "https://aimlapi.com/app/billing",
["azure" /* AZURE */]: "https://portal.azure.com/#view/Microsoft_Azure_CostManagement",
["ollama" /* OLLAMA */]: null,
Expand Down Expand Up @@ -90283,6 +90294,18 @@ var OrcaRouterEngine = class extends OpenAiEngine {
}
};

// src/engine/uberllm.ts
var DEFAULT_UBERLLM_BASE_URL = "https://api.uberllm.dev/v1";
var UberLLMEngine = class extends OpenAiEngine {
constructor(config7) {
super({
...config7,
baseURL: config7.baseURL ?? DEFAULT_UBERLLM_BASE_URL
});
this.providerName = "uberllm";
}
};

// src/utils/proxy.ts
var import_undici = __toESM(require_undici(), 1);
function resolveProxy(proxySetting) {
Expand Down Expand Up @@ -90370,6 +90393,8 @@ function getEngine(config7 = getConfig()) {
return new OpenRouterEngine(DEFAULT_CONFIG2);
case "orcarouter" /* ORCAROUTER */:
return new OrcaRouterEngine(DEFAULT_CONFIG2);
case "uberllm" /* UBERLLM */:
return new UberLLMEngine(DEFAULT_CONFIG2);
default:
return new OpenAiEngine(DEFAULT_CONFIG2);
}
Expand Down Expand Up @@ -91899,6 +91924,15 @@ async function fetchOrcaRouterModels(apiKey) {
})?.map((model) => model.id).sort()
});
}
async function fetchUberLLMModels(apiKey) {
return fetchModelList({
// Without `?type=`, this endpoint lists chat (text-output) models only.
url: "https://api.uberllm.dev/v1/models",
headers: { Authorization: `Bearer ${apiKey}` },
fallback: MODEL_LIST.uberllm,
mapModels: (data) => data.data?.map((model) => model.id).sort()
});
}
async function fetchModelsForProvider(provider, apiKey, baseUrl, forceRefresh = false) {
const cache = readCache();
if (!forceRefresh && isCacheValid(cache) && cache.models[provider]) {
Expand Down Expand Up @@ -91967,6 +92001,13 @@ async function fetchModelsForProvider(provider, apiKey, baseUrl, forceRefresh =
models = MODEL_LIST.orcarouter;
}
break;
case "uberllm" /* UBERLLM */:
if (apiKey) {
models = await fetchUberLLMModels(apiKey);
} else {
models = MODEL_LIST.uberllm;
}
break;
default:
models = MODEL_LIST.openai;
}
Expand Down Expand Up @@ -92054,6 +92095,12 @@ var SETUP_PROVIDERS = [
selectionGroup: "other",
firstRunRequirement: "apiKey"
},
{
provider: "uberllm" /* UBERLLM */,
displayName: "UberLLM (OpenAI-compatible gateway)",
selectionGroup: "other",
firstRunRequirement: "apiKey"
},
{
provider: "aimlapi" /* AIMLAPI */,
displayName: "AI/ML API",
Expand Down Expand Up @@ -92736,7 +92783,9 @@ var runMigrations = async () => {
"mlx" /* MLX */,
"openrouter" /* OPENROUTER */,
"llamacpp" /* LLAMACPP */,
"aimlapi" /* AIMLAPI */
"aimlapi" /* AIMLAPI */,
"orcarouter" /* ORCAROUTER */,
"uberllm" /* UBERLLM */
].includes(config7.OCO_AI_PROVIDER)) {
return;
}
Expand Down
17 changes: 13 additions & 4 deletions src/commands/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,11 @@ export const MODEL_LIST = {

// OrcaRouter available models
// https://api.orcarouter.ai/v1/models
orcarouter: ['orcarouter/auto']
orcarouter: ['orcarouter/auto'],

// UberLLM available models
// https://api.uberllm.dev/v1/models
uberllm: ['deepseek/deepseek-v3.2']
};

const getDefaultModel = (provider: string | undefined): string => {
Expand All @@ -609,6 +613,8 @@ const getDefaultModel = (provider: string | undefined): string => {
return MODEL_LIST.openrouter[0];
case 'orcarouter':
return MODEL_LIST.orcarouter[0];
case 'uberllm':
return MODEL_LIST.uberllm[0];
default:
return MODEL_LIST.openai[0];
}
Expand Down Expand Up @@ -662,7 +668,7 @@ export const configValidators = {
validateConfig(
'OCO_API_KEY',
value,
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter" or "uberllm". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
);

return value;
Expand Down Expand Up @@ -835,11 +841,12 @@ export const configValidators = {
'deepseek',
'aimlapi',
'openrouter',
'orcarouter'
'orcarouter',
'uberllm'
].includes(value) ||
value.startsWith('ollama') ||
value.startsWith('llamacpp'),
`${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter' or 'openai' (default)`
`${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter', 'uberllm' or 'openai' (default)`
);

return value;
Expand Down Expand Up @@ -919,6 +926,7 @@ export const PROVIDER_API_KEY_URLS: Record<string, string | null> = {
[OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'https://platform.deepseek.com/api_keys',
[OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'https://openrouter.ai/keys',
[OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'https://www.orcarouter.ai',
[OCO_AI_PROVIDER_ENUM.UBERLLM]: 'https://uberllm.dev/dashboard/keys',
[OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'https://aimlapi.com/app/keys',
[OCO_AI_PROVIDER_ENUM.AZURE]: 'https://portal.azure.com/',
[OCO_AI_PROVIDER_ENUM.OLLAMA]: null,
Expand All @@ -937,6 +945,7 @@ export const RECOMMENDED_MODELS: Record<string, string> = {
[OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'deepseek-v4-flash',
[OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'openai/gpt-4o-mini',
[OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'orcarouter/auto',
[OCO_AI_PROVIDER_ENUM.UBERLLM]: 'deepseek/deepseek-v3.2',
[OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'gpt-4o-mini'
};

Expand Down
6 changes: 6 additions & 0 deletions src/commands/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ const SETUP_PROVIDERS: SetupProviderDefinition[] = [
selectionGroup: 'other',
firstRunRequirement: 'apiKey'
},
{
provider: OCO_AI_PROVIDER_ENUM.UBERLLM,
displayName: 'UberLLM (OpenAI-compatible gateway)',
selectionGroup: 'other',
firstRunRequirement: 'apiKey'
},
{
provider: OCO_AI_PROVIDER_ENUM.AIMLAPI,
displayName: 'AI/ML API',
Expand Down
16 changes: 16 additions & 0 deletions src/engine/uberllm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { OpenAiEngine, OpenAiConfig } from './openAi';

export interface UberLLMConfig extends OpenAiConfig {}

const DEFAULT_UBERLLM_BASE_URL = 'https://api.uberllm.dev/v1';

export class UberLLMEngine extends OpenAiEngine {
protected providerName = 'uberllm';

constructor(config: UberLLMConfig) {
super({
...config,
baseURL: config.baseURL ?? DEFAULT_UBERLLM_BASE_URL
});
}
}
4 changes: 3 additions & 1 deletion src/migrations/_run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export const runMigrations = async () => {
OCO_AI_PROVIDER_ENUM.MLX,
OCO_AI_PROVIDER_ENUM.OPENROUTER,
OCO_AI_PROVIDER_ENUM.LLAMACPP,
OCO_AI_PROVIDER_ENUM.AIMLAPI
OCO_AI_PROVIDER_ENUM.AIMLAPI,
OCO_AI_PROVIDER_ENUM.ORCAROUTER,
OCO_AI_PROVIDER_ENUM.UBERLLM
].includes(config.OCO_AI_PROVIDER)
) {
return;
Expand Down
4 changes: 4 additions & 0 deletions src/utils/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { DeepseekEngine } from '../engine/deepseek';
import { AimlApiEngine } from '../engine/aimlapi';
import { OpenRouterEngine } from '../engine/openrouter';
import { OrcaRouterEngine } from '../engine/orcarouter';
import { UberLLMEngine } from '../engine/uberllm';
import { parseCustomHeaders } from './customHeaders';
import { resolveProxy } from './proxy';

Expand Down Expand Up @@ -82,6 +83,9 @@ export function getEngine(config = getConfig()): AiEngine {
case OCO_AI_PROVIDER_ENUM.ORCAROUTER:
return new OrcaRouterEngine(DEFAULT_CONFIG);

case OCO_AI_PROVIDER_ENUM.UBERLLM:
return new UberLLMEngine(DEFAULT_CONFIG);

default:
return new OpenAiEngine(DEFAULT_CONFIG);
}
Expand Down
3 changes: 3 additions & 0 deletions src/utils/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const PROVIDER_BILLING_URLS: Record<string, string | null> = {
[OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'https://platform.deepseek.com/usage',
[OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'https://openrouter.ai/credits',
[OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'https://www.orcarouter.ai',
[OCO_AI_PROVIDER_ENUM.UBERLLM]: 'https://uberllm.dev/dashboard/credits',
[OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'https://aimlapi.com/app/billing',
[OCO_AI_PROVIDER_ENUM.AZURE]:
'https://portal.azure.com/#view/Microsoft_Azure_CostManagement',
Expand Down Expand Up @@ -208,6 +209,8 @@ export function getRecommendedModel(provider: string): string | null {
return 'openai/gpt-4o-mini';
case OCO_AI_PROVIDER_ENUM.ORCAROUTER:
return 'orcarouter/auto';
case OCO_AI_PROVIDER_ENUM.UBERLLM:
return 'deepseek/deepseek-v3.2';
case OCO_AI_PROVIDER_ENUM.AIMLAPI:
return 'gpt-4o-mini';
default:
Expand Down
19 changes: 19 additions & 0 deletions src/utils/modelCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,17 @@ export async function fetchOrcaRouterModels(apiKey: string): Promise<string[]> {
});
}

export async function fetchUberLLMModels(apiKey: string): Promise<string[]> {
return fetchModelList({
// Without `?type=`, this endpoint lists chat (text-output) models only.
url: 'https://api.uberllm.dev/v1/models',
headers: { Authorization: `Bearer ${apiKey}` },
fallback: MODEL_LIST.uberllm,
mapModels: (data) =>
(data as ModelListResponse).data?.map((model) => model.id).sort()
});
}

export async function fetchModelsForProvider(
provider: string,
apiKey?: string,
Expand Down Expand Up @@ -295,6 +306,14 @@ export async function fetchModelsForProvider(
}
break;

case OCO_AI_PROVIDER_ENUM.UBERLLM:
if (apiKey) {
models = await fetchUberLLMModels(apiKey);
} else {
models = MODEL_LIST.uberllm;
}
break;

default:
models = MODEL_LIST.openai;
}
Expand Down
4 changes: 3 additions & 1 deletion src/utils/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ export enum OCO_AI_PROVIDER_ENUM {
DEEPSEEK = 'deepseek',
AIMLAPI = 'aimlapi',
OPENROUTER = 'openrouter',
ORCAROUTER = 'orcarouter'
ORCAROUTER = 'orcarouter',
UBERLLM = 'uberllm'
}

export type ProviderConfigRequirement = 'apiKey' | 'model' | 'none';
Expand All @@ -32,6 +33,7 @@ const PROVIDER_CONFIG_REQUIREMENTS: Record<
[OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.UBERLLM]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.AZURE]: 'apiKey',
[OCO_AI_PROVIDER_ENUM.MLX]: 'model',
Expand Down
Loading
Loading