edsl 0.1.32__py3-none-any.whl → 0.1.33.dev1__py3-none-any.whl

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.32"
+__version__ = "0.1.33.dev1"

edsl/jobs/Jobs.py

@@ -562,7 +562,7 @@ class Jobs(Base):
                     )
                     return results
                 else:
-                    duration = 10 if len(self) < 10 else 60
+                    duration = 5
                     time_checked = datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
                     frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
                     start_time = time.time()

edsl/jobs/tasks/TaskHistory.py

@@ -390,7 +390,7 @@ class TaskHistory:
 
                     <h2>Question</h2>
                     <div class="question-detail"> 
-                            {{ interview.survey.get_question(question).html() }}
+                            {{ interview.survey.get_question(question).html(interview.scenario,interview.agent) }}
                     </div>        
 
                     <h2>Scenario</h2>                            

edsl/notebooks/Notebook.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 import json
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 from uuid import uuid4
 from edsl.Base import Base
 from edsl.utilities.decorators import add_edsl_version, remove_edsl_version
@@ -56,6 +56,8 @@ class Notebook(Base):
 
     @classmethod
     def from_script(cls, path: str, name: Optional[str] = None) -> "Notebook":
+        import nbformat
+
         # Read the script file
         with open(path, "r") as script_file:
             script_content = script_file.read()
