edsl 0.1.35__py3-none-any.whl → 0.1.36.dev1__py3-none-any.whl

edsl/prompts/Prompt.py

@@ -17,25 +17,23 @@ class PreserveUndefined(Undefined):
 
 
 from edsl.exceptions.prompts import TemplateRenderError
-from edsl.prompts.prompt_config import (
-    C2A,
-    names_to_component_types,
-    ComponentTypes,
-    NEGATIVE_INFINITY,
-)
-from edsl.prompts.registry import RegisterPromptsMeta
+
+# from edsl.prompts.prompt_config import (
+#     C2A,
+#     names_to_component_types,
+#     ComponentTypes,
+#     NEGATIVE_INFINITY,
+# )
+# from edsl.prompts.registry import RegisterPromptsMeta
 from edsl.Base import PersistenceMixin, RichPrintingMixin
 
 MAX_NESTING = 100
 
 
-class PromptBase(
-    PersistenceMixin, RichPrintingMixin, ABC, metaclass=RegisterPromptsMeta
-):
+class Prompt(PersistenceMixin, RichPrintingMixin):
     """Class for creating a prompt to be used in a survey."""
 
     default_instructions: Optional[str] = "Do good things, friendly LLM!"
-    component_type = ComponentTypes.GENERIC
 
     def _repr_html_(self):
         """Return an HTML representation of the Prompt."""
