update for stacked contexts

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

gptscript/credentials.py

@@ -9,15 +9,15 @@ def is_timezone_aware(dt: datetime):
 
 
 class CredentialType(Enum):
-    Tool = "tool",
-    ModelProvider = "modelProvider"
+    tool = "tool",
+    modelProvider = "modelProvider"
 
 
 class Credential:
     def __init__(self,
                  context: str = "default",
                  toolName: str = "",
-                 type: CredentialType = CredentialType.Tool,
+                 type: CredentialType = CredentialType.tool,
                  env: dict[str, str] = None,
                  ephemeral: bool = False,
                  expiresAt: datetime = None,
@@ -76,3 +76,20 @@ def __init__(self,
         self.allContexts = allContexts
         self.contexts = contexts
         self.name = name
+
+def to_credential(c) -> Credential:
+    expiresAt = c["expiresAt"]
+    if expiresAt is not None:
+        if expiresAt.endswith("Z"):
+            expiresAt = expiresAt.replace("Z", "+00:00")
+        expiresAt = datetime.fromisoformat(expiresAt)
+
+    return Credential(
+        context=c["context"],
+        toolName=c["toolName"],
+        type=CredentialType[c["type"]],
+        env=c["env"],
+        ephemeral=c.get("ephemeral", False),
+        expiresAt=expiresAt,
+        refreshToken=c["refreshToken"],
+    )

gptscript/gptscript.py

@@ -9,7 +9,7 @@
 import requests
 
 from gptscript.confirm import AuthResponse
-from gptscript.credentials import Credential
+from gptscript.credentials import Credential, to_credential
 from gptscript.frame import RunFrame, CallFrame, PromptFrame, Program
 from gptscript.opts import GlobalOptions
 from gptscript.prompt import PromptResponse
@@ -195,7 +195,7 @@ async def list_credentials(self, contexts: List[str] = None, all_contexts: bool
         if res.startswith("an error occurred:"):
             return res
 
-        return [Credential(**c) for c in json.loads(res)]
+        return [to_credential(cred) for cred in json.loads(res)]
 
     async def create_credential(self, cred: Credential) -> str:
         return await self._run_basic_command(
@@ -214,7 +214,7 @@ async def reveal_credential(self, contexts: List[str] = None, name: str = "") ->
         if res.startswith("an error occurred:"):
             return res
 
-        return Credential(**json.loads(res))
+        return to_credential(json.loads(res))
 
     async def delete_credential(self, context: str = "default", name: str = "") -> str:
         return await self._run_basic_command(

tests/test_gptscript.py

@@ -4,6 +4,8 @@
 import os
 import platform
 import subprocess
+from datetime import datetime, timedelta, timezone
+from time import sleep
 
 import pytest
 
@@ -688,12 +690,18 @@ async def test_parse_with_metadata_then_run(gptscript):
 @pytest.mark.asyncio
 async def test_credentials(gptscript):
     name = "test-" + str(os.urandom(4).hex())
-    res = await gptscript.create_credential(Credential(toolName=name, env={"TEST": "test"}))
+    now = datetime.now()
+    res = await gptscript.create_credential(Credential(toolName=name, env={"TEST": "test"}, expiresAt=now + timedelta(seconds=5)))
     assert not res.startswith("an error occurred"), "Unexpected error creating credential: " + res
 
+    sleep(5)
+
     res = await gptscript.list_credentials()
     assert not str(res).startswith("an error occurred"), "Unexpected error listing credentials: " + str(res)
     assert len(res) > 0, "Expected at least one credential"
+    for cred in res:
+        if cred.toolName == name:
+            assert cred.expiresAt < datetime.now(timezone.utc), "Expected credential to have expired"
 
     res = await gptscript.reveal_credential(name=name)
     assert not str(res).startswith("an error occurred"), "Unexpected error revealing credential: " + res