pygpt-net 2.6.63__py3-none-any.whl → 2.6.65__py3-none-any.whl

pygpt_net/provider/agents/llama_index/planner_workflow.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.26 01:00:00                  #
+# Updated Date: 2025.09.27 17:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -56,12 +56,16 @@ class PlannerAgent(BaseAgent):
         prompt_step = self.get_option(preset, "step", "prompt")
         prompt_plan_initial = self.get_option(preset, "plan", "prompt")
         prompt_plan_refine = self.get_option(preset, "plan_refine", "prompt")
+        prompt_plan_refine_each_step = self.get_option(preset, "plan_refine", "after_each_subtask")
         if not prompt_step:
             prompt_step = DEFAULT_EXECUTE_PROMPT
         if not prompt_plan_initial:
             prompt_plan_initial = DEFAULT_INITIAL_PLAN_PROMPT
         if not prompt_plan_refine:
             prompt_plan_refine = DEFAULT_PLAN_REFINE_PROMPT
+        if prompt_plan_refine_each_step is None:
+            prompt_plan_refine_each_step = True
+
 
         return PlannerWorkflow(
             tools=tools,
@@ -69,8 +73,9 @@ class PlannerAgent(BaseAgent):
             verbose=verbose,
             max_steps=max_steps,
             system_prompt=prompt_step,
-            initial_plan_prompt= prompt_plan_initial,
-            plan_refine_prompt= prompt_plan_refine,
+            initial_plan_prompt=prompt_plan_initial,
+            plan_refine_prompt=prompt_plan_refine,
+            refine_after_each_subtask=prompt_plan_refine_each_step,
         )
 
     def get_options(self) -> Dict[str, Any]:
@@ -79,6 +84,7 @@ class PlannerAgent(BaseAgent):
 
         :return: dict of options
         """
+        # step model -> from globals
         return {
             "step": {
                 "label": trans("agent.planner.step.label"),
@@ -111,6 +117,12 @@ class PlannerAgent(BaseAgent):
                         "description": trans("agent.planner.refine.prompt.desc"),
                         "default": DEFAULT_PLAN_REFINE_PROMPT,
                     },
+                    "after_each_subtask": {
+                        "type": "bool",
+                        "label": trans("agent.option.refine.after_each"),
+                        "description": trans("agent.option.refine.after_each.desc"),
+                        "default": True,
+                    },
                 }
             },
         }

pygpt_net/provider/agents/llama_index/workflow/planner.py

@@ -44,6 +44,10 @@ except Exception:
     except Exception:
         ChatMemoryBuffer = None
 
+# Translation utility
+from pygpt_net.utils import trans
+
+
 class SubTask(BaseModel):
     name: str = Field(..., description="The name of the sub-task.")
     input: str = Field(..., description="The input prompt for the sub-task.")
@@ -162,8 +166,8 @@ class PlannerWorkflow(Workflow):
         self._on_stop = on_stop
 
         # Human-friendly display names propagated to UI via workflow events.
-        self._display_planner_name: str = "PlannerWorkflow"
-        self._display_executor_name: str = "FunctionAgent"
+        self._display_planner_name: str = trans("agent.planner.display.planner")  # UI label
+        self._display_executor_name: str = trans("agent.planner.display.executor_agent")  # UI label
 
         self._executor = FunctionAgent(
             name="PlannerExecutor",
@@ -211,21 +215,21 @@ class PlannerWorkflow(Workflow):
     ) -> str:
         if step == "subtask":
             if index and total:
-                base = f"Sub-task {index}/{total}"
+                base = trans("agent.planner.label.subtask.index_total").format(index=index, total=total)
             elif index:
-                base = f"Sub-task {index}"
+                base = trans("agent.planner.label.subtask.index").format(index=index)
             else:
-                base = "Sub-task"
-            return f"{base}: {subtask_name}" if subtask_name else base
+                base = trans("agent.planner.label.subtask")
+            return trans("agent.planner.label.with_name").format(base=base, name=subtask_name) if subtask_name else base
         if step == "refine":
             if index and total:
-                return f"Refine {index}/{total}"
-            return "Refine" if not index else f"Refine {index}"
+                return trans("agent.planner.label.refine.index_total").format(index=index, total=total)
+            return trans("agent.planner.label.refine.index").format(index=index) if index else trans("agent.planner.label.refine")
         if step in {"make_plan", "plan"}:
-            return "Plan"
+            return trans("agent.planner.label.plan")
         if step in {"execute", "execute_plan"}:
-            return "Execute"
-        return step or "Step"
+            return trans("agent.planner.label.execute")
+        return trans("agent.planner.label.step")
 
     def _emit_step_event(
             self,
@@ -369,22 +373,23 @@ class PlannerWorkflow(Workflow):
             self,
             ctx: Context,
             text: str,
-            agent_name: str = "PlannerWorkflow"
+            agent_name: Optional[str] = None
     ):
         """
         Emit a text message to the context stream.
 
