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

edsl/scenarios/FileStore.py

@@ -327,38 +327,6 @@ class FileStore(Scenario):
 
         return ConstructDownloadLink(self).create_link(custom_filename, style)
 
-    def to_pandas(self):
-        """
-        Convert the file content to a pandas DataFrame if supported by the file handler.
-
-        Returns:
-            pandas.DataFrame: The data from the file as a DataFrame
-
-        Raises:
-            AttributeError: If the file type's handler doesn't support pandas conversion
-        """
-        handler = FileMethods.get_handler(self.suffix)
-        if handler and hasattr(handler, "to_pandas"):
-            return handler(self.path).to_pandas()
-        raise AttributeError(
-            f"Converting {self.suffix} files to pandas DataFrame is not supported"
-        )
-
-    def __getattr__(self, name):
-        """
-        Delegate pandas DataFrame methods to the underlying DataFrame if this is a CSV file
-        """
-        if self.suffix == "csv":
-            # Get the pandas DataFrame
-            df = self.to_pandas()
-            # Check if the requested attribute exists in the DataFrame
-            if hasattr(df, name):
-                return getattr(df, name)
-        # If not a CSV or attribute doesn't exist in DataFrame, raise AttributeError
-        raise AttributeError(
-            f"'{self.__class__.__name__}' object has no attribute '{name}'"
-        )
-
 
 class CSVFileStore(FileStore):
     @classmethod

edsl/scenarios/handlers/csv.py

@@ -36,14 +36,3 @@ class CsvMethods(FileMethods):
         with tempfile.NamedTemporaryFile(delete=False, suffix=".csv") as f:
             df.to_csv(f.name, index=False)
         return f.name
-
-    def to_pandas(self):
-        """
-        Convert the CSV file to a pandas DataFrame.
-
-        Returns:
-            pandas.DataFrame: The data from the CSV as a DataFrame
-        """
-        import pandas as pd
-
-        return pd.read_csv(self.path)

edsl/surveys/Survey.py

@@ -391,10 +391,6 @@ class Survey(SurveyExportMixin, Base):
 
             if (class_name := pass_dict.get("edsl_class_name")) == "QuestionBase":
                 return QuestionBase
-            elif pass_dict.get("edsl_class_name") == "QuestionDict":
-                from edsl.questions.QuestionDict import QuestionDict
-
-                return QuestionDict
             elif class_name == "Instruction":
                 from edsl.surveys.instructions.Instruction import Instruction
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.40
+Version: 0.1.40.dev2
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT
@@ -107,5 +107,5 @@ See instructions on [storing API keys](https://docs.expectedparrot.com/en/latest
 
 ## 💡 Contributions, feature requests & bugs
 Interested in contributing? Want us to add a new feature? Found a bug for us to squash? 
-Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m).
+Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m)..
 

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

@@ -1,11 +1,11 @@
 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/agents/Agent.py,sha256=lF7GD_bCvRLP4hrtm3w451AUfuJln5jZHGYBH84CMVE,40741
+edsl/__init__.py,sha256=It2k2drMyde7O-xh0yesod2OxZ3W0yW21zZKRVifv6g,1896
+edsl/__version__.py,sha256=_gR5xyqmw7ERGVJXAViiOprIWYbHw6O-k82fz9ALi1Q,28
+edsl/agents/Agent.py,sha256=VLIe9gMnLcZkRCQpz8VofEIAbCWj7jNpWxDw5k3KiXI,40734
 edsl/agents/AgentList.py,sha256=iRfQfyUYtaJbJ3sRubPqPKRr77nKQgzhFEeZ0wcAEk0,18955
-edsl/agents/Invigilator.py,sha256=ITQtYsbqFL1DTBZZJ68ij5AZkKH4-Ib9tHjiIoLojDg,11954
+edsl/agents/Invigilator.py,sha256=v9KkQ7yQfhwsrZB-7Bu4ZQ-zl_9Hwaxe0uQyxB-Wvss,11862
 edsl/agents/InvigilatorBase.py,sha256=JIRy7uogI8Hsv8nx8J2zMnd4XK-WQETlSAzkU6uIYNw,8967
 edsl/agents/PromptConstructor.py,sha256=orYFJI5Teh47cVJSJ63R8lfcAKSaDclSVX_OVTiqEgw,10752
 edsl/agents/QuestionInstructionPromptBuilder.py,sha256=t7Yuhvzq0cYbcRxzSOv_bvT3ihlmlyAOsScDMWg9A2M,4526
@@ -36,12 +36,12 @@ edsl/coop/CoopFunctionsMixin.py,sha256=RS79ADEbYUK-frf_WY-YnozVbM3ZaBufv1jxjF96G
 edsl/coop/ExpectedParrotKeyHandler.py,sha256=1lriainznM1FfQ7GEvTiI1EW8uNi8Sms3Vt5UDxso3U,4456
 edsl/coop/PriceFetcher.py,sha256=J5EaM-bPqnd2B0ZBVVqXJ-UQK-D4SdjmddYepnN7jz4,1777
 edsl/coop/__init__.py,sha256=4iZCwJSzJVyjBYk8ggGxY2kZjq9dXVT1jhyPDNyew4I,115
