Skip to content

Commit 76e6070

Browse files
di-sukharevdi-sukharev
committed
Merge branch 'feature/Flowise' of github.com:murex/opencommit into murex-feature/Flowise
2 parents cb72837 + 026fd18 commit 76e6070

6 files changed

Lines changed: 97 additions & 19 deletions

File tree

‎out/cli.cjs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28111,7 +28111,7 @@ function G3(t2, e3) {
2811128111
// package.json
2811228112
var package_default = {
2811328113
name: "opencommit",
28114-
version: "3.0.17",
28114+
version: "3.0.16",
2811528115
description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}",
2811628116
keywords: [
2811728117
"git",
@@ -28157,8 +28157,7 @@ var package_default = {
2815728157
"dev:gemini": "OCO_AI_PROVIDER='gemini' ts-node ./src/cli.ts",
2815828158
build: "rimraf out && node esbuild.config.js",
2815928159
"build:push": "npm run build && git add . && git commit -m 'build' && git push",
28160-
deploy: "npm run build:push && git push --tags && npm publish --tag latest",
28161-
"deploy:patch": "npm version patch && npm run deploy",
28160+
deploy: "npm version patch && npm run build:push && git push --tags && npm publish --tag latest",
2816228161
lint: "eslint src --ext ts && tsc --noEmit",
2816328162
format: "prettier --write src",
2816428163
test: "node --no-warnings --experimental-vm-modules $( [ -f ./node_modules/.bin/jest ] && echo ./node_modules/.bin/jest || which jest ) test/unit",
@@ -30688,8 +30687,7 @@ var MODEL_LIST = {
3068830687
"gpt-4o-mini-2024-07-18"
3068930688
],
3069030689
anthropic: [
30691-
"claude-3-5-sonnet-20240620",
30692-
"claude-3-opus-20240229",
30690+
"claude-3-haiku-20240307",
3069330691
"claude-3-sonnet-20240229",
3069430692
"claude-3-haiku-20240307"
3069530693
],

‎out/github-action.cjs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49498,8 +49498,7 @@ var MODEL_LIST = {
4949849498
"gpt-4o-mini-2024-07-18"
4949949499
],
4950049500
anthropic: [
49501-
"claude-3-5-sonnet-20240620",
49502-
"claude-3-opus-20240229",
49501+
"claude-3-haiku-20240307",
4950349502
"claude-3-sonnet-20240229",
4950449503
"claude-3-haiku-20240307"
4950549504
],

‎src/commands/config.ts‎

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ export enum CONFIG_KEYS {
3333
OCO_AZURE_ENDPOINT = 'OCO_AZURE_ENDPOINT',
3434
OCO_TEST_MOCK_TYPE = 'OCO_TEST_MOCK_TYPE',
3535
OCO_API_URL = 'OCO_API_URL',
36-
OCO_OLLAMA_API_URL = 'OCO_OLLAMA_API_URL'
36+
OCO_OLLAMA_API_URL = 'OCO_OLLAMA_API_URL',
37+
OCO_FLOWISE_ENDPOINT = 'OCO_FLOWISE_ENDPOINT',
38+
OCO_FLOWISE_API_KEY = 'OCO_FLOWISE_API_KEY'
3739
}
3840

3941
export enum CONFIG_MODES {
@@ -130,7 +132,8 @@ export const configValidators = {
130132
config.OCO_ANTHROPIC_API_KEY ||
131133
config.OCO_AI_PROVIDER.startsWith('ollama') ||
132134
config.OCO_AZURE_API_KEY ||
133-
config.OCO_AI_PROVIDER == 'test',
135+
config.OCO_AI_PROVIDER == 'test' ||
136+
config.OCO_AI_PROVIDER == 'flowise',
134137
'You need to provide an OpenAI/Anthropic/Azure API key'
135138
);
136139
validateConfig(
@@ -149,7 +152,8 @@ export const configValidators = {
149152
config.OCO_OPENAI_API_KEY ||
150153
config.OCO_AZURE_API_KEY ||
151154
config.OCO_AI_PROVIDER == 'ollama' ||
152-
config.OCO_AI_PROVIDER == 'test',
155+
config.OCO_AI_PROVIDER == 'test' ||
156+
config.OCO_AI_PROVIDER == 'flowise',
153157
'You need to provide an OpenAI/Anthropic/Azure API key'
154158
);
155159

@@ -175,13 +179,24 @@ export const configValidators = {
175179
value ||
176180
config.OCO_OPENAI_API_KEY ||
177181
config.OCO_AI_PROVIDER == 'ollama' ||
178-
config.OCO_AI_PROVIDER == 'test',
182+
config.OCO_AI_PROVIDER == 'test' ||
183+
config.OCO_AI_PROVIDER == 'flowise',
179184
'You need to provide an OpenAI/Anthropic API key'
180185
);
181186

182187
return value;
183188
},
184189

190+
[CONFIG_KEYS.OCO_FLOWISE_API_KEY](value: any, config: any = {}) {
191+
validateConfig(
192+
CONFIG_KEYS.OCO_FLOWISE_API_KEY,
193+
value || config.OCO_AI_PROVIDER != 'flowise',
194+
'You need to provide a flowise API key'
195+
);
196+
197+
return value;
198+
},
199+
185200
[CONFIG_KEYS.OCO_DESCRIPTION](value: any) {
186201
validateConfig(
187202
CONFIG_KEYS.OCO_DESCRIPTION,
@@ -268,7 +283,8 @@ export const configValidators = {
268283
].includes(value) ||
269284
config.OCO_AI_PROVIDER == 'ollama' ||
270285
config.OCO_AI_PROVIDER == 'azure' ||
271-
config.OCO_AI_PROVIDER == 'test',
286+
config.OCO_AI_PROVIDER == 'test' ||
287+
config.OCO_AI_PROVIDER == 'flowise',
272288
`${value} is not supported yet, use:\n\n ${[
273289
...MODEL_LIST.openai,
274290
...MODEL_LIST.anthropic,
@@ -308,9 +324,16 @@ export const configValidators = {
308324
[CONFIG_KEYS.OCO_AI_PROVIDER](value: any) {
309325
validateConfig(
310326
CONFIG_KEYS.OCO_AI_PROVIDER,
311-
['', 'openai', 'anthropic', 'gemini', 'azure', 'test'].includes(value) ||
312-
value.startsWith('ollama'),
313-
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)`
327+
[
328+
'',
329+
'openai',
330+
'anthropic',
331+
'gemini',
332+
'azure',
333+
'test',
334+
'flowise'
335+
].includes(value) || value.startsWith('ollama'),
336+
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini', 'flowise' or 'openai' (default)`
314337
);
315338
return value;
316339
},
@@ -324,6 +347,7 @@ export const configValidators = {
324347

325348
return value;
326349
},
350+
327351
[CONFIG_KEYS.OCO_AZURE_ENDPOINT](value: any) {
328352
validateConfig(
329353
CONFIG_KEYS.OCO_AZURE_ENDPOINT,
@@ -333,6 +357,17 @@ export const configValidators = {
333357

334358
return value;
335359
},
360+
361+
[CONFIG_KEYS.OCO_FLOWISE_ENDPOINT](value: any) {
362+
validateConfig(
363+
CONFIG_KEYS.OCO_FLOWISE_ENDPOINT,
364+
typeof value === 'string' && value.includes(':'),
365+
'Value must be string and should include both I.P. and port number' // Considering the possibility of DNS lookup or feeding the I.P. explicitely, there is no pattern to verify, except a column for the port number
366+
);
367+
368+
return value;
369+
},
370+
336371
[CONFIG_KEYS.OCO_TEST_MOCK_TYPE](value: any) {
337372
validateConfig(
338373
CONFIG_KEYS.OCO_TEST_MOCK_TYPE,
@@ -361,7 +396,6 @@ export type ConfigType = {
361396

362397
const defaultConfigPath = pathJoin(homedir(), '.opencommit');
363398
const defaultEnvPath = pathResolve(process.cwd(), '.env');
364-
365399
export const getConfig = ({
366400
configPath = defaultConfigPath,
367401
envPath = defaultEnvPath
@@ -396,9 +430,10 @@ export const getConfig = ({
396430
OCO_ONE_LINE_COMMIT:
397431
process.env.OCO_ONE_LINE_COMMIT === 'true' ? true : false,
398432
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || undefined,
399-
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || 'commit-message'
433+
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || 'commit-message',
434+
OCO_FLOWISE_ENDPOINT: process.env.OCO_FLOWISE_ENDPOINT || ':',
435+
OCO_FLOWISE_API_KEY: process.env.OCO_FLOWISE_API_KEY || undefined
400436
};
401-
402437
const configExists = existsSync(configPath);
403438
if (!configExists) return configFromEnv;
404439

‎src/engine/flowise.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import axios, { AxiosError } from 'axios';
2+
import { ChatCompletionRequestMessage } from 'openai';
3+
import { AiEngine } from './Engine';
4+
5+
import {
6+
getConfig
7+
} from '../commands/config';
8+
9+
const config = getConfig();
10+
11+
export class FlowiseAi implements AiEngine {
12+
13+
async generateCommitMessage(
14+
messages: Array<ChatCompletionRequestMessage>
15+
): Promise<string | undefined> {
16+
17+
const gitDiff = messages[ messages.length - 1 ]?.content?.replace(/\\/g, '\\\\')
18+
.replace(/"/g, '\\"')
19+
.replace(/\n/g, '\\n')
20+
.replace(/\r/g, '\\r')
21+
.replace(/\t/g, '\\t');
22+
const url = `http://${config?.OCO_FLOWISE_ENDPOINT}/api/v1/prediction/${config?.OCO_FLOWISE_API_KEY}`;
23+
const payload = {
24+
question : gitDiff,
25+
overrideConfig : {
26+
systemMessagePrompt: messages[0]?.content,
27+
},
28+
history : messages.slice( 1, -1 )
29+
}
30+
try {
31+
const response = await axios.post(url, payload, {
32+
headers: {
33+
'Content-Type': 'application/json'
34+
}
35+
});
36+
const message = response.data;
37+
return message?.text;
38+
} catch (err: any) {
39+
const message = err.response?.data?.error ?? err.message;
40+
throw new Error('local model issues. details: ' + message);
41+
}
42+
}
43+
}

‎src/utils/engine.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { OllamaAi } from '../engine/ollama';
66
import { AnthropicAi } from '../engine/anthropic'
77
import { TestAi } from '../engine/testAi';
88
import { Azure } from '../engine/azure';
9+
import { FlowiseAi } from '../engine/flowise'
910

1011
export function getEngine(): AiEngine {
1112
const config = getConfig();
@@ -25,6 +26,8 @@ export function getEngine(): AiEngine {
2526
return new Gemini();
2627
} else if (provider == 'azure') {
2728
return new Azure();
29+
} else if( provider == 'flowise'){
30+
return new FlowiseAi();
2831
}
2932

3033
//open ai gpt by default

‎test/unit/config.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ OCO_ONE_LINE_COMMIT="true"
102102

103103
await envFile.cleanup();
104104
});
105-
});
105+
});

0 commit comments

Comments
 (0)