Skip to content

Commit 07f7a05

Browse files
xtliu97xtliu97
authored
support read OCO_OLLAMA_API_URL from env to OllamaAiEngine and fix bug in getting ollma model name when slash exists (#375)
1 parent c425878 commit 07f7a05

File tree

4 files changed

+34
-18
lines changed

4 files changed

+34
-18
lines changed

‎out/cli.cjs‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30567,8 +30567,8 @@ var vi_VN_default = {
3056730567
// src/i18n/zh_CN.json
3056830568
var zh_CN_default = {
3056930569
localLanguage: "\u7B80\u4F53\u4E2D\u6587",
30570-
commitFix: "\u4FEE\u590D(server.ts)\uFF1A\u5C06\u7AEF\u53E3\u53D8\u91CF\u4ECE\u5C0F\u5199port\u6539\u4E3A\u5927\u5199PORT",
30571-
commitFeat: "\u529F\u80FD(server.ts)\uFF1A\u6DFB\u52A0\u5BF9process.env.PORT\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301",
30570+
commitFix: "fix(server.ts)\uFF1A\u5C06\u7AEF\u53E3\u53D8\u91CF\u4ECE\u5C0F\u5199port\u6539\u4E3A\u5927\u5199PORT",
30571+
commitFeat: "feat(server.ts)\uFF1A\u6DFB\u52A0\u5BF9process.env.PORT\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301",
3057230572
commitDescription: "\u73B0\u5728\u7AEF\u53E3\u53D8\u91CF\u88AB\u547D\u540D\u4E3APORT\uFF0C\u8FD9\u63D0\u9AD8\u4E86\u547D\u540D\u7EA6\u5B9A\u7684\u4E00\u81F4\u6027\uFF0C\u56E0\u4E3APORT\u662F\u4E00\u4E2A\u5E38\u91CF\u3002\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301\u4F7F\u5E94\u7528\u7A0B\u5E8F\u66F4\u52A0\u7075\u6D3B\uFF0C\u56E0\u4E3A\u5B83\u73B0\u5728\u53EF\u4EE5\u901A\u8FC7process.env.PORT\u73AF\u5883\u53D8\u91CF\u5728\u4EFB\u4F55\u53EF\u7528\u7AEF\u53E3\u4E0A\u8FD0\u884C\u3002"
3057330573
};
3057430574

@@ -30691,7 +30691,14 @@ var MODEL_LIST = {
3069130691
"claude-3-5-sonnet-20240620",
3069230692
"claude-3-opus-20240229",
3069330693
"claude-3-sonnet-20240229",
30694-
"claude-3-opus-20240229"
30694+
"claude-3-haiku-20240307"
30695+
],
30696+
gemini: [
30697+
"gemini-1.5-flash",
30698+
"gemini-1.5-pro",
30699+
"gemini-1.0-pro",
30700+
"gemini-pro-vision",
30701+
"text-embedding-004"
3069530702
]
3069630703
};
3069730704
var getDefaultModel = (provider4) => {
@@ -30930,8 +30937,9 @@ var getConfig = ({
3093030937
OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai",
3093130938
OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true,
3093230939
OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false,
30933-
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "",
30934-
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message"
30940+
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || void 0,
30941+
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message",
30942+
OCO_OLLAMA_API_URL: process.env.OCO_OLLAMA_API_URL || void 0
3093530943
};
3093630944
const configExists = (0, import_fs.existsSync)(configPath);
3093730945
if (!configExists)
@@ -41015,9 +41023,11 @@ function getEngine() {
4101541023
const provider4 = config11?.OCO_AI_PROVIDER;
4101641024
if (provider4?.startsWith("ollama")) {
4101741025
const ollamaAi = new OllamaAi();
41018-
const model = provider4.split("/")[1];
41019-
if (model)
41026+
const model = provider4.substring("ollama/".length);
41027+
if (model) {
4102041028
ollamaAi.setModel(model);
41029+
ollamaAi.setUrl(config11?.OCO_OLLAMA_API_URL);
41030+
}
4102141031
return ollamaAi;
4102241032
} else if (provider4 == "anthropic") {
4102341033
return new AnthropicAi();

‎out/github-action.cjs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49377,8 +49377,8 @@ var vi_VN_default = {
4937749377
// src/i18n/zh_CN.json
4937849378
var zh_CN_default = {
4937949379
localLanguage: "\u7B80\u4F53\u4E2D\u6587",
49380-
commitFix: "\u4FEE\u590D(server.ts)\uFF1A\u5C06\u7AEF\u53E3\u53D8\u91CF\u4ECE\u5C0F\u5199port\u6539\u4E3A\u5927\u5199PORT",
49381-
commitFeat: "\u529F\u80FD(server.ts)\uFF1A\u6DFB\u52A0\u5BF9process.env.PORT\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301",
49380+
commitFix: "fix(server.ts)\uFF1A\u5C06\u7AEF\u53E3\u53D8\u91CF\u4ECE\u5C0F\u5199port\u6539\u4E3A\u5927\u5199PORT",
49381+
commitFeat: "feat(server.ts)\uFF1A\u6DFB\u52A0\u5BF9process.env.PORT\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301",
4938249382
commitDescription: "\u73B0\u5728\u7AEF\u53E3\u53D8\u91CF\u88AB\u547D\u540D\u4E3APORT\uFF0C\u8FD9\u63D0\u9AD8\u4E86\u547D\u540D\u7EA6\u5B9A\u7684\u4E00\u81F4\u6027\uFF0C\u56E0\u4E3APORT\u662F\u4E00\u4E2A\u5E38\u91CF\u3002\u73AF\u5883\u53D8\u91CF\u7684\u652F\u6301\u4F7F\u5E94\u7528\u7A0B\u5E8F\u66F4\u52A0\u7075\u6D3B\uFF0C\u56E0\u4E3A\u5B83\u73B0\u5728\u53EF\u4EE5\u901A\u8FC7process.env.PORT\u73AF\u5883\u53D8\u91CF\u5728\u4EFB\u4F55\u53EF\u7528\u7AEF\u53E3\u4E0A\u8FD0\u884C\u3002"
4938349383
};
4938449384

@@ -49501,7 +49501,7 @@ var MODEL_LIST = {
4950149501
"claude-3-5-sonnet-20240620",
4950249502
"claude-3-opus-20240229",
4950349503
"claude-3-sonnet-20240229",
49504-
"claude-3-opus-20240229"
49504+
"claude-3-haiku-20240307"
4950549505
],
4950649506
gemini: [
4950749507
"gemini-1.5-flash",
@@ -49747,8 +49747,9 @@ var getConfig = ({
4974749747
OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai",
4974849748
OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true,
4974949749
OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false,
49750-
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "",
49751-
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message"
49750+
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || void 0,
49751+
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message",
49752+
OCO_OLLAMA_API_URL: process.env.OCO_OLLAMA_API_URL || void 0
4975249753
};
4975349754
const configExists = (0, import_fs.existsSync)(configPath);
4975449755
if (!configExists)
@@ -59832,9 +59833,11 @@ function getEngine() {
5983259833
const provider4 = config10?.OCO_AI_PROVIDER;
5983359834
if (provider4?.startsWith("ollama")) {
5983459835
const ollamaAi = new OllamaAi();
59835-
const model = provider4.split("/")[1];
59836-
if (model)
59836+
const model = provider4.substring("ollama/".length);
59837+
if (model) {
5983759838
ollamaAi.setModel(model);
59839+
ollamaAi.setUrl(config10?.OCO_OLLAMA_API_URL);
59840+
}
5983859841
return ollamaAi;
5983959842
} else if (provider4 == "anthropic") {
5984059843
return new AnthropicAi();

‎src/commands/config.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,8 @@ export const getConfig = ({
396396
OCO_ONE_LINE_COMMIT:
397397
process.env.OCO_ONE_LINE_COMMIT === 'true' ? true : false,
398398
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || undefined,
399-
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || 'commit-message'
399+
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || 'commit-message',
400+
OCO_OLLAMA_API_URL: process.env.OCO_OLLAMA_API_URL || undefined,
400401
};
401402

402403
const configExists = existsSync(configPath);

‎src/utils/engine.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ export function getEngine(): AiEngine {
1313

1414
if (provider?.startsWith('ollama')) {
1515
const ollamaAi = new OllamaAi();
16-
const model = provider.split('/')[1];
17-
if (model) ollamaAi.setModel(model);
18-
16+
const model = provider.substring('ollama/'.length);
17+
if (model) {
18+
ollamaAi.setModel(model);
19+
ollamaAi.setUrl(config?.OCO_OLLAMA_API_URL);
20+
}
1921
return ollamaAi;
2022
} else if (provider == 'anthropic') {
2123
return new AnthropicAi();

0 commit comments

Comments
 (0)