-edsl/coop/coop.py,sha256=j5tfzPfQdBW_CcDDpAD5HaqJQNYPPWUCPkEz5wr3vk4,39750
+edsl/coop/coop.py,sha256=9aJod721k_BOPHV_257YsFLxFKRgTbUqmi9ludvYGPc,39678
 edsl/coop/utils.py,sha256=SBV76sk5_2rhP3RKGkJsOkrx9Qr-jD0puqYhVR_MgSY,3900
-edsl/data/Cache.py,sha256=ryMWLowyXa8VwWKru-0pF43JHh2UVyL5Zezst-26J6c,18510
+edsl/data/Cache.py,sha256=EEzfpAyYKeBuCZ4iryUsktVmuk95uu_L047Lr3yWEyE,18270
 edsl/data/CacheEntry.py,sha256=mTc-WG_dWc4s9s3MrOl3yUqao2Q_igCerNcluM4XCSQ,7376
 edsl/data/CacheHandler.py,sha256=wy2AdKkk_pmwP71htdmLV9UzXM4AuHm5pn1qscJlX9s,5150
-edsl/data/RemoteCacheSync.py,sha256=QVTVjpcGVZz1VxYXZPP7kBGsU9fXOS6EHALHOnQLfRU,6094
+edsl/data/RemoteCacheSync.py,sha256=qgvh2w0c-Ak7poGNucWRd4ze8ncMQYh36a9yp3ib0IU,6062
 edsl/data/SQLiteDict.py,sha256=V5Nfnxctgh4Iblqcw1KmbnkjtfmWrrombROSQ3mvg6A,8979
 edsl/data/__init__.py,sha256=i_bbYBc-vrdASBpDMcpIcfhbLKYOkvqA57R3ysBcQ6o,177
 edsl/data/orm.py,sha256=Jz6rvw5SrlxwysTL0QI9r68EflKxeEBmf6j6himHDS8,238
@@ -86,12 +86,12 @@ edsl/inference_services/models_available_cache.py,sha256=bOvevfRn2HlmBcHalaDkjFL
 edsl/inference_services/rate_limits_cache.py,sha256=HYslviz7mxF9U4CUTPAkoyBsiXjSju-YCp4HHir6e34,1398
 edsl/inference_services/registry.py,sha256=Rkjfe4iABQc7aiY73bGnbRAgLXY0osni22hYnmMEI2c,1335
 edsl/inference_services/write_available.py,sha256=NNwhATlaMp8IYY635MSx-oYxt5X15acjAfaqYCo_I1Y,285
-edsl/jobs/AnswerQuestionFunctionConstructor.py,sha256=wNM2HNhEQLYO8BRCfzqPGpJrqmtw0FBkGPa_VUe9emQ,7977
+edsl/jobs/AnswerQuestionFunctionConstructor.py,sha256=NZk9_9d2u8f_bK-qFFCJyM3KNMYNiedW4Ju7uQyPQxc,7973
 edsl/jobs/Answers.py,sha256=lZpbGAqYqMQw7MUsmpivqMZkHjHHOmCY32s9Km284pQ,1445
 edsl/jobs/FetchInvigilator.py,sha256=83tbrqY_1qK0biNF1x51N0sFx49FFmuOi3o5HmFuCIY,1785
 edsl/jobs/InterviewTaskManager.py,sha256=I1GShC2CrBFnGOcWn3q2YUU0SJbesmeLrrM2_nkuhZo,3748
 edsl/jobs/InterviewsConstructor.py,sha256=MyRgygmi4318PgERjhhZZXlNUju2lB1CBu8LJJjYNSs,1853
-edsl/jobs/Jobs.py,sha256=GHyTwD0bL9p5YIMtrJJbShbE0dtAn14oNTdySugVTNU,29694
+edsl/jobs/Jobs.py,sha256=NeHSyzLRXDp3elct9U0DngVwVt6o3JK_aNrOAYDN15E,29570
 edsl/jobs/JobsChecks.py,sha256=v1sgdjKQTYMoZu-uobM9USn1KaF6QBoOfNSGH7ueZjU,5403
 edsl/jobs/JobsComponentConstructor.py,sha256=yzjBFQx1oK8CN2taniB82kpXo6W712dIG1E9ouwkujg,6969
 edsl/jobs/JobsPrompts.py,sha256=OtLWuTPs6dncNyrXXVskpSCoKOUav4msxoa9uDtP2LM,9755
@@ -108,7 +108,7 @@ edsl/jobs/buckets/TokenBucketClient.py,sha256=Jx20nDAdUSh3USUX9B4PHd1uAFMdyOHtRa
 edsl/jobs/check_survey_scenario_compatibility.py,sha256=dU1IUPb1FFm0P1ievzTmtgcRxH2soCdPaG5GZ1Zd4fA,3816
 edsl/jobs/data_structures.py,sha256=1kLN6goMLcOIT20vrDW2Wq-sA-cfygb_qgplW4-o090,3727
 edsl/jobs/decorators.py,sha256=vpeSgI3EP4RFz5V_OclFdnhiSrswihavAN8C9ygRhGE,1135
