jaf-py 2.5.2__py3-none-any.whl → 2.5.4__py3-none-any.whl

jaf/server/server.py

@@ -18,6 +18,7 @@ from fastapi.responses import StreamingResponse
 
 from ..core.engine import run
 from ..core.streaming import run_streaming
+from ..core.regeneration import regenerate_conversation, get_regeneration_points
 from ..core.types import (
     ApprovalValue,
     CompletedOutcome,
@@ -29,6 +30,8 @@ from ..core.types import (
     RunState,
     create_run_id,
     create_trace_id,
+    create_message_id,
+    RegenerationRequest,
 )
 from ..memory.types import MemoryConfig
 from .types import (
@@ -52,8 +55,15 @@ from .types import (
     PendingApprovalData,
     PendingApprovalsData,
     PendingApprovalsResponse,
+    RegenerationHttpRequest,
+    RegenerationData,
+    RegenerationResponse,
+    RegenerationPointData,
+    RegenerationHistoryData,
+    RegenerationHistoryResponse,
     ServerConfig,
     ToolCallInterruption,
+    validate_regeneration_request,
 )
 
 Ctx = TypeVar('Ctx')
@@ -854,4 +864,157 @@ def create_jaf_server(config: ServerConfig[Ctx]) -> FastAPI:
             }
         )
 
+    # Regeneration endpoints
+    if config.default_memory_provider:
+        @app.post("/conversations/{conversation_id}/regenerate", response_model=RegenerationResponse)
+        async def regenerate_conversation_endpoint(conversation_id: str, request: RegenerationHttpRequest):
+            """Regenerate conversation from a specific message."""
+            request_start_time = time.time()
+            
+            try:
+                # Validate agent exists
+                if request.agent_name not in config.agent_registry:
+                    return RegenerationResponse(
+                        success=False,
+                        error=f"Agent '{request.agent_name}' not found. Available agents: {', '.join(config.agent_registry.keys())}"
+                    )
+                
+                # Create regeneration request
+                regen_request = RegenerationRequest(
+                    conversation_id=conversation_id,
+                    message_id=create_message_id(request.message_id),
+                    context=request.context
+                )
+                
+                # Create run config with memory
+                memory_config = MemoryConfig(
+                    provider=config.default_memory_provider,
+                    auto_store=True,
+                    store_on_completion=True
+                )
+                
+                run_config_with_memory = replace(
+                    config.run_config,
+                    memory=memory_config,
+                    conversation_id=conversation_id,
+                    max_turns=request.max_turns or 10
+                )
+                
+                # Execute regeneration
+                result = await regenerate_conversation(
+                    regen_request,
+                    run_config_with_memory,
+                    request.context or {},
+                    request.agent_name
+                )
+                
+                # Convert result to HTTP format
+                http_messages = [_convert_core_message_to_http(msg) for msg in result.final_state.messages]
+                
+                # Create outcome data
+                if isinstance(result.outcome, CompletedOutcome):
+                    outcome_data = BaseOutcomeData(
+                        status='completed',
+                        output=result.outcome.output
+                    )
+                elif isinstance(result.outcome, ErrorOutcome):
+                    error_info = result.outcome.error
+                    outcome_data = BaseOutcomeData(
+                        status='error',
+                        error={
+                            'type': error_info.__class__.__name__,
+                            'message': str(error_info)
+                        }
+                    )
+                elif isinstance(result.outcome, InterruptedOutcome):
+                    interruptions = []
+                    for interruption in result.outcome.interruptions:
+                        if hasattr(interruption, 'tool_call') and hasattr(interruption, 'type'):
+                            tool_call_data = ToolCallInterruption(
+                                id=interruption.tool_call.id,
+                                function={
+                                    'name': interruption.tool_call.function.name,
+                                    'arguments': interruption.tool_call.function.arguments
+                                }
+                            )
+                            interruptions.append(InterruptionData(
+                                type='tool_approval',
+                                tool_call=tool_call_data,
+                                session_id=interruption.session_id or str(result.final_state.run_id)
+                            ))
+                    
+                    outcome_data = InterruptedOutcomeData(
+                        status='interrupted',
+                        interruptions=interruptions
+                    )
+                else:
+                    outcome_data = BaseOutcomeData(status='error', error='Unknown outcome type')
+                
+                # Get regeneration metadata from conversation
+                conversation_result = await config.default_memory_provider.get_conversation(conversation_id)
+                regeneration_id = f"regen_{int(time.time() * 1000)}_{request.message_id}"
+                original_message_count = 0
+                truncated_at_index = 0
+                
+                if hasattr(conversation_result, 'data') and conversation_result.data:
+                    conversation_data = conversation_result.data
+                    regeneration_points = conversation_data.metadata.get('regeneration_points', []) if conversation_data.metadata else []
+                    if regeneration_points:
+                        latest_regen = regeneration_points[-1]
+                        original_message_count = latest_regen.get('original_message_count', len(conversation_data.messages))
+                        truncated_at_index = latest_regen.get('truncated_at_index', 0)
+                        regeneration_id = latest_regen.get('regeneration_id', regeneration_id)
+                
+                return RegenerationResponse(
+                    success=True,
+                    data=RegenerationData(
+                        regeneration_id=regeneration_id,
+                        conversation_id=conversation_id,
+                        original_message_count=original_message_count,
+                        truncated_at_index=truncated_at_index,
+                        regenerated_message_id=request.message_id,
+                        messages=http_messages,
+                        outcome=outcome_data,
+                        turn_count=result.final_state.turn_count,
+                        execution_time_ms=int((time.time() - request_start_time) * 1000)
+                    )
+                )
+                
+            except Exception as e:
+                return RegenerationResponse(success=False, error=str(e))
+
+        @app.get("/conversations/{conversation_id}/regeneration-history", response_model=RegenerationHistoryResponse)
+        async def get_regeneration_history(conversation_id: str):
+            """Get regeneration history for a conversation."""
+            try:
+                regeneration_points = await get_regeneration_points(conversation_id, config.run_config)
+                
+                if regeneration_points is None:
+                    return RegenerationHistoryResponse(
+                        success=False,
+                        error="Failed to get regeneration history"
+                    )
+                
+                # Convert to response format
+                regeneration_data = []
+                for point in regeneration_points:
+                    regeneration_data.append(RegenerationPointData(
+                        regeneration_id=point.get('regeneration_id', ''),
+                        message_id=point.get('message_id', ''),
+                        timestamp=point.get('timestamp', 0),
+                        original_message_count=point.get('original_message_count', 0),
+                        truncated_at_index=point.get('truncated_at_index', 0)
+                    ))
+                
+                return RegenerationHistoryResponse(
+                    success=True,
+                    data=RegenerationHistoryData(
+                        conversation_id=conversation_id,
+                        regeneration_points=regeneration_data
+                    )
+                )
+                
+            except Exception as e:
+                return RegenerationHistoryResponse(success=False, error=str(e))
+
     return app

