edsl 0.1.47__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.
- edsl/__init__.py +44 -39
- edsl/__version__.py +1 -1
- edsl/agents/__init__.py +4 -2
- edsl/agents/{Agent.py → agent.py} +442 -152
- edsl/agents/{AgentList.py → agent_list.py} +220 -162
- edsl/agents/descriptors.py +46 -7
- edsl/{exceptions/agents.py → agents/exceptions.py} +3 -12
- edsl/base/__init__.py +75 -0
- edsl/base/base_class.py +1303 -0
- edsl/base/data_transfer_models.py +114 -0
- edsl/base/enums.py +215 -0
- edsl/base.py +8 -0
- edsl/buckets/__init__.py +25 -0
- edsl/buckets/bucket_collection.py +324 -0
- edsl/buckets/model_buckets.py +206 -0
- edsl/buckets/token_bucket.py +502 -0
- edsl/{jobs/buckets/TokenBucketAPI.py → buckets/token_bucket_api.py} +1 -1
- edsl/buckets/token_bucket_client.py +509 -0
- edsl/caching/__init__.py +20 -0
- edsl/caching/cache.py +814 -0
- edsl/caching/cache_entry.py +427 -0
- edsl/{data/CacheHandler.py → caching/cache_handler.py} +14 -15
- edsl/caching/exceptions.py +24 -0
- edsl/caching/orm.py +30 -0
- edsl/{data/RemoteCacheSync.py → caching/remote_cache_sync.py} +3 -3
- edsl/caching/sql_dict.py +441 -0
- edsl/config/__init__.py +8 -0
- edsl/config/config_class.py +177 -0
- edsl/config.py +4 -176
- edsl/conversation/Conversation.py +7 -7
- edsl/conversation/car_buying.py +4 -4
- edsl/conversation/chips.py +6 -6
- edsl/coop/__init__.py +25 -2
- edsl/coop/coop.py +303 -67
- edsl/coop/{ExpectedParrotKeyHandler.py → ep_key_handling.py} +86 -10
- edsl/coop/exceptions.py +62 -0
- edsl/coop/price_fetcher.py +126 -0
- edsl/coop/utils.py +89 -24
- edsl/data_transfer_models.py +5 -72
- edsl/dataset/__init__.py +10 -0
- edsl/{results/Dataset.py → dataset/dataset.py} +116 -36
- edsl/{results/DatasetExportMixin.py → dataset/dataset_operations_mixin.py} +606 -122
- edsl/{results/DatasetTree.py → dataset/dataset_tree.py} +156 -75
- edsl/{results/TableDisplay.py → dataset/display/table_display.py} +18 -7
- edsl/{results → dataset/display}/table_renderers.py +58 -2
- edsl/{results → dataset}/file_exports.py +4 -5
- edsl/{results → dataset}/smart_objects.py +2 -2
- edsl/enums.py +5 -205
- edsl/inference_services/__init__.py +5 -0
- edsl/inference_services/{AvailableModelCacheHandler.py → available_model_cache_handler.py} +2 -3
- edsl/inference_services/{AvailableModelFetcher.py → available_model_fetcher.py} +8 -14
- edsl/inference_services/data_structures.py +3 -2
- edsl/{exceptions/inference_services.py → inference_services/exceptions.py} +1 -1
- edsl/inference_services/{InferenceServiceABC.py → inference_service_abc.py} +1 -1
- edsl/inference_services/{InferenceServicesCollection.py → inference_services_collection.py} +8 -7
- edsl/inference_services/registry.py +4 -41
- edsl/inference_services/{ServiceAvailability.py → service_availability.py} +5 -25
- edsl/inference_services/services/__init__.py +31 -0
- edsl/inference_services/{AnthropicService.py → services/anthropic_service.py} +3 -3
- edsl/inference_services/{AwsBedrock.py → services/aws_bedrock.py} +2 -2
- edsl/inference_services/{AzureAI.py → services/azure_ai.py} +2 -2
- edsl/inference_services/{DeepInfraService.py → services/deep_infra_service.py} +1 -3
- edsl/inference_services/{DeepSeekService.py → services/deep_seek_service.py} +2 -4
- edsl/inference_services/{GoogleService.py → services/google_service.py} +5 -4
- edsl/inference_services/{GroqService.py → services/groq_service.py} +1 -1
- edsl/inference_services/{MistralAIService.py → services/mistral_ai_service.py} +3 -3
- edsl/inference_services/{OllamaService.py → services/ollama_service.py} +1 -7
- edsl/inference_services/{OpenAIService.py → services/open_ai_service.py} +5 -6
- edsl/inference_services/{PerplexityService.py → services/perplexity_service.py} +3 -7
- edsl/inference_services/{TestService.py → services/test_service.py} +7 -6
- edsl/inference_services/{TogetherAIService.py → services/together_ai_service.py} +2 -6
- edsl/inference_services/{XAIService.py → services/xai_service.py} +1 -1
- edsl/inference_services/write_available.py +1 -2
- edsl/instructions/__init__.py +6 -0
- edsl/{surveys/instructions/Instruction.py → instructions/instruction.py} +11 -6
- edsl/{surveys/instructions/InstructionCollection.py → instructions/instruction_collection.py} +10 -5
- edsl/{surveys/InstructionHandler.py → instructions/instruction_handler.py} +3 -3
- edsl/{jobs/interviews → interviews}/ReportErrors.py +2 -2
- edsl/interviews/__init__.py +4 -0
- edsl/{jobs/AnswerQuestionFunctionConstructor.py → interviews/answering_function.py} +45 -18
- edsl/{jobs/interviews/InterviewExceptionEntry.py → interviews/exception_tracking.py} +107 -22
- edsl/interviews/interview.py +638 -0
- edsl/{jobs/interviews/InterviewStatusDictionary.py → interviews/interview_status_dictionary.py} +21 -12
- edsl/{jobs/interviews/InterviewStatusLog.py → interviews/interview_status_log.py} +16 -7
- edsl/{jobs/InterviewTaskManager.py → interviews/interview_task_manager.py} +12 -7
- edsl/{jobs/RequestTokenEstimator.py → interviews/request_token_estimator.py} +8 -3
- edsl/{jobs/interviews/InterviewStatistic.py → interviews/statistics.py} +36 -10
- edsl/invigilators/__init__.py +38 -0
- edsl/invigilators/invigilator_base.py +477 -0
- edsl/{agents/Invigilator.py → invigilators/invigilators.py} +263 -10
- edsl/invigilators/prompt_constructor.py +476 -0
- edsl/{agents → invigilators}/prompt_helpers.py +2 -1
- edsl/{agents/QuestionInstructionPromptBuilder.py → invigilators/question_instructions_prompt_builder.py} +18 -13
- edsl/{agents → invigilators}/question_option_processor.py +96 -21
- edsl/{agents/QuestionTemplateReplacementsBuilder.py → invigilators/question_template_replacements_builder.py} +64 -12
- edsl/jobs/__init__.py +7 -1
- edsl/jobs/async_interview_runner.py +99 -35
- edsl/jobs/check_survey_scenario_compatibility.py +7 -5
- edsl/jobs/data_structures.py +153 -22
- edsl/{exceptions/jobs.py → jobs/exceptions.py} +2 -1
- edsl/jobs/{FetchInvigilator.py → fetch_invigilator.py} +4 -4
- edsl/jobs/{loggers/HTMLTableJobLogger.py → html_table_job_logger.py} +6 -2
- edsl/jobs/{Jobs.py → jobs.py} +313 -167
- edsl/jobs/{JobsChecks.py → jobs_checks.py} +15 -7
- edsl/jobs/{JobsComponentConstructor.py → jobs_component_constructor.py} +19 -17
- edsl/jobs/{InterviewsConstructor.py → jobs_interview_constructor.py} +10 -5
- edsl/jobs/jobs_pricing_estimation.py +347 -0
- edsl/jobs/{JobsRemoteInferenceLogger.py → jobs_remote_inference_logger.py} +4 -3
- edsl/jobs/jobs_runner_asyncio.py +282 -0
- edsl/jobs/{JobsRemoteInferenceHandler.py → remote_inference.py} +19 -22
- edsl/jobs/results_exceptions_handler.py +2 -2
- edsl/key_management/__init__.py +28 -0
- edsl/key_management/key_lookup.py +161 -0
- edsl/{language_models/key_management/KeyLookupBuilder.py → key_management/key_lookup_builder.py} +118 -47
- edsl/key_management/key_lookup_collection.py +82 -0
- edsl/key_management/models.py +218 -0
- edsl/language_models/__init__.py +7 -2
- edsl/language_models/{ComputeCost.py → compute_cost.py} +18 -3
- edsl/{exceptions/language_models.py → language_models/exceptions.py} +2 -1
- edsl/language_models/language_model.py +1080 -0
- edsl/language_models/model.py +10 -25
- edsl/language_models/{ModelList.py → model_list.py} +9 -14
- edsl/language_models/{RawResponseHandler.py → raw_response_handler.py} +1 -1
- edsl/language_models/{RegisterLanguageModelsMeta.py → registry.py} +1 -1
- edsl/language_models/repair.py +4 -4
- edsl/language_models/utilities.py +4 -4
- edsl/notebooks/__init__.py +3 -1
- edsl/notebooks/{Notebook.py → notebook.py} +7 -8
- edsl/prompts/__init__.py +1 -1
- edsl/{exceptions/prompts.py → prompts/exceptions.py} +3 -1
- edsl/prompts/{Prompt.py → prompt.py} +101 -95
- edsl/questions/HTMLQuestion.py +1 -1
- edsl/questions/__init__.py +154 -25
- edsl/questions/answer_validator_mixin.py +1 -1
- edsl/questions/compose_questions.py +4 -3
- edsl/questions/derived/question_likert_five.py +166 -0
- edsl/questions/derived/{QuestionLinearScale.py → question_linear_scale.py} +4 -4
- edsl/questions/derived/{QuestionTopK.py → question_top_k.py} +4 -4
- edsl/questions/derived/{QuestionYesNo.py → question_yes_no.py} +4 -5
- edsl/questions/descriptors.py +24 -30
- edsl/questions/loop_processor.py +65 -19
- edsl/questions/question_base.py +881 -0
- edsl/questions/question_base_gen_mixin.py +15 -16
- edsl/questions/{QuestionBasePromptsMixin.py → question_base_prompts_mixin.py} +2 -2
- edsl/questions/{QuestionBudget.py → question_budget.py} +3 -4
- edsl/questions/{QuestionCheckBox.py → question_check_box.py} +16 -16
- edsl/questions/{QuestionDict.py → question_dict.py} +39 -5
- edsl/questions/{QuestionExtract.py → question_extract.py} +9 -9
- edsl/questions/question_free_text.py +282 -0
- edsl/questions/{QuestionFunctional.py → question_functional.py} +6 -5
- edsl/questions/{QuestionList.py → question_list.py} +6 -7
- edsl/questions/{QuestionMatrix.py → question_matrix.py} +6 -5
- edsl/questions/{QuestionMultipleChoice.py → question_multiple_choice.py} +126 -21
- edsl/questions/{QuestionNumerical.py → question_numerical.py} +5 -5
- edsl/questions/{QuestionRank.py → question_rank.py} +6 -6
- edsl/questions/question_registry.py +4 -9
- edsl/questions/register_questions_meta.py +8 -4
- edsl/questions/response_validator_abc.py +17 -16
- edsl/results/__init__.py +4 -1
- edsl/{exceptions/results.py → results/exceptions.py} +1 -1
- edsl/results/report.py +197 -0
- edsl/results/{Result.py → result.py} +131 -45
- edsl/results/{Results.py → results.py} +365 -220
- edsl/results/results_selector.py +344 -25
- edsl/scenarios/__init__.py +30 -3
- edsl/scenarios/{ConstructDownloadLink.py → construct_download_link.py} +7 -0
- edsl/scenarios/directory_scanner.py +156 -13
- edsl/scenarios/document_chunker.py +186 -0
- edsl/scenarios/exceptions.py +101 -0
- edsl/scenarios/file_methods.py +2 -3
- edsl/scenarios/{FileStore.py → file_store.py} +275 -189
- edsl/scenarios/handlers/__init__.py +14 -14
- edsl/scenarios/handlers/{csv.py → csv_file_store.py} +1 -2
- edsl/scenarios/handlers/{docx.py → docx_file_store.py} +8 -7
- edsl/scenarios/handlers/{html.py → html_file_store.py} +1 -2
- edsl/scenarios/handlers/{jpeg.py → jpeg_file_store.py} +1 -1
- edsl/scenarios/handlers/{json.py → json_file_store.py} +1 -1
- edsl/scenarios/handlers/latex_file_store.py +5 -0
- edsl/scenarios/handlers/{md.py → md_file_store.py} +1 -1
- edsl/scenarios/handlers/{pdf.py → pdf_file_store.py} +2 -2
- edsl/scenarios/handlers/{png.py → png_file_store.py} +1 -1
- edsl/scenarios/handlers/{pptx.py → pptx_file_store.py} +8 -7
- edsl/scenarios/handlers/{py.py → py_file_store.py} +1 -3
- edsl/scenarios/handlers/{sql.py → sql_file_store.py} +2 -1
- edsl/scenarios/handlers/{sqlite.py → sqlite_file_store.py} +2 -3
- edsl/scenarios/handlers/{txt.py → txt_file_store.py} +1 -1
- edsl/scenarios/scenario.py +928 -0
- edsl/scenarios/scenario_join.py +18 -5
- edsl/scenarios/{ScenarioList.py → scenario_list.py} +294 -106
- edsl/scenarios/{ScenarioListPdfMixin.py → scenario_list_pdf_tools.py} +16 -15
- edsl/scenarios/scenario_selector.py +5 -1
- edsl/study/ObjectEntry.py +2 -2
- edsl/study/SnapShot.py +5 -5
- edsl/study/Study.py +18 -19
- edsl/study/__init__.py +6 -4
- edsl/surveys/__init__.py +7 -4
- edsl/surveys/dag/__init__.py +2 -0
- edsl/surveys/{ConstructDAG.py → dag/construct_dag.py} +3 -3
- edsl/surveys/{DAG.py → dag/dag.py} +13 -10
- edsl/surveys/descriptors.py +1 -1
- edsl/surveys/{EditSurvey.py → edit_survey.py} +9 -9
- edsl/{exceptions/surveys.py → surveys/exceptions.py} +1 -2
- edsl/surveys/memory/__init__.py +3 -0
- edsl/surveys/{MemoryPlan.py → memory/memory_plan.py} +10 -9
- edsl/surveys/rules/__init__.py +3 -0
- edsl/surveys/{Rule.py → rules/rule.py} +103 -43
- edsl/surveys/{RuleCollection.py → rules/rule_collection.py} +21 -30
- edsl/surveys/{RuleManager.py → rules/rule_manager.py} +19 -13
- edsl/surveys/survey.py +1743 -0
- edsl/surveys/{SurveyExportMixin.py → survey_export.py} +22 -27
- edsl/surveys/{SurveyFlowVisualization.py → survey_flow_visualization.py} +11 -2
- edsl/surveys/{Simulator.py → survey_simulator.py} +10 -3
- edsl/tasks/__init__.py +32 -0
- edsl/{jobs/tasks/QuestionTaskCreator.py → tasks/question_task_creator.py} +115 -57
- edsl/tasks/task_creators.py +135 -0
- edsl/{jobs/tasks/TaskHistory.py → tasks/task_history.py} +86 -47
- edsl/{jobs/tasks → tasks}/task_status_enum.py +91 -7
- edsl/tasks/task_status_log.py +85 -0
- edsl/tokens/__init__.py +2 -0
- edsl/tokens/interview_token_usage.py +53 -0
- edsl/utilities/PrettyList.py +1 -1
- edsl/utilities/SystemInfo.py +25 -22
- edsl/utilities/__init__.py +29 -21
- edsl/utilities/gcp_bucket/__init__.py +2 -0
- edsl/utilities/gcp_bucket/cloud_storage.py +99 -96
- edsl/utilities/interface.py +44 -536
- edsl/{results/MarkdownToPDF.py → utilities/markdown_to_pdf.py} +13 -5
- edsl/utilities/repair_functions.py +1 -1
- {edsl-0.1.47.dist-info → edsl-0.1.48.dist-info}/METADATA +1 -1
- edsl-0.1.48.dist-info/RECORD +347 -0
- edsl/Base.py +0 -493
- edsl/BaseDiff.py +0 -260
- edsl/agents/InvigilatorBase.py +0 -260
- edsl/agents/PromptConstructor.py +0 -318
- edsl/coop/PriceFetcher.py +0 -54
- edsl/data/Cache.py +0 -582
- edsl/data/CacheEntry.py +0 -238
- edsl/data/SQLiteDict.py +0 -292
- edsl/data/__init__.py +0 -5
- edsl/data/orm.py +0 -10
- edsl/exceptions/cache.py +0 -5
- edsl/exceptions/coop.py +0 -14
- edsl/exceptions/data.py +0 -14
- edsl/exceptions/scenarios.py +0 -29
- edsl/jobs/Answers.py +0 -43
- edsl/jobs/JobsPrompts.py +0 -354
- edsl/jobs/buckets/BucketCollection.py +0 -134
- edsl/jobs/buckets/ModelBuckets.py +0 -65
- edsl/jobs/buckets/TokenBucket.py +0 -283
- edsl/jobs/buckets/TokenBucketClient.py +0 -191
- edsl/jobs/interviews/Interview.py +0 -395
- edsl/jobs/interviews/InterviewExceptionCollection.py +0 -99
- edsl/jobs/interviews/InterviewStatisticsCollection.py +0 -25
- edsl/jobs/runners/JobsRunnerAsyncio.py +0 -163
- edsl/jobs/runners/JobsRunnerStatusData.py +0 -0
- edsl/jobs/tasks/TaskCreators.py +0 -64
- edsl/jobs/tasks/TaskStatusLog.py +0 -23
- edsl/jobs/tokens/InterviewTokenUsage.py +0 -27
- edsl/language_models/LanguageModel.py +0 -635
- edsl/language_models/ServiceDataSources.py +0 -0
- edsl/language_models/key_management/KeyLookup.py +0 -63
- edsl/language_models/key_management/KeyLookupCollection.py +0 -38
- edsl/language_models/key_management/models.py +0 -137
- edsl/questions/QuestionBase.py +0 -544
- edsl/questions/QuestionFreeText.py +0 -130
- edsl/questions/derived/QuestionLikertFive.py +0 -76
- edsl/results/ResultsExportMixin.py +0 -45
- edsl/results/TextEditor.py +0 -50
- edsl/results/results_fetch_mixin.py +0 -33
- edsl/results/results_tools_mixin.py +0 -98
- edsl/scenarios/DocumentChunker.py +0 -104
- edsl/scenarios/Scenario.py +0 -548
- edsl/scenarios/ScenarioHtmlMixin.py +0 -65
- edsl/scenarios/ScenarioListExportMixin.py +0 -45
- edsl/scenarios/handlers/latex.py +0 -5
- edsl/shared.py +0 -1
- edsl/surveys/Survey.py +0 -1301
- edsl/surveys/SurveyQualtricsImport.py +0 -284
- edsl/surveys/SurveyToApp.py +0 -141
- edsl/surveys/instructions/__init__.py +0 -0
- edsl/tools/__init__.py +0 -1
- edsl/tools/clusters.py +0 -192
- edsl/tools/embeddings.py +0 -27
- edsl/tools/embeddings_plotting.py +0 -118
- edsl/tools/plotting.py +0 -112
- edsl/tools/summarize.py +0 -18
- edsl/utilities/data/Registry.py +0 -6
- edsl/utilities/data/__init__.py +0 -1
- edsl/utilities/data/scooter_results.json +0 -1
- edsl-0.1.47.dist-info/RECORD +0 -354
- /edsl/coop/{CoopFunctionsMixin.py → coop_functions.py} +0 -0
- /edsl/{results → dataset/display}/CSSParameterizer.py +0 -0
- /edsl/{language_models/key_management → dataset/display}/__init__.py +0 -0
- /edsl/{results → dataset/display}/table_data_class.py +0 -0
- /edsl/{results → dataset/display}/table_display.css +0 -0
- /edsl/{results/ResultsGGMixin.py → dataset/r/ggplot.py} +0 -0
- /edsl/{results → dataset}/tree_explore.py +0 -0
- /edsl/{surveys/instructions/ChangeInstruction.py → instructions/change_instruction.py} +0 -0
- /edsl/{jobs/interviews → interviews}/interview_status_enum.py +0 -0
- /edsl/jobs/{runners/JobsRunnerStatus.py → jobs_runner_status.py} +0 -0
- /edsl/language_models/{PriceManager.py → price_manager.py} +0 -0
- /edsl/language_models/{fake_openai_call.py → unused/fake_openai_call.py} +0 -0
- /edsl/language_models/{fake_openai_service.py → unused/fake_openai_service.py} +0 -0
- /edsl/notebooks/{NotebookToLaTeX.py → notebook_to_latex.py} +0 -0
- /edsl/{exceptions/questions.py → questions/exceptions.py} +0 -0
- /edsl/questions/{SimpleAskMixin.py → simple_ask_mixin.py} +0 -0
- /edsl/surveys/{Memory.py → memory/memory.py} +0 -0
- /edsl/surveys/{MemoryManagement.py → memory/memory_management.py} +0 -0
- /edsl/surveys/{SurveyCSS.py → survey_css.py} +0 -0
- /edsl/{jobs/tokens/TokenUsage.py → tokens/token_usage.py} +0 -0
- /edsl/{results/MarkdownToDocx.py → utilities/markdown_to_docx.py} +0 -0
- /edsl/{TemplateLoader.py → utilities/template_loader.py} +0 -0
- {edsl-0.1.47.dist-info → edsl-0.1.48.dist-info}/LICENSE +0 -0
- {edsl-0.1.47.dist-info → edsl-0.1.48.dist-info}/WHEEL +0 -0
edsl/data/CacheEntry.py
DELETED
@@ -1,238 +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", "service"]
|
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
|
-
service: Optional[str] = None,
|
32
|
-
):
|
33
|
-
self.model = model
|
34
|
-
self.parameters = parameters
|
35
|
-
self.system_prompt = system_prompt
|
36
|
-
self.user_prompt = user_prompt
|
37
|
-
self.output = output
|
38
|
-
self.iteration = iteration or 0
|
39
|
-
self.timestamp = timestamp or int(
|
40
|
-
datetime.datetime.now(datetime.timezone.utc).timestamp()
|
41
|
-
)
|
42
|
-
self.service = service
|
43
|
-
self._check_types()
|
44
|
-
|
45
|
-
def _check_types(self):
|
46
|
-
"""
|
47
|
-
Checks if the types of the fields are correct.
|
48
|
-
"""
|
49
|
-
if not isinstance(self.model, str):
|
50
|
-
raise TypeError("`model` should be a string.")
|
51
|
-
if not isinstance(self.parameters, dict):
|
52
|
-
raise TypeError("`parameters` should be a dictionary.")
|
53
|
-
if not isinstance(self.system_prompt, str):
|
54
|
-
raise TypeError("`system_prompt` should be a string.")
|
55
|
-
if not isinstance(self.user_prompt, str):
|
56
|
-
raise TypeError("`user_prompt` should be a string")
|
57
|
-
if not isinstance(self.output, str):
|
58
|
-
raise TypeError("`output` should be a string")
|
59
|
-
if not isinstance(self.iteration, int):
|
60
|
-
raise TypeError("`iteration` should be an integer")
|
61
|
-
# TODO: should probably be float
|
62
|
-
if not isinstance(self.timestamp, int):
|
63
|
-
raise TypeError(f"`timestamp` should be an integer")
|
64
|
-
if self.service is not None and not isinstance(self.service, str):
|
65
|
-
raise TypeError("`service` should be either a string or None")
|
66
|
-
|
67
|
-
@classmethod
|
68
|
-
def gen_key(
|
69
|
-
self, *, model, parameters, system_prompt, user_prompt, iteration
|
70
|
-
) -> str:
|
71
|
-
"""
|
72
|
-
Generates a key for the cache entry.
|
73
|
-
- Treats single and double quotes as the same.
|
74
|
-
|
75
|
-
TODO: add more robustness.
|
76
|
-
"""
|
77
|
-
long_key = f"{model}{json.dumps(parameters, sort_keys=True)}{system_prompt}{user_prompt}{iteration}"
|
78
|
-
return hashlib.md5(long_key.encode()).hexdigest()
|
79
|
-
|
80
|
-
@property
|
81
|
-
def key(self) -> str:
|
82
|
-
"""
|
83
|
-
Returns the key for the cache entry.
|
84
|
-
- The key is a hash of the key fields.
|
85
|
-
"""
|
86
|
-
d = {k: value for k, value in self.__dict__.items() if k in self.key_fields}
|
87
|
-
return self.gen_key(**d)
|
88
|
-
|
89
|
-
def to_dict(self, add_edsl_version=True) -> dict:
|
90
|
-
"""
|
91
|
-
Returns a dictionary representation of a CacheEntry.
|
92
|
-
"""
|
93
|
-
d = {
|
94
|
-
"model": self.model,
|
95
|
-
"parameters": self.parameters,
|
96
|
-
"system_prompt": self.system_prompt,
|
97
|
-
"user_prompt": self.user_prompt,
|
98
|
-
"output": self.output,
|
99
|
-
"iteration": self.iteration,
|
100
|
-
"timestamp": self.timestamp,
|
101
|
-
"service": self.service,
|
102
|
-
}
|
103
|
-
# if add_edsl_version:
|
104
|
-
# from edsl import __version__
|
105
|
-
|
106
|
-
# d["edsl_version"] = __version__
|
107
|
-
# d["edsl_class_name"] = self.__class__.__name__
|
108
|
-
return d
|
109
|
-
|
110
|
-
def keys(self):
|
111
|
-
return list(self.to_dict().keys())
|
112
|
-
|
113
|
-
def values(self):
|
114
|
-
return list(self.to_dict().values())
|
115
|
-
|
116
|
-
def __getitem__(self, key):
|
117
|
-
"""
|
118
|
-
Returns the value of a field.
|
119
|
-
"""
|
120
|
-
return getattr(self, key)
|
121
|
-
|
122
|
-
@classmethod
|
123
|
-
def from_dict(cls, data: dict) -> CacheEntry:
|
124
|
-
"""
|
125
|
-
Initializes a CacheEntry object from its dictionary representation.
|
126
|
-
"""
|
127
|
-
return cls(**data)
|
128
|
-
|
129
|
-
def __eq__(self, other: CacheEntry) -> bool:
|
130
|
-
"""
|
131
|
-
Checks if two CacheEntry objects are equal.
|
132
|
-
- Does not include timestamp in the comparison.
|
133
|
-
"""
|
134
|
-
if not isinstance(other, CacheEntry):
|
135
|
-
return False
|
136
|
-
for field in self.all_fields:
|
137
|
-
if getattr(self, field) != getattr(other, field) and field != "timestamp":
|
138
|
-
return False
|
139
|
-
return True
|
140
|
-
|
141
|
-
def __repr__(self) -> str:
|
142
|
-
"""
|
143
|
-
Returns a string representation of a CacheEntry.
|
144
|
-
"""
|
145
|
-
return (
|
146
|
-
f"CacheEntry(model={repr(self.model)}, "
|
147
|
-
f"parameters={self.parameters}, "
|
148
|
-
f"system_prompt={repr(self.system_prompt)}, "
|
149
|
-
f"user_prompt={repr(self.user_prompt)}, "
|
150
|
-
f"output={repr(self.output)}, "
|
151
|
-
f"iteration={self.iteration}, "
|
152
|
-
f"timestamp={self.timestamp}, "
|
153
|
-
f"service={repr(self.service)})"
|
154
|
-
)
|
155
|
-
|
156
|
-
@classmethod
|
157
|
-
def example(cls, randomize: bool = False) -> CacheEntry:
|
158
|
-
"""
|
159
|
-
Returns an example CacheEntry instance.
|
160
|
-
|
161
|
-
:param randomize: If True, adds a random string to the system prompt.
|
162
|
-
"""
|
163
|
-
# if random, create a uuid
|
164
|
-
addition = "" if not randomize else str(uuid4())
|
165
|
-
return CacheEntry(
|
166
|
-
model="gpt-3.5-turbo",
|
167
|
-
parameters={"temperature": 0.5},
|
168
|
-
system_prompt=f"The quick brown fox jumps over the lazy dog.{addition}",
|
169
|
-
user_prompt="What does the fox say?",
|
170
|
-
output="The fox says 'hello'",
|
171
|
-
iteration=1,
|
172
|
-
timestamp=int(datetime.datetime.now(datetime.timezone.utc).timestamp()),
|
173
|
-
service="openai",
|
174
|
-
)
|
175
|
-
|
176
|
-
@classmethod
|
177
|
-
def example_dict(cls) -> dict:
|
178
|
-
"""
|
179
|
-
Returns an example dictionary with a single CacheEntry.
|
180
|
-
- This will be useful one level up, in the Cache class.
|
181
|
-
"""
|
182
|
-
cache_entry = cls.example()
|
183
|
-
return {cache_entry.key: cache_entry}
|
184
|
-
|
185
|
-
@classmethod
|
186
|
-
def fetch_input_example(cls) -> dict:
|
187
|
-
"""
|
188
|
-
Creates an example input for a 'fetch' operation.
|
189
|
-
- This will be useful one level up, in the Cache class.
|
190
|
-
"""
|
191
|
-
input = cls.example().to_dict()
|
192
|
-
_ = input.pop("timestamp")
|
193
|
-
_ = input.pop("output")
|
194
|
-
_ = input.pop("service")
|
195
|
-
return input
|
196
|
-
|
197
|
-
@classmethod
|
198
|
-
def store_input_example(cls) -> dict:
|
199
|
-
"""
|
200
|
-
Creates an example input for a 'store' operation.
|
201
|
-
- This will be useful one level up, in the Cache class.
|
202
|
-
"""
|
203
|
-
input = cls.example().to_dict()
|
204
|
-
_ = input.pop("timestamp")
|
205
|
-
input["response"] = input.pop("output")
|
206
|
-
return input
|
207
|
-
|
208
|
-
|
209
|
-
def main():
|
210
|
-
from edsl.data.CacheEntry import CacheEntry
|
211
|
-
|
212
|
-
# an example of how a cache entry looks
|
213
|
-
cache_entry = CacheEntry.example()
|
214
|
-
cache_entry
|
215
|
-
|
216
|
-
# .key property returns the hash of the cache entry
|
217
|
-
cache_entry.key
|
218
|
-
# to dict / from dict
|
219
|
-
cache_entry.to_dict()
|
220
|
-
CacheEntry.from_dict(cache_entry.to_dict())
|
221
|
-
# TODO: this will be false because equality includes timestamp
|
222
|
-
CacheEntry.from_dict(cache_entry.to_dict()) == CacheEntry.example()
|
223
|
-
# equality by checking values
|
224
|
-
cache_entry == CacheEntry.example()
|
225
|
-
# equality by checking keys
|
226
|
-
cache_entry.key == CacheEntry.example().key
|
227
|
-
# evalable repr
|
228
|
-
eval(repr(cache_entry)) == cache_entry
|
229
|
-
# not sure what these are useful for yet
|
230
|
-
cache_entry.example_dict()
|
231
|
-
cache_entry.fetch_input_example()
|
232
|
-
cache_entry.store_input_example()
|
233
|
-
|
234
|
-
|
235
|
-
if __name__ == "__main__":
|
236
|
-
import doctest
|
237
|
-
|
238
|
-
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
edsl/data/orm.py
DELETED
edsl/exceptions/cache.py
DELETED
edsl/exceptions/coop.py
DELETED
edsl/exceptions/data.py
DELETED
edsl/exceptions/scenarios.py
DELETED
@@ -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()
|