Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add workspace stat file #62

Merged
merged 2 commits into from
Oct 28, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions gptscript/fileinfo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from datetime import datetime

from pydantic import BaseModel


class FileInfo(BaseModel):
workspaceID: str
name: str
size: int
modTime: datetime
19 changes: 17 additions & 2 deletions gptscript/gptscript.py
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
from gptscript.confirm import AuthResponse
from gptscript.credentials import Credential, to_credential
from gptscript.datasets import DatasetMeta, Dataset, DatasetElementMeta, DatasetElement
from gptscript.fileinfo import FileInfo
from gptscript.frame import RunFrame, CallFrame, PromptFrame, Program
from gptscript.opts import GlobalOptions
from gptscript.prompt import PromptResponse
@@ -318,9 +319,9 @@ async def create_workspace(self, provider_type: str, from_workspaces: list[str]
}
)

async def delete_workspace(self, workspace_id: str = ""):
async def delete_workspace(self, workspace_id: str):
if workspace_id == "":
workspace_id = os.environ["GPTSCRIPT_WORKSPACE_ID"]
raise ValueError("workspace_id cannot be empty")

await self._run_basic_command(
"workspaces/delete",
@@ -402,6 +403,20 @@ async def read_file_in_workspace(self, file_path: str, workspace_id: str = "") -
}
))

async def stat_file_in_workspace(self, file_path: str, workspace_id: str = "") -> FileInfo:
if workspace_id == "":
workspace_id = os.environ["GPTSCRIPT_WORKSPACE_ID"]

return FileInfo.model_validate_json(await self._run_basic_command(
"workspaces/stat-file",
{
"id": workspace_id,
"filePath": file_path,
"workspaceTool": self.opts.WorkspaceTool,
"env": self.opts.Env,
}
))


def _get_command():
if os.getenv("GPTSCRIPT_BIN") is not None:
27 changes: 24 additions & 3 deletions tests/test_gptscript.py
Original file line number Diff line number Diff line change
@@ -40,15 +40,15 @@ def gptscript():


# Simple tool for testing
@pytest.fixture
@pytest.fixture(scope="function")
def simple_tool():
return ToolDef(
instructions="What is the capital of the united states?"
)


# Complex tool for testing
@pytest.fixture
@pytest.fixture(scope="function")
def complex_tool():
return ToolDef(
jsonResponse=True,
@@ -68,7 +68,7 @@ def complex_tool():


# Fixture for a list of tools
@pytest.fixture
@pytest.fixture(scope="function")
def tool_list():
shebang = "#!/bin/bash"
if platform.system().lower() == "windows":
@@ -810,6 +810,17 @@ async def test_create_read_and_delete_file_in_workspace(gptscript):
await gptscript.write_file_in_workspace("test.txt", b"test", workspace_id)
contents = await gptscript.read_file_in_workspace("test.txt", workspace_id)
assert contents == b"test"

file_info = await gptscript.stat_file_in_workspace("test.txt", workspace_id)
assert file_info.name == "test.txt"
assert file_info.size == 4
assert file_info.modTime.hour == datetime.now(
tz=file_info.modTime.tzinfo,
).hour and file_info.modTime < datetime.now(
tz=file_info.modTime.tzinfo,
)

assert file_info.workspaceID == workspace_id
await gptscript.delete_file_in_workspace("test.txt", workspace_id)
await gptscript.delete_workspace(workspace_id)

@@ -857,6 +868,16 @@ async def test_create_read_and_delete_file_in_workspaces3(gptscript):
await gptscript.write_file_in_workspace("test.txt", b"test", workspace_id)
contents = await gptscript.read_file_in_workspace("test.txt", workspace_id)
assert contents == b"test"

file_info = await gptscript.stat_file_in_workspace("test.txt", workspace_id)
assert file_info.name == "test.txt"
assert file_info.size == 4
assert file_info.modTime.hour == datetime.now(
tz=file_info.modTime.tzinfo,
).hour and file_info.modTime < datetime.now(
tz=file_info.modTime.tzinfo,
)

await gptscript.delete_file_in_workspace("test.txt", workspace_id)
await gptscript.delete_workspace(workspace_id)