fix(config.ts): set default values for OCO_TOKENS_MAX_INPUT and OCO_T…

…OKENS_MAX_OUTPUT to ensure proper configuration refactor(generateCommitMessageFromGitDiff.ts): simplify MAX_TOKENS_INPUT and MAX_TOKENS_OUTPUT assignments by removing redundant default value logic
di-sukharev · Sep 4, 2024 · 3df5b24 · 3df5b24
1 parent 5ddf2cb
commit 3df5b24
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/out/cli.cjs b/out/cli.cjs
@@ -30122,9 +30122,11 @@ var getEnvConfig = (envPath) => {
  OCO_API_URL: process.env.OCO_API_URL,
  OCO_API_KEY: process.env.OCO_API_KEY,
  OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER,
- OCO_TOKENS_MAX_INPUT: parseConfigVarValue(process.env.OCO_TOKENS_MAX_INPUT),
+ OCO_TOKENS_MAX_INPUT: parseConfigVarValue(
+ process.env.OCO_TOKENS_MAX_INPUT ?? 40960 /* DEFAULT_MAX_TOKENS_INPUT */
+ ),
  OCO_TOKENS_MAX_OUTPUT: parseConfigVarValue(
- process.env.OCO_TOKENS_MAX_OUTPUT
+ process.env.OCO_TOKENS_MAX_OUTPUT ?? 4096 /* DEFAULT_MAX_TOKENS_OUTPUT */
  ),
  OCO_DESCRIPTION: parseConfigVarValue(process.env.OCO_DESCRIPTION),
  OCO_EMOJI: parseConfigVarValue(process.env.OCO_EMOJI),
@@ -44965,8 +44967,8 @@ function mergeDiffs(arr, maxStringLength) {
 
 // src/generateCommitMessageFromGitDiff.ts
 var config5 = getConfig();
-var MAX_TOKENS_INPUT = config5.OCO_TOKENS_MAX_INPUT || 40960 /* DEFAULT_MAX_TOKENS_INPUT */;
-var MAX_TOKENS_OUTPUT = config5.OCO_TOKENS_MAX_OUTPUT || 4096 /* DEFAULT_MAX_TOKENS_OUTPUT */;
+var MAX_TOKENS_INPUT = config5.OCO_TOKENS_MAX_INPUT;
+var MAX_TOKENS_OUTPUT = config5.OCO_TOKENS_MAX_OUTPUT;
 var generateCommitMessageChatCompletionPrompt = async (diff, fullGitMojiSpec) => {
  const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
  const chatContextAsCompletionRequest = [...INIT_MESSAGES_PROMPT];

diff --git a/out/github-action.cjs b/out/github-action.cjs
@@ -48925,9 +48925,11 @@ var getEnvConfig = (envPath) => {
  OCO_API_URL: process.env.OCO_API_URL,
  OCO_API_KEY: process.env.OCO_API_KEY,
  OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER,
- OCO_TOKENS_MAX_INPUT: parseConfigVarValue(process.env.OCO_TOKENS_MAX_INPUT),
+ OCO_TOKENS_MAX_INPUT: parseConfigVarValue(
+ process.env.OCO_TOKENS_MAX_INPUT ?? 40960 /* DEFAULT_MAX_TOKENS_INPUT */
+ ),
  OCO_TOKENS_MAX_OUTPUT: parseConfigVarValue(
- process.env.OCO_TOKENS_MAX_OUTPUT
+ process.env.OCO_TOKENS_MAX_OUTPUT ?? 4096 /* DEFAULT_MAX_TOKENS_OUTPUT */
  ),
  OCO_DESCRIPTION: parseConfigVarValue(process.env.OCO_DESCRIPTION),
  OCO_EMOJI: parseConfigVarValue(process.env.OCO_EMOJI),
@@ -63768,8 +63770,8 @@ function mergeDiffs(arr, maxStringLength) {
 
 // src/generateCommitMessageFromGitDiff.ts
 var config5 = getConfig();
-var MAX_TOKENS_INPUT = config5.OCO_TOKENS_MAX_INPUT || 40960 /* DEFAULT_MAX_TOKENS_INPUT */;
-var MAX_TOKENS_OUTPUT = config5.OCO_TOKENS_MAX_OUTPUT || 4096 /* DEFAULT_MAX_TOKENS_OUTPUT */;
+var MAX_TOKENS_INPUT = config5.OCO_TOKENS_MAX_INPUT;
+var MAX_TOKENS_OUTPUT = config5.OCO_TOKENS_MAX_OUTPUT;
 var generateCommitMessageChatCompletionPrompt = async (diff, fullGitMojiSpec) => {
  const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
  const chatContextAsCompletionRequest = [...INIT_MESSAGES_PROMPT];

diff --git a/src/commands/config.ts b/src/commands/config.ts
@@ -370,9 +370,13 @@ const getEnvConfig = (envPath: string) => {
  OCO_API_KEY: process.env.OCO_API_KEY,
  OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER as OCO_AI_PROVIDER_ENUM,
 
- OCO_TOKENS_MAX_INPUT: parseConfigVarValue(process.env.OCO_TOKENS_MAX_INPUT),
+ OCO_TOKENS_MAX_INPUT: parseConfigVarValue(
+ process.env.OCO_TOKENS_MAX_INPUT ??
+ DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT
+ ),
  OCO_TOKENS_MAX_OUTPUT: parseConfigVarValue(
- process.env.OCO_TOKENS_MAX_OUTPUT
+ process.env.OCO_TOKENS_MAX_OUTPUT ??
+ DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT
  ),
 
  OCO_DESCRIPTION: parseConfigVarValue(process.env.OCO_DESCRIPTION),

diff --git a/src/generateCommitMessageFromGitDiff.ts b/src/generateCommitMessageFromGitDiff.ts
@@ -6,11 +6,8 @@ import { mergeDiffs } from './utils/mergeDiffs';
 import { tokenCount } from './utils/tokenCount';
 
 const config = getConfig();
-const MAX_TOKENS_INPUT =
- config.OCO_TOKENS_MAX_INPUT || DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT;
-const MAX_TOKENS_OUTPUT =
- config.OCO_TOKENS_MAX_OUTPUT ||
- DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT;
+const MAX_TOKENS_INPUT = config.OCO_TOKENS_MAX_INPUT;
+const MAX_TOKENS_OUTPUT = config.OCO_TOKENS_MAX_OUTPUT;
 
 const generateCommitMessageChatCompletionPrompt = async (
  diff: string,