agentic-blocks 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

agentic_blocks/agent.py

@@ -3,19 +3,10 @@ from agentic_blocks.utils.tools_utils import (
     create_tool_registry,
     execute_pending_tool_calls,
 )
+from agentic_blocks.utils.logger import get_logger
 from agentic_blocks import call_llm, Messages
-from rich.panel import Panel
-from rich.box import HEAVY
-from rich.console import Console
-from rich.console import Group
-
-console = Console(
-    style="black on bright_white",
-    force_terminal=True,
-    width=None,
-    legacy_windows=False,
-    color_system="truecolor",
-)
+
+logger = get_logger(__name__)
 
 
 class Agent:
@@ -23,7 +14,6 @@ class Agent:
         self.system_prompt = system_prompt
         self.tools = tools
         self.tool_registry = create_tool_registry(tools)
-        self.panels = []
 
         # Create nodes
         self.llm_node = self._create_llm_node()
@@ -49,7 +39,12 @@ class Agent:
                 return messages
 
             def exec(self, messages) -> Messages:
+                latest_message = messages.get_messages()[-1]
+                if latest_message["role"] == "user":
+                    logger.info(f'message: "{latest_message["content"]}"')
+
                 response = call_llm(messages=messages, tools=self.tools)
+                # logger.info(f'response: "{response["content"] or "tool_calls"}"')
                 messages.add_response_message(response)
                 return messages
 
@@ -63,30 +58,19 @@ class Agent:
 
     def _create_tool_node(self):
         class ToolNode(Node):
-            def __init__(self, tool_registry, agent):
+            def __init__(self, tool_registry):
                 super().__init__()
                 self.tool_registry = tool_registry
-                self.agent = agent
 
             def prep(self, shared):
                 return shared["messages"]
 