-edsl/jobs/interviews/Interview.py,sha256=hsMyKJFftalQqwZXdAAcT9V1aW7w-ZSvjAc45aqaIRw,15051
+edsl/jobs/interviews/Interview.py,sha256=Zmi0_gNkpMWaho2fvSoCNITrJDfSEmfw7yqKCW3JeK0,15255
 edsl/jobs/interviews/InterviewExceptionCollection.py,sha256=ZIe9nnI8pznxp1D0K2Ii9SHorc9-f0k_lQV-Giq41P8,3666
 edsl/jobs/interviews/InterviewExceptionEntry.py,sha256=JMLcftRItQRCo8cOWH5S2H02wa-157l1TCFGVDXfViY,5685
 edsl/jobs/interviews/InterviewStatistic.py,sha256=hY5d2EkIJ96NilPpZAvZZzZoxLXM7ss3xx5MIcKtTPs,1856
@@ -120,8 +120,8 @@ edsl/jobs/interviews/interview_status_enum.py,sha256=KJ-1yLAHdX-p8TiFnM0M3v1tnBw
 edsl/jobs/jobs_status_enums.py,sha256=li94KU-DHNEq7ksR2ikQxms6W-J7sfiRlmlgGQX3F-E,172
 edsl/jobs/loggers/HTMLTableJobLogger.py,sha256=0s47WYqT9JK7dF22U_fVDke6_cDjUKxn-KW6JJTwvYg,11717
 edsl/jobs/results_exceptions_handler.py,sha256=5meG_S2SXehcMbmBks6QC2RRaR79eHAclDwMCbl_6Rs,3258
-edsl/jobs/runners/JobsRunnerAsyncio.py,sha256=j_wrU0CdeCSIRdUno9g-R9UL83z_p6HIrFP_twE9td8,5837
-edsl/jobs/runners/JobsRunnerStatus.py,sha256=1aySPXQ0ijCvv6Bqvddqe6Hlr-wAlTvxBV6D3Gvveqw,10466
+edsl/jobs/runners/JobsRunnerAsyncio.py,sha256=isYhNeuNlabvjks5whGVzQKn2t1yJXGCyd2Jg_DACeI,5471
+edsl/jobs/runners/JobsRunnerStatus.py,sha256=DBXohyKcQJ4bkNzQYHm-lT3BaCbrO5Fi6GKr1Vu4Hfc,10379
 edsl/jobs/runners/JobsRunnerStatusData.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edsl/jobs/tasks/QuestionTaskCreator.py,sha256=Bx7x2_Tc6hQvaAQNtnxvoF52bTCZH7AhiVWg_gSajmo,9934
 edsl/jobs/tasks/TaskCreators.py,sha256=XqAbNU33378Z4PQncokbfJwnKt3KHR9aqa5fKYRDpfg,2694
@@ -157,10 +157,9 @@ edsl/questions/ExceptionExplainer.py,sha256=BgM80FRPJjS_TrY6XaVmlT666MzY9DEagviG
 edsl/questions/HTMLQuestion.py,sha256=mRzVpfFLZ2RYBSDbLHeXTyAXbUHorpiwhNf-nuUSC5M,3431
 edsl/questions/QuestionBase.py,sha256=vyMOvEfMtka-k9Lkx07e36Ui00wM0sjBLUMxI6mi82c,18504
 edsl/questions/QuestionBasePromptsMixin.py,sha256=PFzqZKyLhtwKebzakFnbCIN1_GzSzxsHxsRfttsSSEA,7949
-edsl/questions/QuestionBudget.py,sha256=fBxDRfPJ3HctSCNTzqGLPuRCACySb3NHugXCNE7pXH8,8133
+edsl/questions/QuestionBudget.py,sha256=Q5jMspdN0sm85bmwoX83KvtgNtogR6nnNgPcLoDlE3I,8133
 edsl/questions/QuestionCheckBox.py,sha256=ho_tyr3a6gHcA2kWlfz0dSW_-2yd6ifdC3niPPPQJAY,12847
-edsl/questions/QuestionDict.py,sha256=uk2X3WWKYuPY_uOoNsj5l9xiPVKk_wRoXBmz70PKBbI,13647
-edsl/questions/QuestionExtract.py,sha256=Gix35u_RMHN2-paKJ8pc0h5c7HaMoLD6MOPVZVxVHkY,6055
+edsl/questions/QuestionExtract.py,sha256=42gz1nghFybqrmI3sUHUXB2wKtZtYM5NNFrWOU36fEI,6052
 edsl/questions/QuestionFreeText.py,sha256=yxs9H8y4RHUcmEjV02-_Pu_DjA2FizG9B3gd_hZQD2I,3377
 edsl/questions/QuestionFunctional.py,sha256=APuTZ5QNBTLvwv_iNcgFFV81qImiUL3qHMMHjArREf0,5581
 edsl/questions/QuestionList.py,sha256=YWCtqzo0JnYhNH0yOfU_iheL_3xQLiZm2L8i744B6Vo,7093