@@ -111,12 +109,6 @@ class PromptBase(
         with open(folder_path.joinpath(file_name), "r") as f:
             text = f.read()
         return cls(text=text)
-        # Resolve the path to get the absolute path
-        # absolute_path = folder_path.resolve()
-        # env = Environment(loader=FileSystemLoader(absolute_path))
-        # template = env.get_template(file_name)
-        # rendered_text = template.render({})
-        # return cls(text=rendered_text)
 
     @property
     def text(self):
@@ -281,6 +273,7 @@ class PromptBase(
         try:
             previous_text = None
             for _ in range(MAX_NESTING):
+                # breakpoint()
                 rendered_text = env.from_string(text).render(
                     primary_replacement, **additional_replacements
                 )
@@ -323,9 +316,8 @@ class PromptBase(
         Prompt(text=\"""Hello, {{person}}\""")
 
         """
-        class_name = data["class_name"]
-        cls = RegisterPromptsMeta._registry.get(class_name, Prompt)
-        return cls(text=data["text"])
+        # class_name = data["class_name"]
+        return Prompt(text=data["text"])
 
     def rich_print(self):
         """Display an object as a table."""
@@ -346,27 +338,21 @@ class PromptBase(
         return cls(cls.default_instructions)
 
 
-class Prompt(PromptBase):
-    """A prompt to be used in a survey."""
-
-    component_type = ComponentTypes.GENERIC
-
-
 if __name__ == "__main__":
     print("Running doctests...")
     import doctest
 
     doctest.testmod()
 
-from edsl.prompts.library.question_multiple_choice import *
-from edsl.prompts.library.agent_instructions import *
-from edsl.prompts.library.agent_persona import *
-
-from edsl.prompts.library.question_budget import *
-from edsl.prompts.library.question_checkbox import *
-from edsl.prompts.library.question_freetext import *
-from edsl.prompts.library.question_linear_scale import *
-from edsl.prompts.library.question_numerical import *
-from edsl.prompts.library.question_rank import *
-from edsl.prompts.library.question_extract import *
-from edsl.prompts.library.question_list import *
+# from edsl.prompts.library.question_multiple_choice import *
+# from edsl.prompts.library.agent_instructions import *
+# from edsl.prompts.library.agent_persona import *
+
+# from edsl.prompts.library.question_budget import *
+# from edsl.prompts.library.question_checkbox import *
+# from edsl.prompts.library.question_freetext import *
+# from edsl.prompts.library.question_linear_scale import *
+# from edsl.prompts.library.question_numerical import *
+# from edsl.prompts.library.question_rank import *
+# from edsl.prompts.library.question_extract import *
+# from edsl.prompts.library.question_list import *

edsl/prompts/__init__.py

@@ -1,2 +1,2 @@
-from edsl.prompts.registry import get_classes
+# from edsl.prompts.registry import get_classes
 from edsl.prompts.Prompt import Prompt

edsl/questions/QuestionBasePromptsMixin.py

@@ -38,29 +38,29 @@ class QuestionBasePromptsMixin:
     #     ) as file:
     #         return file.read()
 
-    @classmethod
-    def applicable_prompts(
-        cls, model: Optional[str] = None
-    ) -> list[type["PromptBase"]]:
-        """Get the prompts that are applicable to the question type.
+    # @classmethod
+    # def applicable_prompts(
+    #     cls, model: Optional[str] = None
+    # ) -> list[type["PromptBase"]]:
+    #     """Get the prompts that are applicable to the question type.
 
-        :param model: The language model to use.
+    #     :param model: The language model to use.
 
-        >>> from edsl.questions import QuestionFreeText
-        >>> QuestionFreeText.applicable_prompts()
-        [<class 'edsl.prompts.library.question_freetext.FreeText'>]
+    #     >>> from edsl.questions import QuestionFreeText
+    #     >>> QuestionFreeText.applicable_prompts()
+    #     [<class 'edsl.prompts.library.question_freetext.FreeText'>]
 
-        :param model: The language model to use. If None, assumes does not matter.
+    #     :param model: The language model to use. If None, assumes does not matter.
 
-        """
-        from edsl.prompts.registry import get_classes as prompt_lookup
+    #     """
+    #     from edsl.prompts.registry import get_classes as prompt_lookup
 
-        applicable_prompts = prompt_lookup(
-            component_type="question_instructions",
-            question_type=cls.question_type,
-            model=model,
-        )
-        return applicable_prompts
+    #     applicable_prompts = prompt_lookup(
+    #         component_type="question_instructions",
+    #         question_type=cls.question_type,
+    #         model=model,
+    #     )
+    #     return applicable_prompts
 
     @property
     def model_instructions(self) -> dict:

edsl/questions/descriptors.py

@@ -54,32 +54,32 @@ class BaseDescriptor(ABC):
     def __set__(self, instance, value: Any) -> None:
         """Set the value of the attribute."""
         self.validate(value, instance)
-        from edsl.prompts.registry import get_classes
+        # from edsl.prompts.registry import get_classes
 
         instance.__dict__[self.name] = value
-        if self.name == "_instructions":
-            instructions = value
-            if value is not None:
-                instance.__dict__[self.name] = instructions
-                instance.set_instructions = True
-            else:
-                potential_prompt_classes = get_classes(
-                    question_type=instance.question_type
-                )
-                if len(potential_prompt_classes) > 0:
-                    instructions = potential_prompt_classes[0]().text
-                    instance.__dict__[self.name] = instructions
-                    instance.set_instructions = False
-                else:
-                    if not hasattr(instance, "default_instructions"):
-                        raise Exception(
-                            "No default instructions found and no matching prompts!"
-                        )
-                    instructions = instance.default_instructions
-                    instance.__dict__[self.name] = instructions
-                    instance.set_instructions = False
-
-            # instance.set_instructions = value != instance.default_instructions
+        # if self.name == "_instructions":
+        #     instructions = value
+        #     if value is not None:
+        #         instance.__dict__[self.name] = instructions
+        #         instance.set_instructions = True
+        #     else:
+        #         potential_prompt_classes = get_classes(
+        #             question_type=instance.question_type
+        #         )
+        #         if len(potential_prompt_classes) > 0:
+        #             instructions = potential_prompt_classes[0]().text
+        #             instance.__dict__[self.name] = instructions
+        #             instance.set_instructions = False
+        #         else:
+        #             if not hasattr(instance, "default_instructions"):
+        #                 raise Exception(
+        #                     "No default instructions found and no matching prompts!"
+        #                 )
+        #             instructions = instance.default_instructions
+        #             instance.__dict__[self.name] = instructions
+        #             instance.set_instructions = False
+
+        # instance.set_instructions = value != instance.default_instructions
 
     def __set_name__(self, owner, name: str) -> None:
         """Set the name of the attribute."""

{edsl-0.1.35.dist-info → edsl-0.1.36.dev1.dist-info}/METADATA

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

{edsl-0.1.35.dist-info → edsl-0.1.36.dev1.dist-info}/RECORD

@@ -2,12 +2,12 @@ edsl/Base.py,sha256=wdFpHWlQlGNL4XfOmYA0AK9YupMDxK3G7mDHCQp60o4,9295
 edsl/BaseDiff.py,sha256=RoVEh52UJs22yMa7k7jv8se01G62jJNWnBzaZngo-Ug,8260
 edsl/TemplateLoader.py,sha256=sDBlSMt7EfOduM7w3h6v03gvh_Rzn9hVrlS-iLSQdZA,849
 edsl/__init__.py,sha256=UZcx9RHSi3Dslh2lWvCOeppdMW9Xzw_YLs-kFaNW1MU,1770
-edsl/__version__.py,sha256=ABqgofsnbWf7823vTBbZNQ81eKQbWwrVToAU6T3z-6s,23
-edsl/agents/Agent.py,sha256=ww6DK177eHQUlYkzgnt1b-MBDKXCdhVx3HezAZZ7TKk,28473
+edsl/__version__.py,sha256=yS7SjTPwUGI_RFJspMUKx7G1-n8hVfU0zsPUxn0IprE,28
+edsl/agents/Agent.py,sha256=dG3SbCm4IpHpObcWm-OejfYHtVXa5NlxGKYKOc-dUxQ,29311
 edsl/agents/AgentList.py,sha256=qo8VK3Ov0YOSbsBcHmlwLZBH81CcDfy5IEcx9AVH78M,10963
-edsl/agents/Invigilator.py,sha256=6xd4sJ6Jzxld8LZDWZuSCZLL_MfaSux4LJCAm_RLEOM,9077
+edsl/agents/Invigilator.py,sha256=m4T-z4aNCGd4LKjLXVNI2VszYW-pQeScfcFAxkb0pWc,9080
 edsl/agents/InvigilatorBase.py,sha256=qIdAiriXAbnJH_SN9w2UAXHcDgQvk8Ar3QerKFjtPwM,10341
-edsl/agents/PromptConstructor.py,sha256=qVCfRyYR-vKcpGJ_It2SOUvBfHtF8M6qYcf9ZCsHBl8,14855
+edsl/agents/PromptConstructor.py,sha256=1k_Xni5T_ZB5_3hGFLzYiD1fPK4911IIatVHz9qD1s8,13006
 edsl/agents/__init__.py,sha256=B1dWfV4QWOo8cc2KeuetdFGeNhZ8XHc0Q8YhQW9k7BE,136
 edsl/agents/descriptors.py,sha256=m8ND3-2-JbgNX1HGakBNLIeemwsgYa1mQxYO9GW33hw,2934
 edsl/agents/prompt_helpers.py,sha256=rHUxM_F0kCOkJmnhCyK-amFKViAYvpRRLD8LHFLGqQw,5023
@@ -87,34 +87,31 @@ edsl/inference_services/rate_limits_cache.py,sha256=HYslviz7mxF9U4CUTPAkoyBsiXjS
 edsl/inference_services/registry.py,sha256=CwdaQ-A5PTb5lFKMQdOfl8IqCw2SVJ8HlC-_2uZf11k,1141
 edsl/inference_services/write_available.py,sha256=NNwhATlaMp8IYY635MSx-oYxt5X15acjAfaqYCo_I1Y,285
 edsl/jobs/Answers.py,sha256=c4LpigQjdnMr7iJu8571C4FggGPVudfT7hbJgmgKW40,1821
-edsl/jobs/FailedQuestion.py,sha256=3D5Vcmv1t2_dzBWbkUUIia3_jXHdzQDdyg-4TEIWU2Q,2701
-edsl/jobs/Jobs.py,sha256=oryxhrBuXs9Ba8mt5BSIjX3gT37hdzothL5xH0ygrkU,37227
+edsl/jobs/Jobs.py,sha256=t37-_8PemRGfQABTyuXPYW53-4sevPWkvF6qeq8oLxc,40183
 edsl/jobs/__init__.py,sha256=aKuAyd_GoalGj-k7djOoVwEbFUE2XLPlikXaA1_8yAg,32
 edsl/jobs/buckets/BucketCollection.py,sha256=11CRisE1WAPcAlI3YJK3DVvu0AqSvv8KskXo4Q1waSk,2286
 edsl/jobs/buckets/ModelBuckets.py,sha256=hxw_tzc0V42CiB7mh5jIxlgwDVJ-zFZhlLtKrHEg8ho,2419
 edsl/jobs/buckets/TokenBucket.py,sha256=7fG4omzTcj5xC2iJLO9bfBkdAGs6Y3weXzlA3BgPr0E,9090
-edsl/jobs/interviews/Interview.py,sha256=iw0thEGwENOl8uzHRJ88zjYHEDSlM_X96Fyse9wZCwM,23883
+edsl/jobs/interviews/Interview.py,sha256=epaxVw53gplPpDpj1n_ahL3Pibs8vqCasF9QjXve1do,24963
 edsl/jobs/interviews/InterviewExceptionCollection.py,sha256=Ez8BCZUD3odqoY9h-gzYKKM8yaHynQ-eYw2uMDh7t98,3279
-edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=BGGjj0sb1wJJ0QmYklt1DyEYKD8mUGygllGfN2WXKbY,4903
+edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=2ZQOrhoHvfZJx9p357BQUZCfMXGkuU4xITYLyFGK9sg,4806
 edsl/jobs/interviews/InterviewStatistic.py,sha256=hY5d2EkIJ96NilPpZAvZZzZoxLXM7ss3xx5MIcKtTPs,1856
 edsl/jobs/interviews/InterviewStatisticsCollection.py,sha256=_ZZ0fnZBQiIywP9Q_wWjpWhlfcPe2cn32GKut10t5RI,788
 edsl/jobs/interviews/InterviewStatusDictionary.py,sha256=MSyys4hOWe1d8gfsUvAPbcKrs8YiPnz8jpufBSJL7SU,2485
 edsl/jobs/interviews/InterviewStatusLog.py,sha256=6u0F8gf5tha39VQL-IK_QPkCsQAYVOx_IesX7TDDX_A,3252
-edsl/jobs/interviews/InterviewStatusMixin.py,sha256=VV0Pel-crUsLoGpTifeIIkXsLGj0bfuO--UtpRnH-dU,1251
 edsl/jobs/interviews/ReportErrors.py,sha256=RSzDU2rWwtjfztj7sqaMab0quCiY-X2bG3AEOxhTim8,1745
 edsl/jobs/interviews/interview_status_enum.py,sha256=KJ-1yLAHdX-p8TiFnM0M3v1tnBwkq4aMCuBX6-ytrI8,229
 edsl/jobs/runners/JobsRunnerAsyncio.py,sha256=SXWFTgTYQzqIaBjPQ2mRrxR3aGFMQyw2eD9wX8tZNkQ,12850
 edsl/jobs/runners/JobsRunnerStatus.py,sha256=4eCh9sRpswGdKeSMW9pCGCAjJZa-OrWUPI7tsxIy_g4,12112
 edsl/jobs/runners/JobsRunnerStatusData.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/jobs/tasks/QuestionTaskCreator.py,sha256=f26rokFVXVdyKR2M8of_jlZqP6TPcTAINk9tEvb35pw,10122
+edsl/jobs/tasks/QuestionTaskCreator.py,sha256=K-xATHIXMWPTMOnms5UDW30eTIlIfebf7oOEfwrh1ME,10072
 edsl/jobs/tasks/TaskCreators.py,sha256=XqAbNU33378Z4PQncokbfJwnKt3KHR9aqa5fKYRDpfg,2694
 edsl/jobs/tasks/TaskHistory.py,sha256=xRSo22ipyUSJ15w_k2Jc3dZ04VLwft8zfvm3smAIYrA,14227
 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
 edsl/jobs/tokens/InterviewTokenUsage.py,sha256=u_6-IHpGFwZ6qMEXr24-jyLVUSSp4dSs_4iAZsBv7O4,1100
 edsl/jobs/tokens/TokenUsage.py,sha256=odj2-wDNEbHl9noyFAQ0DSKV0D9cv3aDOpmXufKZ8O4,1323
-edsl/language_models/LanguageModel.py,sha256=lGmflHSq0vLt4zBzYSKxH5dFccfA4Mhj4NM-XhTNZxY,25194
+edsl/language_models/LanguageModel.py,sha256=7kXi42P6m8kku-_UxstTapIzI-3N8a3Ks3_IRJEgxpc,25395
 edsl/language_models/ModelList.py,sha256=GhjRV7y1jRvP_Yjgwv6fxksTVb8sFPBiiRRfdqW-hgg,2852
 edsl/language_models/RegisterLanguageModelsMeta.py,sha256=eMtBSAnlRnC4c-0_o2QkSNyzv-uAce4BEGMXq2PLj2E,7523
 edsl/language_models/__init__.py,sha256=bvY7Gy6VkX1gSbNkRbGPS-M1kUnb0EohL0FSagaEaTs,109
@@ -126,26 +123,12 @@ edsl/language_models/unused/ReplicateBase.py,sha256=J1oqf7mEyyKhRwNUomnptVqAsVFY
 edsl/language_models/utilities.py,sha256=GWON2ahCpB-_-hhqmQ5Yi7_rKB4cd8GlucWuq6EnGZQ,2280
 edsl/notebooks/Notebook.py,sha256=xi9xkxmkQ6-DwhqbjjMLpYKB0VJV20AtwEonJ6mnqjo,7739
 edsl/notebooks/__init__.py,sha256=VNUA3nNq04slWNbYaNrzOhQJu3AZANpvBniyCJSzJ7U,45
-edsl/prompts/Prompt.py,sha256=KsIz0tZnIqZlnbzNWO57C3MwJ0OCcUrZPmu7DBApc4s,11887
-edsl/prompts/QuestionInstructionsBase.py,sha256=xico6ob4cqWsHl-txj2RbY_4Ny5u9UqvIjmoTVgjUhk,348
-edsl/prompts/__init__.py,sha256=Z0ywyJfnV0i-sR1SCdK4mHhgECT5cXpHVA-pKuBTifc,85
-edsl/prompts/library/agent_instructions.py,sha256=_2kCDYvh3ZOF72VvcIH5jhmHjM6AAgQdkWrHvR52Yhg,1100
-edsl/prompts/library/agent_persona.py,sha256=jEl1LjlOP67vOPiRW0S_-TRMz3n6Tp3mPRvltM2r2_k,516
-edsl/prompts/library/question_budget.py,sha256=RAc7pmQRbs_-xksU52yYl8iqJ7HejPY4sQOlCSQLGWs,1190
-edsl/prompts/library/question_checkbox.py,sha256=NIGcdnfkJ8_XbGsdq9toeWA_phQVx5FIBOAe0mReXJw,1462
-edsl/prompts/library/question_extract.py,sha256=QxNiNBjUk25Ss_Pax0iDgmgTYXEycpWJk2z0evmqsP0,775
-edsl/prompts/library/question_freetext.py,sha256=_I7hcniRfVwmZr2wXAasfbZ0GTu41ZIKfcoixGhzZUI,510
-edsl/prompts/library/question_linear_scale.py,sha256=sQpgjSvqJU-uQti-DCxOzLzj05ENkpyxmH-qTFq39x0,778
-edsl/prompts/library/question_list.py,sha256=KYi3gtcWyDzRLyAb2-k7C-QJ9TAfbLGPkWVvVmdT6xg,731
-edsl/prompts/library/question_multiple_choice.py,sha256=_2LUM9bOInODoFyaTrKfMkcb5Z7RDj_odq5iAnD7KVQ,1617
-edsl/prompts/library/question_numerical.py,sha256=ZdWnDbTU0gQdMMqcWHw_eIHEZkJ_kuE-XWrnCYFR07w,1456
-edsl/prompts/library/question_rank.py,sha256=WDgXyph0EKWJrSgsW2eqcx3xdU-WA1LEvB2jvQFOQ8s,882
-edsl/prompts/prompt_config.py,sha256=O3Y5EvBsCeKs9m9IjXiRXOcHWlWvQV0yqsNb2oSR1ow,974
-edsl/prompts/registry.py,sha256=XOsqGsvNOmIG83jqoszqI72yNZkkszKR4FrEhwSzj_Q,8093
+edsl/prompts/Prompt.py,sha256=qZCFj_cu2Gu23VLe0TQ-HZ42n3DOk1fQyj8Wa_boFms,11382
+edsl/prompts/__init__.py,sha256=wrtkH7JW72U93_pnmTvqQx_NoadH5OPRNfrZ5AaD7Co,87
 edsl/questions/AnswerValidatorMixin.py,sha256=t_ABep50KP02GSc48Y8VAEjp35drVOngfrWXU5aVhgk,11505
 edsl/questions/QuestionBase.py,sha256=QsdYFHnWYh04JpCdx3o3WGgohBfE5X_7idQRRYrx_SA,21169
 edsl/questions/QuestionBaseGenMixin.py,sha256=CPxjWZjrxuSO8YWelz6dbp7fm788gN7-T8z7jXStboQ,6017
-edsl/questions/QuestionBasePromptsMixin.py,sha256=Km1P6PpkVJ9O3dS8pJZHNJ6aQABhYGLwdef4Z2vSrqk,9516
+edsl/questions/QuestionBasePromptsMixin.py,sha256=tInTg27KtmyO-hX4ZZdzgPTy4a8LZzbssUC_tAhRsxU,9552
 edsl/questions/QuestionBudget.py,sha256=TJgPsyqafJdJw5if0zVxh7zHloourINUqUWfWIlRq9Y,8131
 edsl/questions/QuestionCheckBox.py,sha256=wC_doEdNZi4y8Uz-tXZyQ2GYS5wQKOWhbVUnyVLoACU,12840
 edsl/questions/QuestionExtract.py,sha256=PlXwMeZgPAFBXIHSXpFMYTToag-HwA9C7u6-Z3bQMek,6103
@@ -167,7 +150,7 @@ edsl/questions/derived/QuestionLinearScale.py,sha256=tj_RszK9WumaKRVMS1Fy63-Q6ip
 edsl/questions/derived/QuestionTopK.py,sha256=HT8NlbT8YBTmVNVPVIP1EyqGsiN3bu4SbFp29CVT0a4,3212
 edsl/questions/derived/QuestionYesNo.py,sha256=KWJyaXSNPNxELtK0nWvIqNtpAF05MMAC0ILUjxXkVwo,2735
 edsl/questions/derived/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/questions/descriptors.py,sha256=10zWqaYeRjlc5jTCHFoa0SLZ-myEfZiO42HFoS5_KbE,16407
+edsl/questions/descriptors.py,sha256=t9AFQPHewgqeC1OZ3I3kP-i2ToXRJUAcJsP7CZIrOgY,16447
 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
 edsl/questions/prompt_templates/question_extract.jinja,sha256=27b8iMJaA2h5UOrHPMiBCapMnJou4vSkZzkZndK2s1U,343
@@ -289,7 +272,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=gqMtWWNEZkWLiRR9vHW-VRNy2bStEPlJ-I2aK9CwFiQ,11367
-edsl-0.1.35.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.35.dist-info/METADATA,sha256=eyPEBXgJt4VgO_f7yPO8rIjvRDT2_RFjbCzF3bvVftk,4471
-edsl-0.1.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-edsl-0.1.35.dist-info/RECORD,,
+edsl-0.1.36.dev1.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.36.dev1.dist-info/METADATA,sha256=dTcbX2Paflg5gnjssUQVafoVYWs2FDACLaSf2ngOAc8,4476
+edsl-0.1.36.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+edsl-0.1.36.dev1.dist-info/RECORD,,

edsl/jobs/FailedQuestion.py

@@ -1,78 +0,0 @@
-from edsl.questions import QuestionBase
-from edsl import Question, Scenario, Model, Agent
-
-from edsl.language_models.LanguageModel import LanguageModel
-
-
-class FailedQuestion:
-    # tests/jobs/test_Interview.py::test_handle_model_exceptions
-
-    # (Pdb) dir(self.exception.__traceback__)
-    # ['tb_frame', 'tb_lasti', 'tb_lineno', 'tb_next']
-
-    def __init__(
-        self, question, scenario, model, agent, raw_model_response, exception, prompts
-    ):
-        self.question = question
-        self.scenario = scenario
-        self.model = model
-        self.agent = agent
-        self.raw_model_response = raw_model_response  # JSON
-        self.exception = exception
-        self.prompts = prompts
-
-    def to_dict(self):
-        return {
-            "question": self.question._to_dict(),
-            "scenario": self.scenario._to_dict(),
-            "model": self.model._to_dict(),
-            "agent": self.agent._to_dict(),
-            "raw_model_response": self.raw_model_response,
-            "exception": self.exception.__class__.__name__,  # self.exception,
-            "prompts": self.prompts,
-        }
-
-    @classmethod
-    def from_dict(cls, data):
-        question = QuestionBase.from_dict(data["question"])
-        scenario = Scenario.from_dict(data["scenario"])
-        model = LanguageModel.from_dict(data["model"])
-        agent = Agent.from_dict(data["agent"])
-        raw_model_response = data["raw_model_response"]
-        exception = data["exception"]
-        prompts = data["prompts"]
-        return cls(
-            question, scenario, model, agent, raw_model_response, exception, prompts
-        )
-
-    def __repr__(self):
-        return f"{self.__class__.__name__}(question={repr(self.question)}, scenario={repr(self.scenario)}, model={repr(self.model)}, agent={repr(self.agent)}, raw_model_response={repr(self.raw_model_response)}, exception={repr(self.exception)})"
-
-    @property
-    def jobs(self):
-        return self.question.by(self.scenario).by(self.agent).by(self.model)
-
-    def rerun(self):
-        results = self.jobs.run()
-        return results
-
-    def help(self):
-        pass
-
-    @classmethod
-    def example(cls):
-        from edsl.language_models.utilities import create_language_model
-        from edsl.language_models.utilities import create_survey
-
-        survey = create_survey(2, chained=False, take_scenario=False)
-        fail_at_number = 1
-        model = create_language_model(ValueError, fail_at_number)()
-        from edsl import Survey
-
-        results = survey.by(model).run()
-        return results.failed_questions[0][0]
-
-
-if __name__ == "__main__":
-    fq = FailedQuestion.example()
-    new_fq = FailedQuestion.from_dict(fq.to_dict())

edsl/jobs/interviews/InterviewStatusMixin.py

@@ -1,33 +0,0 @@
-from edsl.jobs.interviews.InterviewStatusLog import InterviewStatusLog
-from edsl.jobs.tokens.InterviewTokenUsage import InterviewTokenUsage
-
-from edsl.jobs.interviews.InterviewStatusDictionary import InterviewStatusDictionary
-
-
-class InterviewStatusMixin:
-    @property
-    def has_exceptions(self) -> bool:
-        """Return True if there are exceptions."""
-        return len(self.exceptions) > 0
-
-    @property
-    def task_status_logs(self) -> InterviewStatusLog:
-        """Return the task status logs for the interview.
-
-        The keys are the question names; the values are the lists of status log changes for each task.
-        """
-        for task_creator in self.task_creators.values():
-            self._task_status_log_dict[
-                task_creator.question.question_name
-            ] = task_creator.status_log
-        return self._task_status_log_dict
-
-    @property
-    def token_usage(self) -> InterviewTokenUsage:
-        """Determine how many tokens were used for the interview."""
-        return self.task_creators.token_usage
-
-    @property
-    def interview_status(self) -> InterviewStatusDictionary:
-        """Return a dictionary mapping task status codes to counts."""
-        return self.task_creators.interview_status

edsl/jobs/tasks/task_management.py

@@ -1,13 +0,0 @@
-from collections import UserDict
-
-
-class TokensUsed(UserDict):
-    """ "Container for tokens used by a task."""
-
-    def __init__(self, cached_tokens, new_tokens):
-        d = {"cached_tokens": cached_tokens, "new_tokens": new_tokens}
-        super().__init__(d)
-
-
-if __name__ == "__main__":
-    pass

edsl/prompts/QuestionInstructionsBase.py

@@ -1,10 +0,0 @@
-"""Class for creating question instructions to be used in a survey."""
-
-from edsl.prompts.Prompt import PromptBase
-from edsl.prompts.prompt_config import ComponentTypes
-
-
-class QuestionInstuctionsBase(PromptBase):
-    """Class for creating question instructions to be used in a survey."""
-
-    component_type = ComponentTypes.QUESTION_INSTRUCTIONS

edsl/prompts/library/agent_instructions.py

@@ -1,38 +0,0 @@
-"""Agent instructions for a human agent."""
-
-import textwrap
-
-from edsl.prompts.Prompt import PromptBase
-from edsl.prompts.prompt_config import ComponentTypes
-
-# from edsl.enums import LanguageModelType
-
-
-class AgentInstruction(PromptBase):
-    """Agent instructions for a human agent."""
-
-    # model = LanguageModelType.GPT_3_5_Turbo.value
-    # from edsl import Model
-    # model = Model().model
-    model = "gpt-3.5-turbo"
-    component_type = ComponentTypes.AGENT_INSTRUCTIONS
-    default_instructions = textwrap.dedent(
-        """\
-    You are playing the role of a human answering survey questions.
-    Do not break character.
-    """
-    )
-
-
-# class AgentInstructionLlama(PromptBase):
-#     """Agent instructions for a human agent."""
-
-#     model = LanguageModelType.LLAMA_2_70B_CHAT_HF.value
-#     component_type = ComponentTypes.AGENT_INSTRUCTIONS
-#     default_instructions = textwrap.dedent(
-#         """\
-#     You are playing the role of a human answering questions.
-#     Do not break character.
-#     Only respond in JSON, with one answer formatted as specified.
-#     """
-#     )

edsl/prompts/library/agent_persona.py

@@ -1,21 +0,0 @@
-"""Agent persona for a human agent."""
-
-import textwrap
-
-from edsl.prompts.Prompt import PromptBase
-from edsl.prompts.prompt_config import ComponentTypes
-
-# from edsl.enums import LanguageModelType
-
-
-class AgentPersona(PromptBase):
-    """Agent persona for a human agent."""
-
-    model = "gpt-4-1106-preview"
-    component_type = ComponentTypes.AGENT_PERSONA
-    default_instructions = textwrap.dedent(
-        """\
-            You are an agent with the following persona:
-            {{ traits }}
-        """
-    )

edsl/prompts/library/question_budget.py

@@ -1,30 +0,0 @@
-"""Budget question instructions."""
-
-import textwrap
-
-from edsl.prompts.QuestionInstructionsBase import QuestionInstuctionsBase
-
-
-class Budget(QuestionInstuctionsBase):
-    """Budget question instructions."""
-
-    question_type = "budget"
-    model = "gpt-4-1106-preview"
-    default_instructions = textwrap.dedent(
-        """\
-        You are being asked the following question: {{question_text}}
-        The options are 
-        {% for option in question_options %}
-        {{ loop.index0 }}: {{option}}
-        {% endfor %}                       
-        Return a valid JSON formatted as follows, with a dictionary for your "answer"
-        where the keys are the option numbers and the values are the amounts you want 
-        to allocate to the options, and the sum of the values is {{budget_sum}}:
-        {"answer": {<put dict of option numbers and allocation amounts here>},
-        "comment": "<put explanation here>"}
-        Example response for a budget of 100 and 4 options: 
-        {"answer": {"0": 25, "1": 25, "2": 25, "3": 25},
-        "comment": "I allocated 25 to each option."}
-        There must be an allocation listed for each item (including 0).
-        """
-    )

edsl/prompts/library/question_checkbox.py

@@ -1,38 +0,0 @@
-"""Checkbox question type."""
-
-import textwrap
-from edsl.prompts.QuestionInstructionsBase import QuestionInstuctionsBase
-
-
-class CheckBox(QuestionInstuctionsBase):
-    """Checkbox question type."""
-
-    question_type = "checkbox"
-    model = "gpt-4-1106-preview"
-    default_instructions = textwrap.dedent(
-        """\
-        You are being asked the following question: {{question_text}}
-        The options are
-        {% for option in question_options %}
-        {{ loop.index0 }}: {{option}}
-        {% endfor %}
-        Return a valid JSON formatted like this, selecting only the number of the option:
-        {"answer": [<put comma-separated list of answer codes here>], "comment": "<put explanation here>"}
-        {% if min_selections != None and max_selections != None and min_selections == max_selections %}
-        You must select exactly {{min_selections}} options.
-        {% elif min_selections != None and max_selections != None %}
-        Minimum number of options that must be selected: {{min_selections}}.
-        Maximum number of options that must be selected: {{max_selections}}.
-        {% elif min_selections != None %}
-        Minimum number of options that must be selected: {{min_selections}}.
-        {% elif max_selections != None %}
-        Maximum number of options that must be selected: {{max_selections}}.
-        {% endif %}
-        """
-    )
-
-
-class TopK(CheckBox):
-    """Top K question type."""
-
-    question_type = "top_k"

edsl/prompts/library/question_extract.py

@@ -1,23 +0,0 @@
-"""Extract question type."""
-
-import textwrap
-
-from edsl.prompts.QuestionInstructionsBase import QuestionInstuctionsBase
-
-
-class Extract(QuestionInstuctionsBase):
-    """Extract question type."""
-
-    question_type = "extract"
-    model = "gpt-4-1106-preview"
-    default_instructions = textwrap.dedent(
-        """\
-        You are given the following input: "{{question_text}}".
-        Create an ANSWER should be formatted like this: "{{ answer_template }}",
-        and it should have the same keys but values extracted from the input.
-        If the value of a key is not present in the input, fill with "null".
-        Return a valid JSON formatted like this:
-        {"answer": <put your ANSWER here>}
-        ONLY RETURN THE JSON, AND NOTHING ELSE.
-        """
-    )

edsl/prompts/library/question_freetext.py

@@ -1,18 +0,0 @@
-"""Free text question type."""
-
-import textwrap
-from edsl.prompts.QuestionInstructionsBase import QuestionInstuctionsBase
-
-
-class FreeText(QuestionInstuctionsBase):
-    """Free text question type."""
-
-    question_type = "free_text"
-    model = "gpt-4-1106-preview"
-    default_instructions = textwrap.dedent(
-        """\
-        You are being asked the following question: {{question_text}}
-        Return a valid JSON formatted like this:
-        {"answer": "<put free text answer here>"}
-        """
-    )