-            def exec(self, messages) -> Messages:
-                tool_calls = messages.get_pending_tool_calls()[0]
-                tool_name = tool_calls["tool_name"]
-                tool_arguments = tool_calls["arguments"]
-
-                # Format arguments nicely
-                if isinstance(tool_arguments, dict):
-                    args_str = ", ".join(
-                        [f"{k}={v}" for k, v in tool_arguments.items()]
+            def exec(self, messages: Messages) -> Messages:
+                tool_calls = messages.get_pending_tool_calls()
+                for tool_call in tool_calls:
+                    logger.info(
+                        f'tool_call: "{tool_call["tool_name"]}({tool_call["arguments"]})"'
                     )
-                    formatted_call = f"{tool_name}({args_str})"
-                else:
-                    formatted_call = f"{tool_name}({tool_arguments})"
-
-                tool_panel = self.agent.create_panel(formatted_call, "Tool Calls")
-                self.agent.panels.append(tool_panel)
 
                 tool_responses = execute_pending_tool_calls(
                     messages, self.tool_registry
@@ -97,7 +81,7 @@ class Agent:
             def post(self, shared, prep_res, messages):
                 return "llm_node"
 
-        return ToolNode(self.tool_registry, self)
+        return ToolNode(self.tool_registry)
 
     def _create_answer_node(self):
         class AnswerNode(Node):
@@ -110,6 +94,7 @@ class Agent:
 
     def invoke(self, user_prompt: str) -> str:
         messages = Messages(user_prompt=user_prompt)
+        logger.info(f'message: "{user_prompt}"')
         if self.system_prompt:
             messages.add_system_message(self.system_prompt)
 
@@ -117,29 +102,3 @@ class Agent:
         self.flow.run(shared)
 
         return shared["answer"]
-
-    def print_response(self, user_prompt: str, stream: bool = False):
-        # Reset panels and start with message
-        self.panels = []
-        message_panel = self.create_panel(user_prompt, "Message")
-        self.panels.append(message_panel)
-
-        # Always collect all panels first
-        response = self.invoke(user_prompt)
-        response_panel = self.create_panel(response, "Response")
-        self.panels.append(response_panel)
-
-        # Print all panels as a group (no gaps)
-        panel_group = Group(*self.panel)
-        console.print(panel_group)
-
-    def create_panel(self, content, title, border_style="blue"):
-        return Panel(
-            content,
-            title=title,
-            title_align="left",
-            border_style=border_style,
-            box=HEAVY,
-            expand=True,  # Full terminal width
-            padding=(1, 1),  # Internal padding
-        )

agentic_blocks/agent_rich.py

@@ -0,0 +1,169 @@
+from pocketflow import Node, Flow
+from agentic_blocks.utils.tools_utils import (
+    create_tool_registry,
+    execute_pending_tool_calls,
+)
+from agentic_blocks import call_llm, Messages
+
+
+from rich.console import Group, Console
+from rich.json import JSON
+from rich.live import Live
+from rich.markdown import Markdown
+from rich.status import Status
+from rich.text import Text
+from rich.box import HEAVY
+from rich.panel import Panel
+from agentic_blocks.utils.rich_logger import print_response
+
+
+class Agent:
+    def __init__(self, system_prompt: str, tools: list):
+        self.system_prompt = system_prompt
+        self.tools = tools
+        self.tool_registry = create_tool_registry(tools)
+        self.panels = []
+
+        # Create nodes
+        self.llm_node = self._create_llm_node()
+        self.tool_node = self._create_tool_node()
+        self.answer_node = self._create_answer_node()
+
+        # Set up flow
+        self.llm_node - "tool_node" >> self.tool_node
+        self.tool_node - "llm_node" >> self.llm_node
+        self.llm_node - "answer_node" >> self.answer_node
+
+        self.flow = Flow(self.llm_node)
+
+    def _create_llm_node(self):
+        class LLMNode(Node):
+            def __init__(self, system_prompt, tools):
+                super().__init__()
+                self.system_prompt = system_prompt
+                self.tools = tools
+
+            def prep(self, shared):
+                messages = shared["messages"]
+                return messages
+
+            def exec(self, messages) -> Messages:
+                response = call_llm(messages=messages, tools=self.tools)
+                messages.add_response_message(response)
+                return messages
+
+            def post(self, shared, prep_res, messages):
+                if messages.has_pending_tool_calls():
+                    return "tool_node"
+                else:
+                    return "answer_node"
+
+        return LLMNode(self.system_prompt, self.tools)
+
+    def _create_tool_node(self):
+        class ToolNode(Node):
+            def __init__(self, tool_registry, agent):
+                super().__init__()
+                self.tool_registry = tool_registry
+                self.agent = agent
+
+            def prep(self, shared):
+                return shared["messages"]
+
+            def exec(self, messages) -> Messages:
+                tool_calls = messages.get_pending_tool_calls()[0]
+                tool_name = tool_calls["tool_name"]
+                tool_arguments = tool_calls["arguments"]
+
+                # Format arguments nicely
+                if isinstance(tool_arguments, dict):
+                    args_str = ", ".join(
+                        [f"{k}={v}" for k, v in tool_arguments.items()]
+                    )
+                    formatted_call = f"{tool_name}({args_str})"
+                else:
+                    formatted_call = f"{tool_name}({tool_arguments})"
+
+                tool_panel = self.agent.create_panel(formatted_call, "Tool Calls")
+                self.agent.panels.append(tool_panel)
+
+                self.agent.live_log.update(Group(*self.agent.panels))
+                self.agent.live_log.refresh()
+
+                tool_responses = execute_pending_tool_calls(
+                    messages, self.tool_registry
+                )
+                messages.add_tool_responses(tool_responses)
+                return messages
+
+            def post(self, shared, prep_res, messages):
+                return "llm_node"
+
+        return ToolNode(self.tool_registry, self)
+
+    def _create_answer_node(self):
+        class AnswerNode(Node):
+            def prep(self, shared):
+                messages = shared["messages"]
+                shared["answer"] = messages.get_messages()[-1]["content"]
+                return messages
+
+        return AnswerNode()
+
+    def invoke(self, user_prompt: str) -> str:
+        messages = Messages(user_prompt=user_prompt)
+        if self.system_prompt:
+            messages.add_system_message(self.system_prompt)
+
+        shared = {"messages": messages}
+        self.flow.run(shared)
+
+        return shared["answer"]
+
+    def create_panel(self, content, title, border_style="blue"):
+        return Panel(
+            content,
+            title=title,
+            title_align="left",
+            border_style=border_style,
+            box=HEAVY,
+            expand=True,
+            padding=(1, 1),
+        )
+
+    def print_response(self, user_prompt: str):
+        messages = Messages(user_prompt=user_prompt)
+        if self.system_prompt:
+            messages.add_system_message(self.system_prompt)
+
+        shared = {"messages": messages}
+
+        with Live(console=Console(), auto_refresh=False) as self.live_log:
+            status = Status("Thinking...", spinner="aesthetic", speed=0.4)
+            self.live_log.update(status)
+            self.live_log.refresh()  # Explicit refresh for Jupyter
+
+            self.panels = [status]
+
+            message_panel = self.create_panel(
+                content=Text(user_prompt, style="green"),
+                title="Message",
+                border_style="cyan",
+            )
+
+            self.panels.append(message_panel)
+            self.live_log.update(Group(*self.panels))
+            self.live_log.refresh()
+
+            self.flow.run(shared)
+            response = shared["answer"]
+
+            response_panel = self.create_panel(
+                content=Text(response, style="bold blue"),
+                title="Response",
+                border_style="green",
+            )
+
+            self.panels.append(response_panel)
+            self.live_log.update(Group(*self.panels))
+            self.live_log.refresh()

agentic_blocks/utils/logger.py

@@ -0,0 +1,14 @@
+import logging
+
+# Auto-configure logging when module is imported
+logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
+
+# Suppress HTTP request logs
+logging.getLogger("openai").setLevel(logging.WARNING)
+logging.getLogger("httpx").setLevel(logging.WARNING)
+logging.getLogger("urllib3").setLevel(logging.WARNING)
+
+
+def get_logger(name):
+    """Get a logger with the given name."""
+    return logging.getLogger(name)

agentic_blocks/utils/rich_logger.py

@@ -0,0 +1,59 @@
+import time
+from rich.console import Group, Console
+from rich.json import JSON
+from rich.live import Live
+from rich.markdown import Markdown
+from rich.status import Status
+from rich.text import Text
+from rich.box import HEAVY
+from rich.panel import Panel
+
+# Create a console instance for Jupyter
+
+
+def create_panel(content, title, border_style="blue"):
+    return Panel(
+        content,
+        title=title,
+        title_align="left",
+        border_style=border_style,
+        box=HEAVY,
+        expand=True,
+        padding=(1, 1),
+    )
+
+
+def print_response(user_prompt):
+    with Live(console=Console(), auto_refresh=False) as live_log:
+        status = Status("Thinking...", spinner="aesthetic", speed=0.4)
+        live_log.update(status)
+        live_log.refresh()  # Explicit refresh for Jupyter
+
+        # Create panels
+        panels = [status]
+
+        message_panel = create_panel(
+            content=Text(user_prompt, style="green"),
+            title="Message",
+            border_style="cyan",
+        )
+
+        panels.append(message_panel)
+        live_log.update(Group(*panels))
+        live_log.refresh()  # Explicit refresh for Jupyter
+
+        # Add some delay to see the display
+
+        for i in range(3):
+            time.sleep(2)
+
+            # Add a response panel
+            response_panel = create_panel(
+                content=Text("Response: " + str(i), style="bold blue"),
+                title="Response",
+                border_style="green",
+            )
+
+            panels.append(response_panel)
+            live_log.update(Group(*panels))
+            live_log.refresh()

{agentic_blocks-0.1.24.dist-info → agentic_blocks-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.24
+Version: 0.1.25
 Summary: Simple building blocks for agentic AI systems with MCP client and conversation management
 Author-email: Magnus Bjelkenhed <bjelkenhed@gmail.com>
 License: MIT

agentic_blocks-0.1.25.dist-info/RECORD

@@ -0,0 +1,15 @@
+agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
+agentic_blocks/agent.py,sha256=gGSHHmPl3p_LguKKxUNhbCZXJV_V6MccmtfoEAC5fO4,3558
+agentic_blocks/agent_rich.py,sha256=MTMFJ1gEMd3mfj65YxSwh50yp19KZKrP40cRiJfDMdU,5639
+agentic_blocks/llm.py,sha256=9OnpOFqZ7CoOoy8DECW7gxSGtpw-76hX-NvV003TKBU,5330
+agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
+agentic_blocks/messages.py,sha256=iJEULGGFGHVp8ViE2oKykU9JVfvGKoySCDhxlHm29Lk,12014
+agentic_blocks/utils/logger.py,sha256=BblwT4Oj6YdHEYV4KtIzpKrcCiRvp_VVC1quk6GN3wo,436
+agentic_blocks/utils/rich_logger.py,sha256=TT2D9v6bLYGPMiwUvb3mMcGHeCmlvD89dSwCxwDGfMA,1612
+agentic_blocks/utils/tools_utils.py,sha256=ZX6cqvtaV_evwMUnR_uukdvEtQah6xkDMBy7jwR7tJg,7145
+agentic_blocks/visualization/visualize.py,sha256=x59lFDKXqaFlereCEhN7GWDimiNRNcb9USeRPv8YY5I,39647
+agentic_blocks-0.1.25.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
+agentic_blocks-0.1.25.dist-info/METADATA,sha256=KQes4V0dczfXrwupfrpMd7ywqN3_XEn_GlcJt_hifco,12126
+agentic_blocks-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_blocks-0.1.25.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
+agentic_blocks-0.1.25.dist-info/RECORD,,

agentic_blocks-0.1.24.dist-info/RECORD

@@ -1,12 +0,0 @@
-agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
-agentic_blocks/agent.py,sha256=KZ2dQnb4IxMK9xOMXFYIBIPofVtLmpISftn-YbSul14,4840
-agentic_blocks/llm.py,sha256=9OnpOFqZ7CoOoy8DECW7gxSGtpw-76hX-NvV003TKBU,5330
-agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
-agentic_blocks/messages.py,sha256=iJEULGGFGHVp8ViE2oKykU9JVfvGKoySCDhxlHm29Lk,12014
-agentic_blocks/utils/tools_utils.py,sha256=ZX6cqvtaV_evwMUnR_uukdvEtQah6xkDMBy7jwR7tJg,7145
-agentic_blocks/visualization/visualize.py,sha256=x59lFDKXqaFlereCEhN7GWDimiNRNcb9USeRPv8YY5I,39647
-agentic_blocks-0.1.24.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
-agentic_blocks-0.1.24.dist-info/METADATA,sha256=lNOys5YTca4ZPZmVQ2SBLYKvpBpsfSgKE3y1_5XjjG8,12126
-agentic_blocks-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_blocks-0.1.24.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
-agentic_blocks-0.1.24.dist-info/RECORD,,