@@ -170,17 +169,17 @@ edsl/questions/QuestionNumerical.py,sha256=IBA8X3BuJ0q2sXrhcG1Px1FF1Hz7NOB9jvvtH
 edsl/questions/QuestionRank.py,sha256=Fqs7Zwv5fzRV5UdBsC7xBR6qzOINJftaCjAtKneSh8w,11283
 edsl/questions/Quick.py,sha256=h6h4fEvIkLIFJX2JiqfOUEXzku9azWxEpI5o2A4RmVs,1731
 edsl/questions/SimpleAskMixin.py,sha256=rbiKvNiH0-Fe5-hWSRqi1Yz0RbmwJ5bgU17z8Zf8oXc,2258
-edsl/questions/__init__.py,sha256=zW51pm47yGEPElTfUBMZVzA-JPXC5CEw_X8xEt0nAIA,1273
-edsl/questions/answer_validator_mixin.py,sha256=JDeWSa6YyZh6wAnnJuVrXxJNPaEou-EDI4X7voqreH4,14332
+edsl/questions/__init__.py,sha256=TasdJQxi0hPlR_icXqkMG6fJMwPi0peOzZMIEyB5ljg,1220
+edsl/questions/answer_validator_mixin.py,sha256=kJQ7lePSt8vIDtZpS0-5NDf_APA7GAR1ufgUulovLvk,13306
 edsl/questions/compose_questions.py,sha256=ZcLkwNaofk-o0-skGXEDGZAj6DumOhVhyIUjqEnKrbg,3380
 edsl/questions/data_structures.py,sha256=PbIML8388sHogUHGamz21DXKEpfU8zwyiGflc1y0cHE,432
 edsl/questions/decorators.py,sha256=ZijaRYUntAcg0JEztCiOEpcDvvVie___85Zx5ogBQXY,596
 edsl/questions/derived/QuestionLikertFive.py,sha256=XCpmwlk2qyCxEkiG3UwPqVpS5-k4d4uWyMaxfJg5wkw,2585
-edsl/questions/derived/QuestionLinearScale.py,sha256=oGxTOFITNrFofV468Gow9rtnBMWBBS6HR2sdw6nenqE,3419
+edsl/questions/derived/QuestionLinearScale.py,sha256=7A1VQc_ECIX8UgkH_usySEMMDThFiqKtrGJakL8mPdY,3420
 edsl/questions/derived/QuestionTopK.py,sha256=IAmW1kUA1rvW_NH3yxroLfarhl6_QyTEwWZ54gbi6fg,3294
 edsl/questions/derived/QuestionYesNo.py,sha256=KWJyaXSNPNxELtK0nWvIqNtpAF05MMAC0ILUjxXkVwo,2735
 edsl/questions/derived/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/questions/descriptors.py,sha256=aZXserK3kKpR_VaxZUhnUZtQd2n4HP4sBxKBGOB9ChY,18374
+edsl/questions/descriptors.py,sha256=tPWOseUxmHUrL0rPcBcYmg-0gyzwvxGLAo3Jh3-apCQ,16606
 edsl/questions/loop_processor.py,sha256=h2t8Sn71JBBpim3MaVcZtPTcUsPCBR2aJIpzDFzam5k,4553
 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
@@ -191,7 +190,7 @@ edsl/questions/prompt_templates/question_list.jinja,sha256=MAkNv88E79jXK9TxKdnf5
 edsl/questions/prompt_templates/question_multiple_choice.jinja,sha256=sSyAhnexZF6oWqHL-45r7o69vrFcCbbYXLZ3zu7q76U,761
 edsl/questions/prompt_templates/question_numerical.jinja,sha256=c20sp3HfFonfaRwwmnF7HjAEugU15QlgpNAIkNHasl0,1218
 edsl/questions/question_base_gen_mixin.py,sha256=UNgYVmQvX_adD9FxQEd0peTzhW6-lf9iDocmkNplZhY,6182
-edsl/questions/question_registry.py,sha256=H4Q4JYMHn7-_5rU7Ap26N6Ruzz9WSZqOf1b89MScIDI,6352
+edsl/questions/question_registry.py,sha256=zfXrHu8nJGLgp-ExIVy9whMwvCEcobSgxw7hvwEawEk,6344
 edsl/questions/register_questions_meta.py,sha256=2h_9iZt3cjr_7JRmveTqbmEBBCvjtefMDfhM7Pgd_zg,2598
 edsl/questions/response_validator_abc.py,sha256=410DIb8Z5uF_xu1lG32OF6X7aoOtL6gG3UIMY83kfeo,6838
 edsl/questions/response_validator_factory.py,sha256=IzRHHcr2CjWFLgCHXHojwWa5Erc6E8pilTLys1M-5zE,1301