-        :param ctx: The context to write the event to
+        :param ctx: The context to write the event to.
         :param text: The text message to emit.
         :param agent_name: The name/label to display in UI (we pass per-step labels here).
         """
+        label = agent_name or self._display_planner_name
         # Always try to include agent name; fall back to minimal event for older validators.
         try:
             ctx.write_event_to_stream(
                 AgentStream(
                     delta=text,
                     response=text,
-                    current_agent_name=agent_name,
+                    current_agent_name=label,
                     tool_calls=[],
                     raw={},
                 )
@@ -565,7 +570,11 @@ class PlannerWorkflow(Workflow):
         try:
             return await _stream()
         except Exception as ex:
-            await self._emit_text(ctx, f"\n`Sub-task failed: {ex}`", agent_name=agent_label or self._display_executor_name)
+            await self._emit_text(
+                ctx,
+                f"\n`{trans('agent.planner.ui.subtask_failed').format(error=ex)}`",
+                agent_name=agent_label or self._display_executor_name,
+            )
             return last_answer or ("".join(stream_buf).strip() if stream_buf else "")
 
     # Helper to render sub-tasks into a readable string for prompts and UI.
@@ -607,7 +616,11 @@ class PlannerWorkflow(Workflow):
         remaining_text = self._format_subtasks(remaining)
 
         # Emit a lightweight status line to the UI.
-        await self._emit_text(ctx, "\n`Refining remaining plan...`", agent_name=agent_label or "Refine")
+        await self._emit_text(
+            ctx,
+            f"\n`{trans('agent.planner.ui.refining_remaining_plan')}`",
+            agent_name=agent_label or trans("agent.planner.label.refine"),
+        )
 
         try:
             refinement = await self._planner_llm.astructured_predict(
@@ -650,12 +663,13 @@ class PlannerWorkflow(Workflow):
         except (ValueError, ValidationError):
             plan = Plan(sub_tasks=[SubTask(name="default", input=ev.query, expected_output="", dependencies=[])])
 
-        lines = ["`Current plan:`"]
+        lines = [f"`{trans('agent.planner.ui.current_plan')}`"]
         for i, st in enumerate(plan.sub_tasks, 1):
+            header = trans("agent.planner.ui.subtask_header.one").format(index=i, name=st.name)
             lines.append(
-                f"\n**===== Sub Task {i}: {st.name} =====**\n"
-                f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n\n"
+                f"\n{header}\n"
+                f"{trans('agent.planner.ui.expected_output')} {st.expected_output}\n"
+                f"{trans('agent.planner.ui.dependencies')} {st.dependencies}\n\n"
             )
         # Use a per-step label for plan creation
         await self._emit_text(ctx, "\n".join(lines), agent_name=self._agent_label("make_plan"))
@@ -677,7 +691,7 @@ class PlannerWorkflow(Workflow):
 
         # Start executing with a per-step label
         execute_label = self._agent_label("execute")
-        await self._emit_text(ctx, "\n\n`Executing plan...`", agent_name=execute_label)
+        await self._emit_text(ctx, f"\n\n`{trans('agent.planner.ui.executing_plan')}`", agent_name=execute_label)
 
         # Prepare static prompt parts for refinement.
         tools_str = ""
@@ -708,18 +722,21 @@ class PlannerWorkflow(Workflow):
                 },
             )
 
-            header = (
-                f"\n\n**===== Sub Task {i + 1}/{total}: {st.name} =====**\n"
-                f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n\n"
+            header = trans("agent.planner.ui.subtask_header.progress").format(
+                index=i + 1, total=total, name=st.name
+            )
+            header_block = (
+                f"\n\n{header}\n"
+                f"{trans('agent.planner.ui.expected_output')} {st.expected_output}\n"
+                f"{trans('agent.planner.ui.dependencies')} {st.dependencies}\n\n"
             )
 
             # stop callback
             if self._stopped():
-                await self._emit_text(ctx, "\n`Plan execution stopped.`", agent_name=execute_label)
-                return FinalEvent(result=last_answer or "Plan execution stopped.")
+                await self._emit_text(ctx, f"\n`{trans('agent.planner.ui.execution_stopped')}`", agent_name=execute_label)
+                return FinalEvent(result=last_answer or trans("agent.planner.ui.execution_stopped"))
 
-            await self._emit_text(ctx, header, agent_name=subtask_label)
+            await self._emit_text(ctx, header_block, agent_name=subtask_label)
 
             # build context for sub-task
             ctx_text = self._build_context_for_subtask(
@@ -728,7 +745,7 @@ class PlannerWorkflow(Workflow):
                 char_limit=self._memory_char_limit,
             )
 
-            # make composed prompt for sub-task
+            # make composed prompt for sub-task (internal; do not translate)
             if ctx_text:
                 composed_prompt = (
                     f"{ctx_text}\n\n"
@@ -743,7 +760,11 @@ class PlannerWorkflow(Workflow):
             sub_answer = await self._run_subtask(ctx, composed_prompt, agent_label=subtask_label)
             sub_answer = (sub_answer or "").strip()
 
-            await self._emit_text(ctx, f"\n\n`Finished Sub Task {i + 1}/{total}: {st.name}`", agent_name=subtask_label)
+            await self._emit_text(
+                ctx,
+                f"\n\n`{trans('agent.planner.ui.subtask_finished').format(index=i + 1, total=total, name=st.name)}`",
+                agent_name=subtask_label,
+            )
 
             # save completed sub-task
             completed.append((st.name, sub_answer))
@@ -752,8 +773,8 @@ class PlannerWorkflow(Workflow):
 
             # Early stop check (external cancel)
             if self._stopped():
-                await self._emit_text(ctx, "\n`Plan execution stopped.`", agent_name=execute_label)
-                return FinalEvent(result=last_answer or "Plan execution stopped.")
+                await self._emit_text(ctx, f"\n`{trans('agent.planner.ui.execution_stopped')}`", agent_name=execute_label)
+                return FinalEvent(result=last_answer or trans("agent.planner.ui.execution_stopped"))
 
             # Optional legacy-style refine after each sub-task
             i += 1  # move pointer to the next item before potential replacement of tail
@@ -790,11 +811,15 @@ class PlannerWorkflow(Workflow):
                     reason = getattr(refinement, "reason", "") or "Planner judged the task as satisfied."
                     await self._emit_text(
                         ctx,
-                        f"\n`Planner marked the plan as complete: {reason}`",
+                        f"\n`{trans('agent.planner.ui.plan_marked_complete').format(reason=reason)}`",
                         agent_name=refine_label,
                     )
-                    await self._emit_text(ctx, "\n\n`Plan execution finished.`", agent_name=execute_label)
-                    return FinalEvent(result=last_answer or "Plan finished.")
+                    await self._emit_text(
+                        ctx,
+                        f"\n\n`{trans('agent.planner.ui.plan_execution_finished')}`",
+                        agent_name=execute_label,
+                    )
+                    return FinalEvent(result=last_answer or trans("agent.planner.ui.plan_finished"))
 
                 # If an updated plan was provided, replace the remaining sub-tasks.
                 if refinement.plan and refinement.plan.sub_tasks is not None:
@@ -808,14 +833,17 @@ class PlannerWorkflow(Workflow):
                     if new_remaining_repr.strip() != current_remaining_repr.strip():
                         plan_sub_tasks = plan_sub_tasks[:i] + new_remaining
                         # Present the updated tail of the plan to the UI.
-                        lines = ["`Updated remaining plan:`"]
+                        lines = [f"`{trans('agent.planner.ui.updated_remaining_plan')}`"]
                         for k, st_upd in enumerate(new_remaining, i + 1):
+                            upd_header = trans("agent.planner.ui.subtask_header.progress").format(
+                                index=k, total=len(plan_sub_tasks), name=st_upd.name
+                            )
                             lines.append(
-                                f"\n**===== Sub Task {k}/{len(plan_sub_tasks)}: {st_upd.name} =====**\n"
-                                f"Expected output: {st_upd.expected_output}\n"
-                                f"Dependencies: {st_upd.dependencies}\n\n"
+                                f"\n{upd_header}\n"
+                                f"{trans('agent.planner.ui.expected_output')} {st_upd.expected_output}\n"
+                                f"{trans('agent.planner.ui.dependencies')} {st_upd.dependencies}\n\n"
                             )
                         await self._emit_text(ctx, "\n".join(lines), agent_name=refine_label)
 
-        await self._emit_text(ctx, "\n\n`Plan execution finished.`", agent_name=execute_label)
-        return FinalEvent(result=last_answer or "Plan finished.")
+        await self._emit_text(ctx, f"\n\n`{trans('agent.planner.ui.plan_execution_finished')}`", agent_name=execute_label)
+        return FinalEvent(result=last_answer or trans("agent.planner.ui.plan_finished"))

pygpt_net/provider/agents/openai/agent_planner.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.27 14:40:00                  #
+# Updated Date: 2025.09.27 17:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -293,21 +293,22 @@ Overall Task: {task}
     ) -> str:
         if step == "subtask":
             if index and total:
-                base = f"Sub-task {index}/{total}"
+                base = trans("agent.planner.label.subtask.index_total").format(index=index, total=total)
             elif index:
-                base = f"Sub-task {index}"
+                base = trans("agent.planner.label.subtask.index").format(index=index)
             else:
-                base = "Sub-task"
-            return f"{base}: {subtask_name}" if subtask_name else base
+                base = trans("agent.planner.label.subtask")
+            return trans("agent.planner.label.with_name").format(base=base, name=subtask_name) if subtask_name else base
         if step == "refine":
             if index and total:
-                return f"Refine {index}/{total}"
-            return "Refine" if not index else f"Refine {index}"
+                return trans("agent.planner.label.refine.index_total").format(index=index, total=total)
+            return trans("agent.planner.label.refine.index").format(index=index) if index else trans(
+                "agent.planner.label.refine")
         if step in {"make_plan", "plan"}:
-            return "Plan"
+            return trans("agent.planner.label.plan")
         if step in {"execute", "execute_plan"}:
-            return "Execute"
-        return step or "Step"
+            return trans("agent.planner.label.execute")
+        return trans("agent.planner.label.step")
 
     def prepare_model(
             self,
@@ -335,14 +336,16 @@ Overall Task: {task}
         """
         context = kwargs.get("context", BridgeContext())
         preset = context.preset
