edsl 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (328) hide show
  1. edsl/__init__.py +44 -39
  2. edsl/__version__.py +1 -1
  3. edsl/agents/__init__.py +4 -2
  4. edsl/agents/{Agent.py → agent.py} +442 -152
  5. edsl/agents/{AgentList.py → agent_list.py} +220 -162
  6. edsl/agents/descriptors.py +46 -7
  7. edsl/{exceptions/agents.py → agents/exceptions.py} +3 -12
  8. edsl/base/__init__.py +75 -0
  9. edsl/base/base_class.py +1303 -0
  10. edsl/base/data_transfer_models.py +114 -0
  11. edsl/base/enums.py +215 -0
  12. edsl/base.py +8 -0
  13. edsl/buckets/__init__.py +25 -0
  14. edsl/buckets/bucket_collection.py +324 -0
  15. edsl/buckets/model_buckets.py +206 -0
  16. edsl/buckets/token_bucket.py +502 -0
  17. edsl/{jobs/buckets/TokenBucketAPI.py → buckets/token_bucket_api.py} +1 -1
  18. edsl/buckets/token_bucket_client.py +509 -0
  19. edsl/caching/__init__.py +20 -0
  20. edsl/caching/cache.py +814 -0
  21. edsl/caching/cache_entry.py +427 -0
  22. edsl/{data/CacheHandler.py → caching/cache_handler.py} +14 -15
  23. edsl/caching/exceptions.py +24 -0
  24. edsl/caching/orm.py +30 -0
  25. edsl/{data/RemoteCacheSync.py → caching/remote_cache_sync.py} +3 -3
  26. edsl/caching/sql_dict.py +441 -0
  27. edsl/config/__init__.py +8 -0
  28. edsl/config/config_class.py +177 -0
  29. edsl/config.py +4 -176
  30. edsl/conversation/Conversation.py +7 -7
  31. edsl/conversation/car_buying.py +4 -4
  32. edsl/conversation/chips.py +6 -6
  33. edsl/coop/__init__.py +25 -2
  34. edsl/coop/coop.py +430 -113
  35. edsl/coop/{ExpectedParrotKeyHandler.py → ep_key_handling.py} +86 -10
  36. edsl/coop/exceptions.py +62 -0
  37. edsl/coop/price_fetcher.py +126 -0
  38. edsl/coop/utils.py +89 -24
  39. edsl/data_transfer_models.py +5 -72
  40. edsl/dataset/__init__.py +10 -0
  41. edsl/{results/Dataset.py → dataset/dataset.py} +116 -36
  42. edsl/dataset/dataset_operations_mixin.py +1492 -0
  43. edsl/{results/DatasetTree.py → dataset/dataset_tree.py} +156 -75
  44. edsl/{results/TableDisplay.py → dataset/display/table_display.py} +18 -7
  45. edsl/{results → dataset/display}/table_renderers.py +58 -2
  46. edsl/{results → dataset}/file_exports.py +4 -5
  47. edsl/{results → dataset}/smart_objects.py +2 -2
  48. edsl/enums.py +5 -205
  49. edsl/inference_services/__init__.py +5 -0
  50. edsl/inference_services/{AvailableModelCacheHandler.py → available_model_cache_handler.py} +2 -3
  51. edsl/inference_services/{AvailableModelFetcher.py → available_model_fetcher.py} +8 -14
  52. edsl/inference_services/data_structures.py +3 -2
  53. edsl/{exceptions/inference_services.py → inference_services/exceptions.py} +1 -1
  54. edsl/inference_services/{InferenceServiceABC.py → inference_service_abc.py} +1 -1
  55. edsl/inference_services/{InferenceServicesCollection.py → inference_services_collection.py} +8 -7
  56. edsl/inference_services/registry.py +4 -41
  57. edsl/inference_services/{ServiceAvailability.py → service_availability.py} +5 -25
  58. edsl/inference_services/services/__init__.py +31 -0
  59. edsl/inference_services/{AnthropicService.py → services/anthropic_service.py} +3 -3
  60. edsl/inference_services/{AwsBedrock.py → services/aws_bedrock.py} +2 -2
  61. edsl/inference_services/{AzureAI.py → services/azure_ai.py} +2 -2
  62. edsl/inference_services/{DeepInfraService.py → services/deep_infra_service.py} +1 -3
  63. edsl/inference_services/{DeepSeekService.py → services/deep_seek_service.py} +2 -4
  64. edsl/inference_services/{GoogleService.py → services/google_service.py} +5 -4
  65. edsl/inference_services/{GroqService.py → services/groq_service.py} +1 -1
  66. edsl/inference_services/{MistralAIService.py → services/mistral_ai_service.py} +3 -3
  67. edsl/inference_services/{OllamaService.py → services/ollama_service.py} +1 -7
  68. edsl/inference_services/{OpenAIService.py → services/open_ai_service.py} +5 -6
  69. edsl/inference_services/{PerplexityService.py → services/perplexity_service.py} +12 -12
  70. edsl/inference_services/{TestService.py → services/test_service.py} +7 -6
  71. edsl/inference_services/{TogetherAIService.py → services/together_ai_service.py} +2 -6
  72. edsl/inference_services/{XAIService.py → services/xai_service.py} +1 -1
  73. edsl/inference_services/write_available.py +1 -2
  74. edsl/instructions/__init__.py +6 -0
  75. edsl/{surveys/instructions/Instruction.py → instructions/instruction.py} +11 -6
  76. edsl/{surveys/instructions/InstructionCollection.py → instructions/instruction_collection.py} +10 -5
  77. edsl/{surveys/InstructionHandler.py → instructions/instruction_handler.py} +3 -3
  78. edsl/{jobs/interviews → interviews}/ReportErrors.py +2 -2
  79. edsl/interviews/__init__.py +4 -0
  80. edsl/{jobs/AnswerQuestionFunctionConstructor.py → interviews/answering_function.py} +45 -18
  81. edsl/{jobs/interviews/InterviewExceptionEntry.py → interviews/exception_tracking.py} +107 -22
  82. edsl/interviews/interview.py +638 -0
  83. edsl/{jobs/interviews/InterviewStatusDictionary.py → interviews/interview_status_dictionary.py} +21 -12
  84. edsl/{jobs/interviews/InterviewStatusLog.py → interviews/interview_status_log.py} +16 -7
  85. edsl/{jobs/InterviewTaskManager.py → interviews/interview_task_manager.py} +12 -7
  86. edsl/{jobs/RequestTokenEstimator.py → interviews/request_token_estimator.py} +8 -3
  87. edsl/{jobs/interviews/InterviewStatistic.py → interviews/statistics.py} +36 -10
  88. edsl/invigilators/__init__.py +38 -0
  89. edsl/invigilators/invigilator_base.py +477 -0
  90. edsl/{agents/Invigilator.py → invigilators/invigilators.py} +263 -10
  91. edsl/invigilators/prompt_constructor.py +476 -0
  92. edsl/{agents → invigilators}/prompt_helpers.py +2 -1
  93. edsl/{agents/QuestionInstructionPromptBuilder.py → invigilators/question_instructions_prompt_builder.py} +18 -13
  94. edsl/{agents → invigilators}/question_option_processor.py +96 -21
  95. edsl/{agents/QuestionTemplateReplacementsBuilder.py → invigilators/question_template_replacements_builder.py} +64 -12
  96. edsl/jobs/__init__.py +7 -1
  97. edsl/jobs/async_interview_runner.py +99 -35
  98. edsl/jobs/check_survey_scenario_compatibility.py +7 -5
  99. edsl/jobs/data_structures.py +153 -22
  100. edsl/{exceptions/jobs.py → jobs/exceptions.py} +2 -1
  101. edsl/jobs/{FetchInvigilator.py → fetch_invigilator.py} +4 -4
  102. edsl/jobs/{loggers/HTMLTableJobLogger.py → html_table_job_logger.py} +6 -2
  103. edsl/jobs/{Jobs.py → jobs.py} +321 -155
  104. edsl/jobs/{JobsChecks.py → jobs_checks.py} +15 -7
  105. edsl/jobs/{JobsComponentConstructor.py → jobs_component_constructor.py} +20 -17
  106. edsl/jobs/{InterviewsConstructor.py → jobs_interview_constructor.py} +10 -5
  107. edsl/jobs/jobs_pricing_estimation.py +347 -0
  108. edsl/jobs/{JobsRemoteInferenceLogger.py → jobs_remote_inference_logger.py} +4 -3
  109. edsl/jobs/jobs_runner_asyncio.py +282 -0
  110. edsl/jobs/{JobsRemoteInferenceHandler.py → remote_inference.py} +19 -22
  111. edsl/jobs/results_exceptions_handler.py +2 -2
  112. edsl/key_management/__init__.py +28 -0
  113. edsl/key_management/key_lookup.py +161 -0
  114. edsl/{language_models/key_management/KeyLookupBuilder.py → key_management/key_lookup_builder.py} +118 -47
  115. edsl/key_management/key_lookup_collection.py +82 -0
  116. edsl/key_management/models.py +218 -0
  117. edsl/language_models/__init__.py +7 -2
  118. edsl/language_models/{ComputeCost.py → compute_cost.py} +18 -3
  119. edsl/{exceptions/language_models.py → language_models/exceptions.py} +2 -1
  120. edsl/language_models/language_model.py +1080 -0
  121. edsl/language_models/model.py +10 -25
  122. edsl/language_models/{ModelList.py → model_list.py} +9 -14
  123. edsl/language_models/{RawResponseHandler.py → raw_response_handler.py} +1 -1
  124. edsl/language_models/{RegisterLanguageModelsMeta.py → registry.py} +1 -1
  125. edsl/language_models/repair.py +4 -4
  126. edsl/language_models/utilities.py +4 -4
  127. edsl/notebooks/__init__.py +3 -1
  128. edsl/notebooks/{Notebook.py → notebook.py} +7 -8
  129. edsl/prompts/__init__.py +1 -1
  130. edsl/{exceptions/prompts.py → prompts/exceptions.py} +3 -1
  131. edsl/prompts/{Prompt.py → prompt.py} +101 -95
  132. edsl/questions/HTMLQuestion.py +1 -1
  133. edsl/questions/__init__.py +154 -25
  134. edsl/questions/answer_validator_mixin.py +1 -1
  135. edsl/questions/compose_questions.py +4 -3
  136. edsl/questions/derived/question_likert_five.py +166 -0
  137. edsl/questions/derived/{QuestionLinearScale.py → question_linear_scale.py} +4 -4
  138. edsl/questions/derived/{QuestionTopK.py → question_top_k.py} +4 -4
  139. edsl/questions/derived/{QuestionYesNo.py → question_yes_no.py} +4 -5
  140. edsl/questions/descriptors.py +24 -30
  141. edsl/questions/loop_processor.py +65 -19
  142. edsl/questions/question_base.py +881 -0
  143. edsl/questions/question_base_gen_mixin.py +15 -16
  144. edsl/questions/{QuestionBasePromptsMixin.py → question_base_prompts_mixin.py} +2 -2
  145. edsl/questions/{QuestionBudget.py → question_budget.py} +3 -4
  146. edsl/questions/{QuestionCheckBox.py → question_check_box.py} +16 -16
  147. edsl/questions/{QuestionDict.py → question_dict.py} +39 -5
  148. edsl/questions/{QuestionExtract.py → question_extract.py} +9 -9
  149. edsl/questions/question_free_text.py +282 -0
  150. edsl/questions/{QuestionFunctional.py → question_functional.py} +6 -5
  151. edsl/questions/{QuestionList.py → question_list.py} +6 -7
  152. edsl/questions/{QuestionMatrix.py → question_matrix.py} +6 -5
  153. edsl/questions/{QuestionMultipleChoice.py → question_multiple_choice.py} +126 -21
  154. edsl/questions/{QuestionNumerical.py → question_numerical.py} +5 -5
  155. edsl/questions/{QuestionRank.py → question_rank.py} +6 -6
  156. edsl/questions/question_registry.py +10 -16
  157. edsl/questions/register_questions_meta.py +8 -4
  158. edsl/questions/response_validator_abc.py +17 -16
  159. edsl/results/__init__.py +4 -1
  160. edsl/{exceptions/results.py → results/exceptions.py} +1 -1
  161. edsl/results/report.py +197 -0
  162. edsl/results/{Result.py → result.py} +131 -45
  163. edsl/results/{Results.py → results.py} +420 -216
  164. edsl/results/results_selector.py +344 -25
  165. edsl/scenarios/__init__.py +30 -3
  166. edsl/scenarios/{ConstructDownloadLink.py → construct_download_link.py} +7 -0
  167. edsl/scenarios/directory_scanner.py +156 -13
  168. edsl/scenarios/document_chunker.py +186 -0
  169. edsl/scenarios/exceptions.py +101 -0
  170. edsl/scenarios/file_methods.py +2 -3
  171. edsl/scenarios/file_store.py +755 -0
  172. edsl/scenarios/handlers/__init__.py +14 -14
  173. edsl/scenarios/handlers/{csv.py → csv_file_store.py} +1 -2
  174. edsl/scenarios/handlers/{docx.py → docx_file_store.py} +8 -7
  175. edsl/scenarios/handlers/{html.py → html_file_store.py} +1 -2
  176. edsl/scenarios/handlers/{jpeg.py → jpeg_file_store.py} +1 -1
  177. edsl/scenarios/handlers/{json.py → json_file_store.py} +1 -1
  178. edsl/scenarios/handlers/latex_file_store.py +5 -0
  179. edsl/scenarios/handlers/{md.py → md_file_store.py} +1 -1
  180. edsl/scenarios/handlers/{pdf.py → pdf_file_store.py} +2 -2
  181. edsl/scenarios/handlers/{png.py → png_file_store.py} +1 -1
  182. edsl/scenarios/handlers/{pptx.py → pptx_file_store.py} +8 -7
  183. edsl/scenarios/handlers/{py.py → py_file_store.py} +1 -3
  184. edsl/scenarios/handlers/{sql.py → sql_file_store.py} +2 -1
  185. edsl/scenarios/handlers/{sqlite.py → sqlite_file_store.py} +2 -3
  186. edsl/scenarios/handlers/{txt.py → txt_file_store.py} +1 -1
  187. edsl/scenarios/scenario.py +928 -0
  188. edsl/scenarios/scenario_join.py +18 -5
  189. edsl/scenarios/{ScenarioList.py → scenario_list.py} +424 -106
  190. edsl/scenarios/{ScenarioListPdfMixin.py → scenario_list_pdf_tools.py} +16 -15
  191. edsl/scenarios/scenario_selector.py +5 -1
  192. edsl/study/ObjectEntry.py +2 -2
  193. edsl/study/SnapShot.py +5 -5
  194. edsl/study/Study.py +20 -21
  195. edsl/study/__init__.py +6 -4
  196. edsl/surveys/__init__.py +7 -4
  197. edsl/surveys/dag/__init__.py +2 -0
  198. edsl/surveys/{ConstructDAG.py → dag/construct_dag.py} +3 -3
  199. edsl/surveys/{DAG.py → dag/dag.py} +13 -10
  200. edsl/surveys/descriptors.py +1 -1
  201. edsl/surveys/{EditSurvey.py → edit_survey.py} +9 -9
  202. edsl/{exceptions/surveys.py → surveys/exceptions.py} +1 -2
  203. edsl/surveys/memory/__init__.py +3 -0
  204. edsl/surveys/{MemoryPlan.py → memory/memory_plan.py} +10 -9
  205. edsl/surveys/rules/__init__.py +3 -0
  206. edsl/surveys/{Rule.py → rules/rule.py} +103 -43
  207. edsl/surveys/{RuleCollection.py → rules/rule_collection.py} +21 -30
  208. edsl/surveys/{RuleManager.py → rules/rule_manager.py} +19 -13
  209. edsl/surveys/survey.py +1743 -0
  210. edsl/surveys/{SurveyExportMixin.py → survey_export.py} +22 -27
  211. edsl/surveys/{SurveyFlowVisualization.py → survey_flow_visualization.py} +11 -2
  212. edsl/surveys/{Simulator.py → survey_simulator.py} +10 -3
  213. edsl/tasks/__init__.py +32 -0
  214. edsl/{jobs/tasks/QuestionTaskCreator.py → tasks/question_task_creator.py} +115 -57
  215. edsl/tasks/task_creators.py +135 -0
  216. edsl/{jobs/tasks/TaskHistory.py → tasks/task_history.py} +86 -47
  217. edsl/{jobs/tasks → tasks}/task_status_enum.py +91 -7
  218. edsl/tasks/task_status_log.py +85 -0
  219. edsl/tokens/__init__.py +2 -0
  220. edsl/tokens/interview_token_usage.py +53 -0
  221. edsl/utilities/PrettyList.py +1 -1
  222. edsl/utilities/SystemInfo.py +25 -22
  223. edsl/utilities/__init__.py +29 -21
  224. edsl/utilities/gcp_bucket/__init__.py +2 -0
  225. edsl/utilities/gcp_bucket/cloud_storage.py +99 -96
  226. edsl/utilities/interface.py +44 -536
  227. edsl/{results/MarkdownToPDF.py → utilities/markdown_to_pdf.py} +13 -5
  228. edsl/utilities/repair_functions.py +1 -1
  229. {edsl-0.1.46.dist-info → edsl-0.1.48.dist-info}/METADATA +3 -2
  230. edsl-0.1.48.dist-info/RECORD +347 -0
  231. edsl/Base.py +0 -426
  232. edsl/BaseDiff.py +0 -260
  233. edsl/agents/InvigilatorBase.py +0 -260
  234. edsl/agents/PromptConstructor.py +0 -318
  235. edsl/auto/AutoStudy.py +0 -130
  236. edsl/auto/StageBase.py +0 -243
  237. edsl/auto/StageGenerateSurvey.py +0 -178
  238. edsl/auto/StageLabelQuestions.py +0 -125
  239. edsl/auto/StagePersona.py +0 -61
  240. edsl/auto/StagePersonaDimensionValueRanges.py +0 -88
  241. edsl/auto/StagePersonaDimensionValues.py +0 -74
  242. edsl/auto/StagePersonaDimensions.py +0 -69
  243. edsl/auto/StageQuestions.py +0 -74
  244. edsl/auto/SurveyCreatorPipeline.py +0 -21
  245. edsl/auto/utilities.py +0 -218
  246. edsl/base/Base.py +0 -279
  247. edsl/coop/PriceFetcher.py +0 -54
  248. edsl/data/Cache.py +0 -580
  249. edsl/data/CacheEntry.py +0 -230
  250. edsl/data/SQLiteDict.py +0 -292
  251. edsl/data/__init__.py +0 -5
  252. edsl/data/orm.py +0 -10
  253. edsl/exceptions/cache.py +0 -5
  254. edsl/exceptions/coop.py +0 -14
  255. edsl/exceptions/data.py +0 -14
  256. edsl/exceptions/scenarios.py +0 -29
  257. edsl/jobs/Answers.py +0 -43
  258. edsl/jobs/JobsPrompts.py +0 -354
  259. edsl/jobs/buckets/BucketCollection.py +0 -134
  260. edsl/jobs/buckets/ModelBuckets.py +0 -65
  261. edsl/jobs/buckets/TokenBucket.py +0 -283
  262. edsl/jobs/buckets/TokenBucketClient.py +0 -191
  263. edsl/jobs/interviews/Interview.py +0 -395
  264. edsl/jobs/interviews/InterviewExceptionCollection.py +0 -99
  265. edsl/jobs/interviews/InterviewStatisticsCollection.py +0 -25
  266. edsl/jobs/runners/JobsRunnerAsyncio.py +0 -163
  267. edsl/jobs/runners/JobsRunnerStatusData.py +0 -0
  268. edsl/jobs/tasks/TaskCreators.py +0 -64
  269. edsl/jobs/tasks/TaskStatusLog.py +0 -23
  270. edsl/jobs/tokens/InterviewTokenUsage.py +0 -27
  271. edsl/language_models/LanguageModel.py +0 -635
  272. edsl/language_models/ServiceDataSources.py +0 -0
  273. edsl/language_models/key_management/KeyLookup.py +0 -63
  274. edsl/language_models/key_management/KeyLookupCollection.py +0 -38
  275. edsl/language_models/key_management/models.py +0 -137
  276. edsl/questions/QuestionBase.py +0 -539
  277. edsl/questions/QuestionFreeText.py +0 -130
  278. edsl/questions/derived/QuestionLikertFive.py +0 -76
  279. edsl/results/DatasetExportMixin.py +0 -911
  280. edsl/results/ResultsExportMixin.py +0 -45
  281. edsl/results/TextEditor.py +0 -50
  282. edsl/results/results_fetch_mixin.py +0 -33
  283. edsl/results/results_tools_mixin.py +0 -98
  284. edsl/scenarios/DocumentChunker.py +0 -104
  285. edsl/scenarios/FileStore.py +0 -564
  286. edsl/scenarios/Scenario.py +0 -548
  287. edsl/scenarios/ScenarioHtmlMixin.py +0 -65
  288. edsl/scenarios/ScenarioListExportMixin.py +0 -45
  289. edsl/scenarios/handlers/latex.py +0 -5
  290. edsl/shared.py +0 -1
  291. edsl/surveys/Survey.py +0 -1306
  292. edsl/surveys/SurveyQualtricsImport.py +0 -284
  293. edsl/surveys/SurveyToApp.py +0 -141
  294. edsl/surveys/instructions/__init__.py +0 -0
  295. edsl/tools/__init__.py +0 -1
  296. edsl/tools/clusters.py +0 -192
  297. edsl/tools/embeddings.py +0 -27
  298. edsl/tools/embeddings_plotting.py +0 -118
  299. edsl/tools/plotting.py +0 -112
  300. edsl/tools/summarize.py +0 -18
  301. edsl/utilities/data/Registry.py +0 -6
  302. edsl/utilities/data/__init__.py +0 -1
  303. edsl/utilities/data/scooter_results.json +0 -1
  304. edsl-0.1.46.dist-info/RECORD +0 -366
  305. /edsl/coop/{CoopFunctionsMixin.py → coop_functions.py} +0 -0
  306. /edsl/{results → dataset/display}/CSSParameterizer.py +0 -0
  307. /edsl/{language_models/key_management → dataset/display}/__init__.py +0 -0
  308. /edsl/{results → dataset/display}/table_data_class.py +0 -0
  309. /edsl/{results → dataset/display}/table_display.css +0 -0
  310. /edsl/{results/ResultsGGMixin.py → dataset/r/ggplot.py} +0 -0
  311. /edsl/{results → dataset}/tree_explore.py +0 -0
  312. /edsl/{surveys/instructions/ChangeInstruction.py → instructions/change_instruction.py} +0 -0
  313. /edsl/{jobs/interviews → interviews}/interview_status_enum.py +0 -0
  314. /edsl/jobs/{runners/JobsRunnerStatus.py → jobs_runner_status.py} +0 -0
  315. /edsl/language_models/{PriceManager.py → price_manager.py} +0 -0
  316. /edsl/language_models/{fake_openai_call.py → unused/fake_openai_call.py} +0 -0
  317. /edsl/language_models/{fake_openai_service.py → unused/fake_openai_service.py} +0 -0
  318. /edsl/notebooks/{NotebookToLaTeX.py → notebook_to_latex.py} +0 -0
  319. /edsl/{exceptions/questions.py → questions/exceptions.py} +0 -0
  320. /edsl/questions/{SimpleAskMixin.py → simple_ask_mixin.py} +0 -0
  321. /edsl/surveys/{Memory.py → memory/memory.py} +0 -0
  322. /edsl/surveys/{MemoryManagement.py → memory/memory_management.py} +0 -0
  323. /edsl/surveys/{SurveyCSS.py → survey_css.py} +0 -0
  324. /edsl/{jobs/tokens/TokenUsage.py → tokens/token_usage.py} +0 -0
  325. /edsl/{results/MarkdownToDocx.py → utilities/markdown_to_docx.py} +0 -0
  326. /edsl/{TemplateLoader.py → utilities/template_loader.py} +0 -0
  327. {edsl-0.1.46.dist-info → edsl-0.1.48.dist-info}/LICENSE +0 -0
  328. {edsl-0.1.46.dist-info → edsl-0.1.48.dist-info}/WHEEL +0 -0