@@ -203,9 +202,6 @@ edsl/questions/templates/budget/question_presentation.jinja,sha256=wrZnM5ZbNhPZs
 edsl/questions/templates/checkbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edsl/questions/templates/checkbox/answering_instructions.jinja,sha256=UCPWWsnaAW3oB05IZDLQtofHXBesbqQxguXMfykUTQU,441
 edsl/questions/templates/checkbox/question_presentation.jinja,sha256=2u8XIkFPWzOuhbeoIvYBm6zUWnTHF66cGJXIznxVobw,807
-edsl/questions/templates/dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edsl/questions/templates/dict/answering_instructions.jinja,sha256=4TJnVLM2PSZbob8fuzrUAS-oaZrU6y8osKTIyxzAtRY,676
-edsl/questions/templates/dict/question_presentation.jinja,sha256=OLDuxUc6BjT4InCtAkK_e-D5qbsDmtxw1Spp9pWFYhU,17
 edsl/questions/templates/extract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edsl/questions/templates/extract/answering_instructions.jinja,sha256=sjHH4mBdoi6fdpHtRNWG0q3E4ZihvBpVUf08TNnwad4,253
 edsl/questions/templates/extract/question_presentation.jinja,sha256=OLDuxUc6BjT4InCtAkK_e-D5qbsDmtxw1Spp9pWFYhU,17
@@ -246,8 +242,8 @@ edsl/results/DatasetExportMixin.py,sha256=6U1IN1Nb_bwgDZtQx9mhUV63Topkvv3ssxyqBE
 edsl/results/DatasetTree.py,sha256=nvNCF9psLcQ65qsxze7qkrhLn-U-N8OJ327Nf-sFskQ,10178
 edsl/results/MarkdownToDocx.py,sha256=e8kdDPoqS6Zvd8OTldP9AXbjtmr8BZnro7f0-g1ENi4,4123
 edsl/results/MarkdownToPDF.py,sha256=RgQ8V86AD_h0HlohUiTWcbL8zOpI8xFC4FK-aOh26HE,3608
-edsl/results/Result.py,sha256=6uNvV7G3mysZbIU5EFhDDtG0xdedXG1p3RYnLhRMfuM,21181
-edsl/results/Results.py,sha256=yc4zx4aNuk1nzXYQljzT024r5bB3V1tSTheOeVzix0I,41859
+edsl/results/Result.py,sha256=B3rlgryviGkLiXYNRmT1F2HnYYZo-9cyC_UYIIWDu6A,20548
+edsl/results/Results.py,sha256=uQbmwPCyb027iZSY_9SYLD5M2NhbZkKpl3U_I9Tc4Ao,41490
 edsl/results/ResultsExportMixin.py,sha256=v9N4pUMrycmKIDzdWn1grmx7F8lxIPAOjfV6OScYSwc,1379
 edsl/results/ResultsGGMixin.py,sha256=SAYz8p4wb1g8x6KhBVz9NHOGib2c2XsqtTclpADrFeM,4344
 edsl/results/TableDisplay.py,sha256=xGJcotgUqWrmCkQLeD9YIwLrNv7su4VDce3EnllfrLQ,3725
@@ -265,7 +261,7 @@ edsl/results/tree_explore.py,sha256=hQjiO4E71rIOPDgEHgK8T8ukxqoNdgX_tvyiDlG4_9U,
 edsl/scenarios/ConstructDownloadLink.py,sha256=DGfF6hoCUovpTQ_GWiEndc--fXe9St6UdiaPhj7ZJZw,3529
 edsl/scenarios/DocumentChunker.py,sha256=LZXh_yx507LMNQ-i2VnSHZiPpRI0XQUECO8e3xAKAjI,3545
 edsl/scenarios/DocxScenario.py,sha256=ul3nkX826m_T6LFptswqtnH5czP_yxMlLWgbTmFIZI4,482
-edsl/scenarios/FileStore.py,sha256=onFZAqkdqzyQeQ9_2zn1qGY40SqmRG9X8DvtcbXW39o,17418
+edsl/scenarios/FileStore.py,sha256=c4Mzco_xpcyVGywHHAyPuu53OzRQD_9W9fyyPsYQKtc,16202
 edsl/scenarios/PdfExtractor.py,sha256=ATJ_QOJ3yE7SkdAu3nQdQ-Z9dSjkBZyrEgeuDNtU_ZQ,1310
 edsl/scenarios/Scenario.py,sha256=670xmH15K0YZovouw4EQc1fdGerY96gtfgfAOOjSxno,17021
 edsl/scenarios/ScenarioHtmlMixin.py,sha256=5H8MnPPWqlGZ0_Ojv1WjkFaNNRrr-JpCRwlABDBfPXs,2111
@@ -276,7 +272,7 @@ edsl/scenarios/__init__.py,sha256=CQXwTNTIG9jg_pLkDPZgapUFY0_LwZFVQ8HaYvof0Nc,14
 edsl/scenarios/directory_scanner.py,sha256=eJHPx6pc_No-I-old0vwrNRwNxmgnn3Fr6mht5mp8Fw,3312
 edsl/scenarios/file_methods.py,sha256=HeusyoXOi2Bb0Bfp8MVDWKMFpe_ipP-cxENiRrSKZQU,2621
 edsl/scenarios/handlers/__init__.py,sha256=4GdEfrAk5a7mUfbwnf0TCcrvp1_aAYZPAnd433NmiGM,384
