edsl 0.1.51__py3-none-any.whl → 0.1.53__py3-none-any.whl

edsl/results/results.py

@@ -44,10 +44,10 @@ from typing import Optional, Callable, Any, Union, List, TYPE_CHECKING
 from bisect import bisect_left
 
 from ..base import Base
+from ..caching import Cache, CacheEntry
 
 if TYPE_CHECKING:
     from ..surveys import Survey
-    from ..caching import Cache
     from ..agents import AgentList
     from ..scenarios import ScenarioList
     from ..results import Result
@@ -707,12 +707,41 @@ class Results(UserList, ResultsOperationsMixin, Base):
             "b_not_a": [other_results[i] for i in indices_other],
         }
 
+    def initialize_cache_from_results(self):
+        cache = Cache(data={})
+
+        for result in self.data:
+            for key in result.data["prompt"]:
+                if key.endswith("_system_prompt"):
+                    question_name = key.removesuffix("_system_prompt")
+                    system_prompt = result.data["prompt"][key].text
+                    user_key = f"{question_name}_user_prompt"
+                    if user_key in result.data["prompt"]:
+                        user_prompt = result.data["prompt"][user_key].text
+                    else:
+                        user_prompt = ""
+
+                    # Get corresponding model response
+                    response_key = f"{question_name}_raw_model_response"
+                    output = result.data["raw_model_response"].get(response_key, "")
+
+                    entry = CacheEntry(
+                        model=result.model.model,
+                        parameters=result.model.parameters,
+                        system_prompt=system_prompt,
+                        user_prompt=user_prompt,
+                        output=json.dumps(output),
+                        iteration=0,
+                    )
+                    cache.data[entry.key] = entry
+
+        self.cache = cache
+
     @property
     def has_unfixed_exceptions(self) -> bool:
         return self.task_history.has_unfixed_exceptions
 
     def __hash__(self) -> int:
-
         return dict_hash(
             self.to_dict(sort=True, add_edsl_version=False, include_cache_info=False)
         )

edsl/scenarios/file_store.py

@@ -17,25 +17,26 @@ from .file_methods import FileMethods
 if TYPE_CHECKING:
     from .scenario_list import ScenarioList
 
+
 class FileStore(Scenario):
     """
     A specialized Scenario subclass for managing file content and metadata.
-    
+
     FileStore provides functionality for working with files in EDSL, handling various
     file formats with appropriate encoding, storage, and access methods. It extends
     Scenario to allow files to be included in surveys, questions, and other EDSL components.
-    
+
     FileStore supports multiple file formats including text, PDF, Word documents, images,
     and more. It can load files from local paths or URLs, and provides methods for
     accessing file content, extracting text, and managing file operations.
-    
+
     Key features:
     - Base64 encoding for portability and serialization
     - Lazy loading through temporary files when needed
     - Automatic MIME type detection
     - Text extraction from various file formats
     - Format-specific operations through specialized handlers
-    
+
     Attributes:
         _path (str): The original file path.
         _temp_path (str): Path to any generated temporary file.
@@ -45,7 +46,7 @@ class FileStore(Scenario):
         base64_string (str): Base64-encoded file content.
         external_locations (dict): Dictionary of external locations.
         extracted_text (str): Text extracted from the file.
-    
+
     Examples:
         >>> import tempfile
         >>> # Create a text file
@@ -53,13 +54,14 @@ class FileStore(Scenario):
         ...     _ = f.write("Hello World")
         ...     _ = f.flush()
         ...     fs = FileStore(f.name)
-        
+
         # The following example works locally but is commented out for CI environments
         # where dependencies like pandoc may not be available:
         # >>> # FileStore supports various formats
         # >>> formats = ["txt", "pdf", "docx", "pptx", "md", "py", "json", "csv", "html", "png", "db"]
         # >>> _ = [FileStore.example(format) for format in formats]
     """
