edsl 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

edsl/results/ResultsGGMixin.py

@@ -5,46 +5,113 @@ import tempfile
 from typing import Optional
 
 
+class GGPlot:
+    """A class to handle ggplot2 plot display and saving."""
+    
+    def __init__(self, r_code: str, width: float = 6, height: float = 4):
+        """Initialize with R code and dimensions."""
+        self.r_code = r_code
+        self.width = width
+        self.height = height
+        self._svg_data = None
+        self._saved = False  # Track if the plot was saved
+        
+    def _execute_r_code(self, save_command: str = ""):
+        """Execute R code with optional save command."""
+        full_r_code = self.r_code + save_command
+        
+        result = subprocess.run(
+            ["Rscript", "-"],
+            input=full_r_code,
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+
+        if result.returncode != 0:
+            if result.returncode == 127:
+                raise RuntimeError(
+                    "Rscript is probably not installed. Please install R from https://cran.r-project.org/"
+                )
+            else:
+                raise RuntimeError(
+                    f"An error occurred while running Rscript: {result.stderr}"
+                )
+
+        if result.stderr:
+            print("Error in R script:", result.stderr)
+            
+        return result
+        
+    def save(self, filename: str):
+        """Save the plot to a file."""
+        format = filename.split('.')[-1].lower()
+        if format not in ['svg', 'png']:
+            raise ValueError("Only 'svg' and 'png' formats are supported")
+            
+        save_command = f'\nggsave("{filename}", plot = last_plot(), width = {self.width}, height = {self.height}, device = "{format}")'
+        self._execute_r_code(save_command)
+        
+        self._saved = True
+        print(f"File saved to: {filename}")
+        return None  # Return None instead of self
+        
+    def _repr_html_(self):
+        """Display the plot in a Jupyter notebook."""
+        # Don't display if the plot was saved
+        if self._saved:
+            return None
+            
+        import tempfile
+        
+        # Generate SVG if we haven't already
+        if self._svg_data is None:
+            # Create temporary SVG file
+            with tempfile.NamedTemporaryFile(suffix='.svg') as tmp:
+                save_command = f'\nggsave("{tmp.name}", plot = last_plot(), width = {self.width}, height = {self.height}, device = "svg")'
+                self._execute_r_code(save_command)
+                with open(tmp.name, 'r') as f:
+                    self._svg_data = f.read()
+                    
+        return self._svg_data
+
 class ResultsGGMixin:
     """Mixin class for ggplot2 plotting."""
 
     def ggplot2(
         self,
         ggplot_code: str,
-        filename: str = None,
         shape="wide",
         sql: str = None,
         remove_prefix: bool = True,
         debug: bool = False,
         height=4,
         width=6,
-        format="svg",
         factor_orders: Optional[dict] = None,
     ):
         """Create a ggplot2 plot from a DataFrame.
 
+        Returns a GGPlot object that can be displayed in a notebook or saved to a file.
+
         :param ggplot_code: The ggplot2 code to execute.
-        :param filename: The filename to save the plot to.
         :param shape: The shape of the data in the DataFrame (wide or long).
         :param sql: The SQL query to execute beforehand to manipulate the data.
         :param remove_prefix: Whether to remove the prefix from the column names.
         :param debug: Whether to print the R code instead of executing it.
         :param height: The height of the plot in inches.
         :param width: The width of the plot in inches.
-        :param format: The format to save the plot in (png or svg).
         :param factor_orders: A dictionary of factor columns and their order.
         """
-
         if sql == None:
             sql = "select * from self"
 
         if shape == "long":
             df = self.sql(sql, shape="long")
         elif shape == "wide":
-            df = self.sql(sql, shape="wide", remove_prefix=remove_prefix)
+            df = self.sql(sql, remove_prefix=remove_prefix)
 
         # Convert DataFrame to CSV format
-        csv_data = df.to_csv(index=False)
+        csv_data = df.to_csv().text
 
         # Embed the CSV data within the R script
         csv_data_escaped = csv_data.replace("\n", "\\n").replace("'", "\\'")
@@ -52,70 +119,60 @@ class ResultsGGMixin:
 
         if factor_orders is not None:
             for factor, order in factor_orders.items():
-                # read_csv_code += f"""self${{{factor}}} <- factor(self${{{factor}}}, levels=c({','.join(['"{}"'.format(x) for x in order])}))"""
-
                 level_string = ", ".join([f'"{x}"' for x in order])
                 read_csv_code += (
                     f"self${factor} <- factor(self${factor}, levels=c({level_string}))"
                 )
                 read_csv_code += "\n"
 
-        # Load ggplot2 library
-        load_ggplot2 = "library(ggplot2)\n"
-
-        # Check if a filename is provided for the plot, if not create a temporary one
-        if not filename:
-            filename = tempfile.mktemp(suffix=f".{format}")
-
-        # Combine all R script parts
-        full_r_code = load_ggplot2 + read_csv_code + ggplot_code
-
-        # Add command to save the plot to a file
-        full_r_code += f'\nggsave("{filename}", plot = last_plot(), width = {width}, height = {height}, device = "{format}")'
+        # Load ggplot2 library and combine all R script parts
+        full_r_code = "library(ggplot2)\n" + read_csv_code + ggplot_code
 
         if debug:
             print(full_r_code)
             return
 
-        result = subprocess.run(
-            ["Rscript", "-"],
-            input=full_r_code,
-            text=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-
-        if result.returncode != 0:
-            if result.returncode == 127:  # 'command not found'
-                raise RuntimeError(
-                    "Rscript is probably not installed. Please install R from https://cran.r-project.org/"
-                )
-            else:
-                raise RuntimeError(
-                    f"An error occurred while running Rscript: {result.stderr}"
-                )
-
-        if result.stderr:
-            print("Error in R script:", result.stderr)
-        else:
-            self._display_plot(filename, width, height)
+        return GGPlot(full_r_code, width=width, height=height)
 
     def _display_plot(self, filename: str, width: float, height: float):
-        """Display the plot in the notebook."""
-        import matplotlib.pyplot as plt
-        import matplotlib.image as mpimg
-
-        if filename.endswith(".png"):
-            img = mpimg.imread(filename)
-            plt.figure(
-                figsize=(width, height)
-            )  # Set the figure size (width, height) in inches
-            plt.imshow(img)
-            plt.axis("off")
-            plt.show()
-        elif filename.endswith(".svg"):
-            from IPython.display import SVG, display
-
-            display(SVG(filename=filename))
+        """Display the plot in the notebook or open in system viewer if running from terminal."""
+        try:
+            # Try to import IPython-related modules
+            import matplotlib.pyplot as plt
+            import matplotlib.image as mpimg
+            from IPython import get_ipython
+
+            # Check if we're in a notebook environment
+            if get_ipython() is not None:
+                if filename.endswith(".png"):
+                    img = mpimg.imread(filename)
+                    plt.figure(figsize=(width, height))
+                    plt.imshow(img)
+                    plt.axis("off")
+                    plt.show()
+                elif filename.endswith(".svg"):
+                    from IPython.display import SVG, display
+                    display(SVG(filename=filename))
+                else:
+                    print("Unsupported file format. Please provide a PNG or SVG file.")
+                return
+
+        except ImportError:
+            pass
+
+        # If we're not in a notebook or imports failed, open with system viewer
+        import platform
+        import os
+        
+        system = platform.system()
+        if system == 'Darwin':       # macOS
+            if filename.endswith('.svg'):
+                subprocess.run(['open', '-a', 'Preview', filename])
+            else:
+                subprocess.run(['open', filename])
+        elif system == 'Linux':
+            subprocess.run(['xdg-open', filename])
+        elif system == 'Windows':
+            os.startfile(filename)
         else:
-            print("Unsupported file format. Please provide a PNG or SVG file.")
+            print(f"File saved to: {filename}")

edsl/scenarios/Scenario.py

@@ -361,6 +361,39 @@ class Scenario(Base, UserDict, ScenarioHtmlMixin):
         extractor = PdfExtractor(pdf_path)
         return Scenario(extractor.get_pdf_dict())
 
+    @classmethod
+    def from_pdf_to_image(cls, pdf_path, image_format="jpeg"):
+        """
+        Convert each page of a PDF into an image and create key/value for it.
+
+        :param pdf_path: Path to the PDF file.
+        :param image_format: Format of the output images (default is 'jpeg').
+        :return: ScenarioList instance containing the Scenario instances.
+
+        The scenario has a key "filepath" and one or more keys "page_{i}" for each page.
+        """
+        import tempfile
+        from pdf2image import convert_from_path
+        from edsl.scenarios import Scenario
+
+        with tempfile.TemporaryDirectory() as output_folder:
+            # Convert PDF to images
+            images = convert_from_path(pdf_path)
+
+            scenario_dict = {"filepath":pdf_path}
+
+            # Save each page as an image and create Scenario instances
+            for i, image in enumerate(images):
+                image_path = os.path.join(output_folder, f"page_{i}.{image_format}")
+                image.save(image_path, image_format.upper())
+
+                from edsl import FileStore
+                scenario_dict[f"page_{i}"] = FileStore(image_path)
+
+            scenario = Scenario(scenario_dict)
+
+            return cls(scenario)
+
     @classmethod
     def from_docx(cls, docx_path: str) -> "Scenario":
         """Creates a scenario from the text of a docx file.

edsl/scenarios/ScenarioList.py

@@ -1135,7 +1135,7 @@ class ScenarioList(Base, UserList, ScenarioListMixin):
         return cls(observations)
 
     @classmethod
-    def from_google_sheet(cls, url: str, sheet_name: str = None) -> ScenarioList:
+    def from_google_sheet(cls, url: str, sheet_name: str = None, column_names: Optional[List[str]]= None) -> ScenarioList:
         """Create a ScenarioList from a Google Sheet.
 
         This method downloads the Google Sheet as an Excel file, saves it to a temporary file,
@@ -1145,6 +1145,8 @@ class ScenarioList(Base, UserList, ScenarioListMixin):
             url (str): The URL to the Google Sheet.
             sheet_name (str, optional): The name of the sheet to load. If None, the method will behave
                                         the same as from_excel regarding multiple sheets.
+            column_names (List[str], optional): If provided, use these names for the columns instead
+                                              of the default column names from the sheet.
 
         Returns:
             ScenarioList: An instance of the ScenarioList class.
@@ -1172,8 +1174,25 @@ class ScenarioList(Base, UserList, ScenarioListMixin):
             temp_file.write(response.content)
             temp_filename = temp_file.name
 
-        # Call the from_excel class method with the temporary file
-        return cls.from_excel(temp_filename, sheet_name=sheet_name)
+        # First create the ScenarioList with default column names
+        scenario_list = cls.from_excel(temp_filename, sheet_name=sheet_name)
+
+        # If column_names is provided, create a new ScenarioList with the specified names
+        if column_names is not None:
+            if len(column_names) != len(scenario_list[0].keys()):
+                raise ValueError(
+                    f"Number of provided column names ({len(column_names)}) "
+                    f"does not match number of columns in sheet ({len(scenario_list[0].keys())})"
+                )
+            
+            # Create a codebook mapping original keys to new names
+            original_keys = list(scenario_list[0].keys())
+            codebook = dict(zip(original_keys, column_names))
+            
+            # Return new ScenarioList with renamed columns
+            return scenario_list.rename(codebook)
+        else:
+            return scenario_list
 
     @classmethod
     def from_delimited_file(

edsl/scenarios/ScenarioListPdfMixin.py

@@ -148,13 +148,15 @@ class ScenarioListPdfMixin:
             return False
 
     @classmethod
-    def _from_pdf_to_image(cls, pdf_path, image_format="jpeg"):
+    def from_pdf_to_image(cls, pdf_path, image_format="jpeg"):
         """
         Convert each page of a PDF into an image and create Scenario instances.
 
         :param pdf_path: Path to the PDF file.
         :param image_format: Format of the output images (default is 'jpeg').
         :return: ScenarioList instance containing the Scenario instances.
+
+        The scenario list has keys "filepath", "page", "content".
         """
         import tempfile
         from pdf2image import convert_from_path
@@ -171,10 +173,14 @@ class ScenarioListPdfMixin:
                 image_path = os.path.join(output_folder, f"page_{i+1}.{image_format}")
                 image.save(image_path, image_format.upper())
 
-                scenario = Scenario._from_filepath_image(image_path)
+                from edsl import FileStore
+                scenario = Scenario({
+                    "filepath":image_path,
+                    "page":i,
+                    "content":FileStore(image_path)
+                    })
                 scenarios.append(scenario)
 
-            # print(f"Saved {len(images)} pages as images in {output_folder}")
             return cls(scenarios)
 
     @staticmethod

{edsl-0.1.42.dist-info → edsl-0.1.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.42
+Version: 0.1.43
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT
@@ -17,7 +17,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
-Requires-Dist: anthropic (>=0.23.1,<0.24.0)
+Requires-Dist: anthropic (>=0.45.0,<0.46.0)
 Requires-Dist: azure-ai-inference (>=1.0.0b3,<2.0.0)
 Requires-Dist: black[jupyter] (>=24.4.2,<25.0.0)
 Requires-Dist: boto3 (>=1.34.161,<2.0.0)
@@ -37,7 +37,6 @@ Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: platformdirs (>=4.3.6,<5.0.0)
 Requires-Dist: pydot (>=2.0.0,<3.0.0)
 Requires-Dist: pygments (>=2.17.2,<3.0.0)
-Requires-Dist: pymupdf (>=1.24.4,<2.0.0)
 Requires-Dist: pypdf2 (>=3.0.1,<4.0.0)
 Requires-Dist: pyreadstat (>=1.2.7,<2.0.0)
 Requires-Dist: python-docx (>=1.1.0,<2.0.0)
@@ -107,5 +106,5 @@ See instructions on [storing API keys](https://docs.expectedparrot.com/en/latest
 
 ## 💡 Contributions, feature requests & bugs
 Interested in contributing? Want us to add a new feature? Found a bug for us to squash? 
-Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m)..
+Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m).
 

{edsl-0.1.42.dist-info → edsl-0.1.43.dist-info}/RECORD

@@ -2,17 +2,17 @@ edsl/Base.py,sha256=-U6ngLZJDqImrAwF-TSmYzMESre0CG5rq9ZFxFh31sY,12864
 edsl/BaseDiff.py,sha256=92BirXj2u3TEGHJWni9TBsvZjvq8wpb4wDL2vxX9Lb0,8253
 edsl/TemplateLoader.py,sha256=sDBlSMt7EfOduM7w3h6v03gvh_Rzn9hVrlS-iLSQdZA,849
 edsl/__init__.py,sha256=iB5q_P2pXDV6Wb5oHKsFDhi_rJXID0aaqio1I98dwXA,1936
-edsl/__version__.py,sha256=a0ON039K5sX117g1thh7kP35cYMBjBhhhU9A-PERuT0,23
+edsl/__version__.py,sha256=PwEipAcIgfEks4UpVgOERoR8Az-FCfCGocVnb0rkncM,23
 edsl/agents/Agent.py,sha256=lF7GD_bCvRLP4hrtm3w451AUfuJln5jZHGYBH84CMVE,40741
 edsl/agents/AgentList.py,sha256=iRfQfyUYtaJbJ3sRubPqPKRr77nKQgzhFEeZ0wcAEk0,18955
-edsl/agents/Invigilator.py,sha256=ukqfmEAvRQOD3HpsI1vGDHkqUvOMEUtuVSBmutSNFXI,12054
+edsl/agents/Invigilator.py,sha256=SObe7PC08XoWNpOubZMFlVKPN8nfZplYBwY9LXJou8c,12084
 edsl/agents/InvigilatorBase.py,sha256=Ene3qKWV7czdBp5lFOL4Q-s_p4zNb8UMWn10XRGb4Cs,8985
-edsl/agents/PromptConstructor.py,sha256=orYFJI5Teh47cVJSJ63R8lfcAKSaDclSVX_OVTiqEgw,10752
-edsl/agents/QuestionInstructionPromptBuilder.py,sha256=t7Yuhvzq0cYbcRxzSOv_bvT3ihlmlyAOsScDMWg9A2M,4526
+edsl/agents/PromptConstructor.py,sha256=WZpodlWC_HT0e6bT05FSvapVXH9vVHQVISmNw50NetY,13657
+edsl/agents/QuestionInstructionPromptBuilder.py,sha256=3myBxREbIQ_1KtZBJEn9_Or2M4nmng-bUk2ubg3lLag,6666
 edsl/agents/QuestionTemplateReplacementsBuilder.py,sha256=-VSCAX0uqpA1xNr62V3kLh9NACR9fY0nvdp6KAJqk3c,5471
 edsl/agents/__init__.py,sha256=a3H1lxDwu9HR8fwh79C5DgxPSFv_bE2rzQ6y1D8Ba5c,80
 edsl/agents/descriptors.py,sha256=JxM_ckzhDmfZT1igSUdCxgyQcCK0o9MhU5jbLIned9g,3189
-edsl/agents/prompt_helpers.py,sha256=Ylo0Y1UVl34ImP76DnMchdL4PTzpYQUWWbtQwDlE_s4,5028
+edsl/agents/prompt_helpers.py,sha256=JkVRPrLQ1egPqbBKcgR22c6WYnTU4QjzZG5HwxDEHjs,5076
 edsl/agents/question_option_processor.py,sha256=q6g5B3E4Q9gWBtFCRqcXHaSxaGfWLqbKB2EXxqzihRk,6345
 edsl/auto/AutoStudy.py,sha256=XniD-g7jg19vbD5CWqq0QAiMsIz2CboKAAIluDODqzo,4326
 edsl/auto/StageBase.py,sha256=7ZjV0T-8FQBL-r5LeAozNQY_0RJ_GySdX48ToM7-dLc,8254
@@ -36,7 +36,7 @@ edsl/coop/CoopFunctionsMixin.py,sha256=RS79ADEbYUK-frf_WY-YnozVbM3ZaBufv1jxjF96G
 edsl/coop/ExpectedParrotKeyHandler.py,sha256=1lriainznM1FfQ7GEvTiI1EW8uNi8Sms3Vt5UDxso3U,4456
 edsl/coop/PriceFetcher.py,sha256=J5EaM-bPqnd2B0ZBVVqXJ-UQK-D4SdjmddYepnN7jz4,1777
 edsl/coop/__init__.py,sha256=4iZCwJSzJVyjBYk8ggGxY2kZjq9dXVT1jhyPDNyew4I,115
-edsl/coop/coop.py,sha256=aUIThjtIbUUXdQ2SAz0jZNcxKux72fnR0B_-6GV3WFk,40858
+edsl/coop/coop.py,sha256=-O07b4zhhjfPGF_XjX8uiv1Cdc41R121Y1h-5kJEEkw,42631
 edsl/coop/utils.py,sha256=SBV76sk5_2rhP3RKGkJsOkrx9Qr-jD0puqYhVR_MgSY,3900
 edsl/data/Cache.py,sha256=ryMWLowyXa8VwWKru-0pF43JHh2UVyL5Zezst-26J6c,18510
 edsl/data/CacheEntry.py,sha256=mTc-WG_dWc4s9s3MrOl3yUqao2Q_igCerNcluM4XCSQ,7376
@@ -46,13 +46,13 @@ edsl/data/SQLiteDict.py,sha256=V5Nfnxctgh4Iblqcw1KmbnkjtfmWrrombROSQ3mvg6A,8979
 edsl/data/__init__.py,sha256=i_bbYBc-vrdASBpDMcpIcfhbLKYOkvqA57R3ysBcQ6o,177
 edsl/data/orm.py,sha256=Jz6rvw5SrlxwysTL0QI9r68EflKxeEBmf6j6himHDS8,238
 edsl/data_transfer_models.py,sha256=r7Nl2ZyR0FZhzqQg8tz2jxonTVBboK9W3qMicts69qc,1960
-edsl/enums.py,sha256=bw_Lr0kyG706RiswpH0LE7smo4LbrnQvJfYG5PUqR0o,6146
+edsl/enums.py,sha256=3K-4xpOfORWOn-BzQVlMQyneSbORklaP39HB05YnXxY,6098
 edsl/exceptions/BaseException.py,sha256=eP30DOYtssbKt0qarfDkNOKDW-aG0DLaHtx42bp5dVQ,811
 edsl/exceptions/__init__.py,sha256=guZX0w_IGt-fYBuK_xVKACfJfQU6AYXM2kscbPp8Yrw,1532
 edsl/exceptions/agents.py,sha256=E_r9bHUQEPWTjy5D-CmDvFMgFe34aPtwo4ApYN71mDg,1626
 edsl/exceptions/cache.py,sha256=z4D4RHPtOV86xLsW5bl4JM8UtpH8D89gufrlpVu2mWM,178
 edsl/exceptions/configuration.py,sha256=qH2sInNTndKlCLAaNgaXHyRFdKQHL7-dElB_j8wz9g4,351
-edsl/exceptions/coop.py,sha256=xunPPrnbcNHn60wnH-Qw0rC_Ey99X_N7HnOBF8BQg7E,138
+edsl/exceptions/coop.py,sha256=C4Et4K3paDpbxgOgO8jBo22jVk9KTnt_uoCXt_qi7hc,188
 edsl/exceptions/data.py,sha256=K24CjgwFiMWxrF1Z2dF6F7Vfrge_y9kMK_wsYYSaroU,209
 edsl/exceptions/general.py,sha256=zAyJnppPjjxQAn6X3A5fetmv5FUR7kQDU58vwBKvAks,1114
 edsl/exceptions/inference_services.py,sha256=fU-HiPiIxR85qG3oDegI4e1kb_2nSih6pq8C-ObeaFc,156
@@ -65,7 +65,7 @@ edsl/exceptions/scenarios.py,sha256=j4OE9xrSrLKdRMwmr3webIRHBwBgvx0DL0uDThRW7yY,
 edsl/exceptions/surveys.py,sha256=BJUKFVkj6nrsq3TyvaZfEE-zjy3BCAM-s1lsdcrv_MM,677
 edsl/inference_services/AnthropicService.py,sha256=Xr1MQmBYYKKaMd9IRBYvK357i7vrxUm73nxxNZGCCCQ,3761
 edsl/inference_services/AvailableModelCacheHandler.py,sha256=9zGT1Huz0VTOZyN5GpakcMAe6pZyYmZcdSzuqPUZ09g,6179
-edsl/inference_services/AvailableModelFetcher.py,sha256=RU_mYHOGOQ7hCQN552EEse0piRrfKiz_Uy1YoP4Xwbc,7774
+edsl/inference_services/AvailableModelFetcher.py,sha256=2RjYftpSVbdxC_lE3U8G1Pn4m2UwY6WbxBHrrujMAFI,7894
 edsl/inference_services/AwsBedrock.py,sha256=aOJ7n_05cdh2EkTWfd9mhOJiPdaqEtmBJBHKmT_Ds5A,4001
 edsl/inference_services/AzureAI.py,sha256=8ymXCAWqa4NkYEGi6_AvcSRN1WLPXueAWk-W8w_T6AI,8817
 edsl/inference_services/DeepInfraService.py,sha256=fWlH5sCNxf8eHPHxPPxJMEVWpCM9sDenkC8IZYqtXfA,515
@@ -92,22 +92,22 @@ edsl/jobs/Answers.py,sha256=lZpbGAqYqMQw7MUsmpivqMZkHjHHOmCY32s9Km284pQ,1445
 edsl/jobs/FetchInvigilator.py,sha256=83tbrqY_1qK0biNF1x51N0sFx49FFmuOi3o5HmFuCIY,1785
 edsl/jobs/InterviewTaskManager.py,sha256=I1GShC2CrBFnGOcWn3q2YUU0SJbesmeLrrM2_nkuhZo,3748
 edsl/jobs/InterviewsConstructor.py,sha256=MyRgygmi4318PgERjhhZZXlNUju2lB1CBu8LJJjYNSs,1853
-edsl/jobs/Jobs.py,sha256=hBi3DD5h55YWTFkhADIGVoS__0_xFBSy1Dd8zDsSBLw,29970
+edsl/jobs/Jobs.py,sha256=-UNknyXlO-3L06ljxukpZBay6IIQqHdCYNKHToiJftw,30776
 edsl/jobs/JobsChecks.py,sha256=v1sgdjKQTYMoZu-uobM9USn1KaF6QBoOfNSGH7ueZjU,5403
 edsl/jobs/JobsComponentConstructor.py,sha256=yzjBFQx1oK8CN2taniB82kpXo6W712dIG1E9ouwkujg,6969
-edsl/jobs/JobsPrompts.py,sha256=7SgpYqskrE0rynj5d53mX8Fz_wZJKniVze2rEmunvYo,10273
-edsl/jobs/JobsRemoteInferenceHandler.py,sha256=2aB3feL1oCYxBAcqHODG3IcX9_3hj7Fm64vJEgiczTE,10998
+edsl/jobs/JobsPrompts.py,sha256=szbNRda8uewU1QrLynIxUIefK94dSMR2MBkTCb9H4hI,12835
+edsl/jobs/JobsRemoteInferenceHandler.py,sha256=UC5LM7bedT9WabqspfdFo2HW6CRNJFNkjh-pSJqu3nU,11464
 edsl/jobs/JobsRemoteInferenceLogger.py,sha256=rUaImMQWVZO24i8cXBeDpd4rMu3fUSbolfqBNbrG1ms,9265
 edsl/jobs/RequestTokenEstimator.py,sha256=IF2sb1Tt_exzNyWnuvd8mm81gfyZsv-rUP-GUHBX32E,1183
 edsl/jobs/__init__.py,sha256=aKuAyd_GoalGj-k7djOoVwEbFUE2XLPlikXaA1_8yAg,32
 edsl/jobs/async_interview_runner.py,sha256=FdkfhazuRZjDUPjSYPqNGdfoYG538PzCa62rwdnKTmc,5226
-edsl/jobs/buckets/BucketCollection.py,sha256=KaeTB-sXWwzAo33SyfwCeBo4YXezlHmH69vQo8x5tqw,3687
+edsl/jobs/buckets/BucketCollection.py,sha256=3rbeEPz6PppJ3YPpYlRGzCsiVOfYzjHyPtwA6TFdZLc,5062
 edsl/jobs/buckets/ModelBuckets.py,sha256=hxw_tzc0V42CiB7mh5jIxlgwDVJ-zFZhlLtKrHEg8ho,2419
 edsl/jobs/buckets/TokenBucket.py,sha256=DNv5aOO8kwq3PvCXg84HCBhYFkzSiOqLBLiEJRFuCGQ,10082
 edsl/jobs/buckets/TokenBucketAPI.py,sha256=ht0b-xZvzaR9ymhjin4c1AZwapuLPOoJ2N9hViSPuA4,6847
 edsl/jobs/buckets/TokenBucketClient.py,sha256=Jx20nDAdUSh3USUX9B4PHd1uAFMdyOHtRa2phzFnh-w,7095
 edsl/jobs/check_survey_scenario_compatibility.py,sha256=dU1IUPb1FFm0P1ievzTmtgcRxH2soCdPaG5GZ1Zd4fA,3816
-edsl/jobs/data_structures.py,sha256=1kLN6goMLcOIT20vrDW2Wq-sA-cfygb_qgplW4-o090,3727
+edsl/jobs/data_structures.py,sha256=VwMLmfAiajRzdy1ruJJC-v3gU2FkOVnbsC9NZjpystw,3756
 edsl/jobs/decorators.py,sha256=vpeSgI3EP4RFz5V_OclFdnhiSrswihavAN8C9ygRhGE,1135
 edsl/jobs/interviews/Interview.py,sha256=GTUS1yuz1dCtlHEVe2N76qTSpmk6OecR5PMkDAjRzsQ,15051
 edsl/jobs/interviews/InterviewExceptionCollection.py,sha256=ZIe9nnI8pznxp1D0K2Ii9SHorc9-f0k_lQV-Giq41P8,3666
@@ -142,17 +142,17 @@ edsl/language_models/__init__.py,sha256=DkG3ZDEFOP1JQlhAuKTotxj4WfkWenzNJwr4WQpq
 edsl/language_models/fake_openai_call.py,sha256=dxbL5e4NLF-eTk9IduPyGwLiVCX_-eGCJDaLYPlQTqc,364
 edsl/language_models/fake_openai_service.py,sha256=2AAsAinELbMZRqiepwBkWhWcLuMe5ORXUBNarrdl1ug,1714
 edsl/language_models/key_management/KeyLookup.py,sha256=bKmSrvivKtUrrSR2CX-uBi82mJKCwbhdRhPYTgLO4bs,2058
-edsl/language_models/key_management/KeyLookupBuilder.py,sha256=ZrsPE177Kbn2gizyk2CSQfyk_8jVzrRpET-qFtZia3U,9373
+edsl/language_models/key_management/KeyLookupBuilder.py,sha256=HV21uTSYOuSKBIIoGIgyRje-CvWtsGjZHPwDRJUUHX4,10342
 edsl/language_models/key_management/KeyLookupCollection.py,sha256=OU6jPZoJ54fAtkTfxwsD2lw_ZVha92G_T0LpCq1r-js,1205
 edsl/language_models/key_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/language_models/key_management/models.py,sha256=n5H76iH6mWCsjVLmFwwVPhcB81jNkfa9hLwIgKVxeQI,2594
+edsl/language_models/key_management/models.py,sha256=Rs7fjzFjPHXv4sKU9E-FnwZj2ul69sWDwhdIMhjjElE,2753
 edsl/language_models/model.py,sha256=yWt3t3e1s0pt3zKJu450RFzhLfV7nA6CZYYzrrq7nyo,10389
 edsl/language_models/repair.py,sha256=TnYY6-rTQFeZaeGOymT0UkIjfZrxs4JK0v2h9UY4m48,5401
 edsl/language_models/utilities.py,sha256=0dXHl74OlGKf1224fo5wYsawdBvxqMAB87nY_tJ0VYY,2295
 edsl/notebooks/Notebook.py,sha256=j1W_sGp5Oa6tY4FlR2KthOU_ZzCFlRShkHYcpciIt94,8217
 edsl/notebooks/NotebookToLaTeX.py,sha256=94gewtyE9PHeZuMHkMm38Bv571vk0Scd5jmQFpVOBNY,4512
 edsl/notebooks/__init__.py,sha256=VNUA3nNq04slWNbYaNrzOhQJu3AZANpvBniyCJSzJ7U,45
-edsl/prompts/Prompt.py,sha256=SwvOVnw0SaSsYBjJgV11_hrrpgBlWbHxXKhM3d-0gG4,11409
+edsl/prompts/Prompt.py,sha256=gSpMneHIlfOr1_rxWKiMdFMC98w458dg0KEFQDJmLAA,14081
 edsl/prompts/__init__.py,sha256=wrtkH7JW72U93_pnmTvqQx_NoadH5OPRNfrZ5AaD7Co,87
 edsl/questions/ExceptionExplainer.py,sha256=BgM80FRPJjS_TrY6XaVmlT666MzY9DEagviGQj9-WEQ,2868
 edsl/questions/HTMLQuestion.py,sha256=mRzVpfFLZ2RYBSDbLHeXTyAXbUHorpiwhNf-nuUSC5M,3431
@@ -181,7 +181,7 @@ edsl/questions/derived/QuestionLinearScale.py,sha256=oGxTOFITNrFofV468Gow9rtnBMW
 edsl/questions/derived/QuestionTopK.py,sha256=IAmW1kUA1rvW_NH3yxroLfarhl6_QyTEwWZ54gbi6fg,3294
 edsl/questions/derived/QuestionYesNo.py,sha256=KWJyaXSNPNxELtK0nWvIqNtpAF05MMAC0ILUjxXkVwo,2735
 edsl/questions/derived/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/questions/descriptors.py,sha256=kDqGQR-SCR45MvG8jLtZvOavxbFYL2nhlfLqu8UDzSs,18384
+edsl/questions/descriptors.py,sha256=B2JB3q5RpxSYdwP7HAuEpf3musZe1rhvI29GkzHn4Qw,18897
 edsl/questions/loop_processor.py,sha256=h2t8Sn71JBBpim3MaVcZtPTcUsPCBR2aJIpzDFzam5k,4553
 edsl/questions/prompt_templates/question_budget.jinja,sha256=-ekZYCa_KRc-xLcpf3j-YmXV0WSyIK_laOp2x3li-tA,737
 edsl/questions/prompt_templates/question_checkbox.jinja,sha256=V-Dn2VJhfXyIILWIhMviTfQ5WuXh1YZerwicaA6Okzc,1136
@@ -191,7 +191,7 @@ edsl/questions/prompt_templates/question_linear_scale.jinja,sha256=VB9bFPeLGGb5a
 edsl/questions/prompt_templates/question_list.jinja,sha256=MAkNv88E79jXK9TxKdnf5KgA77CWz9vXc2TZm2r-g-A,495
 edsl/questions/prompt_templates/question_multiple_choice.jinja,sha256=sSyAhnexZF6oWqHL-45r7o69vrFcCbbYXLZ3zu7q76U,761
 edsl/questions/prompt_templates/question_numerical.jinja,sha256=c20sp3HfFonfaRwwmnF7HjAEugU15QlgpNAIkNHasl0,1218
-edsl/questions/question_base_gen_mixin.py,sha256=UNgYVmQvX_adD9FxQEd0peTzhW6-lf9iDocmkNplZhY,6182
+edsl/questions/question_base_gen_mixin.py,sha256=Wpe0BMqICXM1fRDuHa8AQxL89tczGxaLscyUauI7I_o,6216
 edsl/questions/question_registry.py,sha256=H4Q4JYMHn7-_5rU7Ap26N6Ruzz9WSZqOf1b89MScIDI,6352
 edsl/questions/register_questions_meta.py,sha256=2h_9iZt3cjr_7JRmveTqbmEBBCvjtefMDfhM7Pgd_zg,2598
 edsl/questions/response_validator_abc.py,sha256=410DIb8Z5uF_xu1lG32OF6X7aoOtL6gG3UIMY83kfeo,6838
@@ -243,14 +243,14 @@ edsl/questions/templates/yes_no/answering_instructions.jinja,sha256=UAcssfcYeW8z
 edsl/questions/templates/yes_no/question_presentation.jinja,sha256=hoEVj4GQD3EYnR2AStXkMFOJeqISNoEVzBd8-cx2yWg,273
 edsl/results/CSSParameterizer.py,sha256=vI3VTgTihJeCYGfmGp7fOhTitHZ17jrDGbq46Sa2rd8,3677
 edsl/results/Dataset.py,sha256=5mpxMKUqqv-593lF5fEgi2aORUj2iIbIMEZnPrTP33M,20401
-edsl/results/DatasetExportMixin.py,sha256=6U1IN1Nb_bwgDZtQx9mhUV63Topkvv3ssxyqBEcG848,21267
+edsl/results/DatasetExportMixin.py,sha256=eD3zifl8OU1BaNsZ3ho3P5Pe3-qqW3GflK_7OsRMg3U,22557
 edsl/results/DatasetTree.py,sha256=nvNCF9psLcQ65qsxze7qkrhLn-U-N8OJ327Nf-sFskQ,10178
 edsl/results/MarkdownToDocx.py,sha256=e8kdDPoqS6Zvd8OTldP9AXbjtmr8BZnro7f0-g1ENi4,4123
 edsl/results/MarkdownToPDF.py,sha256=RgQ8V86AD_h0HlohUiTWcbL8zOpI8xFC4FK-aOh26HE,3608
 edsl/results/Result.py,sha256=EQ2klw1vwFv3oih1I38AAJEOYOd7PKEk_oGwA3HTc4A,21404
-edsl/results/Results.py,sha256=WaGHNBT3ctqUwL9iWdQGIU5c7uy-tfAgcgumCjpqlJM,41880
+edsl/results/Results.py,sha256=NmUq0162WpDlmDjR5xi5uJcBTu69XC2Zywvva5a-rho,48363
 edsl/results/ResultsExportMixin.py,sha256=v9N4pUMrycmKIDzdWn1grmx7F8lxIPAOjfV6OScYSwc,1379
-edsl/results/ResultsGGMixin.py,sha256=SAYz8p4wb1g8x6KhBVz9NHOGib2c2XsqtTclpADrFeM,4344
+edsl/results/ResultsGGMixin.py,sha256=-E4vhljp53LSSdoURAZnkAb9ekoV4yF0ASv3S4tgnr8,6530
 edsl/results/TableDisplay.py,sha256=xGJcotgUqWrmCkQLeD9YIwLrNv7su4VDce3EnllfrLQ,3725
 edsl/results/TextEditor.py,sha256=8lG6Dh1PDE3Yq_oDvu2zOQHpcQEfLfflSzd04BjHciw,1370
 edsl/results/__init__.py,sha256=cGvJx1BvGCspUPTKYxKwQDRIoWxFSwHUAfOfuVVti4E,82
@@ -268,11 +268,11 @@ edsl/scenarios/DocumentChunker.py,sha256=LZXh_yx507LMNQ-i2VnSHZiPpRI0XQUECO8e3xA
 edsl/scenarios/DocxScenario.py,sha256=ul3nkX826m_T6LFptswqtnH5czP_yxMlLWgbTmFIZI4,482
 edsl/scenarios/FileStore.py,sha256=onFZAqkdqzyQeQ9_2zn1qGY40SqmRG9X8DvtcbXW39o,17418
 edsl/scenarios/PdfExtractor.py,sha256=AMTwEZY0pFzSqe3CYVWhijQDfj3qlZq0CoaHaYDnapM,1196
-edsl/scenarios/Scenario.py,sha256=hTwUe3VoHAJTfbWgzVomOJEDwUFwQSG5ZB7mj3sWnr8,17058
+edsl/scenarios/Scenario.py,sha256=9eP78TrIsxkvXYq7-aQCcqcW37v2M4MSh7EIk8l018E,18303
 edsl/scenarios/ScenarioHtmlMixin.py,sha256=5H8MnPPWqlGZ0_Ojv1WjkFaNNRrr-JpCRwlABDBfPXs,2111
-edsl/scenarios/ScenarioList.py,sha256=xFn6LqixMsSJQk33Zk49rdGgKmq_K06SqhCQTE3pCuU,54341
+edsl/scenarios/ScenarioList.py,sha256=xxbeaRuA-Bp3Ah8F78SImrXIk0rB2yYUYShXWqgXJ4Q,55372
 edsl/scenarios/ScenarioListExportMixin.py,sha256=eghBPIi4CmvkPbHV2hpFyE08jtOzuHiKAlt4JC9D81w,1475
-edsl/scenarios/ScenarioListPdfMixin.py,sha256=DjDbWdEz8VarVZXs5KCXZ66-74Ac4Xz515AwhPnZua0,7578
+edsl/scenarios/ScenarioListPdfMixin.py,sha256=6sGXgDYo7e5lv7sB685iq5DS7KSbXNav-k6y6MRYNLM,7725
 edsl/scenarios/__init__.py,sha256=CQXwTNTIG9jg_pLkDPZgapUFY0_LwZFVQ8HaYvof0Nc,145
 edsl/scenarios/directory_scanner.py,sha256=eJHPx6pc_No-I-old0vwrNRwNxmgnn3Fr6mht5mp8Fw,3312
 edsl/scenarios/file_methods.py,sha256=HeusyoXOi2Bb0Bfp8MVDWKMFpe_ipP-cxENiRrSKZQU,2621
@@ -358,7 +358,7 @@ edsl/utilities/remove_edsl_version.py,sha256=3n2RoXvZ4pH3k-_lc7B-vkeUyHXHX6vKHQS
 edsl/utilities/repair_functions.py,sha256=tftmklAqam6LOQQu_-9U44N-llycffhW8LfO63vBmNw,929
 edsl/utilities/restricted_python.py,sha256=5-_zUhrNbos7pLhDl9nr8d24auRlquR6w-vKkmNjPiA,2060
 edsl/utilities/utilities.py,sha256=FbI9QYGD4eaHrwZ6ePx51jjpatZqwSPHJhimx-h6HyA,12660
-edsl-0.1.42.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.42.dist-info/METADATA,sha256=MJucv6TTnqq0ttj-78QkoGgyEo-SSxLz4cIWBSNSJuw,4761
-edsl-0.1.42.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-edsl-0.1.42.dist-info/RECORD,,
+edsl-0.1.43.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.43.dist-info/METADATA,sha256=GZMhoOS8tgU-eC7KkTr_kAM5nriLA7tCl3JzfpUvGhk,4719
+edsl-0.1.43.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.43.dist-info/RECORD,,