edsl 0.1.36.dev6__py3-none-any.whl → 0.1.36.dev7__py3-none-any.whl

edsl/__init__.py

@@ -27,6 +27,7 @@ from edsl.questions import QuestionTopK
 
 from edsl.scenarios import Scenario
 from edsl.scenarios import ScenarioList
+from edsl.scenarios.FileStore import FileStore
 
 # from edsl.utilities.interface import print_dict_with_rich
 from edsl.surveys.Survey import Survey

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.36.dev6"
+__version__ = "0.1.36.dev7"

edsl/agents/InvigilatorBase.py

@@ -115,7 +115,11 @@ class InvigilatorBase(ABC):
         iteration = data["iteration"]
         additional_prompt_data = data["additional_prompt_data"]
         cache = Cache.from_dict(data["cache"])
-        sidecar_model = LanguageModel.from_dict(data["sidecar_model"])
+
+        if data["sidecar_model"] is None:
+            sidecar_model = None
+        else:
+            sidecar_model = LanguageModel.from_dict(data["sidecar_model"])
 
         return cls(
             agent=agent,

edsl/agents/PromptConstructor.py

@@ -1,17 +1,11 @@
 from __future__ import annotations
 from typing import Dict, Any, Optional, Set
-from collections import UserList
-import pdb
 
 from jinja2 import Environment, meta
 
 from edsl.prompts.Prompt import Prompt
-from edsl.data_transfer_models import ImageInfo
 
-# from edsl.prompts.registry import get_classes as prompt_lookup
-from edsl.exceptions import QuestionScenarioRenderError
-
-from edsl.agents.prompt_helpers import PromptComponent, PromptList, PromptPlan
+from edsl.agents.prompt_helpers import PromptPlan
 
 
 def get_jinja2_variables(template_str: str) -> Set[str]:
@@ -153,14 +147,28 @@ class PromptConstructor:
 
                 # might be getting it from the prior answers
                 if self.prior_answers_dict().get(question_option_key) is not None:
-                    if isinstance(
-                        question_options := self.prior_answers_dict()
-                        .get(question_option_key)
-                        .answer,
-                        list,
-                    ):
-                        question_data["question_options"] = question_options
-                        self.question.question_options = question_options
+                    prior_question = self.prior_answers_dict().get(question_option_key)
+                    if hasattr(prior_question, "answer"):
+                        if isinstance(prior_question.answer, list):
+                            question_data["question_options"] = prior_question.answer
+                            self.question.question_options = prior_question.answer
+                    else:
+                        placeholder_options = [
+                            "N/A",
+                            "Will be populated by prior answer",
+                            "These are placeholder options",
+                        ]
+                        question_data["question_options"] = placeholder_options
+                        self.question.question_options = placeholder_options
+
+                    # if isinstance(
+                    #     question_options := self.prior_answers_dict()
+                    #     .get(question_option_key)
+                    #     .answer,
+                    #     list,
+                    # ):
+                    #     question_data["question_options"] = question_options
+                    #     self.question.question_options = question_options
 
             replacement_dict = (
                 {key: f"<see file {key}>" for key in self.scenario_file_keys}

edsl/conversation/Conversation.py

@@ -169,6 +169,7 @@ class Conversation:
             agent=speaker,
             just_answer=False,
             cache=self.cache,
+            model=speaker.model,
         )
         return results[0]
 
@@ -179,7 +180,6 @@ class Conversation:
         i = 0
         while await self.continue_conversation():
             speaker = self.next_speaker()
-            # breakpoint()
 
             next_statement = AgentStatement(
                 statement=await self.get_next_statement(

edsl/inference_services/InferenceServicesCollection.py

@@ -60,13 +60,15 @@ class InferenceServicesCollection:
 
         if model_name == "test":
             return TestService.create_model(model_name)
+
+        if service_name:
+            for service in self.services:
+                if service_name == service._inference_service_:
+                    return service.create_model(model_name)
+
         for service in self.services:
             if model_name in self._get_service_available(service):
                 if service_name is None or service_name == service._inference_service_:
                     return service.create_model(model_name)
 
-        # if model_name == "test":
-        #     from edsl.language_models import LanguageModel
-        #     return LanguageModel(test = True)
-
         raise Exception(f"Model {model_name} not found in any of the services")

edsl/jobs/interviews/Interview.py

@@ -178,7 +178,7 @@ class Interview:
         if include_exceptions:
             d["exceptions"] = self.exceptions.to_dict()
         return d
-    
+
     @classmethod
     def from_dict(cls, d: dict[str, Any]) -> "Interview":
         """Return an Interview instance from a dictionary."""
@@ -187,13 +187,23 @@ class Interview:
         scenario = Scenario.from_dict(d["scenario"])
         model = LanguageModel.from_dict(d["model"])
         iteration = d["iteration"]
-        return cls(agent=agent, survey=survey, scenario=scenario, model=model, iteration=iteration)
+        interview = cls(
+            agent=agent,
+            survey=survey,
+            scenario=scenario,
+            model=model,
+            iteration=iteration,
+        )
+        if "exceptions" in d:
+            exceptions = InterviewExceptionCollection.from_dict(d["exceptions"])
+            interview.exceptions = exceptions
+        return interview
 
     def __hash__(self) -> int:
         from edsl.utilities.utilities import dict_hash
 
         return dict_hash(self._to_dict(include_exceptions=False))
-    
+
     def __eq__(self, other: "Interview") -> bool:
         """
         >>> from edsl.jobs.interviews.Interview import Interview; i = Interview.example(); d = i._to_dict(); i2 = Interview.from_dict(d); i == i2

edsl/jobs/interviews/InterviewExceptionEntry.py

@@ -132,18 +132,25 @@ class InterviewExceptionEntry:
         )
         console.print(tb)
         return html_output.getvalue()
-    
+
     @staticmethod
     def serialize_exception(exception: Exception) -> dict:
         return {
             "type": type(exception).__name__,
             "message": str(exception),
-            "traceback": "".join(traceback.format_exception(type(exception), exception, exception.__traceback__)),
+            "traceback": "".join(
+                traceback.format_exception(
+                    type(exception), exception, exception.__traceback__
+                )
+            ),
         }
-    
+
     @staticmethod
     def deserialize_exception(data: dict) -> Exception:
-        exception_class = globals()[data["type"]]
+        try:
+            exception_class = globals()[data["type"]]
+        except KeyError:
+            exception_class = Exception
         return exception_class(data["message"])
 
     def to_dict(self) -> dict:
@@ -158,7 +165,7 @@ class InterviewExceptionEntry:
             "traceback": self.traceback,
             "invigilator": self.invigilator.to_dict(),
         }
-    
+
     @classmethod
     def from_dict(cls, data: dict) -> "InterviewExceptionEntry":
         """Create an InterviewExceptionEntry from a dictionary."""

edsl/scenarios/FileStore.py

@@ -77,8 +77,19 @@ class FileStore(Scenario):
     def __str__(self):
         return "FileStore: self.path"
 
+    @classmethod
+    def example(self):
+        import tempfile
+
+        with tempfile.NamedTemporaryFile(suffix=".txt", delete=False) as f:
+            f.write(b"Hello, World!")
+
+        return self(path=f.name)
+
     @property
     def size(self) -> int:
+        if self.base64_string != None:
+            return (len(self.base64_string) / 4.0) * 3  # from base64 to char size
         return os.path.getsize(self.path)
 
     def upload_google(self, refresh: bool = False) -> None:
@@ -93,7 +104,7 @@ class FileStore(Scenario):
         return cls(**d)
 
     def __repr__(self):
-        return f"FileStore({self.path})"
+        return f"FileStore(path='{self.path}')"
 
     def encode_file_to_base64_string(self, file_path: str):
         try:
@@ -272,7 +283,8 @@ class CSVFileStore(FileStore):
 
         with tempfile.NamedTemporaryFile(suffix=".csv", delete=False) as f:
             r.to_csv(filename=f.name)
-            return cls(f.name)
+
+        return cls(f.name)
 
     def view(self):
         import pandas as pd
@@ -352,7 +364,8 @@ class PDFFileStore(FileStore):
 
         with tempfile.NamedTemporaryFile(suffix=".pdf", delete=False) as f:
             f.write(pdf_string.encode())
-            return cls(f.name)
+
+        return cls(f.name)
 
 
 class PNGFileStore(FileStore):
@@ -367,7 +380,8 @@ class PNGFileStore(FileStore):
 
         with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as f:
             f.write(png_string.encode())
-            return cls(f.name)
+
+        return cls(f.name)
 
     def view(self):
         import matplotlib.pyplot as plt
@@ -407,7 +421,8 @@ class HTMLFileStore(FileStore):
 
         with tempfile.NamedTemporaryFile(suffix=".html", delete=False) as f:
             f.write("<html><body><h1>Test</h1></body></html>".encode())
-            return cls(f.name)
+
+        return cls(f.name)
 
     def view(self):
         import webbrowser

edsl/scenarios/Scenario.py

@@ -448,7 +448,10 @@ class Scenario(Base, UserDict, ScenarioHtmlMixin):
         from edsl.scenarios.FileStore import FileStore
 
         for key, value in d.items():
-            if isinstance(value, FileStore):
+            # TODO: we should check this better if its a FileStore + add remote security check against path traversal
+            if (
+                isinstance(value, dict) and "base64_string" in value and "path" in value
+            ) or isinstance(value, FileStore):
                 d[key] = FileStore.from_dict(value)
         return cls(d)
 

edsl/scenarios/__init__.py

@@ -1,2 +1,4 @@
 from edsl.scenarios.Scenario import Scenario
 from edsl.scenarios.ScenarioList import ScenarioList
+
+# from edsl.scenarios.FileStore import FileStore

{edsl-0.1.36.dev6.dist-info → edsl-0.1.36.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.36.dev6
+Version: 0.1.36.dev7
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT

{edsl-0.1.36.dev6.dist-info → edsl-0.1.36.dev7.dist-info}/RECORD

@@ -1,13 +1,13 @@
-edsl/__init__.py,sha256=FSkGD82Dmfq6YBA3qI2bJ78OkQ8mpIik0sttRyFRy3M,1817
-edsl/__version__.py,sha256=Xth943Ecpt6YA-YRz5PoihEUZTNkilcDyvngmNz_OGI,29
+edsl/__init__.py,sha256=Xc4AuXpEALuT7khU4CFgvV_WI9elsQ28w5RuyVx8MME,1865
+edsl/__version__.py,sha256=6G_boHcFK2Q6vwHq6Zziy2_UPxrrBy5vUxfKO8biOkI,29
 edsl/agents/__init__.py,sha256=Jw2EmdckbcROk_4tRPcJ2i-YEutApOs8BCohy3IHzqY,139
 edsl/agents/Agent.py,sha256=wfkYA8OSQVnxpp5mz-CxhbDeLTefe4JGqs7PNriYRzU,30262
 edsl/agents/AgentList.py,sha256=wV_URK5jc5OAVjT9UUeBatyVCoy0KAqE8id3ZUrnnGE,11300
 edsl/agents/descriptors.py,sha256=Qj-G_ZgfFJFc8wPGz4-Aae4hpL4XRBvxPEeewfaUWv4,3020
 edsl/agents/Invigilator.py,sha256=FTGgnXAEn1oTWQHHeZ32Rq4t7qgX01XZoYhVKsqWQE8,9302
-edsl/agents/InvigilatorBase.py,sha256=wUt4qmO9nu45gGDkfnsrONqPkx1EBqumiZcP07-pqKo,10635
+edsl/agents/InvigilatorBase.py,sha256=S5KGNnq0bKbP-q4eJCH-Bb8MYQG1Ol2oIXPfrrXI4D4,10733
 edsl/agents/prompt_helpers.py,sha256=oBuv6vWyP3na8qmBV_uYMB2Aq0_FEHzCYFhpEzt8leE,5152
-edsl/agents/PromptConstructor.py,sha256=47atZ0F_6uTcVo3Bp-VnHxtdDmmMK248CR3tjFKEry8,13342
+edsl/agents/PromptConstructor.py,sha256=tGZQ7kXjjr8DXbgqDE1kTQJjEJH_3VA3WgPaCVmti6Y,13925
 edsl/auto/AutoStudy.py,sha256=bUhIvpDzQdYgDpAc8jCpNdCh6cI6brdJU8DaoScxkTo,3960
 edsl/auto/StageBase.py,sha256=BUcIdH5O2nsoSjlNyBM61dGTnKV-09N6-5HO0ykmbTU,8163
 edsl/auto/StageGenerateSurvey.py,sha256=4xe7PVTXSP-i3O9NSmX-an2OkRoyxCBygWaT-nslBsA,7572
@@ -40,7 +40,7 @@ edsl/conjure/RawQuestion.py,sha256=jRlnuSq5Wa9wtmlocSAyCC6gLXe_3zOWtOCpyUjL0Is,2
 edsl/conjure/SurveyResponses.py,sha256=_qvRhInlXovVLU4TEzouQ2HvZeYlCvUPaElC9MxvEbg,198
 edsl/conjure/utilities.py,sha256=kFj8mp69fTRYmk-9GX43bRF5Y3HvnBkz4xLcPQPTCI4,5740
 edsl/conversation/car_buying.py,sha256=cY2y7wGiZiXWsat0F0Bh6MJBfVxcuKlZIMlJSpmTbH8,2008
-edsl/conversation/Conversation.py,sha256=7RGYK9goGur-h7gvEBX8rbNdMCW02EJ9EmGXco3tXW4,7865
+edsl/conversation/Conversation.py,sha256=al29DNlKb1QnO1pHN6pAxNSilSrWPbcClySswjQ4nL4,7871
 edsl/conversation/mug_negotiation.py,sha256=WhdhN6dCiZ8bvpptudEnIEObkUQuy4y52-ysQSPuk54,2697
 edsl/conversation/next_speaker_utilities.py,sha256=EpGlZ_J9-vSNzezpngC58EFCfxOoN8tZ3DHBKcT3h80,3722
 edsl/coop/__init__.py,sha256=XqMfFaHIeyAb_dfDw7VaKf6wCPdahh19ye4w6XAY3R4,117
@@ -76,7 +76,7 @@ edsl/inference_services/DeepInfraService.py,sha256=OKpc9E9nyJu-mOqUHs_dBwOHh9xhD
 edsl/inference_services/GoogleService.py,sha256=8nQIlnKNlfP_FNtc0aZGJq1mnAW9aFnU0x8k8YMvTU4,5578
 edsl/inference_services/GroqService.py,sha256=D2E6lnOjeJNSApo1_ndvHJnUUwXn4nOPmmFgt0CzTYs,530
 edsl/inference_services/InferenceServiceABC.py,sha256=u5L56F9iecukMaU5KnXmEjfGipNB466aluuaQl4g3as,4841
-edsl/inference_services/InferenceServicesCollection.py,sha256=D7F6e3eb0NsSav6_cqWCcXGQO5wSwLSciRoL_EB9nKQ,3040
+edsl/inference_services/InferenceServicesCollection.py,sha256=Zvsimdq9GHUavZ_1WAIjuxjZ_V8iG_L7-JqLeOjFK5Q,3090
 edsl/inference_services/MistralAIService.py,sha256=42nQ_yh6hZpu9zSEdm0uJxi4sQI9i5YV3p2iK7omCr4,4001
 edsl/inference_services/models_available_cache.py,sha256=y159MaMtHWQd7Ia7140-dL5zSVKeHRzz1U7y7RAZtL0,4179
 edsl/inference_services/OllamaService.py,sha256=ewT2SKDXnKcc4wHmMaSlVyJDA9uGLLEWcNTifnz31-g,516
@@ -91,10 +91,10 @@ edsl/jobs/Answers.py,sha256=v1aqWXwSwmra3da3JOYYzU2C1IXkAuYxcrxA4jhxqDw,1877
 edsl/jobs/buckets/BucketCollection.py,sha256=X843JvQ2Ii_85Z10dpBSq5kIhyUbwTJ3e1iacyvilX8,2349
 edsl/jobs/buckets/ModelBuckets.py,sha256=Lma0kQ8FvZ1FkB8PkBE2nunU27uDeMxBs1GVAbXrtmo,2484
 edsl/jobs/buckets/TokenBucket.py,sha256=-Dsqrd-TdRH8WElyCv2SaWmUVMQmugEhfVpOBQeqO7w,9338
-edsl/jobs/interviews/Interview.py,sha256=LUAL8geTpd64tAzvyfyncZApalX0txoZ6ZcCUu8N6is,26406
+edsl/jobs/interviews/Interview.py,sha256=pOIxDSNZHgvPpCZemaIDWKFfFUT2_AbfMGewzQWTyQo,26666
 edsl/jobs/interviews/interview_status_enum.py,sha256=p9Nqw2mcKqx3JMOyDQ7wQNnRkM03HVCA8YUPmKaRBrU,238
 edsl/jobs/interviews/InterviewExceptionCollection.py,sha256=F6cHFiG-sQtznVmgZh56yOGaIii6yaGykiNmP0MHNHs,3769
-edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=4KGBg9PywUVRTHtX2Myz4L7GaaJO8gedGGJSrgFW_bc,5771
+edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=-pfyNYrmZxkoumlXVckiwG-k_Fk2-IjM9tWARJyJ_Zg,5916
 edsl/jobs/interviews/InterviewStatistic.py,sha256=U-tgtvE6vReExlzMqbb5XzNT8aA3BpwcQ2KOXvI6Yi0,1919
 edsl/jobs/interviews/InterviewStatisticsCollection.py,sha256=gAUQ77j1tTpBrhnGo4l2l_AD3cvYa7JH_CfdmMVljtM,813
 edsl/jobs/interviews/InterviewStatusDictionary.py,sha256=mxNuG6rVtiqhaeN7r7z_A0ikAqOha-nzKztsPE8YV-4,2563
@@ -212,9 +212,9 @@ edsl/results/ResultsGGMixin.py,sha256=e_PP_IRFjYtxUBJKeQRlTfu0RoavReV1CIY_9g1OQw
 edsl/results/ResultsToolsMixin.py,sha256=WkxeXVi77h1-lkYD6RoVRfpd2Hmb5KNzsEpNzdZdMes,3115
 edsl/results/Selector.py,sha256=rnufGzOX9Nb9KHmv318A0zyWNj80xJMCyZovRP9Z2qA,4521
 edsl/results/tree_explore.py,sha256=IN3dFSXrCfTfjhOb6NmypK6p-TW1TqOD8278BMcyIEg,4739
-edsl/scenarios/__init__.py,sha256=z0E7KqtoirVubKi4VlcR6eKKzy6fX80iVDTPG8FhlM0,100
-edsl/scenarios/FileStore.py,sha256=4QLHgACEk0LyfnrbQrctr53CyI17LXHpDulYeRNNdVE,14372
-edsl/scenarios/Scenario.py,sha256=WtrszxUpRi_ZJiJce9Dzs2LnlpJVxBFWVUxIW2STCUA,17699
+edsl/scenarios/__init__.py,sha256=y67hh_l-sCdMP0fFUa7nEbC-wP-X97OdhTLrcfYussw,152
+edsl/scenarios/FileStore.py,sha256=AHDN8sWIP5Rb1qej_yYNVY4eoKdGAxGyDLrXkZaBmCA,14718
+edsl/scenarios/Scenario.py,sha256=pcMawbPgZRc45CZTnAL2hmi2dZIn-jp8-VlCkGMf2do,17928
 edsl/scenarios/ScenarioHtmlMixin.py,sha256=SS5ZVxw8fo6Z3TER_nJP6FV8UdcYP11wgu-VxBhgqcQ,1941
 edsl/scenarios/ScenarioList.py,sha256=er1qIxC86nBDdD-IiJWwUaKE88y71s98VwK2g7LsFNM,42043
 edsl/scenarios/ScenarioListExportMixin.py,sha256=IjOGh3c8WPJnmdJz69W6DnUcTKpHVsMikdQxzs7-5OE,1733
@@ -273,7 +273,7 @@ edsl/utilities/repair_functions.py,sha256=ZnoJsWzBRxhZnMf4yY3586nmoR_5pzktV-xWdh
 edsl/utilities/restricted_python.py,sha256=ZK4r_T3cNSvIMXTuyC6dCHVX6-ed2NRzzXUbHAcgLlw,2130
 edsl/utilities/SystemInfo.py,sha256=7xJ8MYEEx3aVFOoynu_nQqAv2ePQMyehEZOxFWMZk44,820
 edsl/utilities/utilities.py,sha256=7om9Nh9IWxusHEA2a2QuwZiaoLozbSTCIPkfKf5ZIGk,11758
-edsl-0.1.36.dev6.dist-info/LICENSE,sha256=hq3hkdxkn1rC8xTiiHh0VdWniMNkcS3rBozeiaKE5SQ,1132
-edsl-0.1.36.dev6.dist-info/METADATA,sha256=e9tVTO4aysOkrbQIyO_S7QsmmrWUvBDtKlMtNP5zsl4,4476
-edsl-0.1.36.dev6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-edsl-0.1.36.dev6.dist-info/RECORD,,
+edsl-0.1.36.dev7.dist-info/LICENSE,sha256=hq3hkdxkn1rC8xTiiHh0VdWniMNkcS3rBozeiaKE5SQ,1132
+edsl-0.1.36.dev7.dist-info/METADATA,sha256=Cq1gWcs0i1QKdPy14Vwel2s9D9DvEhqvv0qmVX8tFKs,4476
+edsl-0.1.36.dev7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+edsl-0.1.36.dev7.dist-info/RECORD,,