-        # Keep a stable display name; fallback to 'Executor' if no preset
-        agent_name = (preset.name if preset and getattr(preset, "name", None) else "Executor")
+        # Keep a stable display name; fallback to translated 'Executor' if no preset
+        agent_name = (
+            preset.name if preset and getattr(preset, "name", None) else trans("agent.planner.display.executor"))
         model = kwargs.get("model", ModelItem())
         tools = kwargs.get("function_tools", [])
         handoffs = kwargs.get("handoffs", [])
 
-        # Use internal default prompt, not options
-        base_instructions = self.PROMPT
+        # Use prompt from options if provided; fallback to internal default.
+        step_prompt = self.get_option(preset, "step", "prompt") if preset else None
+        base_instructions = step_prompt or self.PROMPT
 
         allow_local_tools = bool(kwargs.get("allow_local_tools", False))
         allow_remote_tools = bool(kwargs.get("allow_remote_tools", False))
@@ -564,12 +567,13 @@ Overall Task: {task}
             ])
 
         # Present current plan as a dedicated step
-        plan_lines = ["`Current plan:`"]
+        plan_lines = [f"`{trans('agent.planner.ui.current_plan')}`"]
         for i, st in enumerate(plan_obj.sub_tasks, 1):
+            header = trans("agent.planner.ui.subtask_header.one").format(index=i, name=st.name)
             plan_lines.append(
-                f"\n**===== Sub Task {i}: {st.name} =====**\n"
-                f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n\n"
+                f"\n{header}\n"
+                f"{trans('agent.planner.ui.expected_output')} {st.expected_output}\n"
+                f"{trans('agent.planner.ui.dependencies')} {st.dependencies}\n\n"
             )
         plan_text = "\n".join(plan_lines)
 
