refactor: improve Argcfile.sh and scripts/run-tool* (#34)
* refactor: improve Argcfile and scripts/run-tool* * fix run-tool.js on windows
This commit is contained in:
sigoden
+67
-38
@@ -2,12 +2,24 @@
|
||||
|
||||
const path = require("path");
|
||||
const fs = require("fs");
|
||||
const os = require("os");
|
||||
|
||||
function parseArgv() {
|
||||
async function main() {
|
||||
const [toolName, rawData] = parseArgv("run-tool.js");
|
||||
const toolData = parseRawData(rawData);
|
||||
|
||||
const rootDir = path.resolve(__dirname, "..");
|
||||
setupEnv(rootDir, toolName);
|
||||
|
||||
const toolPath = path.resolve(rootDir, `tools/${toolName}.js`);
|
||||
await run(toolPath, "run", toolData);
|
||||
}
|
||||
|
||||
function parseArgv(thisFileName) {
|
||||
let toolName = process.argv[1];
|
||||
let toolData = null;
|
||||
|
||||
if (toolName.endsWith("run-tool.js")) {
|
||||
if (toolName.endsWith(thisFileName)) {
|
||||
toolName = process.argv[2];
|
||||
toolData = process.argv[3];
|
||||
} else {
|
||||
@@ -22,18 +34,22 @@ function parseArgv() {
|
||||
return [toolName, toolData];
|
||||
}
|
||||
|
||||
function loadModule(toolName) {
|
||||
const toolFileName = `${toolName}.js`;
|
||||
const toolPath = path.resolve(
|
||||
process.env["LLM_ROOT_DIR"],
|
||||
`tools/${toolFileName}`,
|
||||
);
|
||||
try {
|
||||
return require(toolPath);
|
||||
} catch {
|
||||
console.log(`Invalid tooltion: ${toolFileName}`);
|
||||
process.exit(1);
|
||||
function parseRawData(data) {
|
||||
if (!data) {
|
||||
throw new Error("No JSON data");
|
||||
}
|
||||
try {
|
||||
return JSON.parse(data);
|
||||
} catch {
|
||||
throw new Error("Invalid JSON data");
|
||||
}
|
||||
}
|
||||
|
||||
function setupEnv(rootDir, toolName) {
|
||||
process.env["LLM_ROOT_DIR"] = rootDir;
|
||||
loadEnv(path.resolve(rootDir, ".env"));
|
||||
process.env["LLM_TOOL_NAME"] = toolName;
|
||||
process.env["LLM_TOOL_CACHE_DIR"] = path.resolve(rootDir, "cache", toolName);
|
||||
}
|
||||
|
||||
function loadEnv(filePath) {
|
||||
@@ -50,32 +66,45 @@ function loadEnv(filePath) {
|
||||
} catch {}
|
||||
}
|
||||
|
||||
const LLM_ROOT_DIR = path.resolve(__dirname, "..");
|
||||
process.env["LLM_ROOT_DIR"] = LLM_ROOT_DIR;
|
||||
|
||||
loadEnv(path.resolve(LLM_ROOT_DIR, ".env"));
|
||||
|
||||
const [toolName, toolData] = parseArgv();
|
||||
|
||||
process.env["LLM_TOOL_NAME"] = toolName;
|
||||
process.env["LLM_TOOL_CACHE_DIR"] = path.resolve(
|
||||
LLM_ROOT_DIR,
|
||||
"cache",
|
||||
toolName,
|
||||
);
|
||||
|
||||
if (!toolData) {
|
||||
console.log("No json data");
|
||||
process.exit(1);
|
||||
async function run(toolPath, toolFunc, toolData) {
|
||||
let mod;
|
||||
if (os.platform() === "win32") {
|
||||
toolPath = `file://${toolPath}`;
|
||||
}
|
||||
try {
|
||||
mod = await import(toolPath);
|
||||
} catch {
|
||||
throw new Error(`Unable to load tool at '${toolPath}'`);
|
||||
}
|
||||
if (!mod || !mod[toolFunc]) {
|
||||
throw new Error(`Not module function '${toolFunc}' at '${toolPath}'`);
|
||||
}
|
||||
const value = await mod[toolFunc](toolData);
|
||||
dumpValue(value);
|
||||
}
|
||||
|
||||
let data = null;
|
||||
try {
|
||||
data = JSON.parse(toolData);
|
||||
} catch {
|
||||
console.log("Invalid json data");
|
||||
process.exit(1);
|
||||
function dumpValue(value) {
|
||||
if (value === null || value === undefined) {
|
||||
return;
|
||||
}
|
||||
const type = typeof value;
|
||||
if (type === "string" || type === "number" || type === "boolean") {
|
||||
console.log(value);
|
||||
} else if (type === "object") {
|
||||
const proto = Object.prototype.toString.call(value);
|
||||
if (proto === "[object Object]" || proto === "[object Array]") {
|
||||
const valueStr = JSON.stringify(value, null, 2);
|
||||
require("assert").deepStrictEqual(value, JSON.parse(valueStr));
|
||||
console.log(valueStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const { run } = loadModule(toolName);
|
||||
run(data);
|
||||
(async () => {
|
||||
try {
|
||||
await main();
|
||||
} catch (err) {
|
||||
console.error(err?.message || err);
|
||||
process.exit(1);
|
||||
}
|
||||
})();
|
||||
|
||||
+64
-35
@@ -6,16 +6,39 @@ import sys
|
||||
import importlib.util
|
||||
|
||||
|
||||
def parse_argv():
|
||||
tool_name = sys.argv[0]
|
||||
def main():
|
||||
(tool_name, raw_data) = parse_argv("run-tool.py")
|
||||
tool_data = parse_raw_data(raw_data)
|
||||
|
||||
root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||
setup_env(root_dir, tool_name)
|
||||
|
||||
tool_path = os.path.join(root_dir, f"tools/{tool_name}.py")
|
||||
run(tool_path, "run", tool_data)
|
||||
|
||||
|
||||
def parse_raw_data(data):
|
||||
if not data:
|
||||
raise ValueError("No JSON data")
|
||||
|
||||
try:
|
||||
return json.loads(data)
|
||||
except Exception:
|
||||
raise ValueError("Invalid JSON data")
|
||||
|
||||
|
||||
def parse_argv(this_file_name):
|
||||
argv = sys.argv[:] + [None] * max(0, 3 - len(sys.argv))
|
||||
|
||||
tool_name = argv[0]
|
||||
tool_data = None
|
||||
|
||||
if tool_name.endswith("run-tool.py"):
|
||||
tool_name = sys.argv[1] if len(sys.argv) > 1 else None
|
||||
tool_data = sys.argv[2] if len(sys.argv) > 2 else None
|
||||
if tool_name.endswith(this_file_name):
|
||||
tool_name = argv[1]
|
||||
tool_data = argv[2]
|
||||
else:
|
||||
tool_name = os.path.basename(tool_name)
|
||||
tool_data = sys.argv[1] if len(sys.argv) > 1 else None
|
||||
tool_data = sys.argv[1]
|
||||
|
||||
if tool_name.endswith(".py"):
|
||||
tool_name = tool_name[:-3]
|
||||
@@ -23,17 +46,11 @@ def parse_argv():
|
||||
return tool_name, tool_data
|
||||
|
||||
|
||||
def load_module(tool_name):
|
||||
tool_file_name = f"{tool_name}.py"
|
||||
tool_path = os.path.join(os.environ["LLM_ROOT_DIR"], f"tools/{tool_file_name}")
|
||||
if os.path.exists(tool_path):
|
||||
spec = importlib.util.spec_from_file_location(f"{tool_file_name}", tool_path)
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
else:
|
||||
print(f"Invalid function: {tool_file_name}")
|
||||
sys.exit(1)
|
||||
def setup_env(root_dir, tool_name):
|
||||
os.environ["LLM_ROOT_DIR"] = root_dir
|
||||
load_env(os.path.join(root_dir, ".env"))
|
||||
os.environ["LLM_TOOL_NAME"] = tool_name
|
||||
os.environ["LLM_TOOL_CACHE_DIR"] = os.path.join(root_dir, "cache", tool_name)
|
||||
|
||||
|
||||
def load_env(file_path):
|
||||
@@ -50,27 +67,39 @@ def load_env(file_path):
|
||||
pass
|
||||
|
||||
|
||||
LLM_ROOT_DIR = os.environ["LLM_ROOT_DIR"] = os.path.abspath(
|
||||
os.path.join(os.path.dirname(__file__), "..")
|
||||
)
|
||||
def run(tool_path, tool_func, tool_data):
|
||||
try:
|
||||
spec = importlib.util.spec_from_file_location(
|
||||
os.path.basename(tool_path), tool_path
|
||||
)
|
||||
mod = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(mod)
|
||||
except:
|
||||
raise Exception(f"Unable to load tool at '{tool_path}'")
|
||||
|
||||
load_env(os.path.join(LLM_ROOT_DIR, ".env"))
|
||||
if not hasattr(mod, tool_func):
|
||||
raise Exception(f"Not module function '{tool_func}' at '{tool_path}'")
|
||||
|
||||
tool_name, tool_data = parse_argv()
|
||||
value = getattr(mod, tool_func)(**tool_data)
|
||||
dump_value(value)
|
||||
|
||||
os.environ["LLM_TOOL_NAME"] = tool_name
|
||||
os.environ["LLM_TOOL_CACHE_DIR"] = os.path.join(LLM_ROOT_DIR, "cache", tool_name)
|
||||
|
||||
if not tool_data:
|
||||
print("No json data")
|
||||
sys.exit(1)
|
||||
def dump_value(value):
|
||||
if value is None:
|
||||
return
|
||||
|
||||
data = None
|
||||
try:
|
||||
data = json.loads(tool_data)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
print("Invalid json data")
|
||||
sys.exit(1)
|
||||
value_type = type(value).__name__
|
||||
if value_type in ("str", "int", "float", "bool"):
|
||||
print(value)
|
||||
elif value_type == "dict" or value_type == "list":
|
||||
value_str = json.dumps(value, indent=2)
|
||||
assert value == json.loads(value_str)
|
||||
print(value_str)
|
||||
|
||||
module = load_module(tool_name)
|
||||
module.run(**data)
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
main()
|
||||
except Exception as e:
|
||||
print(e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
+69
-53
@@ -1,60 +1,76 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
export LLM_ROOT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd)"
|
||||
main() {
|
||||
this_file_name=run-tool.sh
|
||||
parse_argv "$@"
|
||||
root_dir="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd)"
|
||||
setup_env
|
||||
tool_path="$root_dir/tools/$tool_name.sh"
|
||||
run
|
||||
}
|
||||
|
||||
if [[ -f "$LLM_ROOT_DIR/.env" ]]; then
|
||||
source "$LLM_ROOT_DIR/.env"
|
||||
fi
|
||||
|
||||
if [[ "$0" == *run-tool.sh ]]; then
|
||||
tool_name="$1"
|
||||
tool_data="$2"
|
||||
else
|
||||
tool_name="$(basename "$0")"
|
||||
tool_data="$1"
|
||||
fi
|
||||
if [[ "$tool_name" == *.sh ]]; then
|
||||
tool_name="${tool_name:0:$((${#tool_name}-3))}"
|
||||
fi
|
||||
|
||||
export LLM_TOOL_NAME="$tool_name"
|
||||
export LLM_TOOL_CACHE_DIR="$LLM_ROOT_DIR/cache/$tool_name"
|
||||
|
||||
tool_file="$LLM_ROOT_DIR/tools/$tool_name.sh"
|
||||
|
||||
_jq=jq
|
||||
if [[ "$OS" == "Windows_NT" ]]; then
|
||||
_jq="jq -b"
|
||||
tool_file="$(cygpath -w "$tool_file")"
|
||||
fi
|
||||
|
||||
if [[ -z "$tool_data" ]]; then
|
||||
echo "No json data"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
data="$(
|
||||
echo "$tool_data" | \
|
||||
$_jq -r '
|
||||
to_entries | .[] |
|
||||
(.key | split("_") | join("-")) as $key |
|
||||
if .value | type == "array" then
|
||||
.value | .[] | "--\($key)\n\(. | @json)"
|
||||
elif .value | type == "boolean" then
|
||||
if .value then "--\($key)" else "" end
|
||||
parse_argv() {
|
||||
if [[ "$0" == *"$this_file_name" ]]; then
|
||||
tool_name="$1"
|
||||
tool_data="$2"
|
||||
else
|
||||
"--\($key)\n\(.value | @json)"
|
||||
end'
|
||||
)" || {
|
||||
echo "Invalid json data"
|
||||
tool_name="$(basename "$0")"
|
||||
tool_data="$1"
|
||||
fi
|
||||
if [[ "$tool_name" == *.sh ]]; then
|
||||
tool_name="${tool_name:0:$((${#tool_name}-3))}"
|
||||
fi
|
||||
}
|
||||
|
||||
setup_env() {
|
||||
export LLM_ROOT_DIR="$root_dir"
|
||||
if [[ -f "$LLM_ROOT_DIR/.env" ]]; then
|
||||
source "$LLM_ROOT_DIR/.env"
|
||||
fi
|
||||
export LLM_TOOL_NAME="$tool_name"
|
||||
export LLM_TOOL_CACHE_DIR="$LLM_ROOT_DIR/cache/$tool_name"
|
||||
}
|
||||
|
||||
run() {
|
||||
if [[ -z "$tool_data" ]]; then
|
||||
die "No JSON data"
|
||||
fi
|
||||
|
||||
_jq=jq
|
||||
if [[ "$OS" == "Windows_NT" ]]; then
|
||||
_jq="jq -b"
|
||||
tool_path="$(cygpath -w "$tool_path")"
|
||||
fi
|
||||
|
||||
data="$(
|
||||
echo "$tool_data" | \
|
||||
$_jq -r '
|
||||
to_entries | .[] |
|
||||
(.key | split("_") | join("-")) as $key |
|
||||
if .value | type == "array" then
|
||||
.value | .[] | "--\($key)\n\(. | @json)"
|
||||
elif .value | type == "boolean" then
|
||||
if .value then "--\($key)" else "" end
|
||||
else
|
||||
"--\($key)\n\(.value | @json)"
|
||||
end'
|
||||
)" || {
|
||||
die "Invalid JSON data"
|
||||
}
|
||||
while IFS= read -r line; do
|
||||
if [[ "$line" == '--'* ]]; then
|
||||
args+=("$line")
|
||||
else
|
||||
args+=("$(echo "$line" | $_jq -r '.')")
|
||||
fi
|
||||
done <<< "$data"
|
||||
"$tool_path" "${args[@]}"
|
||||
}
|
||||
|
||||
die() {
|
||||
echo "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
while IFS= read -r line; do
|
||||
if [[ "$line" == '--'* ]]; then
|
||||
args+=("$line")
|
||||
else
|
||||
args+=("$(echo "$line" | $_jq -r '.')")
|
||||
fi
|
||||
done <<< "$data"
|
||||
"$tool_file" "${args[@]}"
|
||||
|
||||
main "$@"
|
||||
|
||||
Reference in New Issue
Block a user