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/Base.py DELETED
@@ -1,426 +0,0 @@
1
- """Base class for all classes in the package. It provides rich printing and persistence of objects."""
2
-
3
- from abc import ABC, abstractmethod, ABCMeta
4
- import gzip
5
- import json
6
- from typing import Any, Optional, Union
7
- from uuid import UUID
8
-
9
-
10
- class PersistenceMixin:
11
- """Mixin for saving and loading objects to and from files."""
12
-
13
- def duplicate(self, add_edsl_version=False):
14
- """Return a duplicate of the object."""
15
- return self.from_dict(self.to_dict(add_edsl_version=False))
16
-
17
- def push(
18
- self,
19
- description: Optional[str] = None,
20
- alias: Optional[str] = None,
21
- visibility: Optional[str] = "unlisted",
22
- expected_parrot_url: Optional[str] = None,
23
- ):
24
- """Post the object to coop."""
25
- from edsl.coop import Coop
26
-
27
- c = Coop(url=expected_parrot_url)
28
- return c.create(self, description, alias, visibility)
29
-
30
- def to_yaml(self, add_edsl_version=False, filename: str = None) -> Union[str, None]:
31
- import yaml
32
-
33
- output = yaml.dump(self.to_dict(add_edsl_version=add_edsl_version))
34
- if not filename:
35
- return output
36
-
37
- with open(filename, "w") as f:
38
- f.write(output)
39
-
40
- @classmethod
41
- def from_yaml(cls, yaml_str: Optional[str] = None, filename: Optional[str] = None):
42
- if yaml_str is None and filename is not None:
43
- with open(filename, "r") as f:
44
- yaml_str = f.read()
45
- return cls.from_yaml(yaml_str=yaml_str)
46
- elif yaml_str and filename is None:
47
- import yaml
48
-
49
- d = yaml.load(yaml_str, Loader=yaml.FullLoader)
50
- return cls.from_dict(d)
51
- else:
52
- raise ValueError("Either yaml_str or filename must be provided.")
53
-
54
- def create_download_link(self):
55
- from tempfile import NamedTemporaryFile
56
- from edsl.scenarios.FileStore import FileStore
57
-
58
- with NamedTemporaryFile(suffix=".json.gz") as f:
59
- self.save(f.name)
60
- print(f.name)
61
- fs = FileStore(path=f.name)
62
- return fs.create_link()
63
-
64
- @classmethod
65
- def pull(
66
- cls,
67
- url_or_uuid: Optional[Union[str, UUID]] = None,
68
- # expected_parrot_url: Optional[str] = None,
69
- ):
70
- """Pull the object from coop.
71
-
72
- Args:
73
- url_or_uuid: Either a UUID string or a URL pointing to the object
74
- expected_parrot_url: Optional URL for the Parrot server
75
- """
76
- from edsl.coop import Coop
77
- from edsl.coop.utils import ObjectRegistry
78
-
79
- object_type = ObjectRegistry.get_object_type_by_edsl_class(cls)
80
- coop = Coop()
81
-
82
- # Determine if input is URL or UUID
83
- if "www" in url_or_uuid:
84
- url_or_uuid = url_or_uuid.replace("www", "api")
85
- if url_or_uuid and (
86
- "http://" in str(url_or_uuid) or "https://" in str(url_or_uuid)
87
- ):
88
- return coop.get(url=url_or_uuid, expected_object_type=object_type)
89
- else:
90
- return coop.get(uuid=url_or_uuid, expected_object_type=object_type)
91
-
92
- @classmethod
93
- def delete(cls, uuid: Optional[Union[str, UUID]] = None, url: Optional[str] = None):
94
- """Delete the object from coop."""
95
- from edsl.coop import Coop
96
-
97
- coop = Coop()
98
- return coop.delete(uuid, url)
99
-
100
- @classmethod
101
- def patch(
102
- cls,
103
- uuid: Optional[Union[str, UUID]] = None,
104
- url: Optional[str] = None,
105
- description: Optional[str] = None,
106
- alias: Optional[str] = None,
107
- value: Optional[Any] = None,
108
- visibility: Optional[str] = None,
109
- ):
110
- """
111
- Patch an uploaded objects attributes.
112
- - `description` changes the description of the object on Coop
113
- - `value` changes the value of the object on Coop. **has to be an EDSL object**
114
- - `visibility` changes the visibility of the object on Coop
115
- """
116
- from edsl.coop import Coop
117
-
118
- coop = Coop()
119
- return coop.patch(uuid, url, description, alias, value, visibility)
120
-
121
- @classmethod
122
- def search(cls, query):
123
- """Search for objects on coop."""
124
- from edsl.coop import Coop
125
-
126
- c = Coop()
127
- return c.search(cls, query)
128
-
129
- def store(self, d: dict, key_name: Optional[str] = None):
130
- if key_name is None:
131
- index = len(d)
132
- else:
133
- index = key_name
134
- d[index] = self
135
-
136
- def save(self, filename, compress=True):
137
- """Save the object to a file as zippped JSON.
138
-
139
- >>> obj.save("obj.json.gz")
140
-
141
- """
142
- if filename.endswith("json.gz"):
143
- import warnings
144
-
145
- filename = filename[:-8]
146
- if filename.endswith("json"):
147
- filename = filename[:-5]
148
-
149
- if compress:
150
- full_file_name = filename + ".json.gz"
151
- with gzip.open(full_file_name, "wb") as f:
152
- f.write(json.dumps(self.to_dict()).encode("utf-8"))
153
- else:
154
- full_file_name = filename + ".json"
155
- with open(filename + ".json", "w") as f:
156
- f.write(json.dumps(self.to_dict()))
157
-
158
- print("Saved to", full_file_name)
159
-
160
- @staticmethod
161
- def open_compressed_file(filename):
162
- with gzip.open(filename, "rb") as f:
163
- file_contents = f.read()
164
- file_contents_decoded = file_contents.decode("utf-8")
165
- d = json.loads(file_contents_decoded)
166
- return d
167
-
168
- @staticmethod
169
- def open_regular_file(filename):
170
- with open(filename, "r") as f:
171
- d = json.loads(f.read())
172
- return d
173
-
174
- @classmethod
175
- def load(cls, filename):
176
- """Load the object from a file.
177
-
178
- >>> obj = cls.load("obj.json.gz")
179
-
180
- """
181
-
182
- if filename.endswith("json.gz"):
183
- d = cls.open_compressed_file(filename)
184
- elif filename.endswith("json"):
185
- d = cls.open_regular_file(filename)
186
- else:
187
- try:
188
- d = cls.open_compressed_file(filename + ".json.gz")
189
- except:
190
- d = cls.open_regular_file(filename + ".json")
191
- # finally:
192
- # raise ValueError("File must be a json or json.gz file")
193
-
194
- return cls.from_dict(d)
195
-
196
-
197
- class RegisterSubclassesMeta(ABCMeta):
198
- """Metaclass for registering subclasses."""
199
-
200
- _registry = {}
201
-
202
- def __init__(cls, name, bases, nmspc):
203
- """Register the class in the registry upon creation."""
204
- super(RegisterSubclassesMeta, cls).__init__(name, bases, nmspc)
205
- if cls.__name__ != "Base":
206
- RegisterSubclassesMeta._registry[cls.__name__] = cls
207
-
208
- @staticmethod
209
- def get_registry(exclude_classes: Optional[list] = None):
210
- """Return the registry of subclasses."""
211
- if exclude_classes is None:
212
- exclude_classes = []
213
- return {
214
- k: v
215
- for k, v in dict(RegisterSubclassesMeta._registry).items()
216
- if k not in exclude_classes
217
- }
218
-
219
-
220
- class DiffMethodsMixin:
221
- def __sub__(self, other):
222
- """Return the difference between two objects."""
223
- from edsl.BaseDiff import BaseDiff
224
-
225
- return BaseDiff(self, other)
226
-
227
-
228
- def is_iterable(obj):
229
- try:
230
- iter(obj)
231
- except TypeError:
232
- return False
233
- return True
234
-
235
-
236
- class RepresentationMixin:
237
- def json(self):
238
- return json.loads(json.dumps(self.to_dict(add_edsl_version=False)))
239
-
240
- def to_dataset(self):
241
- from edsl.results.Dataset import Dataset
242
-
243
- return Dataset.from_edsl_object(self)
244
-
245
- def view(self):
246
- "Displays an interactive / perspective view of the object"
247
- return self.to_dataset().view()
248
-
249
- # def print(self, format="rich"):
250
- # return self.to_dataset().table()
251
-
252
- def display_dict(self):
253
- display_dict = {}
254
- d = self.to_dict(add_edsl_version=False)
255
- for key, value in d.items():
256
- if isinstance(value, dict):
257
- for k, v in value.items():
258
- display_dict[f"{key}:{k}"] = v
259
- elif isinstance(value, list):
260
- for i, v in enumerate(value):
261
- display_dict[f"{key}:{i}"] = v
262
- else:
263
- display_dict[key] = value
264
- return display_dict
265
-
266
- def print(self, format="rich"):
267
- from rich.table import Table
268
- from rich.console import Console
269
-
270
- table = Table(title=self.__class__.__name__)
271
- table.add_column("Key", style="bold")
272
- table.add_column("Value", style="bold")
273
-
274
- for key, value in self.display_dict().items():
275
- table.add_row(key, str(value))
276
-
277
- console = Console(record=True)
278
- console.print(table)
279
-
280
- def help(obj):
281
- """
282
- Extract all public instance methods and their docstrings from a class instance.
283
-
284
- Args:
285
- obj: The instance to inspect
286
-
287
- Returns:
288
- dict: A dictionary where keys are method names and values are their docstrings
289
- """
290
- import inspect
291
-
292
- if inspect.isclass(obj):
293
- raise TypeError("Please provide a class instance, not a class")
294
-
295
- methods = {}
296
-
297
- # Get all members of the instance
298
- for name, member in inspect.getmembers(obj):
299
- # Skip private and special methods (those starting with underscore)
300
- if name.startswith("_"):
301
- continue
302
-
303
- # Check if it's specifically an instance method
304
- if inspect.ismethod(member):
305
- # Get the docstring (or empty string if none exists)
306
- docstring = inspect.getdoc(member) or ""
307
- methods[name] = docstring
308
-
309
- from edsl.results.Dataset import Dataset
310
-
311
- d = Dataset(
312
- [
313
- {"method": list(methods.keys())},
314
- {"documentation": list(methods.values())},
315
- ]
316
- )
317
- return d
318
-
319
- def _repr_html_(self):
320
- from edsl.results.TableDisplay import TableDisplay
321
-
322
- if hasattr(self, "_summary"):
323
- summary_dict = self._summary()
324
- summary_line = "".join([f" {k}: {v};" for k, v in summary_dict.items()])
325
- class_name = self.__class__.__name__
326
- docs = getattr(self, "__documentation__", "")
327
- return (
328
- "<p>"
329
- + f"<a href='{docs}'>{class_name}</a>"
330
- + summary_line
331
- + "</p>"
332
- + self.table()._repr_html_()
333
- )
334
- else:
335
- class_name = self.__class__.__name__
336
- documenation = getattr(self, "__documentation__", "")
337
- summary_line = "<p>" + f"<a href='{documenation}'>{class_name}</a>" + "</p>"
338
- display_dict = self.display_dict()
339
- return (
340
- summary_line
341
- + TableDisplay.from_dictionary_wide(display_dict)._repr_html_()
342
- )
343
-
344
- def __str__(self):
345
- return self.__repr__()
346
-
347
-
348
- class HashingMixin:
349
- def __hash__(self) -> int:
350
- """Return a hash of the question."""
351
- from edsl.utilities.utilities import dict_hash
352
-
353
- return dict_hash(self.to_dict(add_edsl_version=False))
354
-
355
- def __eq__(self, other):
356
- """Return whether two objects are equal."""
357
- return hash(self) == hash(other)
358
-
359
-
360
- class Base(
361
- RepresentationMixin,
362
- PersistenceMixin,
363
- DiffMethodsMixin,
364
- HashingMixin,
365
- ABC,
366
- metaclass=RegisterSubclassesMeta,
367
- ):
368
- """Base class for all classes in the package."""
369
-
370
- def keys(self):
371
- """Return the keys of the object."""
372
- _keys = list(self.to_dict().keys())
373
- if "edsl_version" in _keys:
374
- _keys.remove("edsl_version")
375
- if "edsl_class_name" in _keys:
376
- _keys.remove("edsl_class_name")
377
- return _keys
378
-
379
- def values(self):
380
- """Return the values of the object."""
381
- data = self.to_dict()
382
- keys = self.keys()
383
- return {data[key] for key in keys}
384
-
385
- @abstractmethod
386
- def example():
387
- """This method should be implemented by subclasses."""
388
- raise NotImplementedError("This method is not implemented yet.")
389
-
390
- @abstractmethod
391
- def to_dict():
392
- """This method should be implemented by subclasses."""
393
- raise NotImplementedError("This method is not implemented yet.")
394
-
395
- def to_json(self):
396
- return json.dumps(self.to_dict())
397
-
398
- def store(self, d: dict, key_name: Optional[str] = None):
399
- if key_name is None:
400
- index = len(d)
401
- else:
402
- index = key_name
403
- d[index] = self
404
-
405
- @abstractmethod
406
- def from_dict():
407
- """This method should be implemented by subclasses."""
408
- raise NotImplementedError("This method is not implemented yet.")
409
-
410
- @abstractmethod
411
- def code():
412
- """This method should be implemented by subclasses."""
413
- raise NotImplementedError("This method is not implemented yet.")
414
-
415
- def show_methods(self, show_docstrings=True):
416
- """Show the methods of the object."""
417
- public_methods_with_docstrings = [
418
- (method, getattr(self, method).__doc__)
419
- for method in dir(self)
420
- if callable(getattr(self, method)) and not method.startswith("_")
421
- ]
422
- if show_docstrings:
423
- for method, documentation in public_methods_with_docstrings:
424
- print(f"{method}: {documentation}")
425
- else:
426
- return [x[0] for x in public_methods_with_docstrings]
edsl/BaseDiff.py DELETED
@@ -1,260 +0,0 @@
1
- import difflib
2
- import json
3
- from typing import Any, Dict, Tuple
4
- from collections import UserList
5
- import inspect
6
-
7
-
8
- class BaseDiffCollection(UserList):
9
- def __init__(self, diffs=None):
10
- if diffs is None:
11
- diffs = []
12
- super().__init__(diffs)
13
-
14
- def apply(self, obj: Any):
15
- for diff in self:
16
- obj = diff.apply(obj)
17
- return obj
18
-
19
- def add_diff(self, diff) -> "BaseDiffCollection":
20
- self.append(diff)
21
- return self
22
-
23
-
24
- class DummyObject:
25
- def __init__(self, object_dict):
26
- self.object_dict = object_dict
27
-
28
- def to_dict(self):
29
- return self.object_dict
30
-
31
-
32
- class BaseDiff:
33
- def __init__(
34
- self, obj1: Any, obj2: Any, added=None, removed=None, modified=None, level=0
35
- ):
36
- self.level = level
37
-
38
- self.obj1 = obj1
39
- self.obj2 = obj2
40
-
41
- if "sort" in inspect.signature(obj1.to_dict).parameters:
42
- self._dict1 = obj1.to_dict(sort=True)
43
- self._dict2 = obj2.to_dict(sort=True)
44
- else:
45
- self._dict1 = obj1.to_dict()
46
- self._dict2 = obj2.to_dict()
47
- self._obj_class = type(obj1)
48
-
49
- self.added = added
50
- self.removed = removed
51
- self.modified = modified
52
-
53
- def __bool__(self):
54
- return bool(self.added or self.removed or self.modified)
55
-
56
- @property
57
- def added(self):
58
- if self._added is None:
59
- self._added = self._find_added()
60
- return self._added
61
-
62
- def __add__(self, other):
63
- return self.apply(other)
64
-
65
- @added.setter
66
- def added(self, value):
67
- self._added = value if value is not None else self._find_added()
68
-
69
- @property
70
- def removed(self):
71
- if self._removed is None:
72
- self._removed = self._find_removed()
73
- return self._removed
74
-
75
- @removed.setter
76
- def removed(self, value):
77
- self._removed = value if value is not None else self._find_removed()
78
-
79
- @property
80
- def modified(self):
81
- if self._modified is None:
82
- self._modified = self._find_modified()
83
- return self._modified
84
-
85
- @modified.setter
86
- def modified(self, value):
87
- self._modified = value if value is not None else self._find_modified()
88
-
89
- def _find_added(self) -> Dict[Any, Any]:
90
- return {k: self._dict2[k] for k in self._dict2 if k not in self._dict1}
91
-
92
- def _find_removed(self) -> Dict[Any, Any]:
93
- return {k: self._dict1[k] for k in self._dict1 if k not in self._dict2}
94
-
95
- def _find_modified(self) -> Dict[Any, Tuple[Any, Any, str]]:
96
- modified = {}
97
- for k in self._dict1:
98
- if k in self._dict2 and self._dict1[k] != self._dict2[k]:
99
- if isinstance(self._dict1[k], str) and isinstance(self._dict2[k], str):
100
- diff = self._diff_strings(self._dict1[k], self._dict2[k])
101
- modified[k] = (self._dict1[k], self._dict2[k], diff)
102
- elif isinstance(self._dict1[k], dict) and isinstance(
103
- self._dict2[k], dict
104
- ):
105
- diff = self._diff_dicts(self._dict1[k], self._dict2[k])
106
- modified[k] = (self._dict1[k], self._dict2[k], diff)
107
- elif isinstance(self._dict1[k], list) and isinstance(
108
- self._dict2[k], list
109
- ):
110
- d1 = dict(zip(range(len(self._dict1[k])), self._dict1[k]))
111
- d2 = dict(zip(range(len(self._dict2[k])), self._dict2[k]))
112
- diff = BaseDiff(
113
- DummyObject(d1), DummyObject(d2), level=self.level + 1
114
- )
115
- modified[k] = (self._dict1[k], self._dict2[k], diff)
116
- else:
117
- modified[k] = (self._dict1[k], self._dict2[k], "")
118
- return modified
119
-
120
- @staticmethod
121
- def is_json(string_that_could_be_json: str) -> bool:
122
- try:
123
- json.loads(string_that_could_be_json)
124
- return True
125
- except json.JSONDecodeError:
126
- return False
127
-
128
- def _diff_dicts(self, dict1: Dict[str, Any], dict2: Dict[str, Any]) -> str:
129
- diff = BaseDiff(DummyObject(dict1), DummyObject(dict2), level=self.level + 1)
130
- return diff
131
-
132
- def _diff_strings(self, str1: str, str2: str) -> str:
133
- if self.is_json(str1) and self.is_json(str2):
134
- diff = self._diff_dicts(json.loads(str1), json.loads(str2))
135
- return diff
136
- diff = difflib.ndiff(str1.splitlines(), str2.splitlines())
137
- return diff
138
-
139
- def apply(self, obj: Any):
140
- """Apply the diff to the object."""
141
-
142
- new_obj_dict = obj.to_dict()
143
- for k, v in self.added.items():
144
- new_obj_dict[k] = v
145
- for k in self.removed.keys():
146
- del new_obj_dict[k]
147
- for k, (v1, v2, diff) in self.modified.items():
148
- new_obj_dict[k] = v2
149
-
150
- return obj.from_dict(new_obj_dict)
151
-
152
- def to_dict(self) -> Dict[str, Any]:
153
- return {
154
- "added": self.added,
155
- "removed": self.removed,
156
- "modified": self.modified,
157
- "obj1": self._dict1,
158
- "obj2": self._dict2,
159
- "obj_class": self._obj_class.__name__,
160
- "level": self.level,
161
- }
162
-
163
- @classmethod
164
- def from_dict(cls, diff_dict: Dict[str, Any], obj1: Any, obj2: Any):
165
- return cls(
166
- obj1=obj1,
167
- obj2=obj2,
168
- added=diff_dict["added"],
169
- removed=diff_dict["removed"],
170
- modified=diff_dict["modified"],
171
- level=diff_dict["level"],
172
- )
173
-
174
- class Results(UserList):
175
- def __init__(self, prepend=" ", level=0):
176
- super().__init__()
177
- self.prepend = prepend
178
- self.level = level
179
-
180
- def append(self, item):
181
- super().append(self.prepend * self.level + item)
182
-
183
- def __str__(self):
184
- prepend = " "
185
- result = self.Results(level=self.level, prepend="\t")
186
- if self.added:
187
- result.append("Added keys and values:")
188
- for k, v in self.added.items():
189
- result.append(prepend + f" {k}: {v}")
190
- if self.removed:
191
- result.append("Removed keys and values:")
192
- for k, v in self.removed.items():
193
- result.append(f" {k}: {v}")
194
- if self.modified:
195
- result.append("Modified keys and values:")
196
- for k, (v1, v2, diff) in self.modified.items():
197
- result.append(f"Key: {k}:")
198
- result.append(f" Old value: {v1}")
199
- result.append(f" New value: {v2}")
200
- if diff:
201
- result.append(f" Diff:")
202
- try:
203
- for line in diff:
204
- result.append(f" {line}")
205
- except:
206
- result.append(f" {diff}")
207
- return "\n".join(result)
208
-
209
- def __repr__(self):
210
- return (
211
- f"BaseDiff(obj1={self.obj1!r}, obj2={self.obj2!r}, added={self.added!r}, "
212
- f"removed={self.removed!r}, modified={self.modified!r})"
213
- )
214
-
215
- def add_diff(self, diff) -> "BaseDiffCollection":
216
- return BaseDiffCollection([self, diff])
217
-
218
-
219
- if __name__ == "__main__":
220
- from edsl import Question
221
-
222
- q_ft = Question.example("free_text")
223
- q_mc = Question.example("multiple_choice")
224
-
225
- diff1 = q_ft - q_mc
226
- assert q_ft == q_mc + diff1
227
- assert q_ft == diff1.apply(q_mc)
228
- # new_q_mc = diff1.apply(q_ft)
229
- # assert new_q_mc == q_mc
230
-
231
- # new_q_mc = q_ft + diff1
232
- # assert new_q_mc == q_mc
233
-
234
- # new_q_mc = diff1 + q_ft
235
- # assert new_q_mc == q_mc
236
-
237
- # ## Test chain of diffs
238
- q0 = Question.example("free_text")
239
- q1 = q0.copy()
240
- q1.question_text = "Why is Buzzard's Bay so named?"
241
- diff1 = q1 - q0
242
- q2 = q1.copy()
243
- q2.question_name = "buzzard_bay"
244
- diff2 = q2 - q1
245
-
246
- diff_chain = diff1.add_diff(diff2)
247
-
248
- new_q2 = diff_chain.apply(q0)
249
- assert new_q2 == q2
250
-
251
- new_q2 = diff_chain + q0
252
- assert new_q2 == q2
253
-
254
- # new_diffs = diff1.add_diff(diff1).add_diff(diff1)
255
- # assert len(new_diffs) == 3
256
-
257
- # q0 = Question.example("free_text")
258
- # q1 = Question.example("free_text")
259
- # q1.question_text = "Why is Buzzard's Bay so named?"
260
- # q2 = q1.copy()