edsl 0.1.32__tar.gz → 0.1.33.dev1__tar.gz

{edsl-0.1.32 → edsl-0.1.33.dev1}/PKG-INFO

@@ -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.33.dev1/edsl/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.1.33.dev1"

{edsl-0.1.32 → edsl-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-0.1.32 → edsl-0.1.33.dev1}/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-0.1.32 → edsl-0.1.33.dev1}/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-0.1.32 → edsl-0.1.33.dev1}/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 → edsl-0.1.33.dev1}/pyproject.toml

@@ -12,7 +12,7 @@ keywords = ["LLM", "social science", "surveys", "user research"]
 license = "MIT"
 name = "edsl"
 readme = "README.md"
-version = "0.1.32"
+version = "0.1.33.dev1"
 
 [tool.poetry.dependencies]
 python = ">=3.9.1,<3.13"

edsl-0.1.32/edsl/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.1.32"