edsl 0.1.15__py3-none-any.whl → 0.1.40__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/Base.py +348 -38
- edsl/BaseDiff.py +260 -0
- edsl/TemplateLoader.py +24 -0
- edsl/__init__.py +45 -10
- edsl/__version__.py +1 -1
- edsl/agents/Agent.py +842 -144
- edsl/agents/AgentList.py +521 -25
- edsl/agents/Invigilator.py +250 -374
- edsl/agents/InvigilatorBase.py +257 -0
- edsl/agents/PromptConstructor.py +272 -0
- edsl/agents/QuestionInstructionPromptBuilder.py +128 -0
- edsl/agents/QuestionTemplateReplacementsBuilder.py +137 -0
- edsl/agents/descriptors.py +43 -13
- edsl/agents/prompt_helpers.py +129 -0
- edsl/agents/question_option_processor.py +172 -0
- edsl/auto/AutoStudy.py +130 -0
- edsl/auto/StageBase.py +243 -0
- edsl/auto/StageGenerateSurvey.py +178 -0
- edsl/auto/StageLabelQuestions.py +125 -0
- edsl/auto/StagePersona.py +61 -0
- edsl/auto/StagePersonaDimensionValueRanges.py +88 -0
- edsl/auto/StagePersonaDimensionValues.py +74 -0
- edsl/auto/StagePersonaDimensions.py +69 -0
- edsl/auto/StageQuestions.py +74 -0
- edsl/auto/SurveyCreatorPipeline.py +21 -0
- edsl/auto/utilities.py +218 -0
- edsl/base/Base.py +279 -0
- edsl/config.py +115 -113
- edsl/conversation/Conversation.py +290 -0
- edsl/conversation/car_buying.py +59 -0
- edsl/conversation/chips.py +95 -0
- edsl/conversation/mug_negotiation.py +81 -0
- edsl/conversation/next_speaker_utilities.py +93 -0
- edsl/coop/CoopFunctionsMixin.py +15 -0
- edsl/coop/ExpectedParrotKeyHandler.py +125 -0
- edsl/coop/PriceFetcher.py +54 -0
- edsl/coop/__init__.py +1 -0
- edsl/coop/coop.py +1029 -134
- edsl/coop/utils.py +131 -0
- edsl/data/Cache.py +560 -89
- edsl/data/CacheEntry.py +230 -0
- edsl/data/CacheHandler.py +168 -0
- edsl/data/RemoteCacheSync.py +186 -0
- edsl/data/SQLiteDict.py +292 -0
- edsl/data/__init__.py +5 -3
- edsl/data/orm.py +6 -33
- edsl/data_transfer_models.py +74 -27
- edsl/enums.py +165 -8
- edsl/exceptions/BaseException.py +21 -0
- edsl/exceptions/__init__.py +52 -46
- edsl/exceptions/agents.py +33 -15
- edsl/exceptions/cache.py +5 -0
- edsl/exceptions/coop.py +8 -0
- edsl/exceptions/general.py +34 -0
- edsl/exceptions/inference_services.py +5 -0
- edsl/exceptions/jobs.py +15 -0
- edsl/exceptions/language_models.py +46 -1
- edsl/exceptions/questions.py +80 -5
- edsl/exceptions/results.py +16 -5
- edsl/exceptions/scenarios.py +29 -0
- edsl/exceptions/surveys.py +13 -10
- edsl/inference_services/AnthropicService.py +106 -0
- edsl/inference_services/AvailableModelCacheHandler.py +184 -0
- edsl/inference_services/AvailableModelFetcher.py +215 -0
- edsl/inference_services/AwsBedrock.py +118 -0
- edsl/inference_services/AzureAI.py +215 -0
- edsl/inference_services/DeepInfraService.py +18 -0
- edsl/inference_services/GoogleService.py +143 -0
- edsl/inference_services/GroqService.py +20 -0
- edsl/inference_services/InferenceServiceABC.py +80 -0
- edsl/inference_services/InferenceServicesCollection.py +138 -0
- edsl/inference_services/MistralAIService.py +120 -0
- edsl/inference_services/OllamaService.py +18 -0
- edsl/inference_services/OpenAIService.py +236 -0
- edsl/inference_services/PerplexityService.py +160 -0
- edsl/inference_services/ServiceAvailability.py +135 -0
- edsl/inference_services/TestService.py +90 -0
- edsl/inference_services/TogetherAIService.py +172 -0
- edsl/inference_services/data_structures.py +134 -0
- edsl/inference_services/models_available_cache.py +118 -0
- edsl/inference_services/rate_limits_cache.py +25 -0
- edsl/inference_services/registry.py +41 -0
- edsl/inference_services/write_available.py +10 -0
- edsl/jobs/AnswerQuestionFunctionConstructor.py +223 -0
- edsl/jobs/Answers.py +21 -20
- edsl/jobs/FetchInvigilator.py +47 -0
- edsl/jobs/InterviewTaskManager.py +98 -0
- edsl/jobs/InterviewsConstructor.py +50 -0
- edsl/jobs/Jobs.py +684 -206
- edsl/jobs/JobsChecks.py +172 -0
- edsl/jobs/JobsComponentConstructor.py +189 -0
- edsl/jobs/JobsPrompts.py +270 -0
- edsl/jobs/JobsRemoteInferenceHandler.py +311 -0
- edsl/jobs/JobsRemoteInferenceLogger.py +239 -0
- edsl/jobs/RequestTokenEstimator.py +30 -0
- edsl/jobs/async_interview_runner.py +138 -0
- edsl/jobs/buckets/BucketCollection.py +104 -0
- edsl/jobs/buckets/ModelBuckets.py +65 -0
- edsl/jobs/buckets/TokenBucket.py +283 -0
- edsl/jobs/buckets/TokenBucketAPI.py +211 -0
- edsl/jobs/buckets/TokenBucketClient.py +191 -0
- edsl/jobs/check_survey_scenario_compatibility.py +85 -0
- edsl/jobs/data_structures.py +120 -0
- edsl/jobs/decorators.py +35 -0
- edsl/jobs/interviews/Interview.py +392 -0
- edsl/jobs/interviews/InterviewExceptionCollection.py +99 -0
- edsl/jobs/interviews/InterviewExceptionEntry.py +186 -0
- edsl/jobs/interviews/InterviewStatistic.py +63 -0
- edsl/jobs/interviews/InterviewStatisticsCollection.py +25 -0
- edsl/jobs/interviews/InterviewStatusDictionary.py +78 -0
- edsl/jobs/interviews/InterviewStatusLog.py +92 -0
- edsl/jobs/interviews/ReportErrors.py +66 -0
- edsl/jobs/interviews/interview_status_enum.py +9 -0
- edsl/jobs/jobs_status_enums.py +9 -0
- edsl/jobs/loggers/HTMLTableJobLogger.py +304 -0
- edsl/jobs/results_exceptions_handler.py +98 -0
- edsl/jobs/runners/JobsRunnerAsyncio.py +151 -110
- edsl/jobs/runners/JobsRunnerStatus.py +298 -0
- edsl/jobs/tasks/QuestionTaskCreator.py +244 -0
- edsl/jobs/tasks/TaskCreators.py +64 -0
- edsl/jobs/tasks/TaskHistory.py +470 -0
- edsl/jobs/tasks/TaskStatusLog.py +23 -0
- edsl/jobs/tasks/task_status_enum.py +161 -0
- edsl/jobs/tokens/InterviewTokenUsage.py +27 -0
- edsl/jobs/tokens/TokenUsage.py +34 -0
- edsl/language_models/ComputeCost.py +63 -0
- edsl/language_models/LanguageModel.py +507 -386
- edsl/language_models/ModelList.py +164 -0
- edsl/language_models/PriceManager.py +127 -0
- edsl/language_models/RawResponseHandler.py +106 -0
- edsl/language_models/RegisterLanguageModelsMeta.py +184 -0
- edsl/language_models/__init__.py +1 -8
- edsl/language_models/fake_openai_call.py +15 -0
- edsl/language_models/fake_openai_service.py +61 -0
- edsl/language_models/key_management/KeyLookup.py +63 -0
- edsl/language_models/key_management/KeyLookupBuilder.py +273 -0
- edsl/language_models/key_management/KeyLookupCollection.py +38 -0
- edsl/language_models/key_management/__init__.py +0 -0
- edsl/language_models/key_management/models.py +131 -0
- edsl/language_models/model.py +256 -0
- edsl/language_models/repair.py +109 -41
- edsl/language_models/utilities.py +65 -0
- edsl/notebooks/Notebook.py +263 -0
- edsl/notebooks/NotebookToLaTeX.py +142 -0
- edsl/notebooks/__init__.py +1 -0
- edsl/prompts/Prompt.py +222 -93
- edsl/prompts/__init__.py +1 -1
- edsl/questions/ExceptionExplainer.py +77 -0
- edsl/questions/HTMLQuestion.py +103 -0
- edsl/questions/QuestionBase.py +518 -0
- edsl/questions/QuestionBasePromptsMixin.py +221 -0
- edsl/questions/QuestionBudget.py +164 -67
- edsl/questions/QuestionCheckBox.py +281 -62
- edsl/questions/QuestionDict.py +343 -0
- edsl/questions/QuestionExtract.py +136 -50
- edsl/questions/QuestionFreeText.py +79 -55
- edsl/questions/QuestionFunctional.py +138 -41
- edsl/questions/QuestionList.py +184 -57
- edsl/questions/QuestionMatrix.py +265 -0
- edsl/questions/QuestionMultipleChoice.py +293 -69
- edsl/questions/QuestionNumerical.py +109 -56
- edsl/questions/QuestionRank.py +244 -49
- edsl/questions/Quick.py +41 -0
- edsl/questions/SimpleAskMixin.py +74 -0
- edsl/questions/__init__.py +9 -6
- edsl/questions/{AnswerValidatorMixin.py → answer_validator_mixin.py} +153 -38
- edsl/questions/compose_questions.py +13 -7
- edsl/questions/data_structures.py +20 -0
- edsl/questions/decorators.py +21 -0
- edsl/questions/derived/QuestionLikertFive.py +28 -26
- edsl/questions/derived/QuestionLinearScale.py +41 -28
- edsl/questions/derived/QuestionTopK.py +34 -26
- edsl/questions/derived/QuestionYesNo.py +40 -27
- edsl/questions/descriptors.py +228 -74
- edsl/questions/loop_processor.py +149 -0
- edsl/questions/prompt_templates/question_budget.jinja +13 -0
- edsl/questions/prompt_templates/question_checkbox.jinja +32 -0
- edsl/questions/prompt_templates/question_extract.jinja +11 -0
- edsl/questions/prompt_templates/question_free_text.jinja +3 -0
- edsl/questions/prompt_templates/question_linear_scale.jinja +11 -0
- edsl/questions/prompt_templates/question_list.jinja +17 -0
- edsl/questions/prompt_templates/question_multiple_choice.jinja +33 -0
- edsl/questions/prompt_templates/question_numerical.jinja +37 -0
- edsl/questions/question_base_gen_mixin.py +168 -0
- edsl/questions/question_registry.py +130 -46
- edsl/questions/register_questions_meta.py +71 -0
- edsl/questions/response_validator_abc.py +188 -0
- edsl/questions/response_validator_factory.py +34 -0
- edsl/questions/settings.py +5 -2
- edsl/questions/templates/__init__.py +0 -0
- edsl/questions/templates/budget/__init__.py +0 -0
- edsl/questions/templates/budget/answering_instructions.jinja +7 -0
- edsl/questions/templates/budget/question_presentation.jinja +7 -0
- edsl/questions/templates/checkbox/__init__.py +0 -0
- edsl/questions/templates/checkbox/answering_instructions.jinja +10 -0
- edsl/questions/templates/checkbox/question_presentation.jinja +22 -0
- edsl/questions/templates/dict/__init__.py +0 -0
- edsl/questions/templates/dict/answering_instructions.jinja +21 -0
- edsl/questions/templates/dict/question_presentation.jinja +1 -0
- edsl/questions/templates/extract/__init__.py +0 -0
- edsl/questions/templates/extract/answering_instructions.jinja +7 -0
- edsl/questions/templates/extract/question_presentation.jinja +1 -0
- edsl/questions/templates/free_text/__init__.py +0 -0
- edsl/questions/templates/free_text/answering_instructions.jinja +0 -0
- edsl/questions/templates/free_text/question_presentation.jinja +1 -0
- edsl/questions/templates/likert_five/__init__.py +0 -0
- edsl/questions/templates/likert_five/answering_instructions.jinja +10 -0
- edsl/questions/templates/likert_five/question_presentation.jinja +12 -0
- edsl/questions/templates/linear_scale/__init__.py +0 -0
- edsl/questions/templates/linear_scale/answering_instructions.jinja +5 -0
- edsl/questions/templates/linear_scale/question_presentation.jinja +5 -0
- edsl/questions/templates/list/__init__.py +0 -0
- edsl/questions/templates/list/answering_instructions.jinja +4 -0
- edsl/questions/templates/list/question_presentation.jinja +5 -0
- edsl/questions/templates/matrix/__init__.py +1 -0
- edsl/questions/templates/matrix/answering_instructions.jinja +5 -0
- edsl/questions/templates/matrix/question_presentation.jinja +20 -0
- edsl/questions/templates/multiple_choice/__init__.py +0 -0
- edsl/questions/templates/multiple_choice/answering_instructions.jinja +9 -0
- edsl/questions/templates/multiple_choice/html.jinja +0 -0
- edsl/questions/templates/multiple_choice/question_presentation.jinja +12 -0
- edsl/questions/templates/numerical/__init__.py +0 -0
- edsl/questions/templates/numerical/answering_instructions.jinja +7 -0
- edsl/questions/templates/numerical/question_presentation.jinja +7 -0
- edsl/questions/templates/rank/__init__.py +0 -0
- edsl/questions/templates/rank/answering_instructions.jinja +11 -0
- edsl/questions/templates/rank/question_presentation.jinja +15 -0
- edsl/questions/templates/top_k/__init__.py +0 -0
- edsl/questions/templates/top_k/answering_instructions.jinja +8 -0
- edsl/questions/templates/top_k/question_presentation.jinja +22 -0
- edsl/questions/templates/yes_no/__init__.py +0 -0
- edsl/questions/templates/yes_no/answering_instructions.jinja +6 -0
- edsl/questions/templates/yes_no/question_presentation.jinja +12 -0
- edsl/results/CSSParameterizer.py +108 -0
- edsl/results/Dataset.py +550 -19
- edsl/results/DatasetExportMixin.py +594 -0
- edsl/results/DatasetTree.py +295 -0
- edsl/results/MarkdownToDocx.py +122 -0
- edsl/results/MarkdownToPDF.py +111 -0
- edsl/results/Result.py +477 -173
- edsl/results/Results.py +987 -269
- edsl/results/ResultsExportMixin.py +28 -125
- edsl/results/ResultsGGMixin.py +83 -15
- edsl/results/TableDisplay.py +125 -0
- edsl/results/TextEditor.py +50 -0
- edsl/results/__init__.py +1 -1
- edsl/results/file_exports.py +252 -0
- edsl/results/results_fetch_mixin.py +33 -0
- edsl/results/results_selector.py +145 -0
- edsl/results/results_tools_mixin.py +98 -0
- edsl/results/smart_objects.py +96 -0
- edsl/results/table_data_class.py +12 -0
- edsl/results/table_display.css +78 -0
- edsl/results/table_renderers.py +118 -0
- edsl/results/tree_explore.py +115 -0
- edsl/scenarios/ConstructDownloadLink.py +109 -0
- edsl/scenarios/DocumentChunker.py +102 -0
- edsl/scenarios/DocxScenario.py +16 -0
- edsl/scenarios/FileStore.py +543 -0
- edsl/scenarios/PdfExtractor.py +40 -0
- edsl/scenarios/Scenario.py +431 -62
- edsl/scenarios/ScenarioHtmlMixin.py +65 -0
- edsl/scenarios/ScenarioList.py +1415 -45
- edsl/scenarios/ScenarioListExportMixin.py +45 -0
- edsl/scenarios/ScenarioListPdfMixin.py +239 -0
- edsl/scenarios/__init__.py +2 -0
- edsl/scenarios/directory_scanner.py +96 -0
- edsl/scenarios/file_methods.py +85 -0
- edsl/scenarios/handlers/__init__.py +13 -0
- edsl/scenarios/handlers/csv.py +49 -0
- edsl/scenarios/handlers/docx.py +76 -0
- edsl/scenarios/handlers/html.py +37 -0
- edsl/scenarios/handlers/json.py +111 -0
- edsl/scenarios/handlers/latex.py +5 -0
- edsl/scenarios/handlers/md.py +51 -0
- edsl/scenarios/handlers/pdf.py +68 -0
- edsl/scenarios/handlers/png.py +39 -0
- edsl/scenarios/handlers/pptx.py +105 -0
- edsl/scenarios/handlers/py.py +294 -0
- edsl/scenarios/handlers/sql.py +313 -0
- edsl/scenarios/handlers/sqlite.py +149 -0
- edsl/scenarios/handlers/txt.py +33 -0
- edsl/scenarios/scenario_join.py +131 -0
- edsl/scenarios/scenario_selector.py +156 -0
- edsl/shared.py +1 -0
- edsl/study/ObjectEntry.py +173 -0
- edsl/study/ProofOfWork.py +113 -0
- edsl/study/SnapShot.py +80 -0
- edsl/study/Study.py +521 -0
- edsl/study/__init__.py +4 -0
- edsl/surveys/ConstructDAG.py +92 -0
- edsl/surveys/DAG.py +92 -11
- edsl/surveys/EditSurvey.py +221 -0
- edsl/surveys/InstructionHandler.py +100 -0
- edsl/surveys/Memory.py +9 -4
- edsl/surveys/MemoryManagement.py +72 -0
- edsl/surveys/MemoryPlan.py +156 -35
- edsl/surveys/Rule.py +221 -74
- edsl/surveys/RuleCollection.py +241 -61
- edsl/surveys/RuleManager.py +172 -0
- edsl/surveys/Simulator.py +75 -0
- edsl/surveys/Survey.py +1079 -339
- edsl/surveys/SurveyCSS.py +273 -0
- edsl/surveys/SurveyExportMixin.py +235 -40
- edsl/surveys/SurveyFlowVisualization.py +181 -0
- edsl/surveys/SurveyQualtricsImport.py +284 -0
- edsl/surveys/SurveyToApp.py +141 -0
- edsl/surveys/__init__.py +4 -2
- edsl/surveys/base.py +19 -3
- edsl/surveys/descriptors.py +17 -6
- edsl/surveys/instructions/ChangeInstruction.py +48 -0
- edsl/surveys/instructions/Instruction.py +56 -0
- edsl/surveys/instructions/InstructionCollection.py +82 -0
- edsl/surveys/instructions/__init__.py +0 -0
- edsl/templates/error_reporting/base.html +24 -0
- edsl/templates/error_reporting/exceptions_by_model.html +35 -0
- edsl/templates/error_reporting/exceptions_by_question_name.html +17 -0
- edsl/templates/error_reporting/exceptions_by_type.html +17 -0
- edsl/templates/error_reporting/interview_details.html +116 -0
- edsl/templates/error_reporting/interviews.html +19 -0
- edsl/templates/error_reporting/overview.html +5 -0
- edsl/templates/error_reporting/performance_plot.html +2 -0
- edsl/templates/error_reporting/report.css +74 -0
- edsl/templates/error_reporting/report.html +118 -0
- edsl/templates/error_reporting/report.js +25 -0
- edsl/tools/__init__.py +1 -0
- edsl/tools/clusters.py +192 -0
- edsl/tools/embeddings.py +27 -0
- edsl/tools/embeddings_plotting.py +118 -0
- edsl/tools/plotting.py +112 -0
- edsl/tools/summarize.py +18 -0
- edsl/utilities/PrettyList.py +56 -0
- edsl/utilities/SystemInfo.py +5 -0
- edsl/utilities/__init__.py +21 -20
- edsl/utilities/ast_utilities.py +3 -0
- edsl/utilities/data/Registry.py +2 -0
- edsl/utilities/decorators.py +41 -0
- edsl/utilities/gcp_bucket/__init__.py +0 -0
- edsl/utilities/gcp_bucket/cloud_storage.py +96 -0
- edsl/utilities/interface.py +310 -60
- edsl/utilities/is_notebook.py +18 -0
- edsl/utilities/is_valid_variable_name.py +11 -0
- edsl/utilities/naming_utilities.py +263 -0
- edsl/utilities/remove_edsl_version.py +24 -0
- edsl/utilities/repair_functions.py +28 -0
- edsl/utilities/restricted_python.py +70 -0
- edsl/utilities/utilities.py +203 -13
- edsl-0.1.40.dist-info/METADATA +111 -0
- edsl-0.1.40.dist-info/RECORD +362 -0
- {edsl-0.1.15.dist-info → edsl-0.1.40.dist-info}/WHEEL +1 -1
- edsl/agents/AgentListExportMixin.py +0 -24
- edsl/coop/old.py +0 -31
- edsl/data/Database.py +0 -141
- edsl/data/crud.py +0 -121
- edsl/jobs/Interview.py +0 -435
- edsl/jobs/JobsRunner.py +0 -63
- edsl/jobs/JobsRunnerStatusMixin.py +0 -115
- edsl/jobs/base.py +0 -47
- edsl/jobs/buckets.py +0 -178
- edsl/jobs/runners/JobsRunnerDryRun.py +0 -19
- edsl/jobs/runners/JobsRunnerStreaming.py +0 -54
- edsl/jobs/task_management.py +0 -215
- edsl/jobs/token_tracking.py +0 -78
- edsl/language_models/DeepInfra.py +0 -69
- edsl/language_models/OpenAI.py +0 -98
- edsl/language_models/model_interfaces/GeminiPro.py +0 -66
- edsl/language_models/model_interfaces/LanguageModelOpenAIFour.py +0 -8
- edsl/language_models/model_interfaces/LanguageModelOpenAIThreeFiveTurbo.py +0 -8
- edsl/language_models/model_interfaces/LlamaTwo13B.py +0 -21
- edsl/language_models/model_interfaces/LlamaTwo70B.py +0 -21
- edsl/language_models/model_interfaces/Mixtral8x7B.py +0 -24
- edsl/language_models/registry.py +0 -81
- edsl/language_models/schemas.py +0 -15
- edsl/language_models/unused/ReplicateBase.py +0 -83
- edsl/prompts/QuestionInstructionsBase.py +0 -6
- edsl/prompts/library/agent_instructions.py +0 -29
- edsl/prompts/library/agent_persona.py +0 -17
- edsl/prompts/library/question_budget.py +0 -26
- edsl/prompts/library/question_checkbox.py +0 -32
- edsl/prompts/library/question_extract.py +0 -19
- edsl/prompts/library/question_freetext.py +0 -14
- edsl/prompts/library/question_linear_scale.py +0 -20
- edsl/prompts/library/question_list.py +0 -22
- edsl/prompts/library/question_multiple_choice.py +0 -44
- edsl/prompts/library/question_numerical.py +0 -31
- edsl/prompts/library/question_rank.py +0 -21
- edsl/prompts/prompt_config.py +0 -33
- edsl/prompts/registry.py +0 -185
- edsl/questions/Question.py +0 -240
- edsl/report/InputOutputDataTypes.py +0 -134
- edsl/report/RegressionMixin.py +0 -28
- edsl/report/ReportOutputs.py +0 -1228
- edsl/report/ResultsFetchMixin.py +0 -106
- edsl/report/ResultsOutputMixin.py +0 -14
- edsl/report/demo.ipynb +0 -645
- edsl/results/ResultsDBMixin.py +0 -184
- edsl/surveys/SurveyFlowVisualizationMixin.py +0 -92
- edsl/trackers/Tracker.py +0 -91
- edsl/trackers/TrackerAPI.py +0 -196
- edsl/trackers/TrackerTasks.py +0 -70
- edsl/utilities/pastebin.py +0 -141
- edsl-0.1.15.dist-info/METADATA +0 -69
- edsl-0.1.15.dist-info/RECORD +0 -142
- /edsl/{language_models/model_interfaces → inference_services}/__init__.py +0 -0
- /edsl/{report/__init__.py → jobs/runners/JobsRunnerStatusData.py} +0 -0
- /edsl/{trackers/__init__.py → language_models/ServiceDataSources.py} +0 -0
- {edsl-0.1.15.dist-info → edsl-0.1.40.dist-info}/LICENSE +0 -0
edsl/data/CacheEntry.py
ADDED
@@ -0,0 +1,230 @@
|
|
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()
|
@@ -0,0 +1,168 @@
|
|
1
|
+
from __future__ import annotations
|
2
|
+
import ast
|
3
|
+
import json
|
4
|
+
import os
|
5
|
+
import shutil
|
6
|
+
from typing import TYPE_CHECKING
|
7
|
+
|
8
|
+
if TYPE_CHECKING:
|
9
|
+
from edsl.data.Cache import Cache
|
10
|
+
from edsl.data.CacheEntry import CacheEntry
|
11
|
+
|
12
|
+
|
13
|
+
def set_session_cache(cache: "Cache") -> None:
|
14
|
+
"""
|
15
|
+
Set the session cache.
|
16
|
+
"""
|
17
|
+
from edsl.config import CONFIG
|
18
|
+
|
19
|
+
CONFIG.EDSL_SESSION_CACHE = cache
|
20
|
+
|
21
|
+
|
22
|
+
def unset_session_cache() -> None:
|
23
|
+
"""
|
24
|
+
Unset the session cache.
|
25
|
+
"""
|
26
|
+
from edsl.config import CONFIG
|
27
|
+
|
28
|
+
if hasattr(CONFIG, "EDSL_SESSION_CACHE"):
|
29
|
+
del CONFIG.EDSL_SESSION_CACHE
|
30
|
+
|
31
|
+
|
32
|
+
class CacheHandler:
|
33
|
+
"""
|
34
|
+
This CacheHandler figures out what caches are available and does migrations, as needed.
|
35
|
+
"""
|
36
|
+
|
37
|
+
@property
|
38
|
+
def CACHE_PATH(self):
|
39
|
+
from edsl.config import CONFIG
|
40
|
+
|
41
|
+
return CONFIG.get("EDSL_DATABASE_PATH")
|
42
|
+
|
43
|
+
def __init__(self, test: bool = False):
|
44
|
+
self.test = test
|
45
|
+
self.create_cache_directory()
|
46
|
+
self.cache = self.gen_cache()
|
47
|
+
old_data = self.from_old_sqlite_cache()
|
48
|
+
self.cache.add_from_dict(old_data)
|
49
|
+
|
50
|
+
def create_cache_directory(self, notify=False) -> None:
|
51
|
+
"""
|
52
|
+
Create the cache directory if one is required and it does not exist.
|
53
|
+
"""
|
54
|
+
path = self.CACHE_PATH.replace("sqlite:///", "")
|
55
|
+
dir_path = os.path.dirname(path)
|
56
|
+
if dir_path and not os.path.exists(dir_path):
|
57
|
+
os.makedirs(dir_path)
|
58
|
+
if notify:
|
59
|
+
print(f"Created cache directory: {dir_path}")
|
60
|
+
|
61
|
+
def gen_cache(self) -> "Cache":
|
62
|
+
"""
|
63
|
+
Generate a Cache object.
|
64
|
+
"""
|
65
|
+
from edsl.data.Cache import Cache
|
66
|
+
|
67
|
+
if self.test:
|
68
|
+
return Cache(data={})
|
69
|
+
|
70
|
+
from edsl.config import CONFIG
|
71
|
+
|
72
|
+
if hasattr(CONFIG, "EDSL_SESSION_CACHE"):
|
73
|
+
return CONFIG.EDSL_SESSION_CACHE
|
74
|
+
|
75
|
+
from edsl.data.SQLiteDict import SQLiteDict
|
76
|
+
|
77
|
+
cache = Cache(data=SQLiteDict(self.CACHE_PATH))
|
78
|
+
return cache
|
79
|
+
|
80
|
+
def from_old_sqlite_cache(
|
81
|
+
self, path: str = "edsl_cache.db"
|
82
|
+
) -> dict[str, CacheEntry]:
|
83
|
+
"""
|
84
|
+
Convert an old-style cache to the new format.
|
85
|
+
- NB: Not worth converting to sqlalchemy - this is a one-time operation.
|
86
|
+
"""
|
87
|
+
old_data = {}
|
88
|
+
if not os.path.exists(os.path.join(os.getcwd(), path)):
|
89
|
+
return old_data
|
90
|
+
try:
|
91
|
+
import sqlite3
|
92
|
+
|
93
|
+
conn = sqlite3.connect(path)
|
94
|
+
with conn:
|
95
|
+
cur = conn.cursor()
|
96
|
+
table_name = "responses"
|
97
|
+
cur.execute(f"PRAGMA table_info({table_name})")
|
98
|
+
columns = cur.fetchall()
|
99
|
+
schema = {column[1]: column[2] for column in columns}
|
100
|
+
data = cur.execute(f"SELECT * FROM {table_name}").fetchall()
|
101
|
+
for row in data:
|
102
|
+
entry = self._parse_old_cache_entry(row, schema)
|
103
|
+
old_data[entry.key] = entry
|
104
|
+
print(
|
105
|
+
f"Found old cache at {path} with {len(old_data)} entries.\n"
|
106
|
+
f"We will convert this to the new cache format.\n"
|
107
|
+
f"The old cache is backed up to {path}.bak"
|
108
|
+
)
|
109
|
+
shutil.copy(path, f"{path}.bak")
|
110
|
+
os.remove(path)
|
111
|
+
except sqlite3.OperationalError:
|
112
|
+
print("Found an old Cache but could not convert it to new format.")
|
113
|
+
|
114
|
+
return old_data
|
115
|
+
|
116
|
+
def _parse_old_cache_entry(self, row: tuple, schema) -> CacheEntry:
|
117
|
+
"""
|
118
|
+
Parse an old cache entry.
|
119
|
+
"""
|
120
|
+
entry_dict = {k: row[i] for i, k in enumerate(schema.keys())}
|
121
|
+
_ = entry_dict.pop("id")
|
122
|
+
entry_dict["user_prompt"] = entry_dict.pop("prompt")
|
123
|
+
parameters = entry_dict["parameters"]
|
124
|
+
entry_dict["parameters"] = ast.literal_eval(parameters)
|
125
|
+
from edsl.data.CacheEntry import CacheEntry
|
126
|
+
|
127
|
+
entry = CacheEntry(**entry_dict)
|
128
|
+
return entry
|
129
|
+
|
130
|
+
def get_cache(self) -> Cache:
|
131
|
+
return self.cache
|
132
|
+
|
133
|
+
###############
|
134
|
+
# NOT IN USE
|
135
|
+
###############
|
136
|
+
def from_sqlite(uri="new_edsl_cache.db") -> dict[str, "CacheEntry"]:
|
137
|
+
"""
|
138
|
+
Read in a new-style sqlite cache and return a dictionary of dictionaries.
|
139
|
+
"""
|
140
|
+
conn = sqlite3.connect(uri)
|
141
|
+
with conn:
|
142
|
+
cur = conn.cursor()
|
143
|
+
data = cur.execute("SELECT key, value FROM data").fetchall()
|
144
|
+
newdata = {}
|
145
|
+
for _, value in data:
|
146
|
+
entry = CacheEntry.from_dict(json.loads(value))
|
147
|
+
newdata[entry.key] = entry
|
148
|
+
return newdata
|
149
|
+
|
150
|
+
def from_jsonl(filename="edsl_cache.jsonl") -> dict[str, "CacheEntry"]:
|
151
|
+
"""Read in a jsonl file and return a dictionary of CacheEntry objects."""
|
152
|
+
with open(filename, "a+") as f:
|
153
|
+
f.seek(0)
|
154
|
+
lines = f.readlines()
|
155
|
+
newdata = {}
|
156
|
+
for line in lines:
|
157
|
+
d = json.loads(line)
|
158
|
+
key = list(d.keys())[0]
|
159
|
+
value = list(d.values())[0]
|
160
|
+
newdata[key] = CacheEntry.from_dict(value)
|
161
|
+
return newdata
|
162
|
+
|
163
|
+
|
164
|
+
if __name__ == "__main__":
|
165
|
+
# ch = CacheHandler()
|
166
|
+
import doctest
|
167
|
+
|
168
|
+
doctest.testmod()
|
@@ -0,0 +1,186 @@
|
|
1
|
+
from typing import List, Dict, Any, Optional, TYPE_CHECKING, Callable
|
2
|
+
from dataclasses import dataclass
|
3
|
+
from contextlib import AbstractContextManager
|
4
|
+
from collections import UserList
|
5
|
+
|
6
|
+
if TYPE_CHECKING:
|
7
|
+
from .Cache import Cache
|
8
|
+
from edsl.coop.coop import Coop
|
9
|
+
from .CacheEntry import CacheEntry
|
10
|
+
|
11
|
+
from logging import Logger
|
12
|
+
|
13
|
+
|
14
|
+
class CacheKeyList(UserList):
|
15
|
+
def __init__(self, data: List[str]):
|
16
|
+
super().__init__(data)
|
17
|
+
self.data = data
|
18
|
+
|
19
|
+
def __repr__(self):
|
20
|
+
import reprlib
|
21
|
+
|
22
|
+
keys_repr = reprlib.repr(self.data)
|
23
|
+
return f"CacheKeyList({keys_repr})"
|
24
|
+
|
25
|
+
|
26
|
+
class CacheEntriesList(UserList):
|
27
|
+
def __init__(self, data: List["CacheEntry"]):
|
28
|
+
super().__init__(data)
|
29
|
+
self.data = data
|
30
|
+
|
31
|
+
def __repr__(self):
|
32
|
+
import reprlib
|
33
|
+
|
34
|
+
entries_repr = reprlib.repr(self.data)
|
35
|
+
return f"CacheEntries({entries_repr})"
|
36
|
+
|
37
|
+
def to_cache(self) -> "Cache":
|
38
|
+
from edsl.data.Cache import Cache
|
39
|
+
|
40
|
+
return Cache({entry.key: entry for entry in self.data})
|
41
|
+
|
42
|
+
|
43
|
+
@dataclass
|
44
|
+
class CacheDifference:
|
45
|
+
client_missing_entries: CacheEntriesList
|
46
|
+
server_missing_keys: List[str]
|
47
|
+
|
48
|
+
def __repr__(self):
|
49
|
+
"""Returns a string representation of the CacheDifference object."""
|
50
|
+
import reprlib
|
51
|
+
|
52
|
+
missing_entries_repr = reprlib.repr(self.client_missing_entries)
|
53
|
+
missing_keys_repr = reprlib.repr(self.server_missing_keys)
|
54
|
+
return f"CacheDifference(client_missing_entries={missing_entries_repr}, server_missing_keys={missing_keys_repr})"
|
55
|
+
|
56
|
+
|
57
|
+
class RemoteCacheSync(AbstractContextManager):
|
58
|
+
"""Synchronizes a local cache with a remote cache.
|
59
|
+
|
60
|
+
Handles bidirectional synchronization:
|
61
|
+
- Downloads missing entries from remote to local cache
|
62
|
+
- Uploads new local entries to remote cache
|
63
|
+
"""
|
64
|
+
|
65
|
+
def __init__(
|
66
|
+
self,
|
67
|
+
coop: "Coop",
|
68
|
+
cache: "Cache",
|
69
|
+
output_func: Callable,
|
70
|
+
remote_cache: bool = True,
|
71
|
+
remote_cache_description: str = "",
|
72
|
+
):
|
73
|
+
"""
|
74
|
+
Initializes a RemoteCacheSync object.
|
75
|
+
|
76
|
+
:param coop: Coop object for interacting with the remote cache
|
77
|
+
:param cache: Cache object for local cache
|
78
|
+
:param output_func: Function for outputting messages
|
79
|
+
:param remote_cache: Whether to enable remote cache synchronization
|
80
|
+
:param remote_cache_description: Description for remote cache entries
|
81
|
+
|
82
|
+
"""
|
83
|
+
self.coop = coop
|
84
|
+
self.cache = cache
|
85
|
+
self._output = output_func
|
86
|
+
self.remote_cache_enabled = remote_cache
|
87
|
+
self.remote_cache_description = remote_cache_description
|
88
|
+
self.initial_cache_keys = []
|
89
|
+
|
90
|
+
def __enter__(self) -> "RemoteCacheSync":
|
91
|
+
if self.remote_cache_enabled:
|
92
|
+
self._sync_from_remote()
|
93
|
+
self.initial_cache_keys = list(self.cache.keys())
|
94
|
+
return self
|
95
|
+
|
96
|
+
def __exit__(self, exc_type, exc_value, traceback):
|
97
|
+
if self.remote_cache_enabled:
|
98
|
+
self._sync_to_remote()
|
99
|
+
return False # Propagate exceptions
|
100
|
+
|
101
|
+
def _get_cache_difference(self) -> CacheDifference:
|
102
|
+
"""Retrieves differences between local and remote caches."""
|
103
|
+
diff = self.coop.remote_cache_get_diff(self.cache.keys())
|
104
|
+
return CacheDifference(
|
105
|
+
client_missing_entries=diff.get("client_missing_cacheentries", []),
|
106
|
+
server_missing_keys=diff.get("server_missing_cacheentry_keys", []),
|
107
|
+
)
|
108
|
+
|
109
|
+
def _sync_from_remote(self) -> None:
|
110
|
+
"""Downloads missing entries from remote cache to local cache."""
|
111
|
+
diff: CacheDifference = self._get_cache_difference()
|
112
|
+
missing_count = len(diff.client_missing_entries)
|
113
|
+
|
114
|
+
if missing_count == 0:
|
115
|
+
# self._output("No new entries to add to local cache.")
|
116
|
+
return
|
117
|
+
|
118
|
+
# self._output(
|
119
|
+
# f"Updating local cache with {missing_count:,} new "
|
120
|
+
# f"{'entry' if missing_count == 1 else 'entries'} from remote..."
|
121
|
+
# )
|
122
|
+
|
123
|
+
self.cache.add_from_dict(
|
124
|
+
{entry.key: entry for entry in diff.client_missing_entries}
|
125
|
+
)
|
126
|
+
# self._output("Local cache updated!")
|
127
|
+
|
128
|
+
def _get_entries_to_upload(self, diff: CacheDifference) -> CacheEntriesList:
|
129
|
+
"""Determines which entries need to be uploaded to remote cache."""
|
130
|
+
# Get entries for keys missing from server
|
131
|
+
server_missing_entries = CacheEntriesList(
|
132
|
+
[
|
133
|
+
entry
|
134
|
+
for key in diff.server_missing_keys
|
135
|
+
if (entry := self.cache.data.get(key)) is not None
|
136
|
+
]
|
137
|
+
)
|
138
|
+
|
139
|
+
# Get newly added entries since sync started
|
140
|
+
new_entries = CacheEntriesList(
|
141
|
+
[
|
142
|
+
entry
|
143
|
+
for entry in self.cache.values()
|
144
|
+
if entry.key not in self.initial_cache_keys
|
145
|
+
]
|
146
|
+
)
|
147
|
+
|
148
|
+
return server_missing_entries + new_entries
|
149
|
+
|
150
|
+
def _sync_to_remote(self) -> None:
|
151
|
+
"""Uploads new local entries to remote cache."""
|
152
|
+
diff: CacheDifference = self._get_cache_difference()
|
153
|
+
entries_to_upload: CacheEntriesList = self._get_entries_to_upload(diff)
|
154
|
+
upload_count = len(entries_to_upload)
|
155
|
+
|
156
|
+
if upload_count > 0:
|
157
|
+
# self._output(
|
158
|
+
# f"Updating remote cache with {upload_count:,} new "
|
159
|
+
# f"{'entry' if upload_count == 1 else 'entries'}..."
|
160
|
+
# )
|
161
|
+
|
162
|
+
self.coop.remote_cache_create_many(
|
163
|
+
entries_to_upload,
|
164
|
+
visibility="private",
|
165
|
+
description=self.remote_cache_description,
|
166
|
+
)
|
167
|
+
# self._output("Remote cache updated!")
|
168
|
+
# else:
|
169
|
+
# self._output("No new entries to add to remote cache.")
|
170
|
+
|
171
|
+
# self._output(
|
172
|
+
# f"There are {len(self.cache.keys()):,} entries in the local cache."
|
173
|
+
# )
|
174
|
+
|
175
|
+
|
176
|
+
if __name__ == "__main__":
|
177
|
+
import doctest
|
178
|
+
|
179
|
+
doctest.testmod()
|
180
|
+
|
181
|
+
from edsl.coop.coop import Coop
|
182
|
+
from edsl.data.Cache import Cache
|
183
|
+
from edsl.data.CacheEntry import CacheEntry
|
184
|
+
|
185
|
+
r = RemoteCacheSync(Coop(), Cache(), print)
|
186
|
+
diff = r._get_cache_difference()
|