@@ -92,12 +94,26 @@ class Notebook(Base):
         """
         return self.data == other.data
 
+    def __hash__(self) -> int:
+        """
+        Allow the model to be used as a key in a dictionary.
+        """
+        from edsl.utilities.utilities import dict_hash
+
+        return dict_hash(self.data["cells"])
+
+    def _to_dict(self) -> dict:
+        """
+        Serialize to a dictionary.
+        """
+        return {"name": self.name, "data": self.data}
+
     @add_edsl_version
     def to_dict(self) -> dict:
         """
         Convert a Notebook to a dictionary.
         """
-        return {"name": self.name, "data": self.data}
+        return self._to_dict()
 
     @classmethod
     @remove_edsl_version
@@ -111,6 +127,8 @@ class Notebook(Base):
         """
         Save the notebook at the specified filepath.
         """
+        import nbformat
+
         nbformat.write(nbformat.from_dict(self.data), fp=path)
 
     def print(self):

edsl/questions/QuestionBase.py

@@ -441,6 +441,7 @@ class QuestionBase(
     def html(
         self,
         scenario: Optional[dict] = None,
+        agent: Optional[dict] = {},
         include_question_name: bool = False,
         height: Optional[int] = None,
         width: Optional[int] = None,
@@ -473,7 +474,7 @@ class QuestionBase(
 
         params = {
             "question_name": self.question_name,
-            "question_text": Template(self.question_text).render(scenario),
+            "question_text": Template(self.question_text).render(scenario, agent=agent),
             "question_type": self.question_type,
             "question_content": Template(question_content).render(scenario),
             "include_question_name": include_question_name,

{edsl-0.1.32.dist-info → edsl-0.1.33.dev1.dist-info}/METADATA

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

{edsl-0.1.32.dist-info → edsl-0.1.33.dev1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 edsl/Base.py,sha256=ttNxUotSd9LSEJl2w6LdMtT78d0nMQvYDJ0q4JkqBfg,8945
 edsl/BaseDiff.py,sha256=RoVEh52UJs22yMa7k7jv8se01G62jJNWnBzaZngo-Ug,8260
 edsl/__init__.py,sha256=E6PkWI_owu8AUc4uJs2XWDVozqSbcRWzsIqf8_Kskho,1631
-edsl/__version__.py,sha256=GbbcUKhE6NYfh8LsIe9sL2m1pABous_0kRd-OZzd_C8,23
+edsl/__version__.py,sha256=X6lFB08-Y7atQgG3fk8iymIvdiZo3YA8OnNvAv2d2Zc,28
 edsl/agents/Agent.py,sha256=qNJsQkN6HuTKqJrQbuUEgRX3Wo7Dwukle0oNWPi0UIE,27191
 edsl/agents/AgentList.py,sha256=_MsdeOEgaANAceLIXwuLC22mwlBn0ruGX4GEqz8_SSY,9467
 edsl/agents/Invigilator.py,sha256=8nv98bjfal6Q-GVmsxj5Isqn-GLqXDXEijSai3KAbgQ,10923
@@ -70,7 +70,7 @@ edsl/inference_services/rate_limits_cache.py,sha256=HYslviz7mxF9U4CUTPAkoyBsiXjS
 edsl/inference_services/registry.py,sha256=9bPIn6EJsStsNN_3bzkBDVoOLgwAtmUKle18mZskFJs,865
 edsl/inference_services/write_available.py,sha256=NNwhATlaMp8IYY635MSx-oYxt5X15acjAfaqYCo_I1Y,285
 edsl/jobs/Answers.py,sha256=z4TADN-iHIrbMtI1jVyiaetv0OkTv768dFBpREIQC6c,1799
-edsl/jobs/Jobs.py,sha256=EGKIq03bf6IrDwW0nkRfPxCngfq9iUbJ4JxTd7wROL4,33309
+edsl/jobs/Jobs.py,sha256=jnfMbz4VHdDJifGmn3wxEm1_NvYGT6L7LlD41pT9Rsk,33282
 edsl/jobs/__init__.py,sha256=aKuAyd_GoalGj-k7djOoVwEbFUE2XLPlikXaA1_8yAg,32
 edsl/jobs/buckets/BucketCollection.py,sha256=LA8DBVwMdeTFCbSDI0S2cDzfi_Qo6kRizwrG64tE8S4,1844
 edsl/jobs/buckets/ModelBuckets.py,sha256=hxw_tzc0V42CiB7mh5jIxlgwDVJ-zFZhlLtKrHEg8ho,2419
@@ -92,7 +92,7 @@ edsl/jobs/runners/JobsRunnerStatusData.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 edsl/jobs/runners/JobsRunnerStatusMixin.py,sha256=MmVK2udusAbQ3KCkQPiQYjWVDfKprBk9Ecelgui__0k,13424
 edsl/jobs/tasks/QuestionTaskCreator.py,sha256=f-hF7TMdMMjQ5AQMpMJXrFdBUNSLrLHHl1sun774f_U,10394
 edsl/jobs/tasks/TaskCreators.py,sha256=XqAbNU33378Z4PQncokbfJwnKt3KHR9aqa5fKYRDpfg,2694
-edsl/jobs/tasks/TaskHistory.py,sha256=elDENiSj8A2WZ0vPfF7Lq7AC6DkGqsZgvq0XZfnk-7Y,16186
+edsl/jobs/tasks/TaskHistory.py,sha256=PV1G1VdaZNV3GQ_m1L4a_7uPmrEGZw4K-hn8gJe_aDE,16220
 edsl/jobs/tasks/TaskStatusLog.py,sha256=bqH36a32F12fjX-M-4lNOhHaK2-WLFzKE-r0PxZPRjI,546
 edsl/jobs/tasks/task_management.py,sha256=KMToZuXzMlnHRHUF_VHL0-lHMTGhklf2GHVuwEEHtzA,301
 edsl/jobs/tasks/task_status_enum.py,sha256=DOyrz61YlIS8R1W7izJNphcLrJ7I_ReUlfdRmk23h0Q,5333
@@ -105,7 +105,7 @@ edsl/language_models/__init__.py,sha256=bvY7Gy6VkX1gSbNkRbGPS-M1kUnb0EohL0FSagaE
 edsl/language_models/registry.py,sha256=h5eLN7lsqpK5vcEsxn3gsARb9Qyx-k3jq2MMnyuATcY,3727
 edsl/language_models/repair.py,sha256=xaNunBRpMWgceSPOzk-ugp5WXtgLuuhj23TgXUeOobw,5963
 edsl/language_models/unused/ReplicateBase.py,sha256=J1oqf7mEyyKhRwNUomnptVqAsVFYCbS3iTW0EXpKtXo,3331
-edsl/notebooks/Notebook.py,sha256=qwDqUN2Gujr7WUneRrshzRBjHvcPpOIBRyqcrAOc90Q,7341
+edsl/notebooks/Notebook.py,sha256=xi9xkxmkQ6-DwhqbjjMLpYKB0VJV20AtwEonJ6mnqjo,7739
 edsl/notebooks/__init__.py,sha256=VNUA3nNq04slWNbYaNrzOhQJu3AZANpvBniyCJSzJ7U,45
 edsl/prompts/Prompt.py,sha256=12cbeQTKqfVQGpd1urqKZeXiDtKz2RAJqftoXS3q-DE,10070
 edsl/prompts/QuestionInstructionsBase.py,sha256=xico6ob4cqWsHl-txj2RbY_4Ny5u9UqvIjmoTVgjUhk,348
@@ -124,7 +124,7 @@ edsl/prompts/library/question_rank.py,sha256=WDgXyph0EKWJrSgsW2eqcx3xdU-WA1LEvB2
 edsl/prompts/prompt_config.py,sha256=O3Y5EvBsCeKs9m9IjXiRXOcHWlWvQV0yqsNb2oSR1ow,974
 edsl/prompts/registry.py,sha256=XOsqGsvNOmIG83jqoszqI72yNZkkszKR4FrEhwSzj_Q,8093
 edsl/questions/AnswerValidatorMixin.py,sha256=U5i79HoEHpSoevgtx68TSg8a9tELq3R8xMtYyK1L7DQ,12106
-edsl/questions/QuestionBase.py,sha256=L0-IMnSGiUh5Uw7kFDsPV057mR9tL9aMwHUtxjLlKsg,19017
+edsl/questions/QuestionBase.py,sha256=XVB_G6ksX-rYq_mJlWlNHqaD68cJrG7iFymo7rWKGaU,19066
 edsl/questions/QuestionBudget.py,sha256=aaRvSxBDzrQS8o4RBGsALZkSnKqGVJcHkDeEPAS2pd0,5974
 edsl/questions/QuestionCheckBox.py,sha256=d-79SmqZgfPEHCMCzIdjDQJ2JSKJbFxEez05iguY3Ro,5958
 edsl/questions/QuestionExtract.py,sha256=QxVGhgJHtxaPCOS0yqPdO4lsF5SIjjrIBlaiGXA0KjE,3818
@@ -203,7 +203,7 @@ edsl/utilities/interface.py,sha256=AaKpWiwWBwP2swNXmnFlIf3ZFsjfsR5bjXQAW47tD-8,1
 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=2KwKc1J0lu6_CjIAKaufvfLOJ4j3XGKyClwJ6TjKLxM,11157
-edsl-0.1.32.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.32.dist-info/METADATA,sha256=SLvkC-0i6btmF3DUH20rFk1cPs1Yn_UVU78xYTQj7mI,4301
-edsl-0.1.32.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-edsl-0.1.32.dist-info/RECORD,,
+edsl-0.1.33.dev1.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.33.dev1.dist-info/METADATA,sha256=7-OQHBeU2oBSZ54VSVS8JDM3n4iMWSO0eoE5s_Ajq2s,4306
+edsl-0.1.33.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+edsl-0.1.33.dev1.dist-info/RECORD,,