goose-py 0.11.21__tar.gz → 0.11.23__tar.gz

{goose_py-0.11.21 → goose_py-0.11.23}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.11.21
+Version: 0.11.23
 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
-Requires-Dist: aikernel==0.1.41
+Requires-Dist: aikernel==0.1.42
 Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: pydantic>=2.8.2
 Description-Content-Type: text/markdown

{goose_py-0.11.21 → goose_py-0.11.23}/goose/_internal/agent.py

@@ -5,10 +5,10 @@ from typing import Any, Literal, Protocol, overload
 from aikernel import (
     LLMAssistantMessage,
     LLMModelAlias,
+    LLMRouter,
     LLMSystemMessage,
     LLMToolMessage,
     LLMUserMessage,
-    Router,
     llm_structured,
     llm_unstructured,
 )
@@ -37,13 +37,13 @@ class Agent:
         self.run_id = run_id
         self.logger = logger
 
-    async def generate[R: Result](
+    async def generate[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
+        model: M,
         task_name: str,
-        router: Router,
+        router: LLMRouter[M],
         response_model: type[R] = TextResult,
     ) -> R:
         start_time = datetime.now()
@@ -88,13 +88,13 @@ class Agent:
 
         return parsed_response
 
-    async def ask(
+    async def ask[M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
+        model: M,
         task_name: str,
-        router: Router,
+        router: LLMRouter[M],
     ) -> str:
         start_time = datetime.now()
         typed_messages: list[ExpectedMessage] = [*messages]
@@ -129,12 +129,12 @@ class Agent:
 
         return response.text
 
-    async def refine[R: Result](
+    async def refine[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         response_model: type[R],
     ) -> R:
@@ -181,58 +181,58 @@ class Agent:
         return refined_response
 
     @overload
-    async def __call__[R: Result](
+    async def __call__[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         mode: Literal["generate"],
         response_model: type[R],
     ) -> R: ...
 
     @overload
-    async def __call__[R: Result](
+    async def __call__[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         mode: Literal["ask"],
         response_model: type[R] = TextResult,
     ) -> str: ...
 
     @overload
-    async def __call__[R: Result](
+    async def __call__[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         response_model: type[R],
         mode: Literal["refine"],
     ) -> R: ...
 
     @overload
-    async def __call__[R: Result](
+    async def __call__[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         response_model: type[R],
     ) -> R: ...
 
-    async def __call__[R: Result](
+    async def __call__[R: Result, M: LLMModelAlias](
         self,
         *,
         messages: list[LLMUserMessage | LLMAssistantMessage | LLMSystemMessage],
-        model: LLMModelAlias,
-        router: Router,
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         response_model: type[R] = TextResult,
         mode: Literal["generate", "ask", "refine"] = "generate",

{goose_py-0.11.21 → goose_py-0.11.23}/goose/_internal/task.py

@@ -2,7 +2,7 @@ import hashlib
 from collections.abc import Awaitable, Callable
 from typing import Any, overload
 
-from aikernel import LLMModelAlias, LLMSystemMessage, LLMUserMessage, Router
+from aikernel import LLMModelAlias, LLMRouter, LLMSystemMessage, LLMUserMessage
 from pydantic import BaseModel
 
 from goose._internal.agent import Agent
@@ -45,7 +45,12 @@ class Task[**P, R: Result]:
             return self.result_type.model_validate_json(state.raw_result)
 
     async def ask(
-        self, *, user_message: LLMUserMessage, router: Router, context: LLMSystemMessage | None = None, index: int = 0
+        self,
+        *,
+        user_message: LLMUserMessage,
+        router: LLMRouter[LLMModelAlias],
+        context: LLMSystemMessage | None = None,
+        index: int = 0,
     ) -> str:
         flow_run = self.__get_current_flow_run()
         node_state = flow_run.get_state(task=self, index=index)
@@ -73,7 +78,7 @@ class Task[**P, R: Result]:
         self,
         *,
         user_message: LLMUserMessage,
-        router: Router,
+        router: LLMRouter[LLMModelAlias],
         context: LLMSystemMessage | None = None,
         index: int = 0,
     ) -> R:

{goose_py-0.11.21 → goose_py-0.11.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goose-py"
-version = "0.11.21"
+version = "0.11.23"
 description = "A tool for AI workflows based on human-computer collaboration and structured output."
 readme = "README.md"
 authors = [
@@ -11,7 +11,7 @@ authors = [
 requires-python = ">=3.12"
 dependencies = [
     "jsonpath-ng>=1.7.0",
-    "aikernel==0.1.41",
+    "aikernel==0.1.42",
     "pydantic>=2.8.2",
 ]
 

{goose_py-0.11.21 → goose_py-0.11.23}/tests/test_agent.py

@@ -1,7 +1,7 @@
 from unittest.mock import Mock
 
 import pytest
-from aikernel import LLMMessagePart, LLMUserMessage, Router
+from aikernel import LLMMessagePart, LLMModelAlias, LLMRouter, LLMUserMessage
 from pytest_mock import MockerFixture
 
 from goose import Agent, AgentResponse, FlowArguments, TextResult, flow, task
@@ -22,10 +22,11 @@ def mock_llm_unstructured(mocker: MockerFixture) -> Mock:
 
 @task
 async def use_agent(*, agent: Agent) -> TextResult:
-    router = Router(
+    router = LLMRouter[LLMModelAlias](
         model_list=[
             {"model_name": "gemini-2.0-flash-lite", "litellm_params": {"model": "gemini/gemini-2.0-flash-lite"}}
-        ]
+        ],
+        fallbacks=[],
     )
     return await agent(
         messages=[LLMUserMessage(parts=[LLMMessagePart(content="Hello")])],

{goose_py-0.11.21 → goose_py-0.11.23}/tests/test_ask.py

@@ -1,15 +1,16 @@
 from unittest.mock import Mock
 
 import pytest
-from aikernel import LLMAssistantMessage, LLMMessagePart, LLMUserMessage, Router
+from aikernel import LLMAssistantMessage, LLMMessagePart, LLMModelAlias, LLMRouter, LLMUserMessage
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, flow, task
 from goose._internal.result import TextResult
 from goose.errors import Honk
 
-ROUTER = Router(
-    model_list=[{"model_name": "gemini-2.0-flash-lite", "litellm_params": {"model": "gemini/gemini-2.0-flash-lite"}}]
+ROUTER = LLMRouter[LLMModelAlias](
+    model_list=[{"model_name": "gemini-2.0-flash-lite", "litellm_params": {"model": "gemini/gemini-2.0-flash-lite"}}],
+    fallbacks=[],
 )
 
 

{goose_py-0.11.21 → goose_py-0.11.23}/tests/test_refining.py

@@ -3,15 +3,16 @@ import string
 from unittest.mock import Mock
 
 import pytest
-from aikernel import LLMMessagePart, LLMSystemMessage, LLMUserMessage, Router
+from aikernel import LLMMessagePart, LLMModelAlias, LLMRouter, LLMSystemMessage, LLMUserMessage
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, Result, flow, task
 from goose._internal.result import FindReplaceResponse, Replacement
 from goose.errors import Honk
 
-ROUTER = Router(
-    model_list=[{"model_name": "gemini-2.0-flash-lite", "litellm_params": {"model": "gemini/gemini-2.0-flash-lite"}}]
+ROUTER = LLMRouter[LLMModelAlias](
+    model_list=[{"model_name": "gemini-2.0-flash-lite", "litellm_params": {"model": "gemini/gemini-2.0-flash-lite"}}],
+    fallbacks=[],
 )
 
 

{goose_py-0.11.21 → goose_py-0.11.23}/uv.lock

@@ -3,15 +3,15 @@ requires-python = ">=3.12"
 
 [[package]]
 name = "aikernel"
-version = "0.1.41"
+version = "0.1.42"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "litellm" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/81/c0/d8a3616c11f4753e7f1a29fa70112877d4e4d66f7522800ab408c8964cf5/aikernel-0.1.41.tar.gz", hash = "sha256:6298aa904dbd5981b84c150aa4a533e3a816de0024658d5b21f90a8ec039cf09", size = 72588 }
+sdist = { url = "https://files.pythonhosted.org/packages/b5/43/451591e3835257c29e90db4c9cb22cd4c4566d63e1c1ab20652af612686d/aikernel-0.1.42.tar.gz", hash = "sha256:7fb29a14f32119a533502bb2925112c43709a00f2753b3d07b4c7b2c7cb153f6", size = 72593 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c1/62/16f9b1ae7ee8096e878ef69f087d411e4c578d8cb9453b0cfd48c077e8e6/aikernel-0.1.41-py3-none-any.whl", hash = "sha256:b069bbbcb3e7676e5ce70ac55ea1fed2085f6f6e68981e29f5aa7f5f56f07735", size = 10567 },
+    { url = "https://files.pythonhosted.org/packages/0d/69/677ce38aeb965cda409c8f1efecd85f17fc648dba02f7441034a9bba8c1f/aikernel-0.1.42-py3-none-any.whl", hash = "sha256:b22ee9726e1e2688ef05bf7433fed0f671687d63710fbb507c81719efdbff309", size = 10570 },
 ]
 
 [[package]]
@@ -345,7 +345,7 @@ wheels = [
 
 [[package]]
 name = "goose-py"
-version = "0.11.21"
+version = "0.11.23"
 source = { editable = "." }
 dependencies = [
     { name = "aikernel" },
@@ -365,7 +365,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "aikernel", specifier = "==0.1.41" },
+    { name = "aikernel", specifier = "==0.1.42" },
     { name = "jsonpath-ng", specifier = ">=1.7.0" },
     { name = "pydantic", specifier = ">=2.8.2" },
 ]