-edsl/scenarios/handlers/csv.py,sha256=5W2fWa6FAL_QGTYTVLFaiEr28f6W7FaF-a9drsklSfc,1383
+edsl/scenarios/handlers/csv.py,sha256=6wKJwTWqMbVOX5ZgjKmo6fh3P1Y-2QJJ79KJ18hRAnk,1129
 edsl/scenarios/handlers/docx.py,sha256=e6POWp3Xs-XCVr8TKMtDka1ZRySXZf17TcSimvw6owY,2203
 edsl/scenarios/handlers/html.py,sha256=zXipNAYcQE4LRBrKZC9L_tkY1snxQe8ciJ2S1diyMcM,927
 edsl/scenarios/handlers/json.py,sha256=hlZMHYwwuFrV9bGdbn8MNAjgBFue6l5W2TwCfyxSjZ0,3682
@@ -308,7 +304,7 @@ edsl/surveys/Rule.py,sha256=Hou5_sSpvIfBdZNQk8tHFf-q4JT0wrV_kPMGbmLBfgA,12403
 edsl/surveys/RuleCollection.py,sha256=UC300EOPhjrMc-88eWt5kKBg1pVvKzzwgda2hjHW_sk,14790
 edsl/surveys/RuleManager.py,sha256=8k1XfTWaJbgjLLJsryBxVSiZ2_YuJPqE750jZEEtVwI,6216
 edsl/surveys/Simulator.py,sha256=I4_vHNnwe43SAbw7CK1xa45tahAKHfNRbRxGTRXdHuA,2586
-edsl/surveys/Survey.py,sha256=goK0WmA0DyCgqh9hYt3qnJwp2ZY-RUpwoLUXbFDc28s,47993
+edsl/surveys/Survey.py,sha256=DyJGHUftEybU70WKYu891mJEcjVKETxw6fmFnJ7d3zg,47818
 edsl/surveys/SurveyCSS.py,sha256=fIdiLuXTUq6KuoXXAU_LTHTTe6RchnCmZpj3j7qnt5Y,8796
 edsl/surveys/SurveyExportMixin.py,sha256=Kvkd2ku2Kemsn2Nw-Yt8GTnGFcUqfEiKznmisAeO7ck,8339
 edsl/surveys/SurveyFlowVisualization.py,sha256=OLdVZstVuzR_DFulTosRBhpUa9wQ6XJjKbOpvTUCgJw,6467
@@ -356,7 +352,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.40.dev2.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.40.dev2.dist-info/METADATA,sha256=HLmgd08kBzvGc3Rxufmpw0NMMk20FMgzD-4Nk7J2E6E,4766
+edsl-0.1.40.dev2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.40.dev2.dist-info/RECORD,,

edsl/questions/QuestionDict.py