+
     __documentation__ = "https://docs.expectedparrot.com/en/latest/filestore.html"
 
     def __init__(
@@ -75,11 +77,11 @@ class FileStore(Scenario):
     ):
         """
         Initialize a new FileStore object.
-        
+
         This constructor creates a FileStore object from either a file path or a base64-encoded
         string representation of file content. It handles automatic detection of file properties
         like MIME type, extracts text content when possible, and manages file encoding.
-        
+
         Args:
             path: Path to the file to load. Can be a local file path or URL.
             mime_type: MIME type of the file. If not provided, will be auto-detected.
@@ -93,7 +95,7 @@ class FileStore(Scenario):
                           text will be extracted automatically if possible.
             **kwargs: Additional keyword arguments. 'filename' can be used as an
                      alternative to 'path'.
-                     
+
         Note:
             If path is a URL (starts with http:// or https://), the file will be
             downloaded automatically.
@@ -138,15 +140,15 @@ class FileStore(Scenario):
     def path(self) -> str:
         """
         Returns a valid path to the file content, creating a temporary file if needed.
-        
+
         This property ensures that a valid file path is always available for the file
         content, even if the original file is no longer accessible or if the FileStore
         was created from a base64 string without a path. If the original path doesn't
         exist, it automatically generates a temporary file from the base64 content.
-        
+
         Returns:
             A string containing a valid file path to access the file content.
-            
+
         Examples:
             >>> import tempfile, os
             >>> with tempfile.NamedTemporaryFile(suffix=".txt", mode="w") as f:
@@ -155,8 +157,8 @@ class FileStore(Scenario):
             ...     fs = FileStore(f.name)
             ...     os.path.isfile(fs.path)
             True
-            
-            
+
+
         Notes:
             - The path may point to a temporary file that will be cleaned up when the
               Python process exits
@@ -319,9 +321,10 @@ class FileStore(Scenario):
 
         link = ConstructDownloadLink(self).html_create_link(self.path, style=None)
         return f"{parent_html}<br>{link}"
-    
+
     def download_link(self):
         from .construct_download_link import ConstructDownloadLink
+
         return ConstructDownloadLink(self).html_create_link(self.path, style=None)
 
     def encode_file_to_base64_string(self, file_path: str):
@@ -572,6 +575,53 @@ class FileStore(Scenario):
             f"Converting {self.suffix} files to pandas DataFrame is not supported"
         )
 
