From 6ed7e9a10a7af451c9ecb97f02f8959139948052 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Thu, 24 Apr 2025 16:36:52 -0400 Subject: [PATCH 1/2] chore: add credential check param field Signed-off-by: Donnie Adams --- gptscript/credentials.py | 4 ++++ tests/test_gptscript.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gptscript/credentials.py b/gptscript/credentials.py index 9821b8c..ced187e 100644 --- a/gptscript/credentials.py +++ b/gptscript/credentials.py @@ -22,6 +22,7 @@ def __init__(self, ephemeral: bool = False, expiresAt: datetime = None, refreshToken: str = "", + checkParam: str = "", **kwargs, ): self.context = context @@ -31,6 +32,7 @@ def __init__(self, self.ephemeral = ephemeral self.expiresAt = expiresAt self.refreshToken = refreshToken + self.checkParam = checkParam if self.env is None: self.env = {} @@ -56,6 +58,7 @@ def to_json(self): "env": self.env, "ephemeral": self.ephemeral, "refreshToken": self.refreshToken, + "checkParam": self.checkParam, } if datetime_str != "": @@ -95,4 +98,5 @@ def to_credential(c) -> Credential: ephemeral=c.get("ephemeral", False), expiresAt=expiresAt, refreshToken=c["refreshToken"], + checkParam=c.get("checkParam", "") ) diff --git a/tests/test_gptscript.py b/tests/test_gptscript.py index 05f747a..077f74e 100644 --- a/tests/test_gptscript.py +++ b/tests/test_gptscript.py @@ -742,7 +742,8 @@ async def test_credentials(gptscript): name = "test-" + str(os.urandom(4).hex()) now = datetime.now() res = await gptscript.create_credential( - Credential(toolName=name, env={"TEST": "test"}, expiresAt=now + timedelta(seconds=5))) + Credential(toolName=name, env={"TEST": "test"}, expiresAt=now + timedelta(seconds=5), + checkParam="my-check-param")) assert not res.startswith("an error occurred"), "Unexpected error creating credential: " + res sleep(5) @@ -757,6 +758,7 @@ async def test_credentials(gptscript): res = await gptscript.reveal_credential(name=name) assert not str(res).startswith("an error occurred"), "Unexpected error revealing credential: " + res assert res.env["TEST"] == "test", "Unexpected credential value: " + str(res) + assert res.checkParam == "my-check-param", "Unexpected credential value: " + str(res) res = await gptscript.delete_credential(name=name) assert not res.startswith("an error occurred"), "Unexpected error deleting credential: " + res From 4f7a47fba9c129216458faf31c8e22490bf186eb Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Thu, 24 Apr 2025 16:46:16 -0400 Subject: [PATCH 2/2] fix: set the description of tool_list fixture Signed-off-by: Donnie Adams --- tests/test_gptscript.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_gptscript.py b/tests/test_gptscript.py index 077f74e..486e00d 100644 --- a/tests/test_gptscript.py +++ b/tests/test_gptscript.py @@ -81,7 +81,7 @@ def tool_list(): name="echo", tools=["sys.exec"], description="Echoes the input", - arguments=ArgumentSchema(properties={"input": Property("The string input to echo")}), + arguments=ArgumentSchema(properties={"input": Property(description="The string input to echo")}), instructions=f""" ${shebang} echo ${input}