jaf-py 2.4.2__tar.gz → 2.4.4__tar.gz

{jaf_py-2.4.2 → jaf_py-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.4.2
+Version: 2.4.4
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors

{jaf_py-2.4.2 → jaf_py-2.4.4}/jaf/core/engine.py

@@ -174,16 +174,18 @@ async def run(
         from .agent_tool import set_current_run_config
         set_current_run_config(config)
         
+        state_with_memory = await _load_conversation_history(initial_state, config)
+        
+        # Emit RunStartEvent AFTER loading conversation history so we have complete context
         if config.on_event:
             config.on_event(RunStartEvent(data=to_event_data(RunStartEventData(
                 run_id=initial_state.run_id,
                 trace_id=initial_state.trace_id,
                 session_id=config.conversation_id,
-                context=initial_state.context,
-                messages=initial_state.messages
+                context=state_with_memory.context,
+                messages=state_with_memory.messages,  # Now includes full conversation history
+                agent_name=state_with_memory.current_agent_name
             ))))
-
-        state_with_memory = await _load_conversation_history(initial_state, config)
         
         # Load approvals from storage if configured
         if config.approval_storage:

{jaf_py-2.4.2 → jaf_py-2.4.4}/jaf/core/tracing.py

@@ -419,11 +419,24 @@ class LangfuseTraceCollector:
                     for i in range(len(messages) - 1, -1, -1):
                         msg = messages[i]
                         
+                        # Extract message data comprehensively
+                        msg_data = {}
+                        
                         if isinstance(msg, dict):
                             role = msg.get("role")
                             content = msg.get("content", "")
+                            # Capture all additional fields from dict messages
+                            msg_data = {
+                                "role": role,
+                                "content": content,
+                                "tool_calls": msg.get("tool_calls"),
+                                "tool_call_id": msg.get("tool_call_id"),
+                                "name": msg.get("name"),
+                                "function_call": msg.get("function_call"),
+                                "timestamp": msg.get("timestamp", datetime.now().isoformat())
+                            }
                         elif hasattr(msg, 'role'):
-                            role = msg.role
+                            role = getattr(msg, 'role', None)
                             content = getattr(msg, 'content', "")
                             # Handle both string content and complex content structures
                             if not isinstance(content, str):
@@ -436,9 +449,25 @@ class LangfuseTraceCollector:
                                         content = str(content)
                                 else:
                                     content = str(content)
+                            
+                            # Capture all additional fields from object messages
+                            msg_data = {
+                                "role": role,
+                                "content": content,
+                                "tool_calls": getattr(msg, 'tool_calls', None),
+                                "tool_call_id": getattr(msg, 'tool_call_id', None),
+                                "name": getattr(msg, 'name', None),
+                                "function_call": getattr(msg, 'function_call', None),
+                                "timestamp": getattr(msg, 'timestamp', datetime.now().isoformat())
+                            }
                         else:
+                            # Handle messages that don't have expected structure
+                            print(f"[LANGFUSE DEBUG] Skipping message with unexpected structure: {type(msg)}")
                             continue
                         
+                        # Clean up None values from msg_data
+                        msg_data = {k: v for k, v in msg_data.items() if v is not None}
+                        
                         # If we haven't found the current user message yet and this is a user message
                         if not current_user_message_found and (role == "user" or role == 'user'):
                             user_query = content
@@ -446,15 +475,29 @@ class LangfuseTraceCollector:
                             print(f"[LANGFUSE DEBUG] Found current user query: {user_query}")
                         elif current_user_message_found:
                             # Add to conversation history (excluding the current user message)
-                            conversation_history.insert(0, {
-                                "role": role,
-                                "content": content,
-                                "timestamp": datetime.now().isoformat() if not hasattr(msg, 'timestamp') else getattr(msg, 'timestamp', datetime.now().isoformat())
-                            })
+                            # Include ALL message types: assistant, tool, system, function, etc.
+                            conversation_history.insert(0, msg_data)
+                            print(f"[LANGFUSE DEBUG] Added to conversation history: role={role}, content_length={len(str(content))}, has_tool_calls={bool(msg_data.get('tool_calls'))}")
                 
                 print(f"[LANGFUSE DEBUG] Final extracted - user_query: {user_query}, user_id: {user_id}")
                 print(f"[LANGFUSE DEBUG] Conversation history length: {len(conversation_history)}")
                 
+                # Debug: Log the roles and types captured in conversation history
+                if conversation_history:
+                    roles_summary = {}
+                    for msg in conversation_history:
+                        role = msg.get("role", "unknown")
+                        roles_summary[role] = roles_summary.get(role, 0) + 1
+                    print(f"[LANGFUSE DEBUG] Conversation history roles breakdown: {roles_summary}")
+                    
+                    # Log first few messages for verification
+                    for i, msg in enumerate(conversation_history[:3]):
+                        role = msg.get("role", "unknown")
+                        content_preview = str(msg.get("content", ""))[:100]
+                        has_tool_calls = bool(msg.get("tool_calls"))
+                        has_tool_call_id = bool(msg.get("tool_call_id"))
+                        print(f"[LANGFUSE DEBUG] History msg {i}: role={role}, content='{content_preview}...', tool_calls={has_tool_calls}, tool_call_id={has_tool_call_id}")
+                
                 # Create comprehensive input data for the trace
                 trace_input = {
                     "user_query": user_query,
@@ -495,6 +538,7 @@ class LangfuseTraceCollector:
                     print(f"[LANGFUSE] Ending trace for run: {trace_id}")
                     
                     # Update the trace metadata with final tool calls and results
+                    conversation_history = getattr(self.trace_spans[trace_id], '_conversation_history', [])
                     final_metadata = {
                         "framework": "jaf",
                         "event_type": "run_end",
@@ -502,7 +546,7 @@ class LangfuseTraceCollector:
                         "user_query": getattr(self.trace_spans[trace_id], '_user_query', None),
                         "user_id": getattr(self.trace_spans[trace_id], '_user_id', None),
                         "agent_name": event.data.get("agent_name", "analytics_agent_jaf"),
-                        "conversation_history": getattr(self.trace_spans[trace_id], '_conversation_history', []),
+                        "conversation_history": conversation_history,
                         "tool_calls": self.trace_tool_calls.get(trace_id, []),
                         "tool_results": self.trace_tool_results.get(trace_id, [])
                     }

{jaf_py-2.4.2 → jaf_py-2.4.4}/jaf/core/types.py

@@ -490,6 +490,7 @@ class RunStartEventData:
     session_id: Optional[str] = None
     context: Optional[Any] = None
     messages: Optional[List[Message]] = None
+    agent_name: Optional[str] = None
 
 @dataclass(frozen=True)
 class RunStartEvent:

{jaf_py-2.4.2 → jaf_py-2.4.4}/jaf/memory/providers/postgres.py

@@ -261,16 +261,22 @@ async def create_postgres_provider(config: PostgresConfig) -> Result[PostgresPro
             # but we can continue and hope the database already exists.
             print(f"Could not ensure database exists: {e}")
 
-        # Now connect to the target database
+        # Now connect to the target database using connection pool with max_connections
         if config.connection_string:
-            client = await asyncpg.connect(dsn=config.connection_string)
+            client = await asyncpg.create_pool(
+                dsn=config.connection_string,
+                min_size=1,
+                max_size=config.max_connections
+            )
         else:
-            client = await asyncpg.connect(
+            client = await asyncpg.create_pool(
                 host=config.host,
                 port=config.port,
                 user=config.username,
                 password=config.password,
-                database=config.database
+                database=config.database,
+                min_size=1,
+                max_size=config.max_connections
             )
 
         table_name = config.table_name or "conversations"

{jaf_py-2.4.2 → jaf_py-2.4.4}/jaf_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.4.2
+Version: 2.4.4
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors

{jaf_py-2.4.2 → jaf_py-2.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jaf-py"
-version = "2.4.2"
+version = "2.4.4"
 description = "A purely functional agent framework with immutable state and composable tools - Python implementation"
 readme = "README.md"
 license = "MIT"