Trez/opencommit-gitea
4
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
di-sukharev
2024-07-20 10:58:16 +03:00
parent 8361dc6838 2059549dce
commit 6f1e4bcec6
7 changed files with 414 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+17 -13
View File
@@ -58,7 +58,7 @@ git add <files...>
oco oco
``` ```
Link to the GitMoji specification: https://gitmoji.dev/ ### Running locally with Ollama
You can also run it with local model through ollama: You can also run it with local model through ollama:
@@ -70,18 +70,30 @@ You can also run it with local model through ollama:
git add <files...> git add <files...>
OCO_AI_PROVIDER='ollama' opencommit OCO_AI_PROVIDER='ollama' opencommit
``` ```
If you want to use a model other than mistral, you can do so by setting the `OCO_AI_PROVIDER` environment variable as follows: If you want to use a model other than mistral, you can do so by setting the `OCO_AI_PROVIDER` environment variable as follows:
```sh ```sh
OCO_AI_PROVIDER='ollama/llama3:8b' opencommit OCO_AI_PROVIDER='ollama/llama3:8b' opencommit
``` ```
if you have ollama that is set up in docker/ on another machine with GPUs (not locally), you can change the default endpoint url.
You can do so by setting the `OCO_OLLAMA_API_URL` environment variable as follows:
```sh
OCO_OLLAMA_API_URL='http://192.168.1.10:11434/api/chat' opencommit
```
where 192.168.1.10 is example of endpoint URL, where you have ollama set up.
### Flags ### Flags
There are multiple optional flags that can be used with the `oco` command: There are multiple optional flags that can be used with the `oco` command:
#### Use Full GitMoji Specification #### Use Full GitMoji Specification
Link to the GitMoji specification: https://gitmoji.dev/
This flag can only be used if the `OCO_EMOJI` configuration item is set to `true`. This flag allows users to use all emojis in the GitMoji specification, By default, the GitMoji full specification is set to `false`, which only includes 10 emojis (🐛✨📝🚀✅♻️⬆️🔧🌐💡). This flag can only be used if the `OCO_EMOJI` configuration item is set to `true`. This flag allows users to use all emojis in the GitMoji specification, By default, the GitMoji full specification is set to `false`, which only includes 10 emojis (🐛✨📝🚀✅♻️⬆️🔧🌐💡).
This is due to limit the number of tokens sent in each request. However, if you would like to use the full GitMoji specification, you can use the `--fgm` flag. This is due to limit the number of tokens sent in each request. However, if you would like to use the full GitMoji specification, you can use the `--fgm` flag.
@@ -125,7 +137,7 @@ Local config still has more priority than Global config, but you may set `OCO_MO
Simply set any of the variables above like this: Simply set any of the variables above like this:
```sh ```sh
oco config set OCO_MODEL=gpt-4 oco config set OCO_MODEL=gpt-4o
``` ```
Configure [GitMoji](https://gitmoji.dev/) to preface a message. Configure [GitMoji](https://gitmoji.dev/) to preface a message.
@@ -142,7 +154,7 @@ oco config set OCO_EMOJI=false
### Switch to GPT-4 or other models ### Switch to GPT-4 or other models
By default, OpenCommit uses `gpt-3.5-turbo` model. By default, OpenCommit uses `gpt-4o` model.
You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠 You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠
@@ -153,17 +165,9 @@ oco config set OCO_MODEL=gpt-4
or for as a cheaper option: or for as a cheaper option:
```sh ```sh
oco config set OCO_MODEL=gpt-3.5-turbo oco config set OCO_MODEL=gpt-4o-mini
``` ```
or for GPT-4 Turbo (Preview) which is more capable, has knowledge of world events up to April 2023, a 128k context window and 2-3x cheaper vs GPT-4:
```sh
oco config set OCO_MODEL=gpt-4-0125-preview
```
Make sure that you spell it `gpt-4` (lowercase) and that you have API access to the 4th model. Even if you have ChatGPT+, that doesn't necessarily mean that you have API access to GPT-4.
### Switch to Azure OpenAI ### Switch to Azure OpenAI
By default OpenCommit uses [OpenAI](https://openai.com). By default OpenCommit uses [OpenAI](https://openai.com).
@@ -387,7 +391,7 @@ jobs:
OCO_OPENAI_BASE_PATH: '' OCO_OPENAI_BASE_PATH: ''
OCO_DESCRIPTION: false OCO_DESCRIPTION: false
OCO_EMOJI: false OCO_EMOJI: false
OCO_MODEL: gpt-3.5-turbo OCO_MODEL: gpt-4o
OCO_LANGUAGE: en OCO_LANGUAGE: en
OCO_PROMPT_MODULE: conventional-commit OCO_PROMPT_MODULE: conventional-commit
``` ```
out/cli.cjs
+163 -79
View File
@@ -34,7 +34,7 @@ var require_windows = __commonJS({
"node_modules/isexe/windows.js"(exports, module2) { "node_modules/isexe/windows.js"(exports, module2) {
module2.exports = isexe; module2.exports = isexe;
isexe.sync = sync; isexe.sync = sync;
var fs5 = require("fs"); var fs6 = require("fs");
function checkPathExt(path5, options) { function checkPathExt(path5, options) {
var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT; var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
if (!pathext) { if (!pathext) {
@@ -59,12 +59,12 @@ var require_windows = __commonJS({
return checkPathExt(path5, options); return checkPathExt(path5, options);
} }
function isexe(path5, options, cb) { function isexe(path5, options, cb) {
fs5.stat(path5, function(er2, stat) { fs6.stat(path5, function(er2, stat) {
cb(er2, er2 ? false : checkStat(stat, path5, options)); cb(er2, er2 ? false : checkStat(stat, path5, options));
}); });
} }
function sync(path5, options) { function sync(path5, options) {
return checkStat(fs5.statSync(path5), path5, options); return checkStat(fs6.statSync(path5), path5, options);
} }
} }
}); });
@@ -74,14 +74,14 @@ var require_mode = __commonJS({
"node_modules/isexe/mode.js"(exports, module2) { "node_modules/isexe/mode.js"(exports, module2) {
module2.exports = isexe; module2.exports = isexe;
isexe.sync = sync; isexe.sync = sync;
var fs5 = require("fs"); var fs6 = require("fs");
function isexe(path5, options, cb) { function isexe(path5, options, cb) {
fs5.stat(path5, function(er2, stat) { fs6.stat(path5, function(er2, stat) {
cb(er2, er2 ? false : checkStat(stat, options)); cb(er2, er2 ? false : checkStat(stat, options));
}); });
} }
function sync(path5, options) { function sync(path5, options) {
return checkStat(fs5.statSync(path5), options); return checkStat(fs6.statSync(path5), options);
} }
function checkStat(stat, options) { function checkStat(stat, options) {
return stat.isFile() && checkMode(stat, options); return stat.isFile() && checkMode(stat, options);
@@ -105,7 +105,7 @@ var require_mode = __commonJS({
// node_modules/isexe/index.js // node_modules/isexe/index.js
var require_isexe = __commonJS({ var require_isexe = __commonJS({
"node_modules/isexe/index.js"(exports, module2) { "node_modules/isexe/index.js"(exports, module2) {
var fs5 = require("fs"); var fs6 = require("fs");
var core; var core;
if (process.platform === "win32" || global.TESTING_WINDOWS) { if (process.platform === "win32" || global.TESTING_WINDOWS) {
core = require_windows(); core = require_windows();
@@ -367,16 +367,16 @@ var require_shebang_command = __commonJS({
var require_readShebang = __commonJS({ var require_readShebang = __commonJS({
"node_modules/cross-spawn/lib/util/readShebang.js"(exports, module2) { "node_modules/cross-spawn/lib/util/readShebang.js"(exports, module2) {
"use strict"; "use strict";
var fs5 = require("fs"); var fs6 = require("fs");
var shebangCommand = require_shebang_command(); var shebangCommand = require_shebang_command();
function readShebang(command4) { function readShebang(command4) {
const size = 150; const size = 150;
const buffer = Buffer.alloc(size); const buffer = Buffer.alloc(size);
let fd; let fd;
try { try {
fd = fs5.openSync(command4, "r"); fd = fs6.openSync(command4, "r");
fs5.readSync(fd, buffer, 0, size, 0); fs6.readSync(fd, buffer, 0, size, 0);
fs5.closeSync(fd); fs6.closeSync(fd);
} catch (e3) { } catch (e3) {
} }
return shebangCommand(buffer.toString()); return shebangCommand(buffer.toString());
@@ -14177,7 +14177,7 @@ var require_form_data = __commonJS({
var http3 = require("http"); var http3 = require("http");
var https3 = require("https"); var https3 = require("https");
var parseUrl = require("url").parse; var parseUrl = require("url").parse;
var fs5 = require("fs"); var fs6 = require("fs");
var Stream2 = require("stream").Stream; var Stream2 = require("stream").Stream;
var mime = require_mime_types(); var mime = require_mime_types();
var asynckit = require_asynckit(); var asynckit = require_asynckit();
@@ -14242,7 +14242,7 @@ var require_form_data = __commonJS({
if (value.end != void 0 && value.end != Infinity && value.start != void 0) { if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
callback(null, value.end + 1 - (value.start ? value.start : 0)); callback(null, value.end + 1 - (value.start ? value.start : 0));
} else { } else {
fs5.stat(value.path, function(err, stat) { fs6.stat(value.path, function(err, stat) {
var fileSize; var fileSize;
if (err) { if (err) {
callback(err); callback(err);
@@ -14618,7 +14618,7 @@ var require_package2 = __commonJS({
// node_modules/dotenv/lib/main.js // node_modules/dotenv/lib/main.js
var require_main = __commonJS({ var require_main = __commonJS({
"node_modules/dotenv/lib/main.js"(exports, module2) { "node_modules/dotenv/lib/main.js"(exports, module2) {
var fs5 = require("fs"); var fs6 = require("fs");
var path5 = require("path"); var path5 = require("path");
var os4 = require("os"); var os4 = require("os");
var crypto2 = require("crypto"); var crypto2 = require("crypto");
@@ -14725,7 +14725,7 @@ var require_main = __commonJS({
if (options && options.path && options.path.length > 0) { if (options && options.path && options.path.length > 0) {
if (Array.isArray(options.path)) { if (Array.isArray(options.path)) {
for (const filepath of options.path) { for (const filepath of options.path) {
if (fs5.existsSync(filepath)) { if (fs6.existsSync(filepath)) {
possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`; possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`;
} }
} }
@@ -14735,7 +14735,7 @@ var require_main = __commonJS({
} else { } else {
possibleVaultPath = path5.resolve(process.cwd(), ".env.vault"); possibleVaultPath = path5.resolve(process.cwd(), ".env.vault");
} }
if (fs5.existsSync(possibleVaultPath)) { if (fs6.existsSync(possibleVaultPath)) {
return possibleVaultPath; return possibleVaultPath;
} }
return null; return null;
@@ -14779,7 +14779,7 @@ var require_main = __commonJS({
const parsedAll = {}; const parsedAll = {};
for (const path6 of optionPaths) { for (const path6 of optionPaths) {
try { try {
const parsed = DotenvModule.parse(fs5.readFileSync(path6, { encoding })); const parsed = DotenvModule.parse(fs6.readFileSync(path6, { encoding }));
DotenvModule.populate(parsedAll, parsed, options); DotenvModule.populate(parsedAll, parsed, options);
} catch (e3) { } catch (e3) {
if (debug2) { if (debug2) {
@@ -15569,7 +15569,7 @@ var require_tiktoken = __commonJS({
var imports = {}; var imports = {};
imports["./tiktoken_bg.js"] = wasm; imports["./tiktoken_bg.js"] = wasm;
var path5 = require("path"); var path5 = require("path");
var fs5 = require("fs"); var fs6 = require("fs");
var candidates = __dirname.split(path5.sep).reduce((memo, _7, index, array) => { var candidates = __dirname.split(path5.sep).reduce((memo, _7, index, array) => {
const prefix = array.slice(0, index + 1).join(path5.sep) + path5.sep; const prefix = array.slice(0, index + 1).join(path5.sep) + path5.sep;
if (!prefix.includes("node_modules" + path5.sep)) { if (!prefix.includes("node_modules" + path5.sep)) {
@@ -15589,7 +15589,7 @@ var require_tiktoken = __commonJS({
var bytes = null; var bytes = null;
for (const candidate of candidates) { for (const candidate of candidates) {
try { try {
bytes = fs5.readFileSync(candidate); bytes = fs6.readFileSync(candidate);
break; break;
} catch { } catch {
} }
@@ -28111,7 +28111,7 @@ function G3(t2, e3) {
// package.json // package.json
var package_default = { var package_default = {
name: "opencommit", name: "opencommit",
version: "3.0.15", version: "3.0.16",
description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}", description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}",
keywords: [ keywords: [
"git", "git",
@@ -28165,7 +28165,8 @@ var package_default = {
"test:docker-build": "docker build -t oco-test -f test/Dockerfile .", "test:docker-build": "docker build -t oco-test -f test/Dockerfile .",
"test:unit": "NODE_OPTIONS=--experimental-vm-modules jest test/unit", "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest test/unit",
"test:unit:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:unit", "test:unit:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:unit",
"test:e2e": "jest test/e2e", "test:e2e": "npm run test:e2e:setup && jest test/e2e",
"test:e2e:setup": "sh test/e2e/setup.sh",
"test:e2e:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:e2e" "test:e2e:docker": "npm run test:docker-build && DOCKER_CONTENT_TRUST=0 docker run --rm oco-test npm run test:e2e"
}, },
devDependencies: { devDependencies: {
@@ -30631,17 +30632,59 @@ function getI18nLocal(value) {
return false; return false;
} }
// src/engine/testAi.ts
var TEST_MOCK_TYPES = [
"commit-message",
"prompt-module-commitlint-config"
];
var TestAi = class {
async generateCommitMessage(_messages) {
const config11 = getConfig();
switch (config11?.OCO_TEST_MOCK_TYPE) {
case "commit-message":
return "fix(testAi.ts): test commit message";
case "prompt-module-commitlint-config":
return `{
"localLanguage": "english",
"commitFix": "fix(server): Change 'port' variable to uppercase 'PORT'",
"commitFeat": "feat(server): Allow server to listen on a port specified through environment variable",
"commitDescription": "Change 'port' variable to uppercase 'PORT'. Allow server to listen on a port specified through environment variable."
}`;
default:
throw Error("unsupported test mock type");
}
}
};
// src/commands/config.ts // src/commands/config.ts
var MODEL_LIST = { var MODEL_LIST = {
openai: [ openai: [
"gpt-3.5-turbo", "gpt-3.5-turbo",
"gpt-3.5-turbo-instruct",
"gpt-3.5-turbo-0613",
"gpt-3.5-turbo-0301",
"gpt-3.5-turbo-1106",
"gpt-3.5-turbo-0125", "gpt-3.5-turbo-0125",
"gpt-3.5-turbo-16k",
"gpt-3.5-turbo-16k-0613",
"gpt-3.5-turbo-16k-0301",
"gpt-4", "gpt-4",
"gpt-4-turbo", "gpt-4-0314",
"gpt-4-0613",
"gpt-4-1106-preview", "gpt-4-1106-preview",
"gpt-4-turbo-preview",
"gpt-4-0125-preview", "gpt-4-0125-preview",
"gpt-4o" "gpt-4-turbo-preview",
"gpt-4-vision-preview",
"gpt-4-1106-vision-preview",
"gpt-4-turbo",
"gpt-4-turbo-2024-04-09",
"gpt-4-32k",
"gpt-4-32k-0314",
"gpt-4-32k-0613",
"gpt-4o",
"gpt-4o-2024-05-13",
"gpt-4o-mini",
"gpt-4o-mini-2024-07-18"
], ],
anthropic: [ anthropic: [
"claude-3-haiku-20240307", "claude-3-haiku-20240307",
@@ -30700,14 +30743,6 @@ var configValidators = {
); );
return value; return value;
}, },
["OCO_ANTHROPIC_API_KEY" /* OCO_ANTHROPIC_API_KEY */](value, config11 = {}) {
validateConfig(
"ANTHROPIC_API_KEY",
value || config11.OCO_OPENAI_API_KEY || config11.OCO_AI_PROVIDER == "ollama" || config11.OCO_AI_PROVIDER == "test",
"You need to provide an OpenAI/Anthropic/Azure API key"
);
return value;
},
["OCO_GEMINI_API_KEY" /* OCO_GEMINI_API_KEY */](value, config11 = {}) { ["OCO_GEMINI_API_KEY" /* OCO_GEMINI_API_KEY */](value, config11 = {}) {
if (config11.OCO_AI_PROVIDER != "gemini") if (config11.OCO_AI_PROVIDER != "gemini")
return value; return value;
@@ -30793,10 +30828,18 @@ var configValidators = {
["OCO_MODEL" /* OCO_MODEL */](value, config11 = {}) { ["OCO_MODEL" /* OCO_MODEL */](value, config11 = {}) {
validateConfig( validateConfig(
"OCO_MODEL" /* OCO_MODEL */, "OCO_MODEL" /* OCO_MODEL */,
[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].includes(value) || config11.OCO_AI_PROVIDER == "ollama" || config11.OCO_AI_PROVIDER == "azure" || config11.OCO_AI_PROVIDER == "test", [
...MODEL_LIST.openai,
...MODEL_LIST.anthropic,
...MODEL_LIST.gemini
].includes(value) || config11.OCO_AI_PROVIDER == "ollama" || config11.OCO_AI_PROVIDER == "azure" || config11.OCO_AI_PROVIDER == "test",
`${value} is not supported yet, use: `${value} is not supported yet, use:
${[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].join("\n")}` ${[
...MODEL_LIST.openai,
...MODEL_LIST.anthropic,
...MODEL_LIST.gemini
].join("\n")}`
); );
return value; return value;
}, },
@@ -30827,14 +30870,7 @@ var configValidators = {
["OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */](value) { ["OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */](value) {
validateConfig( validateConfig(
"OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */, "OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */,
[ ["", "openai", "anthropic", "gemini", "azure", "test"].includes(value) || value.startsWith("ollama"),
"",
"openai",
"anthropic",
"gemini",
"azure",
"test"
].includes(value) || value.startsWith("ollama"),
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)` `${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)`
); );
return value; return value;
@@ -30854,6 +30890,24 @@ var configValidators = {
'Must be in format "https://<resource name>.openai.azure.com/"' 'Must be in format "https://<resource name>.openai.azure.com/"'
); );
return value; return value;
},
["OCO_TEST_MOCK_TYPE" /* OCO_TEST_MOCK_TYPE */](value) {
validateConfig(
"OCO_TEST_MOCK_TYPE" /* OCO_TEST_MOCK_TYPE */,
TEST_MOCK_TYPES.includes(value),
`${value} is not supported yet, use ${TEST_MOCK_TYPES.map(
(t2) => `'${t2}'`
).join(", ")}`
);
return value;
},
["OCO_OLLAMA_API_URL" /* OCO_OLLAMA_API_URL */](value) {
validateConfig(
"OCO_API_URL" /* OCO_API_URL */,
typeof value === "string" && value.startsWith("http"),
`${value} is not a valid URL`
);
return value;
} }
}; };
var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit"); var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit");
@@ -30881,7 +30935,8 @@ var getConfig = ({
OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai", OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai",
OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true, OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true,
OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false, OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false,
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "" OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "",
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message"
}; };
const configExists = (0, import_fs.existsSync)(configPath); const configExists = (0, import_fs.existsSync)(configPath);
if (!configExists) if (!configExists)
@@ -31117,15 +31172,38 @@ var commitlintPrompts = {
}; };
// src/modules/commitlint/pwd-commitlint.ts // src/modules/commitlint/pwd-commitlint.ts
var import_promises = __toESM(require("fs/promises"), 1);
var import_path2 = __toESM(require("path"), 1); var import_path2 = __toESM(require("path"), 1);
var nodeModulesPath = import_path2.default.join( var getCommitLintModuleType = async () => {
process.env.PWD || process.cwd(), const packageFile = "node_modules/@commitlint/load/package.json";
"node_modules", const packageJsonPath = import_path2.default.join(
"@commitlint", process.env.PWD || process.cwd(),
"load" packageFile
); );
const packageJson = JSON.parse(await import_promises.default.readFile(packageJsonPath, "utf8"));
if (!packageJson) {
throw new Error(`Failed to parse ${packageFile}`);
}
return packageJson.type === "module" ? "esm" : "cjs";
};
var getCommitLintPWDConfig = async () => { var getCommitLintPWDConfig = async () => {
const load = require(nodeModulesPath).default; let load, nodeModulesPath;
switch (await getCommitLintModuleType()) {
case "cjs":
nodeModulesPath = import_path2.default.join(
process.env.PWD || process.cwd(),
"node_modules/@commitlint/load"
);
load = require(nodeModulesPath).default;
break;
case "esm":
nodeModulesPath = import_path2.default.join(
process.env.PWD || process.cwd(),
"node_modules/@commitlint/load/lib/load.js"
);
load = (await import(nodeModulesPath)).default;
break;
}
if (load && typeof load === "function") { if (load && typeof load === "function") {
return await load(); return await load();
} }
@@ -31133,7 +31211,7 @@ var getCommitLintPWDConfig = async () => {
}; };
// src/modules/commitlint/utils.ts // src/modules/commitlint/utils.ts
var import_promises = __toESM(require("fs/promises"), 1); var import_promises2 = __toESM(require("fs/promises"), 1);
var removeDoubleNewlines = (input) => { var removeDoubleNewlines = (input) => {
const pattern = /\\n\\n/g; const pattern = /\\n\\n/g;
if (pattern.test(input)) { if (pattern.test(input)) {
@@ -31146,7 +31224,7 @@ var getJSONBlock = (input) => {
const jsonIndex = input.search("```json"); const jsonIndex = input.search("```json");
if (jsonIndex > -1) { if (jsonIndex > -1) {
input = input.slice(jsonIndex + 8); input = input.slice(jsonIndex + 8);
const endJsonIndex = consistency.search("```"); const endJsonIndex = input.search("```");
input = input.slice(0, endJsonIndex); input = input.slice(0, endJsonIndex);
} }
return input; return input;
@@ -31154,7 +31232,7 @@ var getJSONBlock = (input) => {
var commitlintLLMConfigExists = async () => { var commitlintLLMConfigExists = async () => {
let exists; let exists;
try { try {
await import_promises.default.access(COMMITLINT_LLM_CONFIG_PATH); await import_promises2.default.access(COMMITLINT_LLM_CONFIG_PATH);
exists = true; exists = true;
} catch (e3) { } catch (e3) {
exists = false; exists = false;
@@ -31162,13 +31240,13 @@ var commitlintLLMConfigExists = async () => {
return exists; return exists;
}; };
var writeCommitlintLLMConfig = async (commitlintLLMConfig) => { var writeCommitlintLLMConfig = async (commitlintLLMConfig) => {
await import_promises.default.writeFile( await import_promises2.default.writeFile(
COMMITLINT_LLM_CONFIG_PATH, COMMITLINT_LLM_CONFIG_PATH,
JSON.stringify(commitlintLLMConfig, null, 2) JSON.stringify(commitlintLLMConfig, null, 2)
); );
}; };
var getCommitlintLLMConfig = async () => { var getCommitlintLLMConfig = async () => {
const content = await import_promises.default.readFile(COMMITLINT_LLM_CONFIG_PATH); const content = await import_promises2.default.readFile(COMMITLINT_LLM_CONFIG_PATH);
const commitLintLLMConfig = JSON.parse( const commitLintLLMConfig = JSON.parse(
content.toString() content.toString()
); );
@@ -35036,13 +35114,17 @@ var config4 = getConfig();
var OllamaAi = class { var OllamaAi = class {
constructor() { constructor() {
this.model = "mistral"; this.model = "mistral";
this.url = "http://localhost:11434/api/chat";
} }
setModel(model) { setModel(model) {
this.model = model ?? config4?.OCO_MODEL ?? "mistral"; this.model = model ?? config4?.OCO_MODEL ?? "mistral";
} }
setUrl(url2) {
this.url = url2 ?? config4?.OCO_OLLAMA_API_URL ?? "http://localhost:11434/api/chat";
}
async generateCommitMessage(messages) { async generateCommitMessage(messages) {
const model = this.model; const model = this.model;
const url2 = "http://localhost:11434/api/chat"; const url2 = this.url;
const p4 = { const p4 = {
model, model,
messages, messages,
@@ -37221,13 +37303,6 @@ var AnthropicAi = class {
} }
}; };
// src/engine/testAi.ts
var TestAi = class {
async generateCommitMessage(messages) {
return "test commit message";
}
};
// node_modules/@azure/core-auth/dist/esm/azureKeyCredential.js // node_modules/@azure/core-auth/dist/esm/azureKeyCredential.js
var AzureKeyCredential = class { var AzureKeyCredential = class {
get key() { get key() {
@@ -40968,7 +41043,16 @@ var configureCommitlintIntegration = async (force = false) => {
const spin = le(); const spin = le();
spin.start("Loading @commitlint configuration"); spin.start("Loading @commitlint configuration");
const fileExists = await commitlintLLMConfigExists(); const fileExists = await commitlintLLMConfigExists();
let commitLintConfig = await getCommitLintPWDConfig(); const commitLintConfig = await getCommitLintPWDConfig();
if (commitLintConfig === null) {
throw new Error(
`Failed to load @commitlint config. Please check the following:
* @commitlint >= 9.0.0 is installed in the local directory.
* 'node_modules/@commitlint/load' package exists.
* A valid @commitlint configuration exists.
`
);
}
const hash = await computeHash(JSON.stringify(commitLintConfig)); const hash = await computeHash(JSON.stringify(commitLintConfig));
spin.stop(`Read @commitlint configuration (hash: ${hash})`); spin.stop(`Read @commitlint configuration (hash: ${hash})`);
if (fileExists) { if (fileExists) {
@@ -40984,16 +41068,16 @@ var configureCommitlintIntegration = async (force = false) => {
const prompts = inferPromptsFromCommitlintConfig(commitLintConfig); const prompts = inferPromptsFromCommitlintConfig(commitLintConfig);
const consistencyPrompts = commitlintPrompts.GEN_COMMITLINT_CONSISTENCY_PROMPT(prompts); const consistencyPrompts = commitlintPrompts.GEN_COMMITLINT_CONSISTENCY_PROMPT(prompts);
const engine = getEngine(); const engine = getEngine();
let consistency2 = await engine.generateCommitMessage(consistencyPrompts) || "{}"; let consistency = await engine.generateCommitMessage(consistencyPrompts) || "{}";
prompts.forEach((prompt) => consistency2 = consistency2.replace(prompt, "")); prompts.forEach((prompt) => consistency = consistency.replace(prompt, ""));
consistency2 = getJSONBlock(consistency2); consistency = getJSONBlock(consistency);
consistency2 = removeDoubleNewlines(consistency2); consistency = removeDoubleNewlines(consistency);
const commitlintLLMConfig = { const commitlintLLMConfig = {
hash, hash,
prompts, prompts,
consistency: { consistency: {
[translation2.localLanguage]: { [translation2.localLanguage]: {
...JSON.parse(consistency2) ...JSON.parse(consistency)
} }
} }
}; };
@@ -41546,7 +41630,7 @@ var commitlintConfigCommand = G3(
// src/commands/githook.ts // src/commands/githook.ts
var import_fs4 = require("fs"); var import_fs4 = require("fs");
var import_promises2 = __toESM(require("fs/promises"), 1); var import_promises3 = __toESM(require("fs/promises"), 1);
var import_path4 = __toESM(require("path"), 1); var import_path4 = __toESM(require("path"), 1);
var HOOK_NAME = "prepare-commit-msg"; var HOOK_NAME = "prepare-commit-msg";
var DEFAULT_SYMLINK_URL = import_path4.default.join(".git", "hooks", HOOK_NAME); var DEFAULT_SYMLINK_URL = import_path4.default.join(".git", "hooks", HOOK_NAME);
@@ -41582,7 +41666,7 @@ var hookCommand = G3(
if (await isHookExists()) { if (await isHookExists()) {
let realPath; let realPath;
try { try {
realPath = await import_promises2.default.realpath(SYMLINK_URL); realPath = await import_promises3.default.realpath(SYMLINK_URL);
} catch (error) { } catch (error) {
ce(error); ce(error);
realPath = null; realPath = null;
@@ -41593,9 +41677,9 @@ var hookCommand = G3(
`Different ${HOOK_NAME} is already set. Remove it before setting opencommit as '${HOOK_NAME}' hook.` `Different ${HOOK_NAME} is already set. Remove it before setting opencommit as '${HOOK_NAME}' hook.`
); );
} }
await import_promises2.default.mkdir(import_path4.default.dirname(SYMLINK_URL), { recursive: true }); await import_promises3.default.mkdir(import_path4.default.dirname(SYMLINK_URL), { recursive: true });
await import_promises2.default.symlink(HOOK_URL, SYMLINK_URL, "file"); await import_promises3.default.symlink(HOOK_URL, SYMLINK_URL, "file");
await import_promises2.default.chmod(SYMLINK_URL, 493); await import_promises3.default.chmod(SYMLINK_URL, 493);
return ce(`${source_default.green("\u2714")} Hook set`); return ce(`${source_default.green("\u2714")} Hook set`);
} }
if (mode4 === "unset") { if (mode4 === "unset") {
@@ -41607,13 +41691,13 @@ var hookCommand = G3(
`OpenCommit wasn't previously set as '${HOOK_NAME}' hook, nothing to remove` `OpenCommit wasn't previously set as '${HOOK_NAME}' hook, nothing to remove`
); );
} }
const realpath = await import_promises2.default.realpath(SYMLINK_URL); const realpath = await import_promises3.default.realpath(SYMLINK_URL);
if (realpath !== HOOK_URL) { if (realpath !== HOOK_URL) {
return ce( return ce(
`OpenCommit wasn't previously set as '${HOOK_NAME}' hook, but different hook was, if you want to remove it \u2014 do it manually` `OpenCommit wasn't previously set as '${HOOK_NAME}' hook, but different hook was, if you want to remove it \u2014 do it manually`
); );
} }
await import_promises2.default.rm(SYMLINK_URL); await import_promises3.default.rm(SYMLINK_URL);
return ce(`${source_default.green("\u2714")} Hook is removed`); return ce(`${source_default.green("\u2714")} Hook is removed`);
} }
throw new Error( throw new Error(
@@ -41627,7 +41711,7 @@ var hookCommand = G3(
); );
// src/commands/prepare-commit-msg-hook.ts // src/commands/prepare-commit-msg-hook.ts
var import_promises3 = __toESM(require("fs/promises"), 1); var import_promises4 = __toESM(require("fs/promises"), 1);
var [messageFilePath, commitSource] = process.argv.slice(2); var [messageFilePath, commitSource] = process.argv.slice(2);
var prepareCommitMessageHook = async (isStageAllFlag = false) => { var prepareCommitMessageHook = async (isStageAllFlag = false) => {
try { try {
@@ -41663,8 +41747,8 @@ var prepareCommitMessageHook = async (isStageAllFlag = false) => {
await getDiff({ files: staged }) await getDiff({ files: staged })
); );
spin.stop("Done"); spin.stop("Done");
const fileContent = await import_promises3.default.readFile(messageFilePath); const fileContent = await import_promises4.default.readFile(messageFilePath);
await import_promises3.default.writeFile( await import_promises4.default.writeFile(
messageFilePath, messageFilePath,
commitMessage + "\n" + fileContent.toString() commitMessage + "\n" + fileContent.toString()
); );
out/github-action.cjs
+145 -62
View File
@@ -672,7 +672,7 @@ var require_file_command = __commonJS({
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
var fs3 = __importStar2(require("fs")); var fs4 = __importStar2(require("fs"));
var os3 = __importStar2(require("os")); var os3 = __importStar2(require("os"));
var uuid_1 = require_dist(); var uuid_1 = require_dist();
var utils_1 = require_utils(); var utils_1 = require_utils();
@@ -681,10 +681,10 @@ var require_file_command = __commonJS({
if (!filePath) { if (!filePath) {
throw new Error(`Unable to find environment variable for file command ${command4}`); throw new Error(`Unable to find environment variable for file command ${command4}`);
} }
if (!fs3.existsSync(filePath)) { if (!fs4.existsSync(filePath)) {
throw new Error(`Missing file at path: ${filePath}`); throw new Error(`Missing file at path: ${filePath}`);
} }
fs3.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os3.EOL}`, { fs4.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os3.EOL}`, {
encoding: "utf8" encoding: "utf8"
}); });
} }
@@ -18739,12 +18739,12 @@ var require_io_util = __commonJS({
var _a4; var _a4;
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.READONLY = exports.UV_FS_O_EXLOCK = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rm = exports.rename = exports.readlink = exports.readdir = exports.open = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0; exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.READONLY = exports.UV_FS_O_EXLOCK = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rm = exports.rename = exports.readlink = exports.readdir = exports.open = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0;
var fs3 = __importStar2(require("fs")); var fs4 = __importStar2(require("fs"));
var path2 = __importStar2(require("path")); var path2 = __importStar2(require("path"));
_a4 = fs3.promises, exports.chmod = _a4.chmod, exports.copyFile = _a4.copyFile, exports.lstat = _a4.lstat, exports.mkdir = _a4.mkdir, exports.open = _a4.open, exports.readdir = _a4.readdir, exports.readlink = _a4.readlink, exports.rename = _a4.rename, exports.rm = _a4.rm, exports.rmdir = _a4.rmdir, exports.stat = _a4.stat, exports.symlink = _a4.symlink, exports.unlink = _a4.unlink; _a4 = fs4.promises, exports.chmod = _a4.chmod, exports.copyFile = _a4.copyFile, exports.lstat = _a4.lstat, exports.mkdir = _a4.mkdir, exports.open = _a4.open, exports.readdir = _a4.readdir, exports.readlink = _a4.readlink, exports.rename = _a4.rename, exports.rm = _a4.rm, exports.rmdir = _a4.rmdir, exports.stat = _a4.stat, exports.symlink = _a4.symlink, exports.unlink = _a4.unlink;
exports.IS_WINDOWS = process.platform === "win32"; exports.IS_WINDOWS = process.platform === "win32";
exports.UV_FS_O_EXLOCK = 268435456; exports.UV_FS_O_EXLOCK = 268435456;
exports.READONLY = fs3.constants.O_RDONLY; exports.READONLY = fs4.constants.O_RDONLY;
function exists(fsPath) { function exists(fsPath) {
return __awaiter2(this, void 0, void 0, function* () { return __awaiter2(this, void 0, void 0, function* () {
try { try {
@@ -38442,7 +38442,7 @@ var require_form_data = __commonJS({
var http3 = require("http"); var http3 = require("http");
var https3 = require("https"); var https3 = require("https");
var parseUrl = require("url").parse; var parseUrl = require("url").parse;
var fs3 = require("fs"); var fs4 = require("fs");
var Stream2 = require("stream").Stream; var Stream2 = require("stream").Stream;
var mime = require_mime_types(); var mime = require_mime_types();
var asynckit = require_asynckit(); var asynckit = require_asynckit();
@@ -38507,7 +38507,7 @@ var require_form_data = __commonJS({
if (value.end != void 0 && value.end != Infinity && value.start != void 0) { if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
callback(null, value.end + 1 - (value.start ? value.start : 0)); callback(null, value.end + 1 - (value.start ? value.start : 0));
} else { } else {
fs3.stat(value.path, function(err, stat) { fs4.stat(value.path, function(err, stat) {
var fileSize; var fileSize;
if (err) { if (err) {
callback(err); callback(err);
@@ -38883,7 +38883,7 @@ var require_package2 = __commonJS({
// node_modules/dotenv/lib/main.js // node_modules/dotenv/lib/main.js
var require_main2 = __commonJS({ var require_main2 = __commonJS({
"node_modules/dotenv/lib/main.js"(exports, module2) { "node_modules/dotenv/lib/main.js"(exports, module2) {
var fs3 = require("fs"); var fs4 = require("fs");
var path2 = require("path"); var path2 = require("path");
var os3 = require("os"); var os3 = require("os");
var crypto2 = require("crypto"); var crypto2 = require("crypto");
@@ -38990,7 +38990,7 @@ var require_main2 = __commonJS({
if (options && options.path && options.path.length > 0) { if (options && options.path && options.path.length > 0) {
if (Array.isArray(options.path)) { if (Array.isArray(options.path)) {
for (const filepath of options.path) { for (const filepath of options.path) {
if (fs3.existsSync(filepath)) { if (fs4.existsSync(filepath)) {
possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`; possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`;
} }
} }
@@ -39000,7 +39000,7 @@ var require_main2 = __commonJS({
} else { } else {
possibleVaultPath = path2.resolve(process.cwd(), ".env.vault"); possibleVaultPath = path2.resolve(process.cwd(), ".env.vault");
} }
if (fs3.existsSync(possibleVaultPath)) { if (fs4.existsSync(possibleVaultPath)) {
return possibleVaultPath; return possibleVaultPath;
} }
return null; return null;
@@ -39044,7 +39044,7 @@ var require_main2 = __commonJS({
const parsedAll = {}; const parsedAll = {};
for (const path3 of optionPaths) { for (const path3 of optionPaths) {
try { try {
const parsed = DotenvModule.parse(fs3.readFileSync(path3, { encoding })); const parsed = DotenvModule.parse(fs4.readFileSync(path3, { encoding }));
DotenvModule.populate(parsedAll, parsed, options); DotenvModule.populate(parsedAll, parsed, options);
} catch (e3) { } catch (e3) {
if (debug2) { if (debug2) {
@@ -39834,7 +39834,7 @@ var require_tiktoken = __commonJS({
var imports = {}; var imports = {};
imports["./tiktoken_bg.js"] = wasm; imports["./tiktoken_bg.js"] = wasm;
var path2 = require("path"); var path2 = require("path");
var fs3 = require("fs"); var fs4 = require("fs");
var candidates = __dirname.split(path2.sep).reduce((memo, _3, index, array) => { var candidates = __dirname.split(path2.sep).reduce((memo, _3, index, array) => {
const prefix = array.slice(0, index + 1).join(path2.sep) + path2.sep; const prefix = array.slice(0, index + 1).join(path2.sep) + path2.sep;
if (!prefix.includes("node_modules" + path2.sep)) { if (!prefix.includes("node_modules" + path2.sep)) {
@@ -39854,7 +39854,7 @@ var require_tiktoken = __commonJS({
var bytes = null; var bytes = null;
for (const candidate of candidates) { for (const candidate of candidates) {
try { try {
bytes = fs3.readFileSync(candidate); bytes = fs4.readFileSync(candidate);
break; break;
} catch { } catch {
} }
@@ -49443,17 +49443,59 @@ function getI18nLocal(value) {
return false; return false;
} }
// src/engine/testAi.ts
var TEST_MOCK_TYPES = [
"commit-message",
"prompt-module-commitlint-config"
];
var TestAi = class {
async generateCommitMessage(_messages) {
const config10 = getConfig();
switch (config10?.OCO_TEST_MOCK_TYPE) {
case "commit-message":
return "fix(testAi.ts): test commit message";
case "prompt-module-commitlint-config":
return `{
"localLanguage": "english",
"commitFix": "fix(server): Change 'port' variable to uppercase 'PORT'",
"commitFeat": "feat(server): Allow server to listen on a port specified through environment variable",
"commitDescription": "Change 'port' variable to uppercase 'PORT'. Allow server to listen on a port specified through environment variable."
}`;
default:
throw Error("unsupported test mock type");
}
}
};
// src/commands/config.ts // src/commands/config.ts
var MODEL_LIST = { var MODEL_LIST = {
openai: [ openai: [
"gpt-3.5-turbo", "gpt-3.5-turbo",
"gpt-3.5-turbo-instruct",
"gpt-3.5-turbo-0613",
"gpt-3.5-turbo-0301",
"gpt-3.5-turbo-1106",
"gpt-3.5-turbo-0125", "gpt-3.5-turbo-0125",
"gpt-3.5-turbo-16k",
"gpt-3.5-turbo-16k-0613",
"gpt-3.5-turbo-16k-0301",
"gpt-4", "gpt-4",
"gpt-4-turbo", "gpt-4-0314",
"gpt-4-0613",
"gpt-4-1106-preview", "gpt-4-1106-preview",
"gpt-4-turbo-preview",
"gpt-4-0125-preview", "gpt-4-0125-preview",
"gpt-4o" "gpt-4-turbo-preview",
"gpt-4-vision-preview",
"gpt-4-1106-vision-preview",
"gpt-4-turbo",
"gpt-4-turbo-2024-04-09",
"gpt-4-32k",
"gpt-4-32k-0314",
"gpt-4-32k-0613",
"gpt-4o",
"gpt-4o-2024-05-13",
"gpt-4o-mini",
"gpt-4o-mini-2024-07-18"
], ],
anthropic: [ anthropic: [
"claude-3-haiku-20240307", "claude-3-haiku-20240307",
@@ -49512,14 +49554,6 @@ var configValidators = {
); );
return value; return value;
}, },
["OCO_ANTHROPIC_API_KEY" /* OCO_ANTHROPIC_API_KEY */](value, config10 = {}) {
validateConfig(
"ANTHROPIC_API_KEY",
value || config10.OCO_OPENAI_API_KEY || config10.OCO_AI_PROVIDER == "ollama" || config10.OCO_AI_PROVIDER == "test",
"You need to provide an OpenAI/Anthropic/Azure API key"
);
return value;
},
["OCO_GEMINI_API_KEY" /* OCO_GEMINI_API_KEY */](value, config10 = {}) { ["OCO_GEMINI_API_KEY" /* OCO_GEMINI_API_KEY */](value, config10 = {}) {
if (config10.OCO_AI_PROVIDER != "gemini") if (config10.OCO_AI_PROVIDER != "gemini")
return value; return value;
@@ -49605,10 +49639,18 @@ var configValidators = {
["OCO_MODEL" /* OCO_MODEL */](value, config10 = {}) { ["OCO_MODEL" /* OCO_MODEL */](value, config10 = {}) {
validateConfig( validateConfig(
"OCO_MODEL" /* OCO_MODEL */, "OCO_MODEL" /* OCO_MODEL */,
[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].includes(value) || config10.OCO_AI_PROVIDER == "ollama" || config10.OCO_AI_PROVIDER == "azure" || config10.OCO_AI_PROVIDER == "test", [
...MODEL_LIST.openai,
...MODEL_LIST.anthropic,
...MODEL_LIST.gemini
].includes(value) || config10.OCO_AI_PROVIDER == "ollama" || config10.OCO_AI_PROVIDER == "azure" || config10.OCO_AI_PROVIDER == "test",
`${value} is not supported yet, use: `${value} is not supported yet, use:
${[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].join("\n")}` ${[
...MODEL_LIST.openai,
...MODEL_LIST.anthropic,
...MODEL_LIST.gemini
].join("\n")}`
); );
return value; return value;
}, },
@@ -49639,14 +49681,7 @@ var configValidators = {
["OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */](value) { ["OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */](value) {
validateConfig( validateConfig(
"OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */, "OCO_AI_PROVIDER" /* OCO_AI_PROVIDER */,
[ ["", "openai", "anthropic", "gemini", "azure", "test"].includes(value) || value.startsWith("ollama"),
"",
"openai",
"anthropic",
"gemini",
"azure",
"test"
].includes(value) || value.startsWith("ollama"),
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)` `${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)`
); );
return value; return value;
@@ -49666,6 +49701,24 @@ var configValidators = {
'Must be in format "https://<resource name>.openai.azure.com/"' 'Must be in format "https://<resource name>.openai.azure.com/"'
); );
return value; return value;
},
["OCO_TEST_MOCK_TYPE" /* OCO_TEST_MOCK_TYPE */](value) {
validateConfig(
"OCO_TEST_MOCK_TYPE" /* OCO_TEST_MOCK_TYPE */,
TEST_MOCK_TYPES.includes(value),
`${value} is not supported yet, use ${TEST_MOCK_TYPES.map(
(t2) => `'${t2}'`
).join(", ")}`
);
return value;
},
["OCO_OLLAMA_API_URL" /* OCO_OLLAMA_API_URL */](value) {
validateConfig(
"OCO_API_URL" /* OCO_API_URL */,
typeof value === "string" && value.startsWith("http"),
`${value} is not a valid URL`
);
return value;
} }
}; };
var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit"); var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit");
@@ -49693,7 +49746,8 @@ var getConfig = ({
OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai", OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER || "openai",
OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true, OCO_GITPUSH: process.env.OCO_GITPUSH === "false" ? false : true,
OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false, OCO_ONE_LINE_COMMIT: process.env.OCO_ONE_LINE_COMMIT === "true" ? true : false,
OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "" OCO_AZURE_ENDPOINT: process.env.OCO_AZURE_ENDPOINT || "",
OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE || "commit-message"
}; };
const configExists = (0, import_fs.existsSync)(configPath); const configExists = (0, import_fs.existsSync)(configPath);
if (!configExists) if (!configExists)
@@ -49929,15 +49983,38 @@ var commitlintPrompts = {
}; };
// src/modules/commitlint/pwd-commitlint.ts // src/modules/commitlint/pwd-commitlint.ts
var import_promises = __toESM(require("fs/promises"), 1);
var import_path2 = __toESM(require("path"), 1); var import_path2 = __toESM(require("path"), 1);
var nodeModulesPath = import_path2.default.join( var getCommitLintModuleType = async () => {
process.env.PWD || process.cwd(), const packageFile = "node_modules/@commitlint/load/package.json";
"node_modules", const packageJsonPath = import_path2.default.join(
"@commitlint", process.env.PWD || process.cwd(),
"load" packageFile
); );
const packageJson = JSON.parse(await import_promises.default.readFile(packageJsonPath, "utf8"));
if (!packageJson) {
throw new Error(`Failed to parse ${packageFile}`);
}
return packageJson.type === "module" ? "esm" : "cjs";
};
var getCommitLintPWDConfig = async () => { var getCommitLintPWDConfig = async () => {
const load = require(nodeModulesPath).default; let load, nodeModulesPath;
switch (await getCommitLintModuleType()) {
case "cjs":
nodeModulesPath = import_path2.default.join(
process.env.PWD || process.cwd(),
"node_modules/@commitlint/load"
);
load = require(nodeModulesPath).default;
break;
case "esm":
nodeModulesPath = import_path2.default.join(
process.env.PWD || process.cwd(),
"node_modules/@commitlint/load/lib/load.js"
);
load = (await import(nodeModulesPath)).default;
break;
}
if (load && typeof load === "function") { if (load && typeof load === "function") {
return await load(); return await load();
} }
@@ -49945,7 +50022,7 @@ var getCommitLintPWDConfig = async () => {
}; };
// src/modules/commitlint/utils.ts // src/modules/commitlint/utils.ts
var import_promises = __toESM(require("fs/promises"), 1); var import_promises2 = __toESM(require("fs/promises"), 1);
var removeDoubleNewlines = (input) => { var removeDoubleNewlines = (input) => {
const pattern = /\\n\\n/g; const pattern = /\\n\\n/g;
if (pattern.test(input)) { if (pattern.test(input)) {
@@ -49958,7 +50035,7 @@ var getJSONBlock = (input) => {
const jsonIndex = input.search("```json"); const jsonIndex = input.search("```json");
if (jsonIndex > -1) { if (jsonIndex > -1) {
input = input.slice(jsonIndex + 8); input = input.slice(jsonIndex + 8);
const endJsonIndex = consistency.search("```"); const endJsonIndex = input.search("```");
input = input.slice(0, endJsonIndex); input = input.slice(0, endJsonIndex);
} }
return input; return input;
@@ -49966,7 +50043,7 @@ var getJSONBlock = (input) => {
var commitlintLLMConfigExists = async () => { var commitlintLLMConfigExists = async () => {
let exists; let exists;
try { try {
await import_promises.default.access(COMMITLINT_LLM_CONFIG_PATH); await import_promises2.default.access(COMMITLINT_LLM_CONFIG_PATH);
exists = true; exists = true;
} catch (e3) { } catch (e3) {
exists = false; exists = false;
@@ -49974,13 +50051,13 @@ var commitlintLLMConfigExists = async () => {
return exists; return exists;
}; };
var writeCommitlintLLMConfig = async (commitlintLLMConfig) => { var writeCommitlintLLMConfig = async (commitlintLLMConfig) => {
await import_promises.default.writeFile( await import_promises2.default.writeFile(
COMMITLINT_LLM_CONFIG_PATH, COMMITLINT_LLM_CONFIG_PATH,
JSON.stringify(commitlintLLMConfig, null, 2) JSON.stringify(commitlintLLMConfig, null, 2)
); );
}; };
var getCommitlintLLMConfig = async () => { var getCommitlintLLMConfig = async () => {
const content = await import_promises.default.readFile(COMMITLINT_LLM_CONFIG_PATH); const content = await import_promises2.default.readFile(COMMITLINT_LLM_CONFIG_PATH);
const commitLintLLMConfig = JSON.parse( const commitLintLLMConfig = JSON.parse(
content.toString() content.toString()
); );
@@ -53848,13 +53925,17 @@ var config4 = getConfig();
var OllamaAi = class { var OllamaAi = class {
constructor() { constructor() {
this.model = "mistral"; this.model = "mistral";
this.url = "http://localhost:11434/api/chat";
} }
setModel(model) { setModel(model) {
this.model = model ?? config4?.OCO_MODEL ?? "mistral"; this.model = model ?? config4?.OCO_MODEL ?? "mistral";
} }
setUrl(url2) {
this.url = url2 ?? config4?.OCO_OLLAMA_API_URL ?? "http://localhost:11434/api/chat";
}
async generateCommitMessage(messages) { async generateCommitMessage(messages) {
const model = this.model; const model = this.model;
const url2 = "http://localhost:11434/api/chat"; const url2 = this.url;
const p3 = { const p3 = {
model, model,
messages, messages,
@@ -56033,13 +56114,6 @@ var AnthropicAi = class {
} }
}; };
// src/engine/testAi.ts
var TestAi = class {
async generateCommitMessage(messages) {
return "test commit message";
}
};
// node_modules/@azure/core-auth/dist/esm/azureKeyCredential.js // node_modules/@azure/core-auth/dist/esm/azureKeyCredential.js
var AzureKeyCredential = class { var AzureKeyCredential = class {
get key() { get key() {
@@ -59780,7 +59854,16 @@ var configureCommitlintIntegration = async (force = false) => {
const spin = le(); const spin = le();
spin.start("Loading @commitlint configuration"); spin.start("Loading @commitlint configuration");
const fileExists = await commitlintLLMConfigExists(); const fileExists = await commitlintLLMConfigExists();
let commitLintConfig = await getCommitLintPWDConfig(); const commitLintConfig = await getCommitLintPWDConfig();
if (commitLintConfig === null) {
throw new Error(
`Failed to load @commitlint config. Please check the following:
* @commitlint >= 9.0.0 is installed in the local directory.
* 'node_modules/@commitlint/load' package exists.
* A valid @commitlint configuration exists.
`
);
}
const hash = await computeHash(JSON.stringify(commitLintConfig)); const hash = await computeHash(JSON.stringify(commitLintConfig));
spin.stop(`Read @commitlint configuration (hash: ${hash})`); spin.stop(`Read @commitlint configuration (hash: ${hash})`);
if (fileExists) { if (fileExists) {
@@ -59796,16 +59879,16 @@ var configureCommitlintIntegration = async (force = false) => {
const prompts = inferPromptsFromCommitlintConfig(commitLintConfig); const prompts = inferPromptsFromCommitlintConfig(commitLintConfig);
const consistencyPrompts = commitlintPrompts.GEN_COMMITLINT_CONSISTENCY_PROMPT(prompts); const consistencyPrompts = commitlintPrompts.GEN_COMMITLINT_CONSISTENCY_PROMPT(prompts);
const engine = getEngine(); const engine = getEngine();
let consistency2 = await engine.generateCommitMessage(consistencyPrompts) || "{}"; let consistency = await engine.generateCommitMessage(consistencyPrompts) || "{}";
prompts.forEach((prompt) => consistency2 = consistency2.replace(prompt, "")); prompts.forEach((prompt) => consistency = consistency.replace(prompt, ""));
consistency2 = getJSONBlock(consistency2); consistency = getJSONBlock(consistency);
consistency2 = removeDoubleNewlines(consistency2); consistency = removeDoubleNewlines(consistency);
const commitlintLLMConfig = { const commitlintLLMConfig = {
hash, hash,
prompts, prompts,
consistency: { consistency: {
[translation2.localLanguage]: { [translation2.localLanguage]: {
...JSON.parse(consistency2) ...JSON.parse(consistency)
} }
} }
}; };
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "opencommit", "name": "opencommit",
"version": "3.0.15", "version": "3.0.16",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "opencommit", "name": "opencommit",
"version": "3.0.15", "version": "3.0.16",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@actions/core": "^1.10.0", "@actions/core": "^1.10.0",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "opencommit", "name": "opencommit",
"version": "3.0.15", "version": "3.0.16",
"description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫", "description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
"keywords": [ "keywords": [
"git", "git",
src/commands/config.ts
+80 -45
View File
@@ -32,6 +32,8 @@ export enum CONFIG_KEYS {
OCO_ONE_LINE_COMMIT = 'OCO_ONE_LINE_COMMIT', OCO_ONE_LINE_COMMIT = 'OCO_ONE_LINE_COMMIT',
OCO_AZURE_ENDPOINT = 'OCO_AZURE_ENDPOINT', OCO_AZURE_ENDPOINT = 'OCO_AZURE_ENDPOINT',
OCO_TEST_MOCK_TYPE = 'OCO_TEST_MOCK_TYPE', OCO_TEST_MOCK_TYPE = 'OCO_TEST_MOCK_TYPE',
OCO_API_URL = 'OCO_API_URL',
OCO_OLLAMA_API_URL = 'OCO_OLLAMA_API_URL'
} }
export enum CONFIG_MODES { export enum CONFIG_MODES {
@@ -40,33 +42,49 @@ export enum CONFIG_MODES {
} }
export const MODEL_LIST = { export const MODEL_LIST = {
openai: [ openai: [
'gpt-3.5-turbo', 'gpt-3.5-turbo',
'gpt-3.5-turbo-instruct',
'gpt-3.5-turbo-0613',
'gpt-3.5-turbo-0301',
'gpt-3.5-turbo-1106',
'gpt-3.5-turbo-0125', 'gpt-3.5-turbo-0125',
'gpt-3.5-turbo-16k',
'gpt-3.5-turbo-16k-0613',
'gpt-3.5-turbo-16k-0301',
'gpt-4', 'gpt-4',
'gpt-4-turbo', 'gpt-4-0314',
'gpt-4-0613',
'gpt-4-1106-preview', 'gpt-4-1106-preview',
'gpt-4-turbo-preview',
'gpt-4-0125-preview', 'gpt-4-0125-preview',
'gpt-4-turbo-preview',
'gpt-4-vision-preview',
'gpt-4-1106-vision-preview',
'gpt-4-turbo',
'gpt-4-turbo-2024-04-09',
'gpt-4-32k',
'gpt-4-32k-0314',
'gpt-4-32k-0613',
'gpt-4o', 'gpt-4o',
'gpt-4o-2024-05-13',
'gpt-4o-mini',
'gpt-4o-mini-2024-07-18'
], ],
anthropic: [ anthropic: [
'claude-3-haiku-20240307', 'claude-3-haiku-20240307',
'claude-3-sonnet-20240229', 'claude-3-sonnet-20240229',
'claude-3-opus-20240229', 'claude-3-opus-20240229'
], ],
gemini: [ gemini: [
'gemini-1.5-flash', 'gemini-1.5-flash',
'gemini-1.5-pro', 'gemini-1.5-pro',
'gemini-1.0-pro', 'gemini-1.0-pro',
'gemini-pro-vision', 'gemini-pro-vision',
'text-embedding-004', 'text-embedding-004'
], ]
};
}
const getDefaultModel = (provider: string | undefined): string => { const getDefaultModel = (provider: string | undefined): string => {
switch (provider) { switch (provider) {
@@ -103,11 +121,15 @@ const validateConfig = (
export const configValidators = { export const configValidators = {
[CONFIG_KEYS.OCO_OPENAI_API_KEY](value: any, config: any = {}) { [CONFIG_KEYS.OCO_OPENAI_API_KEY](value: any, config: any = {}) {
if (config.OCO_AI_PROVIDER == 'gemini') return value; if (config.OCO_AI_PROVIDER == 'gemini') return value;
//need api key unless running locally with ollama //need api key unless running locally with ollama
validateConfig( validateConfig(
'OpenAI API_KEY', 'OpenAI API_KEY',
value || config.OCO_ANTHROPIC_API_KEY || config.OCO_AI_PROVIDER.startsWith('ollama') || config.OCO_AZURE_API_KEY || config.OCO_AI_PROVIDER == 'test' , value ||
config.OCO_ANTHROPIC_API_KEY ||
config.OCO_AI_PROVIDER.startsWith('ollama') ||
config.OCO_AZURE_API_KEY ||
config.OCO_AI_PROVIDER == 'test',
'You need to provide an OpenAI/Anthropic/Azure API key' 'You need to provide an OpenAI/Anthropic/Azure API key'
); );
validateConfig( validateConfig(
@@ -122,27 +144,21 @@ export const configValidators = {
[CONFIG_KEYS.OCO_AZURE_API_KEY](value: any, config: any = {}) { [CONFIG_KEYS.OCO_AZURE_API_KEY](value: any, config: any = {}) {
validateConfig( validateConfig(
'ANTHROPIC_API_KEY', 'ANTHROPIC_API_KEY',
value || config.OCO_OPENAI_API_KEY || config.OCO_AZURE_API_KEY || config.OCO_AI_PROVIDER == 'ollama' || config.OCO_AI_PROVIDER == 'test', value ||
config.OCO_OPENAI_API_KEY ||
config.OCO_AZURE_API_KEY ||
config.OCO_AI_PROVIDER == 'ollama' ||
config.OCO_AI_PROVIDER == 'test',
'You need to provide an OpenAI/Anthropic/Azure API key' 'You need to provide an OpenAI/Anthropic/Azure API key'
); );
return value; return value;
}, },
[CONFIG_KEYS.OCO_ANTHROPIC_API_KEY](value: any, config: any = {}) {
validateConfig(
'ANTHROPIC_API_KEY',
value || config.OCO_OPENAI_API_KEY || config.OCO_AI_PROVIDER == 'ollama' || config.OCO_AI_PROVIDER == 'test',
'You need to provide an OpenAI/Anthropic/Azure API key'
);
return value;
},
[CONFIG_KEYS.OCO_GEMINI_API_KEY](value: any, config: any = {}) { [CONFIG_KEYS.OCO_GEMINI_API_KEY](value: any, config: any = {}) {
// only need to check for gemini api key if using gemini // only need to check for gemini api key if using gemini
if (config.OCO_AI_PROVIDER != 'gemini') return value; if (config.OCO_AI_PROVIDER != 'gemini') return value;
validateConfig( validateConfig(
'Gemini API Key', 'Gemini API Key',
value || config.OCO_GEMINI_API_KEY || config.OCO_AI_PROVIDER == 'test', value || config.OCO_GEMINI_API_KEY || config.OCO_AI_PROVIDER == 'test',
@@ -155,7 +171,10 @@ export const configValidators = {
[CONFIG_KEYS.OCO_ANTHROPIC_API_KEY](value: any, config: any = {}) { [CONFIG_KEYS.OCO_ANTHROPIC_API_KEY](value: any, config: any = {}) {
validateConfig( validateConfig(
'ANTHROPIC_API_KEY', 'ANTHROPIC_API_KEY',
value || config.OCO_OPENAI_API_KEY || config.OCO_AI_PROVIDER == 'ollama' || config.OCO_AI_PROVIDER == 'test', value ||
config.OCO_OPENAI_API_KEY ||
config.OCO_AI_PROVIDER == 'ollama' ||
config.OCO_AI_PROVIDER == 'test',
'You need to provide an OpenAI/Anthropic API key' 'You need to provide an OpenAI/Anthropic API key'
); );
@@ -241,11 +260,19 @@ export const configValidators = {
[CONFIG_KEYS.OCO_MODEL](value: any, config: any = {}) { [CONFIG_KEYS.OCO_MODEL](value: any, config: any = {}) {
validateConfig( validateConfig(
CONFIG_KEYS.OCO_MODEL, CONFIG_KEYS.OCO_MODEL,
[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].includes(value) || [
config.OCO_AI_PROVIDER == 'ollama' || ...MODEL_LIST.openai,
config.OCO_AI_PROVIDER == 'azure' || ...MODEL_LIST.anthropic,
config.OCO_AI_PROVIDER == 'test', ...MODEL_LIST.gemini
`${value} is not supported yet, use:\n\n ${[...MODEL_LIST.openai, ...MODEL_LIST.anthropic, ...MODEL_LIST.gemini].join('\n')}` ].includes(value) ||
config.OCO_AI_PROVIDER == 'ollama' ||
config.OCO_AI_PROVIDER == 'azure' ||
config.OCO_AI_PROVIDER == 'test',
`${value} is not supported yet, use:\n\n ${[
...MODEL_LIST.openai,
...MODEL_LIST.anthropic,
...MODEL_LIST.gemini
].join('\n')}`
); );
return value; return value;
}, },
@@ -280,14 +307,8 @@ export const configValidators = {
[CONFIG_KEYS.OCO_AI_PROVIDER](value: any) { [CONFIG_KEYS.OCO_AI_PROVIDER](value: any) {
validateConfig( validateConfig(
CONFIG_KEYS.OCO_AI_PROVIDER, CONFIG_KEYS.OCO_AI_PROVIDER,
[ ['', 'openai', 'anthropic', 'gemini', 'azure', 'test'].includes(value) ||
'', value.startsWith('ollama'),
'openai',
'anthropic',
'gemini',
'azure',
'test'
].includes(value) || value.startsWith('ollama'),
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)` `${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini' or 'openai' (default)`
); );
return value; return value;
@@ -315,10 +336,22 @@ export const configValidators = {
validateConfig( validateConfig(
CONFIG_KEYS.OCO_TEST_MOCK_TYPE, CONFIG_KEYS.OCO_TEST_MOCK_TYPE,
TEST_MOCK_TYPES.includes(value), TEST_MOCK_TYPES.includes(value),
`${value} is not supported yet, use ${TEST_MOCK_TYPES.map(t => `'${t}'`).join(', ')}` `${value} is not supported yet, use ${TEST_MOCK_TYPES.map(
(t) => `'${t}'`
).join(', ')}`
); );
return value; return value;
}, },
[CONFIG_KEYS.OCO_OLLAMA_API_URL](value: any) {
// add simple api validator
validateConfig(
CONFIG_KEYS.OCO_API_URL,
typeof value === 'string' && value.startsWith('http'),
`${value} is not a valid URL`
);
return value;
}
}; };
export type ConfigType = { export type ConfigType = {
@@ -332,8 +365,8 @@ export const getConfig = ({
configPath = defaultConfigPath, configPath = defaultConfigPath,
envPath = defaultEnvPath envPath = defaultEnvPath
}: { }: {
configPath?: string configPath?: string;
envPath?: string envPath?: string;
} = {}): ConfigType | null => { } = {}): ConfigType | null => {
dotenv.config({ path: envPath }); dotenv.config({ path: envPath });
const configFromEnv = { const configFromEnv = {
@@ -351,7 +384,8 @@ export const getConfig = ({
OCO_GEMINI_BASE_PATH: process.env.OCO_GEMINI_BASE_PATH, OCO_GEMINI_BASE_PATH: process.env.OCO_GEMINI_BASE_PATH,
OCO_DESCRIPTION: process.env.OCO_DESCRIPTION === 'true' ? true : false, OCO_DESCRIPTION: process.env.OCO_DESCRIPTION === 'true' ? true : false,
OCO_EMOJI: process.env.OCO_EMOJI === 'true' ? true : false, OCO_EMOJI: process.env.OCO_EMOJI === 'true' ? true : false,
OCO_MODEL: process.env.OCO_MODEL || getDefaultModel(process.env.OCO_AI_PROVIDER), OCO_MODEL:
process.env.OCO_MODEL || getDefaultModel(process.env.OCO_AI_PROVIDER),
OCO_LANGUAGE: process.env.OCO_LANGUAGE || 'en', OCO_LANGUAGE: process.env.OCO_LANGUAGE || 'en',
OCO_MESSAGE_TEMPLATE_PLACEHOLDER: OCO_MESSAGE_TEMPLATE_PLACEHOLDER:
process.env.OCO_MESSAGE_TEMPLATE_PLACEHOLDER || '$msg', process.env.OCO_MESSAGE_TEMPLATE_PLACEHOLDER || '$msg',
@@ -371,9 +405,7 @@ export const getConfig = ({
const config = iniParse(configFile); const config = iniParse(configFile);
for (const configKey of Object.keys(config)) { for (const configKey of Object.keys(config)) {
if ( if (['null', 'undefined'].includes(config[configKey])) {
['null', 'undefined'].includes(config[configKey])
) {
config[configKey] = undefined; config[configKey] = undefined;
continue; continue;
} }
@@ -397,7 +429,10 @@ export const getConfig = ({
return config; return config;
}; };
export const setConfig = (keyValues: [key: string, value: string][], configPath: string = defaultConfigPath) => { export const setConfig = (
keyValues: [key: string, value: string][],
configPath: string = defaultConfigPath
) => {
const config = getConfig() || {}; const config = getConfig() || {};
for (const [configKey, configValue] of keyValues) { for (const [configKey, configValue] of keyValues) {
src/engine/ollama.ts
+6 -1
View File
@@ -10,10 +10,15 @@ const config = getConfig();
export class OllamaAi implements AiEngine { export class OllamaAi implements AiEngine {
private model = "mistral"; // as default model of Ollama private model = "mistral"; // as default model of Ollama
private url = "http://localhost:11434/api/chat"; // default URL of Ollama API
setModel(model: string) { setModel(model: string) {
this.model = model ?? config?.OCO_MODEL ?? 'mistral'; this.model = model ?? config?.OCO_MODEL ?? 'mistral';
} }
setUrl(url: string) {
this.url = url ?? config?.OCO_OLLAMA_API_URL ?? 'http://localhost:11434/api/chat';
}
async generateCommitMessage( async generateCommitMessage(
messages: Array<ChatCompletionRequestMessage> messages: Array<ChatCompletionRequestMessage>
): Promise<string | undefined> { ): Promise<string | undefined> {
@@ -22,7 +27,7 @@ export class OllamaAi implements AiEngine {
//console.log(messages); //console.log(messages);
//process.exit() //process.exit()
const url = 'http://localhost:11434/api/chat'; const url = this.url;
const p = { const p = {
model, model,
messages, messages,