Merge pull request #12 from thedadams/add-chdir

feat: add chdir option

Author: thedadams

README.md

@@ -71,11 +71,13 @@ Aside from the list methods there are `exec` and `exec_file` methods that allow
 
 ### Opts
 
-You can pass the following options to the exec and exec_file functions:
+You can pass the following options to the exec and exec_file functions. See `gptscript --help` for further information.
 
 opts= {
     "cache": True(default)|False,
-    "cache-dir": "",
+    "cache-dir": "/path/to/dir",
+    "quiet": True|False(default),
+    "chdir": "/path/to/dir",
 }
 
 Cache can be set to true or false to enable or disable caching globally or it can be set at the individual tool level. The cache-dir can be set to a directory to use for caching. If not set, the default cache directory will be used.

gptscript/command.py

@@ -4,9 +4,11 @@
 from gptscript.exec_utils import exec_cmd, stream_exec_cmd, stream_exec_cmd_with_events
 from gptscript.tool import FreeForm, Tool
 
-optToArg = {
+opt_to_arg = {
     "cache": "--disable-cache=",
     "cacheDir": "--cache-dir=",
+    "quiet": "--quiet=",
+    "chdir": "--chdir=",
 }
 
 
@@ -35,7 +37,7 @@ def list_models():
 
 def exec(tool, opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
     args.append("-")
     try:
         tool_str = process_tools(tool)
@@ -47,7 +49,7 @@ def exec(tool, opts={}):
 
 def stream_exec(tool, opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
     args.append("-")
     try:
         tool_str = process_tools(tool)
@@ -59,7 +61,7 @@ def stream_exec(tool, opts={}):
 
 def stream_exec_with_events(tool, opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
     args.append("-")
     try:
         tool_str = process_tools(tool)
@@ -71,7 +73,7 @@ def stream_exec_with_events(tool, opts={}):
 
 def exec_file(tool_path, input="", opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
 
     args.append(tool_path)
 
@@ -86,7 +88,7 @@ def exec_file(tool_path, input="", opts={}):
 
 def stream_exec_file(tool_path, input="", opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
 
     args.append(tool_path)
 
@@ -102,7 +104,7 @@ def stream_exec_file(tool_path, input="", opts={}):
 
 def stream_exec_file_with_events(tool_path, input="", opts={}):
     cmd = _get_command()
-    args = toArgs(opts)
+    args = to_args(opts)
 
     args.append(tool_path)
 
@@ -116,14 +118,15 @@ def stream_exec_file_with_events(tool_path, input="", opts={}):
         raise e
 
 
-def toArgs(opts):
-    args = ["--quiet=false"]
+def to_args(opts):
+    args = []
     for opt, val in opts.items():
-        if optToArg.get(opt):
+        opt_arg = opt_to_arg.get(opt, None)
+        if opt_arg is not None:
             if opt == "cache":
-                args.append(optToArg[opt] + str(not val))
+                args.append(opt_arg + str(not val))
             else:
-                args.append(optToArg[opt] + val)
+                args.append(opt_arg + val)
     return args
 
 
@@ -147,9 +150,7 @@ def tool_concat(tools=[]):
     resp = ""
     if len(tools) == 1:
         return str(tools[0])
-    for tool in tools:
+    if tools:
         resp = "\n---\n".join([str(tool) for tool in tools])
 
-    print(resp)
-
     return resp

tests/test_gptscript.py

@@ -4,6 +4,7 @@
     list_models,
     list_tools,
     exec,
+    exec_file,
     stream_exec,
     stream_exec_with_events,
     stream_exec_file,
@@ -112,6 +113,18 @@ def test_stream_exec_complex_tool(complex_tool):
     ), "Expected a successful response from stream_exec using complex_tool"
 
 
+def test_exec_file_with_chdir():
+    # By changing the directory here, we should be able to find the test.gpt file without `./test`
+    out, err = exec_file("./test.gpt", opts={"chdir": "./fixtures"})
+    for line in out:
+        print(line)
+    for line in err:
+        print(line)
+    assert (
+            out is not None and err is not None
+    ), "Expected some output or error from stream_exec_file"
+
+
 # Test streaming execution from a file
 def test_stream_exec_file():
     out, err, wait = stream_exec_file("./fixtures/test.gpt")