fix: shell_exec tools (#33)

* fix: add lib folder and remove from gitignore

* refactor: streamline backend structure and enhance logging

- Removed commented-out code and unnecessary imports in main.py for clarity.
- Updated logging levels from info to debug in agent.py and panda_agi_client.py for more granular logging.
- Refactored token_processor.py to improve error handling and streamline token processing logic.
- Introduced ShellOutput model in shell_ops.py to standardize command execution results and improve error reporting.
- Updated shell command functions to return ShellOutput, enhancing consistency across shell operations.
- Cleaned up event handling in shell tools to remove commented-out event logging.

* fix: python code execution in execute_script

* fix: remove 'Z' suffix from timestamp generation

- Modified the timestamp generation in panda_agi/client/agent.py at line 522 by removing the 'Z' suffix. Changed 'end_timestamp = datetime.now().isoformat() + "Z"' to 'end_timestamp = datetime.now().isoformat()'.

* fix: Removed JSONDecodeError

---------

Co-authored-by: ArslanSaleem <khan.arslan38@gmail.com>
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

Author: 3 people

examples/ui/backend/main.py

@@ -5,44 +5,16 @@
 import logging
 import os
 import sys
+
 from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from panda_agi.envs.e2b_env import E2BEnv
-import asyncio
+from middleware.auth import AuthMiddleware
+from routes import agent, auth, conversation, files, health
 
 # Load environment variables from .env file
 load_dotenv()
 
-
-# sandbox = E2BEnv.get_active_sandbox(
-#     {"conversation_id": "92e5bbdc-c102-45dc-a7df-4fe8e9ef0b5c"}
-# )
-# env = E2BEnv("/workspace", timeout=100, sandbox=sandbox)
-
-# print(
-#     "list_files::: -> ",
-#     asyncio.run(env.path_exists("/images/artistic_panda_portrait.png")),
-# )
-
-# Await the async list_files call using asyncio.run
-# print(
-#     "list_files::: -> ",
-#     asyncio.run(env.mkdir("/workspace/test1", parents=True, exist_ok=True)),
-# )
-
-# print("list_files::: -> ", asyncio.run(env.list_files("/workspace", recursive=True)))
-
-
-# # Add parent directory to path for imports
-# sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
-
-# Import routes
-from routes import agent, auth, conversation, files, health
-
-# Import middleware
-from middleware.auth import AuthMiddleware
-
 # Configure logging with more explicit settings
 logging.basicConfig(
     level=logging.DEBUG,

examples/ui/backend/services/chat_env.py

@@ -1,8 +1,8 @@
-from e2b.api.client.models import sandbox
+import os
+from typing import Any, Dict, Optional
+
 from panda_agi.envs import E2BEnv
 from panda_agi.envs.local_env import LocalEnv
-import os
-from typing import Dict, Any, Optional
 
 WORKSPACE_PATH = os.getenv("WORKSPACE_PATH", "./workspace")
 

panda_agi/client/agent.py

@@ -347,7 +347,7 @@ async def run_stream(
                     token_stream
                 ):
                     if processed_event.get("type") == "conversation_id":
-                        logger.info(
+                        logger.debug(
                             f"Received conversation_id: {processed_event.get('conversation_id')}"
                         )
                         self.conversation_id = processed_event.get("conversation_id")
@@ -519,7 +519,7 @@ async def _handle_tool_execution(
             result = await handler.execute(arguments)
 
             # Generate timestamp for tool end
-            end_timestamp = datetime.utcnow().isoformat() + "Z"
+            end_timestamp = datetime.now().isoformat()
 
             # Yield tool end event or error event
             if result.success:
@@ -636,7 +636,7 @@ async def _execute_collected_tools_and_yield_events(
                 result = await handler.execute(arguments)
 
                 # Generate timestamp for tool end
-                end_timestamp = datetime.utcnow().isoformat() + "Z"
+                end_timestamp = datetime.now().isoformat() + "Z"
 
                 if result.success:
                     yield {

panda_agi/client/panda_agi_client.py

@@ -115,7 +115,7 @@ async def send_streaming_request(
                     # check if chunk is conversation_id
                     if self.is_chunk_conversation_id(chunk):
                         self.conversation_id = self._extract_conversation_id(chunk)
-                        logger.info(
+                        logger.debug(
                             f"[HTTP] Received conversation_id: {self.conversation_id}"
                         )
                         yield {

panda_agi/client/token_processor.py

@@ -66,62 +66,15 @@ async def process_token_stream(
                         )
                     )
 
-                # Try to parse JSON if the token looks like JSON
                 try:
-                    token_data = json.loads(token)
-
-                    # Extract content if it's a structured response
-                    if isinstance(token_data, dict):
-                        content = self._extract_content(token_data)
-                        if content:
-                            self.accumulated_content += content
-                            self.xml_buffer += content
-
-                            # Check for XML tool calls in the buffer and yield tool events
-                            async for (
-                                tool_event
-                            ) in self._process_xml_tools_and_yield_events(content):
-                                logger.info(f"Yielding XML tool call: {tool_event}")
-                                yield tool_event
-
-                        # Yield structured event
-                        yield {
-                            "type": "token",
-                            "raw_token": token,
-                            "parsed_data": token_data,
-                            "content": content,
-                            "accumulated_content": self.accumulated_content,
-                        }
-                    else:
-                        # Handle non-dict JSON data
-                        self.accumulated_content += str(token_data)
-                        self.xml_buffer += str(token_data)
-
-                        # Check for XML tool calls and yield tool events
-                        async for (
-                            tool_event
-                        ) in self._process_xml_tools_and_yield_events(str(token_data)):
-                            logger.info(f"Yielding XML tool call: {tool_event}")
-                            yield tool_event
-
-                        yield {
-                            "type": "token",
-                            "raw_token": token,
-                            "parsed_data": token_data,
-                            "content": str(token_data),
-                            "accumulated_content": self.accumulated_content,
-                        }
-
-                except json.JSONDecodeError:
-                    # Handle plain text tokens
                     self.accumulated_content += token
                     self.xml_buffer += token
 
                     # Check for XML tool calls and yield tool events
                     async for tool_event in self._process_xml_tools_and_yield_events(
                         token
                     ):
-                        logger.info(f"Yielding XML tool call: {tool_event}")
+                        logger.debug(f"Yielding XML tool call: {tool_event}")
                         yield tool_event
 
                     yield {
@@ -132,6 +85,9 @@ async def process_token_stream(
                         "accumulated_content": self.accumulated_content,
                     }
 
+                except Exception as e:
+                    logger.error(f"Error processing token: {e}")
+
         except Exception as e:
             logger.error(f"Error processing token stream: {e}")
             raise e

panda_agi/envs/e2b_env.py

@@ -3,8 +3,8 @@
 from typing import Any, Dict, List, Optional, Union
 
 try:
-    from e2b.sandbox_sync.sandbox_api import SandboxQuery
     from e2b.sandbox.filesystem.filesystem import FileType
+    from e2b.sandbox_sync.sandbox_api import SandboxQuery
     from e2b_code_interpreter import Sandbox
 except ImportError:
     Sandbox = None

panda_agi/tools/base.py

@@ -77,18 +77,10 @@ def validate_input(self, params: Dict[str, Any]) -> Optional[str]:
     async def send_response(self, msg_id: str, result: ToolResult) -> None:
         """Send standardized response message"""
 
-        if (
-            not self.agent
-            or not self.agent.client
-            or not self.agent.client.is_connected
-        ):
+        if not self.agent or not self.agent.client:
             self.logger.warning("Cannot send response: agent not connected")
             return
 
-        # For HTTP-based communication, we'll handle responses differently
-        # This method is kept for backward compatibility but may need to be updated
-        # based on the new HTTP streaming architecture
-
         try:
             # Log the result for now - in HTTP streaming, tool results are handled differently
             self.logger.info(f"Tool result for {self.__class__.__name__}: {result}")