edsl/data/CacheEntry.py DELETED
@@ -1,230 +0,0 @@
1
- from __future__ import annotations
2
- import json
3
- import datetime
4
- import hashlib
5
- from typing import Optional
6
- from uuid import uuid4
7
-
8
- from edsl.utilities.decorators import remove_edsl_version
9
-
10
- from edsl.Base import RepresentationMixin
11
-
12
-
13
- class CacheEntry(RepresentationMixin):
14
- """
15
- A Class to represent a cache entry.
16
- """
17
-
18
- key_fields = ["model", "parameters", "system_prompt", "user_prompt", "iteration"]
19
- all_fields = key_fields + ["timestamp", "output"]
20
-
21
- def __init__(
22
- self,
23
- *,
24
- model: str,
25
- parameters: dict,
26
- system_prompt: str,
27
- user_prompt: str,
28
- iteration: Optional[int] = None,
29
- output: str,
30
- timestamp: Optional[int] = None,
31
- ):
32
- self.model = model
33
- self.parameters = parameters
34
- self.system_prompt = system_prompt
35
- self.user_prompt = user_prompt
36
- self.output = output
37
- self.iteration = iteration or 0
38
- self.timestamp = timestamp or int(
39
- datetime.datetime.now(datetime.timezone.utc).timestamp()
40
- )
41
- self._check_types()
42
-
43
- def _check_types(self):
44
- """
45
- Checks if the types of the fields are correct.
46
- """
47
- if not isinstance(self.model, str):
48
- raise TypeError("`model` should be a string.")
49
- if not isinstance(self.parameters, dict):
50
- raise TypeError("`parameters` should be a dictionary.")
51
- if not isinstance(self.system_prompt, str):
52
- raise TypeError("`system_prompt` should be a string.")
53
- if not isinstance(self.user_prompt, str):
54
- raise TypeError("`user_prompt` should be a string")
55
- if not isinstance(self.output, str):
56
- raise TypeError("`output` should be a string")
57
- if not isinstance(self.iteration, int):
58
- raise TypeError("`iteration` should be an integer")
59
- # TODO: should probably be float
60
- if not isinstance(self.timestamp, int):
61
- raise TypeError(f"`timestamp` should be an integer")
62
-
63
- @classmethod
64
- def gen_key(
65
- self, *, model, parameters, system_prompt, user_prompt, iteration
66
- ) -> str:
67
- """
68
- Generates a key for the cache entry.
69
- - Treats single and double quotes as the same.
70
-
71
- TODO: add more robustness.
72
- """
73
- long_key = f"{model}{json.dumps(parameters, sort_keys=True)}{system_prompt}{user_prompt}{iteration}"
74
- return hashlib.md5(long_key.encode()).hexdigest()
75
-
76
- @property
77
- def key(self) -> str:
78
- """
79
- Returns the key for the cache entry.
80
- - The key is a hash of the key fields.
81
- """
82
- d = {k: value for k, value in self.__dict__.items() if k in self.key_fields}
83
- return self.gen_key(**d)
84
-
85
- def to_dict(self, add_edsl_version=True) -> dict:
86
- """
87
- Returns a dictionary representation of a CacheEntry.
88
- """
89
- d = {
90
- "model": self.model,
91
- "parameters": self.parameters,
92
- "system_prompt": self.system_prompt,
93
- "user_prompt": self.user_prompt,
94
- "output": self.output,
95
- "iteration": self.iteration,
96
- "timestamp": self.timestamp,
97
- }
98
- # if add_edsl_version:
99
- # from edsl import __version__
100
-
101
- # d["edsl_version"] = __version__
102
- # d["edsl_class_name"] = self.__class__.__name__
103
- return d
104
-
105
- def keys(self):
106
- return list(self.to_dict().keys())
107
-
108
- def values(self):
109
- return list(self.to_dict().values())
110
-
111
- def __getitem__(self, key):
112
- """
113
- Returns the value of a field.
114
- """
115
- return getattr(self, key)
116
-
117
- @classmethod
118
- def from_dict(cls, data: dict) -> CacheEntry:
119
- """
120
- Initializes a CacheEntry object from its dictionary representation.
121
- """
122
- return cls(**data)
123
-
124
- def __eq__(self, other: CacheEntry) -> bool:
125
- """
126
- Checks if two CacheEntry objects are equal.
127
- - Does not include timestamp in the comparison.
128
- """
129
- if not isinstance(other, CacheEntry):
130
- return False
131
- for field in self.all_fields:
132
- if getattr(self, field) != getattr(other, field) and field != "timestamp":
133
- return False
134
- return True
135
-
136
- def __repr__(self) -> str:
137
- """
138
- Returns a string representation of a CacheEntry.
139
- """
140
- return (
141
- f"CacheEntry(model={repr(self.model)}, "
142
- f"parameters={self.parameters}, "
143
- f"system_prompt={repr(self.system_prompt)}, "
144
- f"user_prompt={repr(self.user_prompt)}, "
145
- f"output={repr(self.output)}, "
146
- f"iteration={self.iteration}, "
147
- f"timestamp={self.timestamp})"
148
- )
149
-
150
- @classmethod
151
- def example(cls, randomize: bool = False) -> CacheEntry:
152
- """
153
- Returns an example CacheEntry instance.
154
-
155
- :param randomize: If True, adds a random string to the system prompt.
156
- """
157
- # if random, create a uuid
158
- addition = "" if not randomize else str(uuid4())
159
- return CacheEntry(
160
- model="gpt-3.5-turbo",
161
- parameters={"temperature": 0.5},
162
- system_prompt=f"The quick brown fox jumps over the lazy dog.{addition}",
163
- user_prompt="What does the fox say?",
164
- output="The fox says 'hello'",
165
- iteration=1,
166
- timestamp=int(datetime.datetime.now(datetime.timezone.utc).timestamp()),
167
- )
168
-
169
- @classmethod
170
- def example_dict(cls) -> dict:
171
- """
172
- Returns an example dictionary with a single CacheEntry.
173
- - This will be useful one level up, in the Cache class.
174
- """
175
- cache_entry = cls.example()
176
- return {cache_entry.key: cache_entry}
177
-
178
- @classmethod
179
- def fetch_input_example(cls) -> dict:
180
- """
181
- Creates an example input for a 'fetch' operation.
182
- - This will be useful one level up, in the Cache class.
183
- """
184
- input = cls.example().to_dict()
185
- _ = input.pop("timestamp")
186
- _ = input.pop("output")
187
- return input
188
-
189
- @classmethod
190
- def store_input_example(cls) -> dict:
191
- """
192
- Creates an example input for a 'store' operation.
193
- - This will be useful one level up, in the Cache class.
194
- """
195
- input = cls.example().to_dict()
196
- _ = input.pop("timestamp")
197
- input["response"] = input.pop("output")
198
- return input
199
-
200
-
201
- def main():
202
- from edsl.data.CacheEntry import CacheEntry
203
-
204
- # an example of how a cache entry looks
205
- cache_entry = CacheEntry.example()
206
- cache_entry
207
-
208
- # .key property returns the hash of the cache entry
209
- cache_entry.key
210
- # to dict / from dict
211
- cache_entry.to_dict()
212
- CacheEntry.from_dict(cache_entry.to_dict())
213
- # TODO: this will be false because equality includes timestamp
214
- CacheEntry.from_dict(cache_entry.to_dict()) == CacheEntry.example()
215
- # equality by checking values
216
- cache_entry == CacheEntry.example()
217
- # equality by checking keys
218
- cache_entry.key == CacheEntry.example().key
219
- # evalable repr
220
- eval(repr(cache_entry)) == cache_entry
221
- # not sure what these are useful for yet
222
- cache_entry.example_dict()
223
- cache_entry.fetch_input_example()
224
- cache_entry.store_input_example()
225
-
226
-
227
- if __name__ == "__main__":
228
- import doctest
229
-
230
- doctest.testmod()
edsl/data/SQLiteDict.py DELETED
@@ -1,292 +0,0 @@
1
- from __future__ import annotations
2
- import json
3
- from typing import Any, Generator, Optional, Union
4
-
5
- from edsl.config import CONFIG
6
- from edsl.data.CacheEntry import CacheEntry
7
- from edsl.data.orm import Base, Data
8
-
9
-
10
- class SQLiteDict:
11
- """
12
- A dictionary-like object that is an interface for an local database.
13
- - You can use SQLiteDict as a regular dictionary.
14
- - Supports only SQLite for now.
15
- """
16
-
17
- def __init__(self, db_path: Optional[str] = None):
18
- """
19
-
20
- >>> temp_db_path = SQLiteDict._get_temp_path()
21
- >>> SQLiteDict(f"sqlite:///{temp_db_path}") # Use the temp file for SQLite
22
- SQLiteDict(db_path='...')
23
- >>> import os; os.unlink(temp_db_path) # Clean up the temp file after the test
24
-
25
- """
26
- from sqlalchemy.exc import SQLAlchemyError
27
- from sqlalchemy.orm import sessionmaker
28
- from sqlalchemy import create_engine
29
-
30
- self.db_path = db_path or CONFIG.get("EDSL_DATABASE_PATH")
31
- if not self.db_path.startswith("sqlite:///"):
32
- self.db_path = f"sqlite:///{self.db_path}"
33
- try:
34
- from edsl.data.orm import Base, Data
35
-
36
- self.engine = create_engine(self.db_path, echo=False, future=True)
37
- Base.metadata.create_all(self.engine)
38
- self.Session = sessionmaker(bind=self.engine)
39
- except SQLAlchemyError as e:
40
- raise Exception(
41
- f"""Database initialization error: {e}. The attempted DB path was {db_path}"""
42
- ) from e
43
-
44
- @classmethod
45
- def _get_temp_path(self):
46
- import tempfile
47
- import os
48
-
49
- _, temp_db_path = tempfile.mkstemp(suffix=".db")
50
- return temp_db_path
51
-
52
- def __setitem__(self, key: str, value: CacheEntry) -> None:
53
- """
54
- Stores a key-value pair.
55
-
56
- >>> d = SQLiteDict.example()
57
- >>> d["foo"] = CacheEntry.example()
58
- """
59
- if not isinstance(value, CacheEntry):
60
- raise ValueError(f"Value must be a CacheEntry object (got {type(value)}).")
61
- with self.Session() as db:
62
- from edsl.data.orm import Base, Data
63
-
64
- db.merge(Data(key=key, value=json.dumps(value.to_dict())))
65
- db.commit()
66
-
67
- def __getitem__(self, key: str) -> CacheEntry:
68
- """
69
- Gets a value for a given key.
70
- - Raises a KeyError if the key is not found.
71
-
72
- >>> d = SQLiteDict.example()
73
- >>> d["foo"] = CacheEntry.example()
74
- >>> d["foo"] == CacheEntry.example()
75
- True
76
- """
77
- with self.Session() as db:
78
- from edsl.data.orm import Base, Data
79
-
80
- value = db.query(Data).filter_by(key=key).first()
81
- if not value:
82
- raise KeyError(f"Key '{key}' not found.")
83
- return CacheEntry.from_dict(json.loads(value.value))
84
-
85
- def get(self, key: str, default: Optional[Any] = None) -> Union[CacheEntry, Any]:
86
- """
87
- Gets the value for a given key
88
- - Returns the `default` value if the key is not found.
89
-
90
- >>> d = SQLiteDict.example()
91
- >>> d.get("foo", "bar")
92
- 'bar'
93
- """
94
- try:
95
- return self[key]
96
- except KeyError:
97
- return default
98
-
99
- def __bool__(self) -> bool:
100
- """This is so likes like
101
- self.data = data or {} 'work' as expected
102
- """
103
- return True
104
-
105
- def update(
106
- self,
107
- new_d: Union[dict, SQLiteDict],
108
- overwrite: Optional[bool] = False,
109
- max_batch_size: Optional[int] = 100,
110
- ) -> None:
111
- """
112
- Update the dictionary with the values from another dictionary.
113
-
114
- :param new_d: The dictionary to update the current dictionary with.
115
- :param overwrite: If `overwrite` is False, existing values will not be overwritten.
116
- :param max_batch_size: The maximum number of items to update in a single transaction.
117
-
118
- - If `overwrite` is True, existing values will be overwritten.
119
-
120
- >>> d = SQLiteDict.example()
121
- >>> d.update({"foo": CacheEntry.example()})
122
- >>> d["foo"] == CacheEntry.example()
123
- True
124
- """
125
- if not (isinstance(new_d, dict) or isinstance(new_d, SQLiteDict)):
126
- raise ValueError(
127
- f"new_d must be a dict or SQLiteDict object (got {type(new_d)})"
128
- )
129
- current_batch = 0
130
- with self.Session() as db:
131
- for key, value in new_d.items():
132
- if current_batch == max_batch_size:
133
- db.commit()
134
- current_batch = 0
135
- current_batch += 1
136
- if key in self:
137
- if overwrite:
138
- db.merge(Data(key=key, value=json.dumps(value.to_dict())))
139
- else:
140
- db.merge(Data(key=key, value=json.dumps(value.to_dict())))
141
- db.commit()
142
-
143
- def values(self) -> Generator[CacheEntry, None, None]:
144
- """
145
- Returns a generator that yields the values in the cache.
146
-
147
- >>> d = SQLiteDict.example()
148
- >>> d["foo"] = CacheEntry.example()
149
- >>> list(d.values()) == [CacheEntry.example()]
150
- True
151
- """
152
- with self.Session() as db:
153
- for instance in db.query(Data).all():
154
- yield CacheEntry.from_dict(json.loads(instance.value))
155
-
156
- def items(self) -> Generator[tuple[str, CacheEntry], None, None]:
157
- """
158
- Returns a generator that yields the items in the cache.
159
-
160
- >>> d = SQLiteDict.example()
161
- >>> d["foo"] = CacheEntry.example()
162
- >>> list(d.items()) == [("foo", CacheEntry.example())]
163
- True
164
- """
165
- with self.Session() as db:
166
- for instance in db.query(Data).all():
167
- yield (instance.key, CacheEntry.from_dict(json.loads(instance.value)))
168
-
169
- def to_dict(self):
170
- """
171
- Returns the cache as a dictionary.
172
-
173
- >>> d = SQLiteDict.example()
174
- >>> d["foo"] = CacheEntry.example()
175
- >>> d.to_dict() == {"foo": CacheEntry.example()}
176
- True
177
- """
178
- return dict(self.items())
179
-
180
- def __delitem__(self, key: str) -> None:
181
- """
182
- Deletes the value for a given key.
183
-
184
- >>> d = SQLiteDict.example()
185
- >>> d["foo"] = CacheEntry.example()
186
- >>> del d["foo"]
187
- >>> d.get("foo", "missing")
188
- 'missing'
189
- """
190
- with self.Session() as db:
191
- instance = db.query(Data).filter_by(key=key).one_or_none()
192
- if instance:
193
- db.delete(instance)
194
- db.commit()
195
- else:
196
- raise KeyError(f"Key '{key}' not found.")
197
-
198
- def __contains__(self, key: str) -> bool:
199
- """
200
- Checks if the dict contains the given key.
201
-
202
- >>> d = SQLiteDict.example()
203
- >>> d["foo"] = CacheEntry.example()
204
- >>> "foo" in d
205
- True
206
- >>> "bar" in d
207
- False
208
- """
209
- with self.Session() as db:
210
- return db.query(Data).filter_by(key=key).first() is not None
211
-
212
- def __iter__(self) -> Generator[str, None, None]:
213
- """
214
- Returns a generator that yields the keys in the dict.
215
-
216
- >>> d = SQLiteDict.example()
217
- >>> d["foo"] = CacheEntry.example()
218
- >>> list(iter(d)) == ["foo"]
219
- True
220
- """
221
- with self.Session() as db:
222
- for instance in db.query(Data).all():
223
- yield instance.key
224
-
225
- def __len__(self) -> int:
226
- """
227
- Returns the number of items in the cache.
228
-
229
- >>> d = SQLiteDict.example()
230
- >>> len(d)
231
- 0
232
- >>> d["foo"] = CacheEntry.example()
233
- >>> len(d)
234
- 1
235
- """
236
- with self.Session() as db:
237
- return db.query(Data).count()
238
-
239
- def keys(self) -> Generator[str, None, None]:
240
- """
241
- Returns a generator that yields the keys in the cache.
242
-
243
- >>> d = SQLiteDict.example()
244
- >>> d["foo"] = CacheEntry.example()
245
- >>> list(d.keys()) == ["foo"]
246
- True
247
- """
248
- return self.__iter__()
249
-
250
- def __repr__(self) -> str:
251
- return f"{self.__class__.__name__}(db_path={self.db_path!r})"
252
-
253
- @classmethod
254
- def example(cls) -> SQLiteDict:
255
- """
256
- Returns an example SQLiteDict object.
257
- - The example SQLiteDict is empty and stored in memory.
258
-
259
- >>> SQLiteDict.example()
260
- SQLiteDict(db_path='sqlite:///:memory:')
261
- """
262
- return cls(db_path="sqlite:///:memory:")
263
-
264
-
265
- def main():
266
- from edsl.data.CacheEntry import CacheEntry
267
- from edsl.data.SQLiteDict import SQLiteDict
268
-
269
- d = SQLiteDict.example()
270
- d["foo"] = CacheEntry.example()
271
- d["foo"]
272
- d.get("foo")
273
- d.get("poo")
274
- d.get("poo", "not found")
275
- d.update({"poo": CacheEntry.example()})
276
- d["poo"]
277
- len(d)
278
- list(d.keys())
279
- list(d.values())
280
- list(d.items())
281
- assert "poo" in d
282
- assert "loo" not in d
283
- del d["poo"]
284
- assert len(d) == 1
285
- repr(d)
286
- d
287
-
288
-
289
- if __name__ == "__main__":
290
- import doctest
291
-
292
- doctest.testmod()
edsl/data/__init__.py DELETED
@@ -1,5 +0,0 @@
1
- # from edsl.data.CacheEntry import CacheEntry
2
- # from edsl.data.SQLiteDict import SQLiteDict
3
- from edsl.data.Cache import Cache
4
-
5
- # from edsl.data.CacheHandler import CacheHandler
edsl/data/orm.py DELETED
@@ -1,10 +0,0 @@
1
- from sqlalchemy import Column, String
2
- from sqlalchemy.ext.declarative import declarative_base
3
-
4
- Base = declarative_base()
5
-
6
-
7
- class Data(Base):
8
- __tablename__ = "data"
9
- key = Column(String, primary_key=True)
10
- value = Column(String)
edsl/exceptions/cache.py DELETED
@@ -1,5 +0,0 @@
1
- from edsl.exceptions.BaseException import BaseException
2
-
3
-
4
- class CacheError(BaseException):
5
- relevant_doc = "https://docs.expectedparrot.com/en/latest/agents.html#agent-lists"
edsl/exceptions/coop.py DELETED
@@ -1,14 +0,0 @@
1
- class CoopErrors(Exception):
2
- pass
3
-
4
-
5
- class CoopInvalidURLError(CoopErrors):
6
- pass
7
-
8
-
9
- class CoopNoUUIDError(CoopErrors):
10
- pass
11
-
12
-
13
- class CoopServerResponseError(CoopErrors):
14
- pass
edsl/exceptions/data.py DELETED
@@ -1,14 +0,0 @@
1
- class DatabaseErrors(Exception):
2
- pass
3
-
4
-
5
- class DatabaseConnectionError(DatabaseErrors):
6
- pass
7
-
8
-
9
- class DatabaseCRUDError(DatabaseErrors):
10
- pass
11
-
12
-
13
- class DatabaseIntegrityError(DatabaseErrors):
14
- pass
@@ -1,29 +0,0 @@
1
- import re
2
- import textwrap
3
-
4
- # from IPython.core.error import UsageError
5
-
6
-
7
- class AgentListError(Exception):
8
- def __init__(self, message):
9
- super().__init__(message)
10
-
11
-
12
- class ScenarioError(Exception):
13
- documentation = "https://docs.expectedparrot.com/en/latest/scenarios.html#module-edsl.scenarios.Scenario"
14
-
15
- def __init__(self, message: str):
16
- self.message = message + "\n" + "Documentation: " + self.documentation
17
- super().__init__(self.message)
18
-
19
- def __str__(self):
20
- return self.make_urls_clickable(self.message)
21
-
22
- @staticmethod
23
- def make_urls_clickable(text):
24
- url_pattern = r"https?://[^\s]+"
25
- urls = re.findall(url_pattern, text)
26
- for url in urls:
27
- clickable_url = f"\033]8;;{url}\007{url}\033]8;;\007"
28
- text = text.replace(url, clickable_url)
29
- return text
edsl/jobs/Answers.py DELETED
@@ -1,43 +0,0 @@
1
- """This module contains the Answers class, which is a helper class to hold the answers to a survey."""
2
-
3
- from collections import UserDict
4
- from edsl.data_transfer_models import EDSLResultObjectInput
5
-
6
-
7
- class Answers(UserDict):
8
- """Helper class to hold the answers to a survey."""
9
-
10
- def add_answer(
11
- self, response: EDSLResultObjectInput, question: "QuestionBase"
12
- ) -> None:
13
- """Add a response to the answers dictionary."""
14
- answer = response.answer
15
- comment = response.comment
16
- generated_tokens = response.generated_tokens
17
- # record the answer
18
- if generated_tokens:
19
- self[question.question_name + "_generated_tokens"] = generated_tokens
20
- self[question.question_name] = answer
21
- if comment:
22
- self[question.question_name + "_comment"] = comment
23
-
24
- def replace_missing_answers_with_none(self, survey: "Survey") -> None:
25
- """Replace missing answers with None. Answers can be missing if the agent skips a question."""
26
- for question_name in survey.question_names:
27
- if question_name not in self:
28
- self[question_name] = None
29
-
30
- def to_dict(self):
31
- """Return a dictionary of the answers."""
32
- return self.data
33
-
34
- @classmethod
35
- def from_dict(cls, d):
36
- """Return an Answers object from a dictionary."""
37
- return cls(d)
38
-
39
-
40
- if __name__ == "__main__":
41
- import doctest
42
-
43
- doctest.testmod()