edsl 0.1.40__py3-none-any.whl → 0.1.41__py3-none-any.whl

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.40"
+__version__ = "0.1.41"

edsl/jobs/interviews/InterviewExceptionEntry.py

@@ -1,5 +1,6 @@
 import traceback
 import datetime
+from edsl.agents.InvigilatorBase import InvigilatorBase
 
 
 class InterviewExceptionEntry:
@@ -9,7 +10,7 @@ class InterviewExceptionEntry:
         self,
         *,
         exception: Exception,
-        invigilator: "Invigilator",
+        invigilator: "InvigilatorBase",
         traceback_format="text",
         answers=None,
     ):
@@ -20,6 +21,8 @@ class InterviewExceptionEntry:
         self.traceback_format = traceback_format
         self.answers = answers
 
+        # breakpoint()
+
     @property
     def question_type(self):
         # return self.failed_question.question.question_type
@@ -163,12 +166,16 @@ class InterviewExceptionEntry:
         >>> entry = InterviewExceptionEntry.example()
         >>> _ = entry.to_dict()
         """
-        return {
+        invigilator = (
+            self.invigilator.to_dict() if self.invigilator is not None else None
+        )
+        d = {
             "exception": self.serialize_exception(self.exception),
             "time": self.time,
             "traceback": self.traceback,
-            "invigilator": self.invigilator.to_dict(),
+            "invigilator": invigilator,
         }
+        return d
 
     @classmethod
     def from_dict(cls, data: dict) -> "InterviewExceptionEntry":
@@ -176,7 +183,10 @@ class InterviewExceptionEntry:
         from edsl.agents.Invigilator import InvigilatorAI
 
         exception = cls.deserialize_exception(data["exception"])
-        invigilator = InvigilatorAI.from_dict(data["invigilator"])
+        if data["invigilator"] is None:
+            invigilator = None
+        else:
+            invigilator = InvigilatorAI.from_dict(data["invigilator"])
         return cls(exception=exception, invigilator=invigilator)
 
 

edsl/language_models/key_management/KeyLookupBuilder.py

@@ -36,7 +36,7 @@ class KeyLookupBuilder:
 
     >>> builder = KeyLookupBuilder(fetch_order=("config", "env"))
     >>> builder.DEFAULT_RPM
-    10
+    100
     >>> builder.DEFAULT_TPM
     2000000
     >>> builder.fetch_order
@@ -54,8 +54,12 @@ class KeyLookupBuilder:
     ('openai', 'rpm')
     """
 
-    DEFAULT_RPM = 10
-    DEFAULT_TPM = 2000000
+    # DEFAULT_RPM = 10
+    # DEFAULT_TPM = 2000000
+    from edsl.config import CONFIG
+
+    DEFAULT_RPM = int(CONFIG.get("EDSL_SERVICE_RPM_BASELINE"))
+    DEFAULT_TPM = int(CONFIG.get("EDSL_SERVICE_TPM_BASELINE"))
 
     def __init__(self, fetch_order: Optional[tuple[str]] = None):
         if fetch_order is None:

{edsl-0.1.40.dist-info → edsl-0.1.41.dist-info}/METADATA

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

{edsl-0.1.40.dist-info → edsl-0.1.41.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=bRKE9C91TYGzTq0wxI4905SCxXVaXJVP1EuahhGjfCQ,23
+edsl/__version__.py,sha256=y9uk7vaddYq7x48m1qAG2qgbHu814vUzjs_fjnrQ3Es,23
 edsl/agents/Agent.py,sha256=lF7GD_bCvRLP4hrtm3w451AUfuJln5jZHGYBH84CMVE,40741
 edsl/agents/AgentList.py,sha256=iRfQfyUYtaJbJ3sRubPqPKRr77nKQgzhFEeZ0wcAEk0,18955
 edsl/agents/Invigilator.py,sha256=ITQtYsbqFL1DTBZZJ68ij5AZkKH4-Ib9tHjiIoLojDg,11954
@@ -110,7 +110,7 @@ edsl/jobs/data_structures.py,sha256=1kLN6goMLcOIT20vrDW2Wq-sA-cfygb_qgplW4-o090,
 edsl/jobs/decorators.py,sha256=vpeSgI3EP4RFz5V_OclFdnhiSrswihavAN8C9ygRhGE,1135
 edsl/jobs/interviews/Interview.py,sha256=hsMyKJFftalQqwZXdAAcT9V1aW7w-ZSvjAc45aqaIRw,15051
 edsl/jobs/interviews/InterviewExceptionCollection.py,sha256=ZIe9nnI8pznxp1D0K2Ii9SHorc9-f0k_lQV-Giq41P8,3666
-edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=JMLcftRItQRCo8cOWH5S2H02wa-157l1TCFGVDXfViY,5685
+edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=uV6pnhdp9WAabh_78htoOxIZqisHNfOAX2QZFlUnnlQ,5972
 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
@@ -141,7 +141,7 @@ 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=sykgASMHvbj9az3-uEMjhlZqN8veTl9JSDxIKzaG3rs,9206
+edsl/language_models/key_management/KeyLookupBuilder.py,sha256=ZrsPE177Kbn2gizyk2CSQfyk_8jVzrRpET-qFtZia3U,9373
 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
@@ -356,7 +356,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.40.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.40.dist-info/METADATA,sha256=b_Qbp0IFIJsaj0QHf0_ppCaCoZaiTyV8F-yn5FeP3KU,4760
-edsl-0.1.40.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-edsl-0.1.40.dist-info/RECORD,,
+edsl-0.1.41.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.41.dist-info/METADATA,sha256=Baf74nLwN11_oWpcILhjy22j3g1LBRX0U1n8WU0w2DQ,4760
+edsl-0.1.41.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.41.dist-info/RECORD,,