jaf/server/types.py

@@ -11,7 +11,7 @@ import base64
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
-from ..core.types import Agent, RunConfig, Attachment, MessageContentPart, get_text_content
+from ..core.types import Agent, RunConfig, Attachment, MessageContentPart, get_text_content, MessageId, RegenerationRequest
 from ..memory.types import MemoryProvider
 
 Ctx = TypeVar('Ctx')
@@ -267,8 +267,56 @@ class PendingApprovalsResponse(BaseModel):
     data: Optional[PendingApprovalsData] = None
     error: Optional[str] = None
 
+# Regeneration types
+class RegenerationHttpRequest(BaseModel):
+    """HTTP request format for conversation regeneration."""
+    message_id: str = Field(..., description="ID of the message to regenerate from")
+    agent_name: str = Field(..., description="Name of the agent to use for regeneration")
+    context: Optional[Dict[str, Any]] = Field(default=None, description="Optional context override for regeneration")
+    max_turns: Optional[int] = Field(default=10, description="Maximum number of turns for regeneration")
+
+class RegenerationData(BaseModel):
+    """Data for successful regeneration response."""
+    regeneration_id: str
+    conversation_id: str
+    original_message_count: int
+    truncated_at_index: int
+    regenerated_message_id: str
+    messages: List[HttpMessage]
+    outcome: BaseOutcomeData
+    turn_count: int
+    execution_time_ms: int
+
+class RegenerationResponse(BaseModel):
+    """Response format for regeneration endpoints."""
+    success: bool
+    data: Optional[RegenerationData] = None
+    error: Optional[str] = None
+
+class RegenerationPointData(BaseModel):
+    """Data for a regeneration point."""
+    regeneration_id: str
+    message_id: str
+    timestamp: int
+    original_message_count: int
+    truncated_at_index: int
+
+class RegenerationHistoryData(BaseModel):
+    """Data for regeneration history response."""
+    conversation_id: str
+    regeneration_points: List[RegenerationPointData]
+
+class RegenerationHistoryResponse(BaseModel):
+    """Response format for regeneration history endpoint."""
+    success: bool
+    data: Optional[RegenerationHistoryData] = None
+    error: Optional[str] = None
 
 # Validation schemas
 def validate_chat_request(data: Dict[str, Any]) -> ChatRequest:
     """Validate and parse a chat request."""
     return ChatRequest.model_validate(data)