+    def is_image(self) -> bool:
+        """
+        Check if the file is an image by examining its MIME type.
+
+        Returns:
+            bool: True if the file is an image, False otherwise.
+
+        Examples:
+            >>> fs = FileStore.example("png")
+            >>> fs.is_image()
+            True
+            >>> fs = FileStore.example("txt")
+            >>> fs.is_image()
+            False
+        """
+        # Check if the mime type starts with 'image/'
+        return self.mime_type.startswith("image/")
+
+    def get_image_dimensions(self) -> tuple:
+        """
+        Get the dimensions (width, height) of an image file.
+
+        Returns:
+            tuple: A tuple containing the width and height of the image.
+
+        Raises:
+            ValueError: If the file is not an image or PIL is not installed.
+
+        Examples:
+            >>> fs = FileStore.example("png")
+            >>> width, height = fs.get_image_dimensions()
+            >>> isinstance(width, int) and isinstance(height, int)
+            True
+        """
+        if not self.is_image():
+            raise ValueError("This file is not an image")
+
+        try:
+            from PIL import Image
+        except ImportError:
+            raise ImportError(
+                "PIL (Pillow) is required to get image dimensions. Install it with: pip install pillow"
+            )
+
+        with Image.open(self.path) as img:
+            return img.size  # Returns (width, height)
+
     def __getattr__(self, name):
         """
         Delegate pandas DataFrame methods to the underlying DataFrame if this is a CSV file
@@ -662,13 +712,13 @@ class FileStore(Scenario):
 #         endobj
 #         xref
 #         0 7
-#         0000000000 65535 f 
-#         0000000010 00000 n 
-#         0000000053 00000 n 
-#         0000000100 00000 n 
-#         0000000173 00000 n 
-#         0000000232 00000 n 
-#         0000000272 00000 n 
+#         0000000000 65535 f
+#         0000000010 00000 n
+#         0000000053 00000 n
+#         0000000100 00000 n
+#         0000000173 00000 n
+#         0000000232 00000 n
+#         0000000272 00000 n
 #         trailer
 #         << /Size 7 /Root 1 0 R >>
 #         startxref
@@ -748,6 +798,7 @@ class FileStore(Scenario):
 
 if __name__ == "__main__":
     import doctest
+
     doctest.testmod()
 
     # formats = FileMethods.supported_file_types()
@@ -756,4 +807,3 @@ if __name__ == "__main__":
     #     fs = FileStore.example(file_type)
     #     fs.view()
     #     input("Press Enter to continue...")
-

edsl/tasks/task_history.py

@@ -302,22 +302,59 @@ class TaskHistory(RepresentationMixin):
         js = env.joinpath("report.js").read_text()
         return js
 
+    # @property
+    # def exceptions_table(self) -> dict:
+    #     """Return a dictionary of exceptions organized by type, service, model, and question name."""
+    #     exceptions_table = {}
+    #     for interview in self.total_interviews:
+    #         for question_name, exceptions in interview.exceptions.items():
+    #             for exception in exceptions:
+    #                 key = (
+    #                     exception.exception.__class__.__name__,  # Exception type
+    #                     interview.model._inference_service_,  # Service
+    #                     interview.model.model,  # Model
+    #                     question_name,  # Question name
+    #                 )
+    #                 if key not in exceptions_table:
+    #                     exceptions_table[key] = 0
+    #                 exceptions_table[key] += 1
+    #     return exceptions_table
+
     @property
     def exceptions_table(self) -> dict:
-        """Return a dictionary of exceptions organized by type, service, model, and question name."""
+        """Return a dictionary of unique exceptions organized by type, service, model, and question name."""
         exceptions_table = {}
+        seen_exceptions = set()
+        
         for interview in self.total_interviews:
             for question_name, exceptions in interview.exceptions.items():
                 for exception in exceptions:
-                    key = (
+                    # Create a unique identifier for this exception based on its content
+                    exception_key = (
                         exception.exception.__class__.__name__,  # Exception type
-                        interview.model._inference_service_,  # Service
-                        interview.model.model,  # Model
-                        question_name,  # Question name
+                        interview.model._inference_service_,     # Service
+                        interview.model.model,                   # Model
+                        question_name,                           # Question name
+                        exception.name,                          # Exception name
+                        str(exception.traceback)[:100] if exception.traceback else "",  # Truncated traceback
                     )
-                    if key not in exceptions_table:
-                        exceptions_table[key] = 0
-                    exceptions_table[key] += 1
+                    
+                    # Only count if we haven't seen this exact exception before
+                    if exception_key not in seen_exceptions:
+                        seen_exceptions.add(exception_key)
+                        
+                        # Add to the summary table
+                        table_key = (
+                            exception.exception.__class__.__name__,  # Exception type
+                            interview.model._inference_service_,     # Service
+                            interview.model.model,                   # Model
+                            question_name,                           # Question name
+                        )
+                        
+                        if table_key not in exceptions_table:
+                            exceptions_table[table_key] = 0
+                        exceptions_table[table_key] += 1
+        
         return exceptions_table
 
     @property

edsl/templates/error_reporting/base.html

@@ -5,6 +5,39 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Exceptions Report</title>
     <style>
+    /* Global styles */
+    :root {
+        --primary-color: #3f51b5;
+        --secondary-color: #5c6bc0;
+        --success-color: #4caf50;
+        --error-color: #f44336;
+        --warning-color: #ff9800;
+        --text-color: #333;
+        --light-bg: #f5f7fa;
+        --border-color: #e0e0e0;
+        --header-bg: #f9f9f9;
+        --card-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+        --font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+    }
+    
+    * {
+        box-sizing: border-box;
+    }
+    
+    body {
+        font-family: var(--font-family);
+        background-color: var(--light-bg);
+        color: var(--text-color);
+        line-height: 1.6;
+        margin: 0;
+        padding: 20px;
+    }
+    
+    .container {
+        max-width: 1200px;
+        margin: 0 auto;
+    }
+    
     {{ css }}
     </style>
 
@@ -14,9 +47,9 @@
 
 </head>
 <body>
-    {% include 'overview.html' %}
-    {% include 'exceptions_table.html' %}
-    {% include 'interviews.html' %}
-    {% include 'performance_plot.html' %}
+    <div class="container">
+        {% include 'exceptions_table.html' %}
+        {% include 'interviews.html' %}
+    </div>
 </body>
 </html>

edsl/templates/error_reporting/exceptions_table.html

@@ -1,34 +1,106 @@
+<div class="summary-section">    
+    <div class="table-container">
+        <h2>Exceptions Report</h2>
+        <table class="exceptions-table">
+            <thead>
+                <tr>
+                    <th>Exception Type</th>
+                    <th>Service</th>
+                    <th>Model</th>
+                    <th>Question Name</th>
+                    <th class="count-column">Count</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for (exception_type, service, model, question_name), count in exceptions_table.items() %}
+                    <tr>
+                        <td>{{ exception_type }}</td>
+                        <td>{{ service }}</td>
+                        <td>{{ model }}</td>
+                        <td>{{ question_name }}</td>
+                        <td class="count-cell">{{ count }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    
+    <p class="note">
+        Note: Each unique exception is counted only once. You may encounter repeated exceptions where retries were attempted.
+    </p>
+</div>
+
 <style>
-    th, td {
-        padding: 0 10px; /* This applies the padding uniformly to all td elements */
-    }
-</style>
-
-<table border="1">
-    <thead>
-        <tr>
-            <th style="text-align: left">Exception Type</th>
-            <th style="text-align: left">Service</th>
-            <th style="text-align: left">Model</th>
-            <th style="text-align: left">Question Name</th>
-            <th style="text-align: left">Total</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for (exception_type, service, model, question_name), count in exceptions_table.items() %}
-            <tr>
-                <td>{{ exception_type }}</td>
-                <td>{{ service }}</td>
-                <td>{{ model }}</td>
-                <td>{{ question_name }}</td>
-                <td>{{ count }}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
-<p>
-    Note: You may encounter repeated exceptions where retries were attempted. 
-</p>
-<p>
-    See details about each exception, including code for reproducing it (click to expand).
-</p>
+/* Summary section styles */
+.summary-section {
+    background-color: white;
+    border-radius: 8px;
+    margin-bottom: 24px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    overflow: hidden;
+    border: 1px solid #e0e0e0;
+    padding: 0 0 16px 0;
+}
+
+.section-header {
+    background-color: #f9f9f9;
+    padding: 12px 16px;
+    border-bottom: 1px solid #e0e0e0;
+}
+
+.section-header h2 {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 500;
+    color: #3f51b5;
+}
+
+.table-container {
+    padding: 16px;
+    overflow-x: auto;
+}
+
+/* Table styles */
+.exceptions-table {
+    width: 100%;
+    border-collapse: collapse;
+    margin-bottom: 16px;
+}
+
+.exceptions-table th {
+    background-color: #f5f5f5;
+    color: #333;
+    font-weight: 500;
+    text-align: left;
+    padding: 12px;
+    border-bottom: 2px solid #e0e0e0;
+}
+
+.exceptions-table td {
+    padding: 10px 12px;
+    border-bottom: 1px solid #e0e0e0;
+    color: #333;
+}
+
+.exceptions-table tr:hover {
+    background-color: #f9f9f9;
+}
+
+.count-column {
+    width: 80px;
+    text-align: center;
+}
+
+.count-cell {
+    text-align: center;
+    font-weight: 500;
+}
+
+/* Note styles */
+.note {
+    font-size: 14px;
+    color: #666;
+    margin: 0 16px;
+    line-height: 1.5;
+}
+</style>