flock-core 0.4.527__py3-none-any.whl → 0.4.529__py3-none-any.whl

flock/webapp/app/api/execution.py

@@ -1,10 +1,9 @@
 # src/flock/webapp/app/api/execution.py
+import html
 import json
-from datetime import datetime
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
-import html
 import markdown2  # Import markdown2
 from fastapi import (  # Ensure Form and HTTPException are imported
     APIRouter,
@@ -15,6 +14,14 @@ from fastapi import (  # Ensure Form and HTTPException are imported
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.templating import Jinja2Templates
+from werkzeug.utils import secure_filename
+
+from flock.webapp.app.services.feedback_file_service import (
+    create_csv_feedback_file,
+    create_csv_feedback_file_for_agent,
+    create_xlsx_feedback_file,
+    create_xlsx_feedback_file_for_agent,
+)
 
 if TYPE_CHECKING:
     from flock.core.flock import Flock
@@ -385,6 +392,8 @@ async def htmx_submit_feedback_shared(
     expected_response: str | None = Form(None),
     actual_response: str | None = Form(None),
     flock_definition: str | None = Form(None),
+    flock_name: str | None = Form(None),
+    agent_name: str | None = Form(None),
     store: SharedLinkStoreInterface = Depends(get_shared_link_store),
 ):
     from uuid import uuid4
@@ -399,6 +408,8 @@ async def htmx_submit_feedback_shared(
         expected_response=expected_response,
         actual_response=actual_response,
         flock_definition=flock_definition,
+        agent_name=agent_name,
+        flock_name=flock_name,
     )
     await store.save_feedback(record)
     return HTMLResponse(
@@ -406,9 +417,10 @@ async def htmx_submit_feedback_shared(
     )
 
 
-@router.get("/htmx/feedback-download/", response_class=FileResponse)
+@router.get("/htmx/feedback-download/{format}", response_class=FileResponse)
 async def chat_feedback_download_all(
     request: Request,
+    format: Literal["csv", "xlsx"] = "csv",
     store: SharedLinkStoreInterface = Depends(get_shared_link_store),
 ):
     """Download all feedback records for all agents in the current flock as a CSV file.
@@ -421,170 +433,69 @@ async def chat_feedback_download_all(
         store: The shared link store interface dependency
 
     Returns:
-        FileResponse: CSV file containing all feedback records for all agents
+        FileResponse: CSV/XLSX file containing all feedback records for all agents
 
     Raises:
         HTTPException: If no flock is loaded or no agents are found in the flock
     """
-    import csv
-    import tempfile
-    from pathlib import Path
-
-    # Get the current flock instance to retrieve all agent names
-    from flock.core.flock import Flock
-
-    current_flock_instance: Flock | None = getattr(
-        request.app.state, "flock_instance", None
-    )
-
-    if not current_flock_instance:
-        # If no flock is loaded, return an error response
-        from fastapi import HTTPException
-
-        raise HTTPException(
-            status_code=400, detail="No Flock loaded to download feedback for"
+    safe_format = secure_filename(format)
+    if safe_format == "csv":
+        return await create_csv_feedback_file(
+            request=request,
+            store=store,
+            separator=","
         )
-
-    # Get all agent names from the current flock
-    all_agent_names = list(current_flock_instance.agents.keys())
-
-    if not all_agent_names:
-        # If no agents in the flock, return an error response
+    elif safe_format == "xlsx":
+        return await create_xlsx_feedback_file(
+            request=request,
+            store=store,
+        )
+    else:
         from fastapi import HTTPException
 
         raise HTTPException(
-            status_code=400, detail="No agents found in the current Flock"
+            status_code=400,
+            detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
         )
 
-    # Collect all feedback records from all agents
-    all_records = []
-    for agent_name in all_agent_names:
-        records = await store.get_all_feedback_records_for_agent(
-            agent_name=agent_name
-        )
-        all_records.extend(records)
-
-    # Create a temporary CSV file
-    temp_dir = tempfile.gettempdir()
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    csv_filename = f"flock_feedback_all_agents_{timestamp}.csv"
-    csv_path = Path(temp_dir) / csv_filename
-
-    # Define CSV headers based on FeedbackRecord fields
-    headers = [
-        "feedback_id",
-        "share_id",
-        "context_type",
-        "reason",
-        "expected_response",
-        "actual_response",
-        "created_at",
-        "flock_name",
-        "agent_name",
-        "flock_definition",
-    ]
-
-    # Write records to CSV
-    with open(csv_path, "w", newline="", encoding="utf-8") as csvfile:
-        writer = csv.DictWriter(csvfile, fieldnames=headers)
-        writer.writeheader()
-
-        for record in all_records:
-            # Convert the Pydantic model to dict and ensure all fields are present
-            row_data = {}
-            for header in headers:
-                value = getattr(record, header, None)
-                # Convert datetime to ISO string for CSV
-                if header == "created_at" and value:
-                    row_data[header] = (
-                        value.isoformat()
-                        if isinstance(value, datetime)
-                        else str(value)
-                    )
-                else:
-                    row_data[header] = str(value) if value is not None else ""
-            writer.writerow(row_data)
-
-    # Return FileResponse with the CSV file
-    return FileResponse(
-        path=str(csv_path),
-        filename=csv_filename,
-        media_type="text/csv",
-        headers={"Content-Disposition": f"attachment; filename={csv_filename}"},
-    )
 
-
-@router.get("/htmx/feedback-download/{agent_name}", response_class=FileResponse)
+@router.get("/htmx/feedback-download/{agent_name}/{format}", response_class=FileResponse)
 async def chat_feedback_download(
     request: Request,
     agent_name: str,
+    format: Literal["csv", "xlsx"] = "csv",
     store: SharedLinkStoreInterface = Depends(get_shared_link_store),
 ):
-    """Download all feedback records for a specific agent as a CSV file.
+    """Download all feedback records for a specific agent as a file.
 
     Args:
         request: The FastAPI request object
         agent_name: Name of the agent to download feedback for
         store: The shared link store interface dependency
+        format: Either 'csv' or 'xlsx' the file format to use
 
     Returns:
-        FileResponse: CSV file containing all feedback records for the specified agent
+        FileResponse: CSV/XLSX file containing all feedback records for the specified agent
     """
-    import csv
-    import tempfile
-    from pathlib import Path
-    from werkzeug.utils import secure_filename
-
-    records = await store.get_all_feedback_records_for_agent(
-        agent_name=agent_name
-    )
-
-    # Create a temporary CSV file
-    temp_dir = tempfile.gettempdir()
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    safe_format = secure_filename(format)
     safe_agent_name = secure_filename(agent_name)
-    csv_filename = f"flock_feedback_{safe_agent_name}_{timestamp}.csv"
-    csv_path = Path(temp_dir) / csv_filename
-
-    # Define CSV headers based on FeedbackRecord fields
-    headers = [
-        "feedback_id",
-        "share_id",
-        "context_type",
-        "reason",
-        "expected_response",
-        "actual_response",
-        "created_at",
-        "flock_name",
-        "agent_name",
-        "flock_definition",
-    ]
-
-    # Write records to CSV
-    with open(csv_path, "w", newline="", encoding="utf-8") as csvfile:
-        writer = csv.DictWriter(csvfile, fieldnames=headers)
-        writer.writeheader()
-
-        for record in records:
-            # Convert the Pydantic model to dict and ensure all fields are present
-            row_data = {}
-            for header in headers:
-                value = getattr(record, header, None)
-                # Convert datetime to ISO string for CSV
-                if header == "created_at" and value:
-                    row_data[header] = (
-                        value.isoformat()
-                        if isinstance(value, datetime)
-                        else str(value)
-                    )
-                else:
-                    row_data[header] = str(value) if value is not None else ""
-            writer.writerow(row_data)
-
-    # Return FileResponse with the CSV file
-    return FileResponse(
-        path=str(csv_path),
-        filename=csv_filename,
-        media_type="text/csv",
-        headers={"Content-Disposition": f"attachment; filename={csv_filename}"},
-    )
+    if safe_format == "csv":
+        return await create_csv_feedback_file_for_agent(
+            request=request,
+            store=store,
+            separator=",",
+            agent_name=safe_agent_name,
+        )
+    elif safe_format == "xlsx":
+        return await create_xlsx_feedback_file_for_agent(
+            request=request,
+            store=store,
+            agent_name=safe_agent_name,
+        )
+    else:
+        from fastapi import HTTPException
+
+        raise HTTPException(
+            status_code=400,
+            detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
+        )

flock/webapp/app/chat.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import ast  # Add import ast
 import json
 from datetime import datetime
+from typing import Literal
 from uuid import uuid4
 
 import markdown2  # Added for Markdown to HTML conversion
@@ -14,6 +15,12 @@ from flock.core.flock import Flock
 from flock.core.logging.logging import get_logger
 from flock.webapp.app.dependencies import get_shared_link_store
 from flock.webapp.app.main import get_base_context_web, templates
+from flock.webapp.app.services.feedback_file_service import (
+    create_csv_feedback_file,
+    create_csv_feedback_file_for_agent,
+    create_xlsx_feedback_file,
+    create_xlsx_feedback_file_for_agent,
+)
 from flock.webapp.app.services.sharing_models import (
     FeedbackRecord,
     SharedLinkConfig,
@@ -602,143 +609,57 @@ async def chat_feedback_shared(request: Request,
     headers = {"HX-Trigger": json.dumps(toast_event)}
     return Response(status_code=204, headers=headers)
 
-@router.get("/chat/htmx/feedback-download/", response_class=FileResponse, include_in_schema=False)
+@router.get("/chat/htmx/feedback-download/{format}", response_class=FileResponse, include_in_schema=False)
 async def chat_feedback_download_all(
     request: Request,
+    format: Literal["csv", "xlsx"] = "csv",
     store: SharedLinkStoreInterface = Depends(get_shared_link_store)
 ):
     """Download all feedback records for all agents."""
-    import csv
-    import tempfile
-    from pathlib import Path
-
-
-    current_flock_instance: Flock | None = getattr(
-        request.app.state, "flock_instance", None
-    )
-
-    if not current_flock_instance:
-        from fastapi import HTTPException
-
-        raise HTTPException(
-            status_code=400, detail="No Flock loaded to download feedback for"
+    if format == "csv":
+        return await create_csv_feedback_file(
+            request=request,
+            store=store,
+            separator=","
         )
-
-    all_agent_names = list(current_flock_instance.agents.keys)
-
-    if not all_agent_names:
+    elif format == "xlsx":
+        return await create_xlsx_feedback_file(
+            request=request,
+            store=store,
+        )
+    else:
         from fastapi import HTTPException
 
         raise HTTPException(
             status_code=400,
-            detail="No agents found in the current Flock"
-        )
-
-    all_records = []
-
-    for agent_name in all_agent_names:
-        records = await store.get_all_feedback_records_for_agent(
-            agent_name=agent_name
+            detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
         )
 
-        all_records.extend(records)
-
-    temp_dir = tempfile.gettempdir()
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    csv_filename = f"flock_feedback_all_agents_{timestamp}.csv"
-    csv_path = Path(temp_dir) / csv_filename
-
-    headers = [
-        "feedback_id",
-        "share_id",
-        "context_type",
-        "reason",
-        "excpected_response",
-        "actual_response",
-        "created_at",
-        "flock_name",
-        "agent_name",
-        "flock_definition"
-    ]
-
-    with open(csv_path, "w", newline="", encoding="utf-8") as csvfile:
-        writer = csv.DictWriter(csvfile, fieldnames=headers)
-        writer.writeheader()
-
-        for record in all_records:
-            row_data = {}
-            for header in headers:
-                value = getattr(record, header, None)
-                if header == "created_at" and value:
-                    row_data[header] = (
-                        value.isoformat()
-                        if isinstance(value, datetime)
-                        else str(value)
-                    )
-                else:
-                    row_data[header] = str(value) if value is not None else ""
-            writer.writerow(row_data)
-
-    return FileResponse(
-        path=str(csv_path),
-        filename=csv_filename,
-        media_type="text/csv",
-        headers={"Content-Disposition": f"attachment; filename={csv_filename}"}
-    )
-
-@router.get("/chat/htmx/feedback-download/{agent_name}", response_class=FileResponse, include_in_schema=False)
+@router.get("/chat/htmx/feedback-download/{agent_name}/{format}", response_class=FileResponse, include_in_schema=False)
 async def chat_feedback_download(
     request: Request,
     agent_name: str,
+    format: Literal["csv", "xlsx"] = "csv",
     store: SharedLinkStoreInterface = Depends(get_shared_link_store)
 ):
-    import csv
-    import tempfile
-    from pathlib import Path
-
-    records = await store.get_all_feedback_records_for_agent(agent_name=agent_name)
-
-    # Create a temporary CSV file
-    temp_dir = tempfile.gettempdir()
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    csv_filename = f"flock_feedback_{timestamp}.csv"
-    csv_path = Path(temp_dir) / csv_filename
-
-    # Define CSV headers based on FeedbackRecord fields
-    headers = [
-        "feedback_id",
-        "share_id",
-        "context_type",
-        "reason",
-        "expected_response",
-        "actual_response",
-        "created_at",
-        "flock_name",
-        "agent_name",
-        "flock_definition"
-    ]
-
-    # Write records to CSV
-    with open(csv_path, 'w', newline='', encoding='utf-8') as csvfile:
-        writer = csv.DictWriter(csvfile, fieldnames=headers)
-        writer.writeheader()
-
-        for record in records:
-            # Convert the Pydantic model to dict and ensure all fields are present
-            row_data = {}
-            for header in headers:
-                value = getattr(record, header, None)
-                # Convert datetime to ISO string for CSV
-                if header == "created_at" and value:
-                    row_data[header] = value.isoformat() if isinstance(value, datetime) else str(value)
-                else:
-                    row_data[header] = str(value) if value is not None else ""
-            writer.writerow(row_data)
-
-    # Return FileResponse with the CSV file
-    return FileResponse(
-        path=str(csv_path),
-        filename=csv_filename,
-        media_type="text/csv",
-        headers={"Content-Disposition": f"attachment; filename={csv_filename}"}
-    )
+    """Download all feedback records for a specific agent as a File."""
+    if format == "csv":
+        return await create_csv_feedback_file_for_agent(
+            request=request,
+            store=store,
+            separator=",",
+            agent_name=agent_name,
+        )
+    elif format == "xlsx":
+        return await create_xlsx_feedback_file_for_agent(
+            request=request,
+            store=store,
+            agent_name=agent_name,
+        )
+    else:
+        from fastapi import HTTPException
+
+        raise HTTPException(
+            status_code=400,
+            detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
+        )

flock/webapp/app/services/feedback_file_service.py

@@ -0,0 +1,363 @@
+"""Methods for creating Feedback-File Downloads."""
+import csv
+import tempfile
+from datetime import datetime
+from pathlib import Path
+from werkzeug.utils import secure_filename
+from fastapi import Request
+from fastapi.responses import FileResponse
+
+from flock.webapp.app.services.sharing_store import SharedLinkStoreInterface
+
+
+async def create_xlsx_feedback_file_for_agent(
+  request: Request,
+  store: SharedLinkStoreInterface,
+  agent_name: str,
+) -> FileResponse:
+  """Creates an XLSX-File containing all feedback-entries for a single agent."""
+  from flock.core.flock import Flock
+
+  current_flock_instance: Flock | None = getattr(
+    request.app.state, "flock_instance", None
+  )
+
+  if not current_flock_instance:
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No Flock loaded to download feedback for"
+    )
+
+  all_agent_names = list(current_flock_instance.agents.keys())
+
+  if not all_agent_names:
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No agents found in the current Flock"
+    )
+
+  all_records = await store.get_all_feedback_records_for_agent(
+    agent_name=agent_name
+  )
+
+  temp_dir = tempfile.gettempdir()
+  timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+  safe_agent_name = secure_filename(agent_name)
+  xlsx_filename = f"flock_feedback_{safe_agent_name}_{timestamp}.xlsx"
+  xlsx_path = Path(temp_dir) / xlsx_filename
+  headers = [
+      "feedback_id",
+      "share_id",
+      "context_type",
+      "reason",
+      "expected_response",
+      "actual_response",
+      "created_at",
+      "flock_name",
+      "agent_name",
+      "flock_definition",
+    ]
+
+  return await _write_xlsx_file(
+    records=all_records,
+    path=xlsx_path,
+    filename=xlsx_filename,
+    headers=headers,
+  )
+
+async def create_xlsx_feedback_file(
+  request: Request,
+  store: SharedLinkStoreInterface
+) -> FileResponse:
+  """Creates an XLSX-File containing all feddback-entries for all agents."""
+  from flock.core.flock import Flock
+
+  current_flock_instance: Flock | None = getattr(
+    request.app.state, "flock_instance", None
+  )
+
+  if not current_flock_instance:
+    # If no flock is loaded, return an error response
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No Flock loaded to download feedback for"
+    )
+
+  # Get all agent names from the current flock
+  all_agent_names = list(current_flock_instance.agents.keys())
+
+  if not all_agent_names:
+
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No agents found in the current Flock"
+    )
+
+  all_records = []
+  for agent_name in all_agent_names:
+    agent_records = await store.get_all_feedback_records_for_agent(
+      agent_name=agent_name,
+    )
+    all_records.extend(agent_records)
+
+  temp_dir = tempfile.gettempdir()
+  timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+  xlsx_filename = f"flock_feedback_all_agents_{timestamp}.xlsx"
+  xlsx_path = Path(temp_dir) / xlsx_filename
+  headers = [
+      "feedback_id",
+      "share_id",
+      "context_type",
+      "reason",
+      "expected_response",
+      "actual_response",
+      "created_at",
+      "flock_name",
+      "agent_name",
+      "flock_definition",
+    ]
+
+  return await _write_xlsx_file(
+    records=all_records,
+    path=xlsx_path,
+    filename=xlsx_filename,
+    headers=headers,
+  )
+
+
+async def create_csv_feedback_file_for_agent(
+  request: Request,
+  store: SharedLinkStoreInterface,
+  agent_name: str,
+  separator: str = ",",
+) -> FileResponse:
+  """Creates a CSV-File filled with the feedback-records for a single agent."""
+  from flock.core.flock import Flock
+
+  current_flock_instance: Flock | None = getattr(
+    request.app.state, "flock_instance", None
+  )
+
+  if not current_flock_instance:
+    # If no flock is loaded, return an error response
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No Flock loaded to download feedback for"
+    )
+
+
+  # Get all agent names from the current flock
+  all_agent_names = list(current_flock_instance.agents.keys())
+
+
+  if not all_agent_names:
+
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No agents found in the current Flock"
+    )
+
+  all_records = await store.get_all_feedback_records_for_agent(
+    agent_name=agent_name
+  )
+  temp_dir = tempfile.gettempdir()
+  timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+  safe_agent_name = secure_filename(agent_name)
+  csv_filename = f"flock_feedback_{safe_agent_name}_{timestamp}.csv"
+  csv_path = Path(temp_dir) / csv_filename
+  headers = [
+    "feedback_id",
+    "share_id",
+    "context_type",
+    "reason",
+    "expected_response",
+    "actual_response",
+    "created_at",
+    "flock_name",
+    "agent_name",
+    "flock_definition",
+  ]
+  return await _write_csv_file(
+    records=all_records,
+    path=csv_path,
+    headers=headers,
+    separator=separator,
+    filename=csv_filename,
+  )
+
+
+async def create_csv_feedback_file(
+  request: Request,
+  store: SharedLinkStoreInterface,
+  separator: str = ",",
+
+  ) -> FileResponse:
+  """Creates a CSV-File filled with the feedback-records for all agents."""
+  from flock.core.flock import Flock
+
+  current_flock_instance: Flock | None = getattr(
+    request.app.state, "flock_instance", None
+  )
+
+  if not current_flock_instance:
+    # If no flock is loaded, return an error response
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No Flock loaded to download feedback for"
+    )
+
+  # Get all agent names from the current flock
+  all_agent_names = list(current_flock_instance.agents.keys())
+
+  if not all_agent_names:
+
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=400,
+      detail="No agents found in the current Flock"
+    )
+
+  all_records = []
+  for agent_name in all_agent_names:
+    records_for_agent = await store.get_all_feedback_records_for_agent(
+      agent_name=agent_name
+    )
+    all_records.extend(records_for_agent)
+
+  temp_dir = tempfile.gettempdir()
+  timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+  csv_filename = f"flock_feedback_all_agents_{timestamp}.csv"
+  csv_path = Path(temp_dir) / csv_filename
+  headers = [
+    "feedback_id",
+    "share_id",
+    "context_type",
+    "reason",
+    "expected_response",
+    "actual_response",
+    "created_at",
+    "flock_name",
+    "agent_name",
+    "flock_definition",
+  ]
+
+  return await _write_csv_file(
+    records=all_records,
+    path=csv_path,
+    headers=headers,
+    filename=csv_filename,
+    separator=separator,
+  )
+
+async def _write_xlsx_file(
+  records: list[dict],
+  headers: list,
+  path: str | Path,
+  filename: str,
+) -> FileResponse:
+  """Writes an xlsx-file with the specified records."""
+  try:
+    import pandas as pd
+
+    # Convert records to a format suitable for
+    # pandas DataFrame
+    data_rows = []
+    for record in records:
+      row_data = {}
+      for header in headers:
+        value = getattr(record, header, None)
+        # Convert datetime to string for excel
+        if header == "created_at" and value:
+          row_data[header] = (
+            value.isoformat()
+            if isinstance(value, datetime)
+            else str(value)
+          )
+        else:
+          row_data[header] = str(value) if value is not None else ""
+      data_rows.append(row_data)
+
+    # Create DataFrame and write to Excel
+    df = pd.DataFrame(data_rows)
+    df.to_excel(str(path), index=False)
+
+    return FileResponse(
+      path=str(path),
+      filename=filename,
+      media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      headers={
+        "Content-Disposition": f"attachment; filename={filename}"
+      }
+    )
+
+  except Exception:
+    from fastapi import HTTPException
+
+    raise HTTPException(
+      status_code=500,
+      detail="Unable to create feedback Excel file"
+    )
+
+async def _write_csv_file(
+  records: list[dict],
+  path: str | Path,
+  filename: str,
+  headers: list,
+  separator: str = ","
+) -> FileResponse:
+  """Writes a CSV_File with the specified records."""
+  try:
+    with open(path, "w", newline="", encoding="utf-8") as csvfile:
+      writer = csv.DictWriter(
+        csvfile,
+        fieldnames=headers,
+        delimiter=separator
+      )
+      writer.writeheader()
+      for record in records:
+        # Convert the Pydantic model
+        # to dict and ensure all fields are present
+        row_data = {}
+        for header in headers:
+          value = getattr(record, header, None)
+          # Convert datetime to ISO string for CSV
+          if header == "created_at" and value:
+            row_data[header] = (
+              value.isoformat()
+              if isinstance(value, datetime)
+              else str(value)
+            )
+          else:
+            row_data[header] = str(value) if value is not None else ""
+        writer.writerow(row_data)
+
+    return FileResponse(
+      path=str(path),
+      filename=filename,
+      media_type="text/csv",
+      headers={
+        "Content-Disposition": f"attachment; filename={filename}"
+      }
+    )
+  except Exception:
+    from fastapi import HTTPException
+
+    raise HTTPException(
+        status_code=500,
+        detail="Unable to create feedback-file"
+      )

flock/webapp/app/services/sharing_store.py

@@ -455,6 +455,9 @@ class AzureTableSharedLinkStore(SharedLinkStoreInterface):
             "actual_response":   record.actual_response,
             "created_at":   record.created_at.isoformat(),
         }
+
+        # additional sanity check
+
         if record.flock_name is not None:
             entity["flock_name"] = record.flock_name
         if record.agent_name is not None:
@@ -520,38 +523,49 @@ class AzureTableSharedLinkStore(SharedLinkStoreInterface):
         tbl_client = self.table_svc.get_table_client(self._FEEDBACK_TBL_NAME)
 
         # Use Azure Table Storage filtering to only get records for the specified agent
-        filter_query = f"agent_name eq '{agent_name}'"
+        escaped_agent_name = agent_name.replace("'", "''")
+        filter_query = f"agent_name eq '{escaped_agent_name}'"
+
+        logger.debug(f"Querying feedback records with filter: {filter_query}")
 
         records = []
-        async for entity in tbl_client.query_entities(filter_query):
-            # Get flock_definition from blob if it exists
-            flock_definition = None
-            if "flock_blob_name" in entity:
-                blob_name = entity["flock_blob_name"]
-                blob_client = self.blob_svc.get_blob_client(self._CONTAINER_NAME, blob_name)
-                try:
-                    blob_bytes = await (await blob_client.download_blob()).readall()
-                    flock_definition = blob_bytes.decode()
-                except Exception as e:
-                    logger.error("Cannot download blob '%s' for feedback_id=%s: %s",
-                               blob_name, entity["RowKey"], e, exc_info=True)
-                    # Continue without flock_definition rather than failing
-
-            records.append(FeedbackRecord(
-                feedback_id=entity["RowKey"],
-                share_id=entity.get("share_id"),
-                context_type=entity["context_type"],
-                reason=entity["reason"],
-                expected_response=entity.get("expected_response"),
-                actual_response=entity.get("actual_response"),
-                flock_name=entity.get("flock_name"),
-                agent_name=entity.get("agent_name"),
-                flock_definition=flock_definition,
-                created_at=entity["created_at"],
-            ))
-
-        logger.debug("Retrieved %d feedback records for agent %s", len(records), agent_name)
-        return records
+        try:
+            async for entity in tbl_client.query_entities(filter_query):
+                # Get flock_definition from blob if it exists
+                flock_definition = None
+                if "flock_blob_name" in entity:
+                    blob_name = entity["flock_blob_name"]
+                    blob_client = self.blob_svc.get_blob_client(self._CONTAINER_NAME, blob_name)
+                    try:
+                        blob_bytes = await (await blob_client.download_blob()).readall()
+                        flock_definition = blob_bytes.decode()
+                    except Exception as e:
+                        logger.error("Cannot download blob '%s' for feedback_id=%s: %s",
+                                   blob_name, entity["RowKey"], e, exc_info=True)
+                        # Continue without flock_definition rather than failing
+
+                records.append(FeedbackRecord(
+                    feedback_id=entity["RowKey"],
+                    share_id=entity.get("share_id"),
+                    context_type=entity["context_type"],
+                    reason=entity["reason"],
+                    expected_response=entity.get("expected_response"),
+                    actual_response=entity.get("actual_response"),
+                    flock_name=entity.get("flock_name"),
+                    agent_name=entity.get("agent_name"),
+                    flock_definition=flock_definition,
+                    created_at=entity["created_at"],
+                ))
+
+            logger.debug("Retrieved %d feedback records for agent %s", len(records), agent_name)
+            return records
+
+        except Exception as e:
+            # Log the error.
+            logger.error(
+                f"Unable to query entries for agent {agent_name}. Exception: {e}"
+            )
+            return records
 
 
 # ----------------------- Factory Function -----------------------

flock/webapp/templates/partials/_execution_form.html

@@ -1,22 +1,17 @@
 <script>
-// Create URL template for agent input forms
-window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agent_name="AGENT_PLACEHOLDER") }}';
+    // Create URL template for agent input forms
+    window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agent_name="AGENT_PLACEHOLDER") }}';
 </script>
 
 <article id="execution-form-content">
     <header>
         <h2>Run Flock</h2>
     </header>
-    {% if flock and flock.agents %}    <form hx-post="{{ url_for('htmx_run_flock') }}" 
-          hx-target="#results-display"
-          hx-swap="innerHTML" 
-          hx-indicator="#run-loading-indicator"
-          x-data="{ selectedAgentForInput: '' }">
-        
+    {% if flock and flock.agents %} <form hx-post="{{ url_for('htmx_run_flock') }}" hx-target="#results-display"
+        hx-swap="innerHTML" hx-indicator="#run-loading-indicator" x-data="{ selectedAgentForInput: '' }">
+
         <label for="start_agent_name_select">Select Start Agent:</label>
-        <select id="start_agent_name_select" 
-                name="start_agent_name" 
-                required                x-model="selectedAgentForInput"                @change="
+        <select id="start_agent_name_select" name="start_agent_name" required x-model="selectedAgentForInput" @change="
                     if ($event.target.value) {
                         const url = window.agentInputFormUrlTemplate.replace('AGENT_PLACEHOLDER', $event.target.value);
                         htmx.ajax('GET', url, {target: '#dynamic-input-form-fields', swap: 'innerHTML', indicator: '#input-form-loading-indicator'});
@@ -26,7 +21,8 @@ window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agen
                 ">
             <option value="" disabled {% if not selected_agent_name %}selected{% endif %}>-- Choose an agent --</option>
             {% for agent_name_key in flock.agents.keys() %}
-            <option value="{{ agent_name_key }}" {% if selected_agent_name == agent_name_key %}selected{% endif %}>{{ agent_name_key }}</option>
+            <option value="{{ agent_name_key }}" {% if selected_agent_name==agent_name_key %}selected{% endif %}>{{
+                agent_name_key }}</option>
             {% endfor %}
         </select>
 
@@ -38,16 +34,12 @@ window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agen
             <progress indeterminate></progress> Loading input form...
         </div>
 
-        <button type="submit" {% if not flock.agents %}disabled{% endif %}>Run Flock</button>        
-        <div id="share-agent-link-container" style="margin-top: 0.5rem;">            
-            <a href="#" 
-               id="shareAgentHtmxLink"
-               hx-post="{{ url_for('htmx_generate_share_link') }}" 
-               hx-target="#shareLinkDisplayArea" 
-               hx-swap="innerHTML"
-               hx-indicator="#share-loading-indicator"
-               hx-include="#start_agent_name_select"
-               style="text-decoration: underline; cursor: pointer; color: var(--pico-primary);">
+        <button type="submit" {% if not flock.agents %}disabled{% endif %}>Run Flock</button>
+        <div id="share-agent-link-container" style="margin-top: 0.5rem;">
+            <a href="#" id="shareAgentHtmxLink" hx-post="{{ url_for('htmx_generate_share_link') }}"
+                hx-target="#shareLinkDisplayArea" hx-swap="innerHTML" hx-indicator="#share-loading-indicator"
+                hx-include="#start_agent_name_select"
+                style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
                 Create shareable link...
             </a>
             <span id="share-loading-indicator" class="htmx-indicator">
@@ -56,26 +48,46 @@ window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agen
         </div>
 
         <div id="feedback-download-container" style="margin-top: 0.5rem;">
-            <a href="#" 
-               id="downloadFeedbackLink"
-               x-show="selectedAgentForInput"
-               hx-indicator="#download-feedback-loading-indicator"
-               hx-include="#start_agent_name_select"
-               :href="selectedAgentForInput ? '{{ url_for('chat_feedback_download', agent_name='AGENT_PLACEHOLDER') }}'.replace('AGENT_PLACEHOLDER', selectedAgentForInput) : '#'"
-               style="text-decoration: underline; cursor: pointer; color: var(--pico-primary);"
-               x-cloak>
-                Download feedback for the selected agent...
-            </a>
+            <div x-show="selectedAgentForInput" x-cloak
+                style="display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap;">
+                <span style="padding: 0.25rem; text-decoration: underline;">Download feedback for selected
+                    agent:</span>
+                <div>
+                    <a href="#" id="downloadFeedbackLink" hx-indicator="#download-feedback-loading-indicator"
+                    hx-include="#start_agent_name_select"
+                    :href="selectedAgentForInput ? '{{ url_for('chat_feedback_download', agent_name='AGENT_PLACEHOLDER', format='csv') }}'.replace('AGENT_PLACEHOLDER', selectedAgentForInput) : '#'"
+                    style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                    CSV
+                </a>
+                <a href="#" id="downloadFeedbackLinkXlsx" hx-indicator="#download-feedback-loading-indicator"
+                    hx-include="#start_agent_name_select"
+                    :href="selectedAgentForInput ? '{{ url_for('chat_feedback_download', agent_name='AGENT_PLACEHOLDER', format='xlsx') }}'.replace('AGENT_PLACEHOLDER', selectedAgentForInput) : '#'"
+                    style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                    XLSX
+                </a>
+                </div>
+            </div>
             <span id="download-feedback-loading-indicator" class="htmx-indicator">
                 <progress indeterminate></progress> Preparing file...
             </span>
         </div>
 
         <div id="feedback-download-container-all" style="margin-top: 0.5rem;">
-            <a href="{{ url_for('chat_feedback_download_all')}}"
-               id="downloadFeedbackLinkAll"
-               style="text-decoration: underline; cursor: pointer; color: var(--pico-primary);"
-               >Download feedback for all agents...</a>
+            <div style="display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap;">
+                <span style="padding: 0.25rem; text-decoration: underline;">Download feedback for all
+                    agents:</span>
+                <div>
+                    <a href="{{ url_for('chat_feedback_download_all', format='csv') }}" id="downloadFeedbackLinkAll"
+                        style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                        CSV
+                    </a>
+                    <a href="{{ url_for('chat_feedback_download_all', format='xlsx') }}"
+                        id="downloadFeedbackLinkAllXlsx"
+                        style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                        XLSX
+                    </a>
+                </div>
+            </div>
             <span id="download-feedback-loading-indicator-all" class="htmx-indicator">
                 <progress indeterminate></progress> Preparing file...
             </span>
@@ -98,7 +110,7 @@ window.agentInputFormUrlTemplate = '{{ url_for("htmx_get_agent_input_form", agen
 </article>
 
 <script>
-    document.addEventListener('DOMContentLoaded', function() {
+    document.addEventListener('DOMContentLoaded', function () {
         // All previous JavaScript for toggling share link visibility is removed.
         // If there are other unrelated JavaScript functions in this script block,
         // they would remain.

flock/webapp/templates/partials/_registry_viewer_content.html

@@ -31,9 +31,18 @@
                 </button>
             </li>
             <li>
-                <a role="button" class="outline" href="{{ url_for('chat_feedback_download_all')}}" download>
-                    Feedback-Files
-                </a>
+                <span style="padding: 0.25rem; text-decoration: underline;">Feedback-Files</span>
+                <div>
+                    <a href="{{ url_for('chat_feedback_download_all', format='csv') }}" id="downloadFeedbackLinkAll"
+                        style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                        CSV
+                    </a>
+                    <a href="{{ url_for('chat_feedback_download_all', format='xlsx') }}"
+                        id="downloadFeedbackLinkAllXlsx"
+                        style="padding: 0.25rem 0.5rem; margin: 0.25rem; background: var(--pico-primary); color: white; text-decoration: none; border-radius: 4px; font-size: 0.875rem;">
+                        XLSX
+                    </a>
+                </div>
             </li>
         </ul>
     </nav>

{flock_core-0.4.527.dist-info → flock_core-0.4.529.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.527
+Version: 0.4.529
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Requires-Dist: aiosqlite>=0.21.0
 Requires-Dist: azure-data-tables>=12.7.0
+Requires-Dist: azure-storage-blob>=12.25.1
 Requires-Dist: cloudpickle>=3.1.1
 Requires-Dist: croniter>=6.0.0
 Requires-Dist: devtools>=0.12.2
@@ -49,6 +50,8 @@ Requires-Dist: tqdm>=4.60.1
 Requires-Dist: uvicorn>=0.34.0
 Requires-Dist: wd-di>=0.2.14
 Requires-Dist: websockets>=15.0.1
+Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: xlsxwriter>=3.2.3
 Provides-Extra: all
 Requires-Dist: azure-identity>=1.23.0; extra == 'all'
 Requires-Dist: azure-search-documents>=11.5.2; extra == 'all'

{flock_core-0.4.527.dist-info → flock_core-0.4.529.dist-info}/RECORD

@@ -492,7 +492,7 @@ flock/tools/zendesk_tools.py,sha256=e7KMfHVl7wGbstwdz9CvoChyuoZfpS9n4TEtvrxawgI,
 flock/webapp/__init__.py,sha256=YtRbbyciN3Z2oMB9fdXZuvM3e49R8m2mY5qHLDoapRA,37
 flock/webapp/run.py,sha256=btKVwIqrFg3FhLRuj2RN_fazwaFat3Ue5yiFiIg60rQ,9054
 flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flock/webapp/app/chat.py,sha256=Wm7yr3j2Zjh2t6i5QF461m8FXZFfBMFtf7Sy_s2cigA,33159
+flock/webapp/app/chat.py,sha256=cfEXOJRwobLZF6Ikj_x1Ev8ZVwhoukKF0xyklVKlCYk,30754
 flock/webapp/app/config.py,sha256=lqmneujnNZk-EFJV5cWpvxkqisxH3T3zT_YOI0JYThE,4809
 flock/webapp/app/dependencies.py,sha256=JUcwY1N6SZplU141lMN2wk9dOC9er5HCedrKTJN9wJk,5533
 flock/webapp/app/main.py,sha256=J3NiwW4fFTrp_YKa-HFXs3gLtLC6qu9LjIb_i-jJHMk,58426
@@ -502,13 +502,14 @@ flock/webapp/app/theme_mapper.py,sha256=QzWwLWpED78oYp3FjZ9zxv1KxCyj43m8MZ0fhfzz
 flock/webapp/app/utils.py,sha256=RF8DMKKAj1XPmm4txUdo2OdswI1ATQ7cqUm6G9JFDzA,2942
 flock/webapp/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/webapp/app/api/agent_management.py,sha256=5xqO94QjjAYvxImyjKV9EGUQOvo4n3eqs7pGwGPSQJ4,10394
-flock/webapp/app/api/execution.py,sha256=ovtjcBmm_S7Gyg1_hM4euBdIPDTZJZu-hCQa64tQS8o,21109
+flock/webapp/app/api/execution.py,sha256=OzTjCP5CxAGdD2YrX7vI2qkQejqikX9Jn8_sq2o6yKA,18163
 flock/webapp/app/api/flock_management.py,sha256=1o-6-36kTnUjI3am_BqLpdrcz0aqFXrxE-hQHIFcCsg,4869
 flock/webapp/app/api/registry_viewer.py,sha256=IoInxJiRR0yFlecG_l2_eRc6l35RQQyEDMG9BcBkipY,1020
 flock/webapp/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flock/webapp/app/services/feedback_file_service.py,sha256=6WYJjml8lt_ULH5vq7JSWrPQPvUSLvp91qMBt-_tg5Q,9376
 flock/webapp/app/services/flock_service.py,sha256=olU1My3YYkrTCVIOYPgRted-8YgAop-Yi7G4gbRHTrg,14941
 flock/webapp/app/services/sharing_models.py,sha256=XeJk1akILV_1l-cIUaG8k_eYhjV3EWBCWZ2kpwbdImA,3609
-flock/webapp/app/services/sharing_store.py,sha256=vUIFSDppxPL65DP2OWczYe5aheuv_oHO2cynCtsRgtE,26649
+flock/webapp/app/services/sharing_store.py,sha256=QjwG84PzEbzXyyHjFnDHz8Sf1pmB_4PY-_s9g8ht6S0,27163
 flock/webapp/app/templates/theme_mapper.html,sha256=z8ZY7nmk6PiUGzD_-px7wSXcEnuBM121rMq6u-2oaCo,14249
 flock/webapp/static/css/chat.css,sha256=Njc9gXfQzbXMrqtFJH2Yda-IQlwNPd2z4apXxzfA0sY,8169
 flock/webapp/static/css/components.css,sha256=WnicEHy3ptPzggKmyG9_oZp3X30EMJBUW3KEXaiUCUE,6018
@@ -537,7 +538,7 @@ flock/webapp/templates/partials/_dashboard_flock_properties_preview.html,sha256=
 flock/webapp/templates/partials/_dashboard_upload_flock_form.html,sha256=UWU_WpIsq6iw5FwK989ANmhzcCOcDKVjdakZ4kxY8lU,961
 flock/webapp/templates/partials/_dynamic_input_form_content.html,sha256=WYr2M7Mb5vKITFhIVXXEHppRx9IjGew91yLo1_I9kkI,1230
 flock/webapp/templates/partials/_env_vars_table.html,sha256=st8bRQpIJ3TJ_znEdyOwDT43ZhO2QTLne2IZNxQdQNM,1106
-flock/webapp/templates/partials/_execution_form.html,sha256=ln73ShbXU1ZNYoBkryvuK4RnPebimNyHHE9VK4heX0s,5113
+flock/webapp/templates/partials/_execution_form.html,sha256=lYdX3qqlKZ4_6EQttv_zEC9PR75qayoJ0p1IfebC2Lw,6733
 flock/webapp/templates/partials/_execution_view_container.html,sha256=w4QEr-yPs0k1vF2oxMhhPoOr-ki0YJzzUltGmZgfRfY,1672
 flock/webapp/templates/partials/_flock_file_list.html,sha256=3F1RE1EaeRSQeyIWeA2ALHU2j4oGwureDtY6k1aZVjQ,1261
 flock/webapp/templates/partials/_flock_properties_form.html,sha256=kUHoxB6_C_R9nMDD_ClLRDL_9zQ6E8gFCrlkEkqcUYo,2904
@@ -545,7 +546,7 @@ flock/webapp/templates/partials/_flock_upload_form.html,sha256=IK4Kk_82z3m9zlutK
 flock/webapp/templates/partials/_header_flock_status.html,sha256=reNB4Prsu9lObz5tFhGk3AMe4bNw92gDJZUKABVaVBM,158
 flock/webapp/templates/partials/_load_manager_view.html,sha256=lu_2yKJcBPF8yZEeA0rnCPpYODieVfQgjq8HzKoPTzs,2950
 flock/webapp/templates/partials/_registry_table.html,sha256=z4EW5G3DTknymBeSlpL2PZLcb2143P35upMnmHFfeJs,715
-flock/webapp/templates/partials/_registry_viewer_content.html,sha256=GNI5LJsxefjwhxP24Q2flRgs-2yWAG-f-KFAAuV23tk,2347
+flock/webapp/templates/partials/_registry_viewer_content.html,sha256=rF3jFxP6mNkuf-nRRG_a0S8wWL4gdgoMRgxfpQGy0P4,3067
 flock/webapp/templates/partials/_results_display.html,sha256=1UJvCeyJTPxuJYUcGUM8O8uhNvCxxOfxpCjC-PCr80U,5268
 flock/webapp/templates/partials/_settings_env_content.html,sha256=16h1ppTGNY7wNkxQkaNhouTNN22tlw_u5rBk6cdhzFk,597
 flock/webapp/templates/partials/_settings_theme_content.html,sha256=TPkqLyXJHwWOOgjLVURLpHA2JJRncZGf78Q6olIZIJc,852
@@ -562,8 +563,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.527.dist-info/METADATA,sha256=RvdNldnNPaR7aVN0c_pULSlP166YPJr5uJwey78shgo,22786
-flock_core-0.4.527.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.527.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.527.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.527.dist-info/RECORD,,
+flock_core-0.4.529.dist-info/METADATA,sha256=WzwwdzvEuCbx-eWDDlfIjYRv8QLXgyznLqy0APSTKvc,22893
+flock_core-0.4.529.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.529.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.529.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.529.dist-info/RECORD,,