+
+def validate_regeneration_request(data: Dict[str, Any]) -> RegenerationHttpRequest:
+    """Validate and parse a regeneration request."""
+    return RegenerationHttpRequest.model_validate(data)

{jaf_py-2.5.2.dist-info → jaf_py-2.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.5.2
+Version: 2.5.4
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors
@@ -42,13 +42,13 @@ Requires-Dist: fastmcp>=0.1.0
 Requires-Dist: opentelemetry-api>=1.22.0
 Requires-Dist: opentelemetry-sdk>=1.22.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.22.0
-Requires-Dist: langfuse<4.0.0,>=3.6.1
+Requires-Dist: langfuse<3.0.0
 Requires-Dist: litellm>=1.76.3
 Provides-Extra: tracing
 Requires-Dist: opentelemetry-api>=1.22.0; extra == "tracing"
 Requires-Dist: opentelemetry-sdk>=1.22.0; extra == "tracing"
 Requires-Dist: opentelemetry-exporter-otlp>=1.22.0; extra == "tracing"
-Requires-Dist: langfuse<4.0.0,>=3.6.1; extra == "tracing"
+Requires-Dist: langfuse<3.0.0; extra == "tracing"
 Provides-Extra: attachments
 Requires-Dist: PyPDF2>=3.0.0; extra == "attachments"
 Requires-Dist: python-docx>=1.1.0; extra == "attachments"
@@ -82,7 +82,7 @@ Dynamic: license-file
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.5.2-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.5.4-blue.svg)](https://github.com/xynehq/jaf-py)
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)](https://www.python.org/)
 [![Docs](https://img.shields.io/badge/Docs-Live-brightgreen)](https://xynehq.github.io/jaf-py/)
 

{jaf_py-2.5.2.dist-info → jaf_py-2.5.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jaf/__init__.py,sha256=SbhsrrcWZmeOfOlOOpIzmd1jCGYs3T4ckoJYr15Q3sQ,8260
+jaf/__init__.py,sha256=05QV74KFtLBXDOyJnhFS4uco0WLSL22ipBRFc4gBMtY,8260
 jaf/cli.py,sha256=Af4di_NZ7rZ4wFl0R4EZh611NgJ--TL03vNyZ2M1_FY,8477
 jaf/exceptions.py,sha256=nl8JY355u7oTXB3PmC_LhnUaL8fzk2K4EaWM4fVpMPE,9196
 jaf/a2a/__init__.py,sha256=p4YVthZH0ow1ZECqWTQ0aQl8JWySYZb25jlzZJ09na4,7662
@@ -42,7 +42,7 @@ jaf/core/__init__.py,sha256=1VHV2-a1oJXIWcg8n5G5g2cmjw2QXv7OezncNB59KLw,1988
 jaf/core/agent_tool.py,sha256=tfLNaTIcOZ0dR9GBP1AHLPkLExm_dLbURnVIN4R84FQ,11806
 jaf/core/analytics.py,sha256=zFHIWqWal0bbEFCmJDc4DKeM0Ja7b_D19PqVaBI12pA,23338
 jaf/core/composition.py,sha256=IVxRO1Q9nK7JRH32qQ4p8WMIUu66BhqPNrlTNMGFVwE,26317
-jaf/core/engine.py,sha256=wt5RW8ntEV8Prq5IoNiTIqAe6PBZM4XLTXYrwCUONTo,58252
+jaf/core/engine.py,sha256=5SUYyUbLTEXm9sk56n21PRdgkhrbPoJiU2i55ZETqcE,57914
 jaf/core/errors.py,sha256=5fwTNhkojKRQ4wZj3lZlgDnAsrYyjYOwXJkIr5EGNUc,5539
 jaf/core/guardrails.py,sha256=nv7pQuCx7-9DDZrecWO1DsDqFoujL81FBDrafOsXgcI,26179
 jaf/core/handoff.py,sha256=ttjOQ6CSl34J4T_1ejdmq78gZ-ve07_IQE_DAbz2bmo,6002
@@ -50,22 +50,23 @@ jaf/core/parallel_agents.py,sha256=ahwYoTnkrF4xQgV-hjc5sUaWhQWQFENMZG5riNa_Ieg,1
 jaf/core/performance.py,sha256=jedQmTEkrKMD6_Aw1h8PdG-5TsdYSFFT7Or6k5dmN2g,9974
 jaf/core/proxy.py,sha256=_WM3cpRlSQLYpgSBrnY30UPMe2iZtlqDQ65kppE-WY0,4609
 jaf/core/proxy_helpers.py,sha256=i7a5fAX9rLmO4FMBX51-yRkTFwfWedzQNgnLmeLUd_A,4370
+jaf/core/regeneration.py,sha256=jlV2PwobP_kAhafaP8zuwZcYyZiuh7QbWgA9_4ST8xM,17904
 jaf/core/state.py,sha256=oNCVXPWLkqnBQObdQX10TcmZ0eOF3wKG6DtL3kF6ohw,9649
 jaf/core/streaming.py,sha256=h_lYHQA9ee_D5QsDO9-Vhevgi7rFXPslPzd9605AJGo,17034
 jaf/core/tool_results.py,sha256=-bTOqOX02lMyslp5Z4Dmuhx0cLd5o7kgR88qK2HO_sw,11323
 jaf/core/tools.py,sha256=84N9A7QQ3xxcOs2eUUot3nmCnt5i7iZT9VwkuzuFBxQ,16274
-jaf/core/tracing.py,sha256=2YF266jIwRHjDd5C-D5l_9T_Ts0jfY5md20odc5ygQw,47464
-jaf/core/types.py,sha256=GE7Q2s6jglAFfkpc1MIgVkC9XWaWT46OOQd7L17ACxw,27955
+jaf/core/tracing.py,sha256=aIPhDtugRhdym5_IO8ES4Cm5qzc1zYDjdMsE2wsJ_as,53367
+jaf/core/types.py,sha256=GaAjeLimd8LNRIu6QnpsWGPtNCdlk77HdXoPtJdQ9eY,32154
 jaf/core/workflows.py,sha256=Ul-82gzjIXtkhnSMSPv-8igikjkMtW1EBo9yrfodtvI,26294
 jaf/memory/__init__.py,sha256=-L98xlvihurGAzF0DnXtkueDVvO_wV2XxxEwAWdAj50,1400
 jaf/memory/approval_storage.py,sha256=HHZ_b57kIthdR53QE5XNSII9xy1Cg-1cFUCSAZ8A4Rk,11083
 jaf/memory/factory.py,sha256=Fh6JyvQtCKe38DZV5-NnC9vPRCvzBgSSPFIGaX7Nt5E,2958
-jaf/memory/types.py,sha256=rAilMYhAzJLceGkdk1U_worRTNw75ZJV5ZuXYR6oyLA,8484
-jaf/memory/utils.py,sha256=t_sH2txnbYLO_noT6ysmJfiU6lX7b_sp_g0lNQ2B61A,6881
+jaf/memory/types.py,sha256=pEFaofSISJ_FipiNpju0qPImpB_Pqy8yY5MSpMMi59E,9614
+jaf/memory/utils.py,sha256=TTiLdP6-fEzy2GjF-KyimOLfeEla8bIHcscAETA4_Ic,6966
 jaf/memory/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaf/memory/providers/in_memory.py,sha256=5hiCumGK2c6SlEFdPAacC493JY1hDDfY1CaMxx8pS2E,12558
-jaf/memory/providers/postgres.py,sha256=mq6nB0FNet62QFh_NP-luKKmHLhkD8en5B1hhI512rA,12379
-jaf/memory/providers/redis.py,sha256=_eU_1vMQzhskp0_yAqyANXrdb1ZjXm7kP6vqrz0YgOg,9274
+jaf/memory/providers/in_memory.py,sha256=aL1a1vttvu6WKmJFWMN6T6OMdpdOaQL0a0tkq2YUfks,20413
+jaf/memory/providers/postgres.py,sha256=gxGnoQyBeYMg3GVE1Y6aN45w-RLgyefOJBzhVK3kF84,20989
+jaf/memory/providers/redis.py,sha256=eSUmR66j_DyOE13Hug9bC2DdK1n6D85ERYNPcZFpyZs,17106
 jaf/plugins/__init__.py,sha256=8GMtLld3UpkJVJ05gfVthw8tVXW0ALL6e6s88cKiCwY,796
 jaf/plugins/base.py,sha256=clQohPxT19zj-AjRtDoevE26xS5-cm7qdUOW2VX2InY,12575
 jaf/policies/__init__.py,sha256=tfbUgIPMwMKvZsyDItP_zvbhGXGY5scKSo78LIomgDU,416
@@ -76,8 +77,8 @@ jaf/providers/mcp.py,sha256=WxcC8gUFpDBBYyhorMcc1jHq3xMDMBtnwyRPthfL0S0,13074
 jaf/providers/model.py,sha256=bN2Hhr0N3soZzMrCdJ1pJa4rvo80oedCphDPcNgrVMY,39336
 jaf/server/__init__.py,sha256=fMPnLZBRm6t3yQrr7-PnoHAQ8qj9o6Z1AJLM1M6bIS0,392
 jaf/server/main.py,sha256=CTb0ywbPIq9ELfay5MKChVR7BpIQOoEbPjPfpzo2aBQ,2152
-jaf/server/server.py,sha256=K8XKNyadP_YqkCRSK9jCVZh52d2_IbHp_jHkKzBeB9Q,38786
-jaf/server/types.py,sha256=Gg8z1bkA7IYg94lp31iB92-4VkJr9syKA41uVCfNZBc,10544
+jaf/server/server.py,sha256=cbdhVTPoWa7rVIX3DDLoXjppeGTKQWNFj3NA1jrZN88,46830
+jaf/server/types.py,sha256=Evsq9yaZp_mleGRBXCj39fRKBCwBaBDbORCB2x9r5aw,12405
 jaf/utils/__init__.py,sha256=4Lte7HPIpmEuGvWd9lSH9gljV11wy-yNFjECPhcejAY,1236
 jaf/utils/attachments.py,sha256=9xNzzQanCwJnBR1L6P79YQtbuRupiDluDn46SYUlHok,13542
 jaf/utils/document_processor.py,sha256=FSALtq-RLMWJPmxRSDs32Nys4XAvacSbRf211-mjIeA,20150
@@ -87,9 +88,9 @@ jaf/visualization/functional_core.py,sha256=zedMDZbvjuOugWwnh6SJ2stvRNQX1Hlkb9Ab
 jaf/visualization/graphviz.py,sha256=WTOM6UP72-lVKwI4_SAr5-GCC3ouckxHv88ypCDQWJ0,12056
 jaf/visualization/imperative_shell.py,sha256=GpMrAlMnLo2IQgyB2nardCz09vMvAzaYI46MyrvJ0i4,2593
 jaf/visualization/types.py,sha256=QQcbVeQJLuAOXk8ynd08DXIS-PVCnv3R-XVE9iAcglw,1389
-jaf_py-2.5.2.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
-jaf_py-2.5.2.dist-info/METADATA,sha256=bpMawyewNtufu4o4eQWuPRCwiqhLqKqw0ZZNbeEMtl8,27759
-jaf_py-2.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jaf_py-2.5.2.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
-jaf_py-2.5.2.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
-jaf_py-2.5.2.dist-info/RECORD,,
+jaf_py-2.5.4.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
+jaf_py-2.5.4.dist-info/METADATA,sha256=rI-ngB2xNPg5gIk_L5hq9j5pi_XdAyV3htqTpgtq0Pk,27743
+jaf_py-2.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jaf_py-2.5.4.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
+jaf_py-2.5.4.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
+jaf_py-2.5.4.dist-info/RECORD,,