Skip to content

Commit 577586d

Browse files
committed
feat: add default model provider option
Signed-off-by: Donnie Adams <[email protected]>
1 parent 28c43f7 commit 577586d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ run `Options`. Anything specified as a run option will take precedence over the
5555

5656
- `APIKey`: Specify an OpenAI API key for authenticating requests. Defaults to `OPENAI_API_KEY` environment variable
5757
- `BaseURL`: A base URL for an OpenAI compatible API (the default is `https://api.openai.com/v1`)
58-
- `DefaultModel`: The default model to use for OpenAI requests
58+
- `DefaultModel`: The default model to use for chat completion requests
59+
- `DefaultModelProvider`: The default model provider to use for chat completion requests
5960
- `Env`: Supply the environment variables. Supplying anything here means that nothing from the environment is used. The
6061
default is `os.environ()`. Supplying `Env` at the run/evaluate level will be treated as "additional."
6162

gptscript/opts.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33

44

55
class GlobalOptions:
6-
def __init__(self, apiKey: str = "", baseURL: str = "", defaultModel: str = "", env: Mapping[str, str] = None):
6+
def __init__(self,
7+
apiKey: str = "", baseURL: str = "", defaultModelProvider: str = "", defaultModel: str = "",
8+
env: Mapping[str, str] = None):
79
self.APIKey = apiKey
810
self.BaseURL = baseURL
911
self.DefaultModel = defaultModel
12+
self.DefaultModelProvider = defaultModelProvider
1013
self.Env = env
1114

1215
def toEnv(self):
@@ -19,6 +22,8 @@ def toEnv(self):
1922
self.Env["OPENAI_BASE_URL"] = self.BaseURL
2023
if self.DefaultModel != "":
2124
self.Env["GPTSCRIPT_SDKSERVER_DEFAULT_MODEL"] = self.DefaultModel
25+
if self.DefaultModelProvider != "":
26+
self.Env["GPTSCRIPT_SDKSERVER_DEFAULT_MODEL_PROVIDER"] = self.DefaultModelProvider
2227

2328

2429
class Options(GlobalOptions):
@@ -36,9 +41,10 @@ def __init__(self,
3641
forceSequential: bool = False,
3742
apiKey: str = "",
3843
baseURL: str = "",
44+
defaultModelProvider: str = "",
3945
defaultModel: str = ""
4046
):
41-
super().__init__(apiKey, baseURL, defaultModel)
47+
super().__init__(apiKey, baseURL, defaultModelProvider, defaultModel)
4248
self.input = input
4349
self.disableCache = disableCache
4450
self.subTool = subTool

0 commit comments

Comments
 (0)