goose-py 0.7.1__tar.gz → 0.7.3__tar.gz

{goose_py-0.7.1 → goose_py-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.7.1
+Version: 0.7.3
 Summary: A tool for AI workflows based on human-computer collaboration and structured output.
 Author-email: Nash Taylor <nash@chelle.ai>, Joshua Cook <joshua@chelle.ai>, Michael Sankur <michael@chelle.ai>
 Requires-Python: >=3.12

{goose_py-0.7.1 → goose_py-0.7.3}/goose/_internal/conversation.py

@@ -1,12 +1,9 @@
+from typing import Self
+
 from pydantic import BaseModel
 
 from goose._internal.result import Result
-from goose._internal.types.agent import (
-    AssistantMessage,
-    LLMMessage,
-    SystemMessage,
-    UserMessage,
-)
+from goose._internal.types.agent import AssistantMessage, LLMMessage, SystemMessage, UserMessage
 
 
 class Conversation[R: Result](BaseModel):
@@ -31,3 +28,8 @@ class Conversation[R: Result](BaseModel):
             messages.append(AssistantMessage(text=self.result_messages[-1].model_dump_json()).render())
 
         return messages
+
+    def undo(self) -> Self:
+        self.user_messages.pop()
+        self.result_messages.pop()
+        return self

{goose_py-0.7.1 → goose_py-0.7.3}/goose/_internal/state.py

@@ -61,6 +61,17 @@ class NodeState[ResultT: Result](BaseModel):
         self.conversation.user_messages.append(message)
         return self
 
+    def edit_last_result(self, *, result: ResultT) -> Self:
+        if len(self.conversation.result_messages) == 0:
+            raise Honk("Node awaiting response, has no result")
+
+        self.conversation.result_messages[-1] = result
+        return self
+
+    def undo(self) -> Self:
+        self.conversation.undo()
+        return self
+
 
 class FlowRun:
     def __init__(self) -> None:
@@ -115,7 +126,7 @@ class FlowRun:
         self._flow_args = args
         self._flow_kwargs = kwargs
 
-    def add_node_state(self, node_state: NodeState[Any], /) -> None:
+    def upsert_node_state(self, node_state: NodeState[Any], /) -> None:
         key = (node_state.task_name, node_state.index)
         self._node_states[key] = node_state.model_dump_json()
 

{goose_py-0.7.1 → goose_py-0.7.3}/goose/_internal/task.py

@@ -59,15 +59,27 @@ class Task[**P, R: Result]:
 
         result = await self.__adapt(conversation=node_state.conversation, agent=flow_run.agent)
         node_state.add_result(result=result)
-        flow_run.add_node_state(node_state)
+        flow_run.upsert_node_state(node_state)
 
         return result
 
+    def edit(self, *, result: R, index: int = 0) -> None:
+        flow_run = self.__get_current_flow_run()
+        node_state = flow_run.get(task=self, index=index)
+        node_state.edit_last_result(result=result)
+        flow_run.upsert_node_state(node_state)
+
+    def undo(self, *, index: int = 0) -> None:
+        flow_run = self.__get_current_flow_run()
+        node_state = flow_run.get(task=self, index=index)
+        node_state.undo()
+        flow_run.upsert_node_state(node_state)
+
     async def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         flow_run = self.__get_current_flow_run()
         node_state = flow_run.get_next(task=self)
         result = await self.generate(node_state, *args, **kwargs)
-        flow_run.add_node_state(node_state)
+        flow_run.upsert_node_state(node_state)
         return result
 
     async def __adapt(self, *, conversation: Conversation[R], agent: Agent) -> R:

{goose_py-0.7.1 → goose_py-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goose-py"
-version = "0.7.1"
+version = "0.7.3"
 description = "A tool for AI workflows based on human-computer collaboration and structured output."
 readme = "README.md"
 authors = [

goose_py-0.7.3/tests/test_state.py

@@ -0,0 +1,91 @@
+import random
+import string
+from unittest.mock import Mock
+
+import pytest
+from pytest_mock import MockerFixture
+
+from goose import Result, flow, task
+from goose._internal.types.agent import SystemMessage, TextMessagePart, UserMessage
+from goose.errors import Honk
+
+
+class GeneratedWord(Result):
+    word: str
+
+
+class GeneratedSentence(Result):
+    sentence: str
+
+
+@task
+async def generate_random_word(*, n_characters: int) -> GeneratedWord:
+    return GeneratedWord(word="".join(random.sample(string.ascii_lowercase, n_characters)))
+
+
+@pytest.fixture
+def generate_random_word_adapter(mocker: MockerFixture) -> Mock:
+    return mocker.patch.object(
+        generate_random_word,
+        "_Task__adapt",
+        return_value=GeneratedWord(word="__ADAPTED__"),
+    )
+
+
+@task
+async def make_sentence(*, words: list[GeneratedWord]) -> GeneratedSentence:
+    return GeneratedSentence(sentence=" ".join([word.word for word in words]))
+
+
+@flow
+async def with_state() -> None:
+    word = await generate_random_word(n_characters=10)
+    await make_sentence(words=[word])
+
+
+@pytest.mark.asyncio
+async def test_state_causes_caching() -> None:
+    async with with_state.start_run(run_id="1") as run:
+        await with_state.generate()
+
+    random_word = run.get(task=generate_random_word).result.word
+
+    with pytest.raises(Honk):
+        with_state.current_run
+
+    async with with_state.start_run(run_id="1") as new_run:
+        await with_state.generate()
+
+    new_random_word = new_run.get(task=generate_random_word).result.word
+
+    assert random_word == new_random_word  # unchanged node is not re-generated
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("generate_random_word_adapter")
+async def test_state_undo() -> None:
+    async with with_state.start_run(run_id="2"):
+        await with_state.generate()
+
+    async with with_state.start_run(run_id="2"):
+        await generate_random_word.jam(
+            index=0,
+            user_message=UserMessage(parts=[TextMessagePart(text="Change it")]),
+            context=SystemMessage(parts=[TextMessagePart(text="Extra info")]),
+        )
+
+    async with with_state.start_run(run_id="2") as run:
+        generate_random_word.undo()
+
+    assert run.get(task=generate_random_word).result.word != "__ADAPTED__"
+
+
+@pytest.mark.asyncio
+async def test_state_edit() -> None:
+    async with with_state.start_run(run_id="3"):
+        await with_state.generate()
+
+    async with with_state.start_run(run_id="3") as run:
+        generate_random_word.edit(result=GeneratedWord(word="__EDITED__"), index=0)
+
+    assert run.get(task=generate_random_word).result.word == "__EDITED__"

{goose_py-0.7.1 → goose_py-0.7.3}/uv.lock

@@ -234,7 +234,7 @@ wheels = [
 
 [[package]]
 name = "goose-py"
-version = "0.7.1"
+version = "0.7.3"
 source = { editable = "." }
 dependencies = [
     { name = "jsonpath-ng" },

goose_py-0.7.1/tests/test_state.py

@@ -1,49 +0,0 @@
-import random
-import string
-
-import pytest
-
-from goose import Result, flow, task
-from goose.errors import Honk
-
-
-class GeneratedWord(Result):
-    word: str
-
-
-class GeneratedSentence(Result):
-    sentence: str
-
-
-@task
-async def generate_random_word(*, n_characters: int) -> GeneratedWord:
-    return GeneratedWord(word="".join(random.sample(string.ascii_lowercase, n_characters)))
-
-
-@task
-async def make_sentence(*, words: list[GeneratedWord]) -> GeneratedSentence:
-    return GeneratedSentence(sentence=" ".join([word.word for word in words]))
-
-
-@flow
-async def with_state() -> None:
-    word = await generate_random_word(n_characters=10)
-    await make_sentence(words=[word])
-
-
-@pytest.mark.asyncio
-async def test_state_causes_caching() -> None:
-    async with with_state.start_run(run_id="1") as run:
-        await with_state.generate()
-
-    random_word = run.get(task=generate_random_word).result.word
-
-    with pytest.raises(Honk):
-        with_state.current_run
-
-    async with with_state.start_run(run_id="1") as new_run:
-        await with_state.generate()
-
-    new_random_word = new_run.get(task=generate_random_word).result.word
-
-    assert random_word == new_random_word  # unchanged node is not re-generated