goose-py 0.11.22__py3-none-any.whl → 0.11.24__py3-none-any.whl

goose/_internal/agent.py

@@ -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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        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: LLMRouter[LLMModelAlias],
+        model: M,
+        router: LLMRouter[M],
         task_name: str,
         response_model: type[R] = TextResult,
         mode: Literal["generate", "ask", "refine"] = "generate",

goose/_internal/task.py

@@ -18,11 +18,9 @@ class Task[**P, R: Result]:
         /,
         *,
         retries: int = 0,
-        refinement_model: LLMModelAlias = "gemini-2.0-flash-lite",
     ) -> None:
         self._generator = generator
         self._retries = retries
-        self._refinement_model: LLMModelAlias = refinement_model
 
     @property
     def result_type(self) -> type[R]:
@@ -44,11 +42,12 @@ class Task[**P, R: Result]:
         else:
             return self.result_type.model_validate_json(state.raw_result)
 
-    async def ask(
+    async def ask[M: LLMModelAlias](
         self,
         *,
         user_message: LLMUserMessage,
-        router: LLMRouter[LLMModelAlias],
+        router: LLMRouter[M],
+        model: M,
         context: LLMSystemMessage | None = None,
         index: int = 0,
     ) -> str:
@@ -64,7 +63,7 @@ class Task[**P, R: Result]:
 
         answer = await flow_run.agent(
             messages=node_state.conversation.render(),
-            model=self._refinement_model,
+            model=model,
             task_name=f"ask--{self.name}",
             mode="ask",
             router=router,
@@ -74,11 +73,12 @@ class Task[**P, R: Result]:
 
         return answer
 
-    async def refine(
+    async def refine[M: LLMModelAlias](
         self,
         *,
         user_message: LLMUserMessage,
-        router: LLMRouter[LLMModelAlias],
+        router: LLMRouter[M],
+        model: M,
         context: LLMSystemMessage | None = None,
         index: int = 0,
     ) -> R:
@@ -94,7 +94,7 @@ class Task[**P, R: Result]:
 
         result = await flow_run.agent(
             messages=node_state.conversation.render(),
-            model=self._refinement_model,
+            model=model,
             task_name=f"refine--{self.name}",
             response_model=self.result_type,
             mode="refine",
@@ -161,21 +161,18 @@ class Task[**P, R: Result]:
 @overload
 def task[**P, R: Result](generator: Callable[P, Awaitable[R]], /) -> Task[P, R]: ...
 @overload
-def task[**P, R: Result](
-    *, retries: int = 0, refinement_model: LLMModelAlias = "gemini-2.0-flash-lite"
-) -> Callable[[Callable[P, Awaitable[R]]], Task[P, R]]: ...
+def task[**P, R: Result](*, retries: int = 0) -> Callable[[Callable[P, Awaitable[R]]], Task[P, R]]: ...
 def task[**P, R: Result](
     generator: Callable[P, Awaitable[R]] | None = None,
     /,
     *,
     retries: int = 0,
-    refinement_model: LLMModelAlias = "gemini-2.0-flash-lite",
 ) -> Task[P, R] | Callable[[Callable[P, Awaitable[R]]], Task[P, R]]:
     if generator is None:
 
         def decorator(fn: Callable[P, Awaitable[R]]) -> Task[P, R]:
-            return Task(fn, retries=retries, refinement_model=refinement_model)
+            return Task(fn, retries=retries)
 
         return decorator
 
-    return Task(generator, retries=retries, refinement_model=refinement_model)
+    return Task(generator, retries=retries)

{goose_py-0.11.22.dist-info → goose_py-0.11.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.11.22
+Version: 0.11.24
 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.11.22.dist-info → goose_py-0.11.24.dist-info}/RECORD

@@ -4,15 +4,15 @@ goose/flow.py,sha256=YsZLBa5I1W27_P6LYGWbtFX8ZYx9vJG3KtENYChHm5E,111
 goose/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goose/runs.py,sha256=ub-r_gzbUbaIzWXX-jc-dncNxEh6zTfzIkmnDfCSbRI,160
 goose/task.py,sha256=95rspdxETJoY12IHBl3KjnVIdqQnf1jDKlnGWNWOTvQ,53
-goose/_internal/agent.py,sha256=Wn-bWCG14D60XBmlZoyp2OFX7khw8tdtYv5zsPC5mwA,9235
+goose/_internal/agent.py,sha256=9Hz15SOrhaJWgOXhfQYYW4nrolB2xbMG5G3RwHX_k90,9187
 goose/_internal/conversation.py,sha256=vhJwe1pHk2lV60DaB9Tz9KbpzQo7_thRYInPjbIoUTE,1437
 goose/_internal/flow.py,sha256=8MJxlhHYSAzUHZefpF_sRJc37o532OF0X7l3KRopDmc,4115
 goose/_internal/result.py,sha256=vtJMfBxb9skfl8st2tn4hBmEq6qmXiJTme_B5QTgu2M,538
 goose/_internal/state.py,sha256=kA116MpsetsQz6nYodsXOqE3uYz37OTgjC9Vcy_3Qvg,8065
 goose/_internal/store.py,sha256=tWmKfa1-yq1jU6lT3l6kSOmVt2m3H7I1xLMTrxnUDI8,889
-goose/_internal/task.py,sha256=27xzbD_4E_j3Cn7JCIxXFiYMgLzVomCKF5I1QInRb2U,6627
+goose/_internal/task.py,sha256=A13TsBQJlo1yuAqbUpDY8k15JAd5WZxqgrz32F18H2U,6311
 goose/_internal/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goose/_internal/types/telemetry.py,sha256=xpfkhx7zCdZjjKU8rPuUJ2UHgqmZ084ZupzbTU36gSM,3791
-goose_py-0.11.22.dist-info/METADATA,sha256=FwtMXDWnfQrb4Z2zmBCAalMgGAnqtNc1wxwCGQlx6uM,444
-goose_py-0.11.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-goose_py-0.11.22.dist-info/RECORD,,
+goose_py-0.11.24.dist-info/METADATA,sha256=nbZUrRJMGWKXI8mm0TiYY1VT6W_dQp8T_hhhGZLX5CY,444
+goose_py-0.11.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+goose_py-0.11.24.dist-info/RECORD,,