@@ -1,343 +0,0 @@
-from __future__ import annotations
-from typing import Union, Optional, Dict, List, Any, Type
-from pydantic import BaseModel, Field, field_validator
-from jinja2 import Environment, FileSystemLoader, TemplateNotFound
-from pathlib import Path
-
-from edsl.questions.QuestionBase import QuestionBase
-from edsl.questions.descriptors import (
-    AnswerKeysDescriptor,
-    ValueTypesDescriptor,
-    ValueDescriptionsDescriptor,
-    QuestionTextDescriptor,
-)
-from edsl.questions.response_validator_abc import ResponseValidatorABC
-from edsl.exceptions.questions import QuestionCreationValidationError
-from edsl.questions.decorators import inject_exception
-
-
-class DictResponseValidator(ResponseValidatorABC):
-    required_params = ["answer_keys", "permissive"]
-
-    valid_examples = [
-        (
-            {
-                "answer": {
-                    "name": "Hot Chocolate",
-                    "num_ingredients": 5,
-                    "ingredients": ["milk", "cocoa", "sugar"]
-                }
-            },
-            {
-                "answer_keys": ["name", "num_ingredients", "ingredients"],
-                "value_types": ["str", "int", "list[str]"]
-            },
-        )
-    ]
-    invalid_examples = [
-        (
-            {"answer": {"name": 123}},  # Name should be a string
-            {"answer_keys": ["name"], "value_types": ["str"]},
-            "Key 'name' has value of type int, expected str",
-        ),
-        (
-            {"answer": {"ingredients": "milk"}},  # Should be a list
-            {"answer_keys": ["ingredients"], "value_types": ["list"]},
-            "Key 'ingredients' should be a list, got str",
-        )
-    ]
-
-
-class QuestionDict(QuestionBase):
-    question_type = "dict"
-    question_text: str = QuestionTextDescriptor()
-    answer_keys: List[str] = AnswerKeysDescriptor()
-    value_types: Optional[List[str]] = ValueTypesDescriptor()
-    value_descriptions: Optional[List[str]] = ValueDescriptionsDescriptor()
-
-    _response_model = None
-    response_validator_class = DictResponseValidator
-
-    def _get_default_answer(self) -> Dict[str, Any]:
-        """Get default answer based on types."""
-        answer = {}
-        if not self.value_types:
-            return {
-                "title": "Sample Recipe",
-                "ingredients": ["ingredient1", "ingredient2"],
-                "num_ingredients": 2,
-                "instructions": "Sample instructions"
-            }
-
-        for key, type_str in zip(self.answer_keys, self.value_types):
-            if type_str.startswith(('list[', 'list')):
-                if '[' in type_str:
-                    element_type = type_str[type_str.index('[') + 1:type_str.rindex(']')].lower()
-                    if element_type == 'str':
-                        answer[key] = ["sample_string"]
-                    elif element_type == 'int':
-                        answer[key] = [1]
-                    elif element_type == 'float':
-                        answer[key] = [1.0]
-                    else:
-                        answer[key] = []
-                else:
-                    answer[key] = []
-            else:
-                if type_str == 'str':
-                    answer[key] = "sample_string"
-                elif type_str == 'int':
-                    answer[key] = 1
-                elif type_str == 'float':
-                    answer[key] = 1.0
-                else:
-                    answer[key] = None
-                    
-        return answer
-
-    def create_response_model(
-        self,
-    ) -> Type[BaseModel]:
-        """Create a response model for dict questions."""
-        default_answer = self._get_default_answer()
-        
-        class DictResponse(BaseModel):
-            answer: Dict[str, Any] = Field(
-                default_factory=lambda: default_answer.copy()
-            )
-            comment: Optional[str] = None
-            
-            @field_validator("answer")
-            def validate_answer(cls, v, values, **kwargs):
-                # Ensure all keys exist
-                missing_keys = set(self.answer_keys) - set(v.keys())
-                if missing_keys:
-                    raise ValueError(f"Missing required keys: {missing_keys}")
-                    
-                # Validate value types if not permissive
-                if not self.permissive and self.value_types:
-                    for key, type_str in zip(self.answer_keys, self.value_types):
-                        if key not in v:
-                            continue
-                            
-                        value = v[key]
-                        type_str = type_str.lower()  # Normalize to lowercase
-                        
-                        # Handle list types
-                        if type_str.startswith(('list[', 'list')):
-                            if not isinstance(value, list):
-                                raise ValueError(f"Key '{key}' should be a list, got {type(value).__name__}")
-                                
-                            # If it's a parameterized list, check element types
-                            if '[' in type_str:
-                                element_type = type_str[type_str.index('[') + 1:type_str.rindex(']')]
-                                element_type = element_type.lower().strip()
-                                
-                                for i, elem in enumerate(value):
-                                    expected_type = {
-                                        'str': str,
-                                        'int': int,
-                                        'float': float,
-                                        'list': list
-                                    }.get(element_type)
-                                    
-                                    if expected_type and not isinstance(elem, expected_type):
-                                        raise ValueError(
-                                            f"List element at index {i} for key '{key}' "
-                                            f"has type {type(elem).__name__}, expected {element_type}"
-                                        )
-                        else:
-                            # Handle basic types
-                            expected_type = {
-                                'str': str,
-                                'int': int,
-                                'float': float,
-                                'list': list,
-                            }.get(type_str)
-                            
-                            if expected_type and not isinstance(value, expected_type):
-                                raise ValueError(
-                                    f"Key '{key}' has value of type {type(value).__name__}, expected {type_str}"
-                                )
-                return v
-
-            model_config = {
-                "json_schema_extra": {
-                    "examples": [{
-                        "answer": default_answer,
-                        "comment": None
-                    }]
-                }
-            }
-
-        DictResponse.__name__ = "DictResponse"
-        return DictResponse
-
-    def __init__(
-        self,
-        question_name: str,
-        question_text: str,
-        answer_keys: List[str],
-        value_types: Optional[List[Union[str, type]]] = None,
-        value_descriptions: Optional[List[str]] = None,
-        include_comment: bool = True,
-        question_presentation: Optional[str] = None,
-        answering_instructions: Optional[str] = None,
-        permissive: bool = False,
-    ):
-        self.question_name = question_name
-        self.question_text = question_text
-        self.answer_keys = answer_keys
-        self.value_types = self._normalize_value_types(value_types)
-        self.value_descriptions = value_descriptions
-        self.include_comment = include_comment
-        self.question_presentation = question_presentation or self._render_template(
-            "question_presentation.jinja"
-        )
-        self.answering_instructions = answering_instructions or self._render_template(
-            "answering_instructions.jinja"
-        )
-        self.permissive = permissive
-
-        # Validation
-        if self.value_types and len(self.value_types) != len(self.answer_keys):
-            raise QuestionCreationValidationError(
-                "Length of value_types must match length of answer_keys."
-            )
-        if self.value_descriptions and len(self.value_descriptions) != len(self.answer_keys):
-            raise QuestionCreationValidationError(
-                "Length of value_descriptions must match length of answer_keys."
-            )
-
-    @staticmethod
-    def _normalize_value_types(value_types: Optional[List[Union[str, type]]]) -> Optional[List[str]]:
-        """Convert all value_types to string representations, including type hints."""
-        if not value_types:
-            return None
-
-        def normalize_type(t) -> str:
-            # Handle string representations of List
-            t_str = str(t)
-            if t_str == 'List':
-                return 'list'
-                
-            # Handle string inputs
-            if isinstance(t, str):
-                t = t.lower()
-                # Handle list types
-                if t.startswith(('list[', 'list')):
-                    if '[' in t:
-                        # Normalize the inner type
-                        inner_type = t[t.index('[') + 1:t.rindex(']')].strip().lower()
-                        return f"list[{inner_type}]"
-                    return "list"
-                return t
-
-            # Handle List the same as list
-            if t_str == "<class 'List'>":
-                return "list"
-
-            # If it's list type
-            if t is list:
-                return "list"
-
-            # If it's a basic type
-            if hasattr(t, "__name__"):
-                return t.__name__.lower()
-            
-            # If it's a typing.List
-            if t_str.startswith(('list[', 'list')):
-                return t_str.replace('typing.', '').lower()
-
-            # Handle generic types
-            if hasattr(t, "__origin__"):
-                origin = t.__origin__.__name__.lower()
-                args = [
-                    arg.__name__.lower() if hasattr(arg, "__name__") else str(arg).lower()
-                    for arg in t.__args__
-                ]
-                return f"{origin}[{', '.join(args)}]"
-
-            raise QuestionCreationValidationError(
-                f"Invalid type in value_types: {t}. Must be a type or string."
-            )
-
-        normalized = []
-        for t in value_types:
-            try:
-                normalized.append(normalize_type(t))
-            except Exception as e:
-                raise QuestionCreationValidationError(f"Error normalizing type {t}: {str(e)}")
-        
-        return normalized
-
-    def _render_template(self, template_name: str) -> str:
-        """Render a template using Jinja."""
-        try:
-            template_dir = Path(__file__).parent / "templates" / "dict"
-            env = Environment(loader=FileSystemLoader(template_dir))
-            template = env.get_template(template_name)
-            return template.render(
-                question_name=self.question_name,
-                question_text=self.question_text,
-                answer_keys=self.answer_keys,
-                value_types=self.value_types,
-                value_descriptions=self.value_descriptions,
-                include_comment=self.include_comment,
-            )
-        except TemplateNotFound:
-            return f"Template {template_name} not found in {template_dir}."
-
-    def to_dict(self, add_edsl_version: bool = True) -> dict:
-        """Serialize to JSON-compatible dictionary."""
-        return {
-            "question_type": self.question_type,
-            "question_name": self.question_name,
-            "question_text": self.question_text,
-            "answer_keys": self.answer_keys,
-            "value_types": self.value_types or [],
-            "value_descriptions": self.value_descriptions or [],
-            "include_comment": self.include_comment,
-            "permissive": self.permissive,
-        }
-
-    @classmethod
-    def from_dict(cls, data: dict) -> 'QuestionDict':
-        """Recreate from a dictionary."""
-        return cls(
-            question_name=data["question_name"],
-            question_text=data["question_text"],
-            answer_keys=data["answer_keys"],
-            value_types=data.get("value_types"),
-            value_descriptions=data.get("value_descriptions"),
-            include_comment=data.get("include_comment", True),
-            permissive=data.get("permissive", False),
-        )
-
-    @classmethod
-    @inject_exception
-    def example(cls) -> 'QuestionDict':
-        """Return an example question."""
-        return cls(
-            question_name="example",
-            question_text="Please provide a simple recipe for hot chocolate.",
-            answer_keys=["title", "ingredients", "num_ingredients", "instructions"],
-            value_types=["str", "list[str]", "int", "str"],
-            value_descriptions=[
-                "The title of the recipe.",
-                "A list of ingredients.",
-                "The number of ingredients.",
-                "The instructions for making the recipe."
-            ],
-        )
-
-    def _simulate_answer(self) -> dict:
-            """Simulate an answer for the question."""
-            return {
-                "answer": self._get_default_answer(),
-                "comment": None
-            }
-
-if __name__ == "__main__":
-    q = QuestionDict.example()
-    print(q.to_dict())

edsl/questions/templates/dict/answering_instructions.jinja

@@ -1,21 +0,0 @@
-Please respond with a dictionary using the following keys: {{ answer_keys | join(', ') }}.
-
-{% if value_descriptions %}
-Here are descriptions of the values to provide:
-{% for idx in range(answer_keys | length) %}
-- "{{ answer_keys[idx] }}": "{{ value_descriptions[idx] }}"
-{% endfor %}
-{% endif %}
-
-{% if value_types %}
-The values should be formatted in the following types:
-{% for idx in range(answer_keys | length) %}
-- "{{ answer_keys[idx] }}": "{{ value_types[idx] }}"
-{% endfor %}
-{% endif %}
-
-If you do not have a value for a given key, use "null".
-
-{% if include_comment %}
-After the answer, you can put a comment explaining your response on the next line.
-{% endif %}

edsl/questions/templates/dict/question_presentation.jinja

@@ -1 +0,0 @@
-{{question_text}}