Skip to content

Add fallback to OAF_MODEL when OAFP_MODEL missing #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nmaguiar merged 1 commit into from
Oct 16, 2025
Merged

Add fallback to OAF_MODEL when OAFP_MODEL missing #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/docs/USAGE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ List of options to use when _in=llm_ or _llmprompt=..._:
> OpenAF sBuckets are supported in llmoptions. You can set any of the environment variables OAFP_SECREPO, OAFP_SECBUCKET, OAFP_SECPASS, OAFP_SECMAINPASS and OAFP_SECFILE OR set the corresponding map values secRepo, secBucket, secPass, secMainPass and secFile.

> Tip: Use the 'getlist=' optional transform to automatically filter list of data from LLMs prompt responses if relevant.
> If `OAFP_MODEL` is not defined but `OAF_MODEL` is, the latter will be used automatically.
> Example: `OAFP_MODEL="(type:ollama,model:llama3)" oafp llmprompt="hello world"`

---
Expand Down
22 changes: 14 additions & 8 deletions src/include/inputFns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
if (typeof _resolveLLMEnvName === "undefined") {
var _resolveLLMEnvName = function (aEnv) {
var _env = aEnv
if (_env == "OAFP_MODEL" && isUnDef(getEnv("OAFP_MODEL")) && isDef(getEnv("OAF_MODEL"))) {
_env = "OAF_MODEL"
}
return _env
}
}

var _inputFns = new Map([
["?" , (_res, options) => {
_res = Array.from(_inputFns.keys()).filter(r => r != '?').sort()
Expand Down Expand Up @@ -1301,11 +1311,9 @@ var _inputFns = new Map([
}],
["llm", (_res, options) => {
params.llmenv = _$(params.llmenv, "llmenv").isString().default("OAFP_MODEL")
params.llmenv = _resolveLLMEnvName(params.llmenv)
params.llmoptions = _$(params.llmoptions, "llmoptions").or().isString().isMap().default(__)
if (params.llmenv == "OAFP_MODEL" && isUnDef(getEnv("OAFP_MODEL")) && isDef(getEnv("OAF_MODEL"))) {
params.llmenv = "OAF_MODEL"
}
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
_exit(-1, "llmoptions not defined and " + params.llmenv + " not found.")

_showTmpMsg()
Expand Down Expand Up @@ -1339,12 +1347,10 @@ var _inputFns = new Map([
}],
["llmmodels", (_res, options) => {
params.llmenv = _$(params.llmenv, "llmenv").isString().default("OAFP_MODEL")
params.llmenv = _resolveLLMEnvName(params.llmenv)
params.llmoptions = _$(params.llmoptions, "llmoptions").or().isString().isMap().default(__)
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
_exit(-1, "llmoptions not defined and " + params.llmenv + " not found.")
if (params.llmenv == "OAFP_MODEL" && isUnDef(getEnv("OAFP_MODEL")) && isDef(getEnv("OAF_MODEL"))) {
params.llmenv = "OAF_MODEL"
}
_showTmpMsg()

var res = $llm( _getSec(isDef(params.llmoptions) ? _fromJSSLON(params.llmoptions) : $sec("system", "envs").get(params.llmenv)) )
Expand Down
13 changes: 12 additions & 1 deletion src/include/transformFns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
if (typeof _resolveLLMEnvName === "undefined") {
var _resolveLLMEnvName = function (aEnv) {
var _env = aEnv
if (_env == "OAFP_MODEL" && isUnDef(getEnv("OAFP_MODEL")) && isDef(getEnv("OAF_MODEL"))) {
_env = "OAF_MODEL"
}
return _env
}
}

var _transformFns = {
"transforms" : _r => {
if (toBoolean(params.transforms)) {
Expand Down Expand Up @@ -268,8 +278,9 @@ var _transformFns = {
"llmprompt": _r => {
if (isString(params.llmprompt)) {
params.llmenv = _$(params.llmenv, "llmenv").isString().default("OAFP_MODEL")
params.llmenv = _resolveLLMEnvName(params.llmenv)
params.llmoptions = _$(params.llmoptions, "llmoptions").isString().default(__)
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
if (isUnDef(params.llmoptions) && !isString(getEnv(params.llmenv)))
_exit(-1, "llmoptions not defined and " + params.llmenv + " not found.")

var res = $llm( _getSec(isDef(params.llmoptions) ? params.llmoptions : $sec("system", "envs").get(params.llmenv)) )
Expand Down