@@ -616,16 +620,19 @@ Overall Task: {task}
 
             # UI header for the sub-task
             subtask_label = self._agent_label("subtask", index=i + 1, total=total, subtask_name=st.name)
-            header = (
-                f"\n\n**===== Sub Task {i + 1}/{total}: {st.name} =====**\n"
-                f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n\n"
+            header = trans("agent.planner.ui.subtask_header.progress").format(
+                index=i + 1, total=total, name=st.name
+            )
+            header_block = (
+                f"\n\n{header}\n"
+                f"{trans('agent.planner.ui.expected_output')} {st.expected_output}\n"
+                f"{trans('agent.planner.ui.dependencies')} {st.dependencies}\n\n"
             )
 
             # Compose sub-task prompt and open a new persisted step
             composed_prompt = self._compose_subtask_prompt(st, completed)
             ctx.set_agent_name(subtask_label)
-            ctx.stream = header
+            ctx.stream = header_block
             bridge.on_step(ctx, False)  # open a new step block
 
             exec_kwargs = dict(common_kwargs)
@@ -642,7 +649,7 @@ Overall Task: {task}
                     sub_rid = getattr(result, "last_response_id", "") or ""
                     sub_answer = str(getattr(result, "final_output", "") or "")
                 except Exception as ex:
-                    sub_answer = f"Sub-task failed: {ex}"
+                    sub_answer = trans("agent.planner.ui.subtask_failed").format(error=ex)
 
                 if sub_answer:
                     ctx.stream = sub_answer
@@ -674,7 +681,7 @@ Overall Task: {task}
                 ctx = bridge.on_next_ctx(
                     ctx=ctx,
                     input="",
-                    output=sub_answer if sub_answer else header.strip(),
+                    output=sub_answer if sub_answer else header_block.strip(),
                     response_id=sub_rid,
                     finish=(is_last_subtask and not will_refine),
                     stream=stream,
@@ -695,7 +702,7 @@ Overall Task: {task}
                 refine_label = self._agent_label("refine", index=i, total=len(plan_sub_tasks))
 
                 # Start refine step
-                refine_display = "\n`Refining remaining plan...`"
+                refine_display = f"\n`{trans('agent.planner.ui.refining_remaining_plan')}`"
                 ctx.set_agent_name(refine_label)
                 ctx.stream = refine_display
                 bridge.on_step(ctx, False)
@@ -730,8 +737,8 @@ Overall Task: {task}
                     refinement = None
 
                 if refinement is None:
-                    refine_display += "\n`Refine step failed to parse; continuing without changes.`"
-                    ctx.stream = "\n`Refine step failed to parse; continuing without changes.`"
+                    refine_display += f"\n`{trans('agent.planner.ui.refine_failed_parse')}`"
+                    ctx.stream = f"\n`{trans('agent.planner.ui.refine_failed_parse')}`"
                     bridge.on_step(ctx, True)
                     # finalize refine step
                     if use_partial_ctx:
@@ -749,7 +756,7 @@ Overall Task: {task}
 
                 if getattr(refinement, "is_done", False):
                     reason = getattr(refinement, "reason", "") or "Planner judged the task as satisfied."
-                    done_msg = f"\n`Planner marked the plan as complete: {reason}`"
+                    done_msg = f"\n`{trans('agent.planner.ui.plan_marked_complete').format(reason=reason)}`"
                     refine_display += done_msg
                     ctx.stream = done_msg
                     bridge.on_step(ctx, True)
@@ -777,12 +784,15 @@ Overall Task: {task}
                     if new_remaining_repr.strip() != current_remaining_repr.strip():
                         plan_sub_tasks = plan_sub_tasks[:i] + new_remaining
                         # Present the updated tail of the plan
-                        lines = ["`Updated remaining plan:`"]
+                        lines = [f"`{trans('agent.planner.ui.updated_remaining_plan')}`"]
                         for k, st_upd in enumerate(new_remaining, i + 1):
+                            upd_header = trans("agent.planner.ui.subtask_header.progress").format(
+                                index=k, total=len(plan_sub_tasks), name=st_upd.name
+                            )
                             lines.append(
-                                f"\n**===== Sub Task {k}/{len(plan_sub_tasks)}: {st_upd.name} =====**\n"
-                                f"Expected output: {st_upd.expected_output}\n"
-                                f"Dependencies: {st_upd.dependencies}\n\n"
+                                f"\n{upd_header}\n"
+                                f"{trans('agent.planner.ui.expected_output')} {st_upd.expected_output}\n"
+                                f"{trans('agent.planner.ui.dependencies')} {st_upd.dependencies}\n\n"
                             )
                         upd_text = "\n".join(lines)
                         refine_display += "\n" + upd_text
@@ -803,7 +813,7 @@ Overall Task: {task}
                     bridge.on_next(ctx)
 
         # Return last answer (final block already closed in the loop)
-        return ctx, (last_answer or "Plan finished."), (response_id or "")
+        return ctx, (last_answer or trans("agent.planner.ui.plan_finished")), (response_id or "")
 
     def get_options(self) -> Dict[str, Any]:
         """
@@ -811,7 +821,19 @@ Overall Task: {task}
 
         :return: dict of options
         """
+        # step model -> from globals
         return {
+            "step": {
+                "label": trans("agent.planner.step.label"),
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": trans("agent.option.prompt"),
+                        "description": trans("agent.planner.step.prompt.desc"),
+                        "default": self.PROMPT,
+                    },
+                }
+            },
             "planner": {
                 "label": trans("agent.option.section.planner"),
                 "options": {
@@ -842,7 +864,7 @@ Overall Task: {task}
                 }
             },
             "refine": {
-                "label": trans("agent.option.section.refine"),
+                "label": trans("agent.planner.refine.label"),
                 "options": {
                     "model": {
                         "label": trans("agent.option.model"),

pygpt_net/provider/agents/openai/evolve.py

@@ -330,7 +330,6 @@ class Agent(BaseAgent):
                 choose_query = self.make_choose_query(results)
                 choose_items.append(choose_query)
 
-                ctx.set_agent_name(chooser.name)
                 chooser_result = await Runner.run(chooser, choose_items)
                 result: ChooseFeedback = chooser_result.final_output
                 choose = result.answer_number
@@ -348,7 +347,6 @@ class Agent(BaseAgent):
                     bridge.on_stop(ctx)
                     break
 
-                ctx.set_agent_name(evaluator.name)
                 evaluator_result = await Runner.run(evaluator, input_items)
                 result: EvaluationFeedback = evaluator_result.final_output
 
@@ -443,7 +441,6 @@ class Agent(BaseAgent):
                 window.core.api.openai.responses.unpack_agent_response(results[choose], ctx)
                 input_items = results[choose].to_input_list()
 
-                ctx.set_agent_name(evaluator.name)
                 evaluator_result = await Runner.run(evaluator, input_items)
                 result: EvaluationFeedback = evaluator_result.final_output
 

pygpt_net/provider/api/google/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.17 05:00:00                  #
+# Updated Date: 2025.09.14 00:00:00                  #
 # ================================================== #
 
 import os
@@ -33,6 +33,7 @@ from .audio import Audio
 from .image import Image
 from .realtime import Realtime
 from .video import Video
+from .music import Music
 
 class ApiGoogle:
     def __init__(self, window=None):
@@ -49,6 +50,7 @@ class ApiGoogle:
         self.image = Image(window)
         self.realtime = Realtime(window)
         self.video = Video(window)
+        self.music = Music(window)
         self.client: Optional[genai.Client] = None
         self.locked = False
         self.last_client_args: Optional[Dict[str, Any]] = None
@@ -135,10 +137,14 @@ class ApiGoogle:
                 self.vision.append_images(ctx)
 
         elif mode == MODE_IMAGE:
+            # Route to video / music / image based on selected model.
             if context.model.is_video_output():
                 return self.video.generate(context=context, extra=extra)  # veo, etc.
-            else:
-                return self.image.generate(context=context, extra=extra) # imagen, etc.
+            # Lyria / music models
+            if self.music.is_music_model(model.id if model else ""):
+                return self.music.generate(context=context, extra=extra)   # lyria, etc.
+            # Default: image
+            return self.image.generate(context=context, extra=extra)       # imagen, etc.
 
         elif mode == MODE_ASSISTANT:
             return False  # not implemented for Google

pygpt_net/provider/api/google/image.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.29 20:40:00                  #
+# Updated Date: 2025.09.14 00:00:00                  #
 # ================================================== #
 
 import mimetypes
@@ -45,6 +45,16 @@ class Image:
         :param sync: run synchronously (blocking) if True
         :return: True if started
         """
+        # Music fast-path: delegate to Music flow if a music model is selected (e.g., Lyria).
+        # This keeps image flow unchanged while enabling music in the same "image" mode.
+        try:
+            model_id = (context.model.id if context and context.model else "") or ""
+            if self.window and hasattr(self.window.core.api.google, "music"):
+                if self.window.core.api.google.music.is_music_model(model_id):
+                    return self.window.core.api.google.music.generate(context=context, extra=extra, sync=sync)
+        except Exception:
+            pass
+
         extra = extra or {}
         ctx = context.ctx or CtxItem()
         model = context.model