PyPI - edsl - Versions diffs - 0.1.37.dev6__py3-none-any.whl → 0.1.38__py3-none-any.whl - Mend

edsl 0.1.37.dev6py3-none-any.whl → 0.1.38py3-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 (271) hide show

edsl/Base.py +332 -303
edsl/BaseDiff.py +260 -260
edsl/TemplateLoader.py +24 -24
edsl/__init__.py +49 -48
edsl/__version__.py +1 -1
edsl/agents/Agent.py +867 -855
edsl/agents/AgentList.py +413 -350
edsl/agents/Invigilator.py +233 -222
edsl/agents/InvigilatorBase.py +265 -284
edsl/agents/PromptConstructor.py +354 -353
edsl/agents/__init__.py +3 -3
edsl/agents/descriptors.py +99 -99
edsl/agents/prompt_helpers.py +129 -129
edsl/auto/AutoStudy.py +117 -117
edsl/auto/StageBase.py +230 -230
edsl/auto/StageGenerateSurvey.py +178 -178
edsl/auto/StageLabelQuestions.py +125 -125
edsl/auto/StagePersona.py +61 -61
edsl/auto/StagePersonaDimensionValueRanges.py +88 -88
edsl/auto/StagePersonaDimensionValues.py +74 -74
edsl/auto/StagePersonaDimensions.py +69 -69
edsl/auto/StageQuestions.py +73 -73
edsl/auto/SurveyCreatorPipeline.py +21 -21
edsl/auto/utilities.py +224 -224
edsl/base/Base.py +279 -289
edsl/config.py +157 -149
edsl/conversation/Conversation.py +290 -290
edsl/conversation/car_buying.py +58 -58
edsl/conversation/chips.py +95 -95
edsl/conversation/mug_negotiation.py +81 -81
edsl/conversation/next_speaker_utilities.py +93 -93
edsl/coop/PriceFetcher.py +54 -54
edsl/coop/__init__.py +2 -2
edsl/coop/coop.py +1028 -958
edsl/coop/utils.py +131 -131
edsl/data/Cache.py +555 -527
edsl/data/CacheEntry.py +233 -228
edsl/data/CacheHandler.py +149 -149
edsl/data/RemoteCacheSync.py +78 -97
edsl/data/SQLiteDict.py +292 -292
edsl/data/__init__.py +4 -4
edsl/data/orm.py +10 -10
edsl/data_transfer_models.py +73 -73
edsl/enums.py +175 -173
edsl/exceptions/BaseException.py +21 -21
edsl/exceptions/__init__.py +54 -54
edsl/exceptions/agents.py +42 -38
edsl/exceptions/cache.py +5 -0
edsl/exceptions/configuration.py +16 -16
edsl/exceptions/coop.py +10 -10
edsl/exceptions/data.py +14 -14
edsl/exceptions/general.py +34 -34
edsl/exceptions/jobs.py +33 -33
edsl/exceptions/language_models.py +63 -63
edsl/exceptions/prompts.py +15 -15
edsl/exceptions/questions.py +91 -91
edsl/exceptions/results.py +29 -29
edsl/exceptions/scenarios.py +22 -22
edsl/exceptions/surveys.py +37 -37
edsl/inference_services/AnthropicService.py +87 -87
edsl/inference_services/AwsBedrock.py +120 -120
edsl/inference_services/AzureAI.py +217 -217
edsl/inference_services/DeepInfraService.py +18 -18
edsl/inference_services/GoogleService.py +148 -156
edsl/inference_services/GroqService.py +20 -20
edsl/inference_services/InferenceServiceABC.py +147 -147
edsl/inference_services/InferenceServicesCollection.py +97 -97
edsl/inference_services/MistralAIService.py +123 -123
edsl/inference_services/OllamaService.py +18 -18
edsl/inference_services/OpenAIService.py +224 -224
edsl/inference_services/PerplexityService.py +163 -0
edsl/inference_services/TestService.py +89 -89
edsl/inference_services/TogetherAIService.py +170 -170
edsl/inference_services/models_available_cache.py +118 -118
edsl/inference_services/rate_limits_cache.py +25 -25
edsl/inference_services/registry.py +41 -39
edsl/inference_services/write_available.py +10 -10
edsl/jobs/Answers.py +56 -56
edsl/jobs/Jobs.py +898 -1347
edsl/jobs/JobsChecks.py +147 -0
edsl/jobs/JobsPrompts.py +268 -0
edsl/jobs/JobsRemoteInferenceHandler.py +239 -0
edsl/jobs/__init__.py +1 -1
edsl/jobs/buckets/BucketCollection.py +63 -63
edsl/jobs/buckets/ModelBuckets.py +65 -65
edsl/jobs/buckets/TokenBucket.py +251 -248
edsl/jobs/interviews/Interview.py +661 -661
edsl/jobs/interviews/InterviewExceptionCollection.py +99 -99
edsl/jobs/interviews/InterviewExceptionEntry.py +186 -186
edsl/jobs/interviews/InterviewStatistic.py +63 -63
edsl/jobs/interviews/InterviewStatisticsCollection.py +25 -25
edsl/jobs/interviews/InterviewStatusDictionary.py +78 -78
edsl/jobs/interviews/InterviewStatusLog.py +92 -92
edsl/jobs/interviews/ReportErrors.py +66 -66
edsl/jobs/interviews/interview_status_enum.py +9 -9
edsl/jobs/runners/JobsRunnerAsyncio.py +466 -338
edsl/jobs/runners/JobsRunnerStatus.py +330 -332
edsl/jobs/tasks/QuestionTaskCreator.py +242 -242
edsl/jobs/tasks/TaskCreators.py +64 -64
edsl/jobs/tasks/TaskHistory.py +450 -442
edsl/jobs/tasks/TaskStatusLog.py +23 -23
edsl/jobs/tasks/task_status_enum.py +163 -163
edsl/jobs/tokens/InterviewTokenUsage.py +27 -27
edsl/jobs/tokens/TokenUsage.py +34 -34
edsl/language_models/KeyLookup.py +30 -30
edsl/language_models/LanguageModel.py +668 -706
edsl/language_models/ModelList.py +155 -102
edsl/language_models/RegisterLanguageModelsMeta.py +184 -184
edsl/language_models/__init__.py +3 -3
edsl/language_models/fake_openai_call.py +15 -15
edsl/language_models/fake_openai_service.py +61 -61
edsl/language_models/registry.py +190 -137
edsl/language_models/repair.py +156 -156
edsl/language_models/unused/ReplicateBase.py +83 -83
edsl/language_models/utilities.py +64 -64
edsl/notebooks/Notebook.py +258 -259
edsl/notebooks/__init__.py +1 -1
edsl/prompts/Prompt.py +362 -357
edsl/prompts/__init__.py +2 -2
edsl/questions/AnswerValidatorMixin.py +289 -289
edsl/questions/QuestionBase.py +664 -656
edsl/questions/QuestionBaseGenMixin.py +161 -161
edsl/questions/QuestionBasePromptsMixin.py +217 -234
edsl/questions/QuestionBudget.py +227 -227
edsl/questions/QuestionCheckBox.py +359 -359
edsl/questions/QuestionExtract.py +182 -183
edsl/questions/QuestionFreeText.py +114 -114
edsl/questions/QuestionFunctional.py +166 -159
edsl/questions/QuestionList.py +231 -231
edsl/questions/QuestionMultipleChoice.py +286 -286
edsl/questions/QuestionNumerical.py +153 -153
edsl/questions/QuestionRank.py +324 -324
edsl/questions/Quick.py +41 -41
edsl/questions/RegisterQuestionsMeta.py +71 -71
edsl/questions/ResponseValidatorABC.py +174 -174
edsl/questions/SimpleAskMixin.py +73 -73
edsl/questions/__init__.py +26 -26
edsl/questions/compose_questions.py +98 -98
edsl/questions/decorators.py +21 -21
edsl/questions/derived/QuestionLikertFive.py +76 -76
edsl/questions/derived/QuestionLinearScale.py +87 -87
edsl/questions/derived/QuestionTopK.py +93 -91
edsl/questions/derived/QuestionYesNo.py +82 -82
edsl/questions/descriptors.py +413 -413
edsl/questions/prompt_templates/question_budget.jinja +13 -13
edsl/questions/prompt_templates/question_checkbox.jinja +32 -32
edsl/questions/prompt_templates/question_extract.jinja +11 -11
edsl/questions/prompt_templates/question_free_text.jinja +3 -3
edsl/questions/prompt_templates/question_linear_scale.jinja +11 -11
edsl/questions/prompt_templates/question_list.jinja +17 -17
edsl/questions/prompt_templates/question_multiple_choice.jinja +33 -33
edsl/questions/prompt_templates/question_numerical.jinja +36 -36
edsl/questions/question_registry.py +177 -147
edsl/questions/settings.py +12 -12
edsl/questions/templates/budget/answering_instructions.jinja +7 -7
edsl/questions/templates/budget/question_presentation.jinja +7 -7
edsl/questions/templates/checkbox/answering_instructions.jinja +10 -10
edsl/questions/templates/checkbox/question_presentation.jinja +22 -22
edsl/questions/templates/extract/answering_instructions.jinja +7 -7
edsl/questions/templates/likert_five/answering_instructions.jinja +10 -10
edsl/questions/templates/likert_five/question_presentation.jinja +11 -11
edsl/questions/templates/linear_scale/answering_instructions.jinja +5 -5
edsl/questions/templates/linear_scale/question_presentation.jinja +5 -5
edsl/questions/templates/list/answering_instructions.jinja +3 -3
edsl/questions/templates/list/question_presentation.jinja +5 -5
edsl/questions/templates/multiple_choice/answering_instructions.jinja +9 -9
edsl/questions/templates/multiple_choice/question_presentation.jinja +11 -11
edsl/questions/templates/numerical/answering_instructions.jinja +6 -6
edsl/questions/templates/numerical/question_presentation.jinja +6 -6
edsl/questions/templates/rank/answering_instructions.jinja +11 -11
edsl/questions/templates/rank/question_presentation.jinja +15 -15
edsl/questions/templates/top_k/answering_instructions.jinja +8 -8
edsl/questions/templates/top_k/question_presentation.jinja +22 -22
edsl/questions/templates/yes_no/answering_instructions.jinja +6 -6
edsl/questions/templates/yes_no/question_presentation.jinja +11 -11
edsl/results/CSSParameterizer.py +108 -0
edsl/results/Dataset.py +424 -293
edsl/results/DatasetExportMixin.py +731 -717
edsl/results/DatasetTree.py +275 -145
edsl/results/Result.py +465 -450
edsl/results/Results.py +1165 -1071
edsl/results/ResultsDBMixin.py +238 -238
edsl/results/ResultsExportMixin.py +43 -43
edsl/results/ResultsFetchMixin.py +33 -33
edsl/results/ResultsGGMixin.py +121 -121
edsl/results/ResultsToolsMixin.py +98 -98
edsl/results/Selector.py +135 -135
edsl/results/TableDisplay.py +198 -0
edsl/results/__init__.py +2 -2
edsl/results/table_display.css +78 -0
edsl/results/tree_explore.py +115 -115
edsl/scenarios/FileStore.py +632 -458
edsl/scenarios/Scenario.py +601 -546
edsl/scenarios/ScenarioHtmlMixin.py +64 -64
edsl/scenarios/ScenarioJoin.py +127 -0
edsl/scenarios/ScenarioList.py +1287 -1112
edsl/scenarios/ScenarioListExportMixin.py +52 -52
edsl/scenarios/ScenarioListPdfMixin.py +261 -261
edsl/scenarios/__init__.py +4 -4
edsl/shared.py +1 -1
edsl/study/ObjectEntry.py +173 -173
edsl/study/ProofOfWork.py +113 -113
edsl/study/SnapShot.py +80 -80
edsl/study/Study.py +528 -528
edsl/study/__init__.py +4 -4
edsl/surveys/DAG.py +148 -148
edsl/surveys/Memory.py +31 -31
edsl/surveys/MemoryPlan.py +244 -244
edsl/surveys/Rule.py +326 -330
edsl/surveys/RuleCollection.py +387 -387
edsl/surveys/Survey.py +1801 -1795
edsl/surveys/SurveyCSS.py +261 -261
edsl/surveys/SurveyExportMixin.py +259 -259
edsl/surveys/SurveyFlowVisualizationMixin.py +179 -121
edsl/surveys/SurveyQualtricsImport.py +284 -284
edsl/surveys/__init__.py +3 -3
edsl/surveys/base.py +53 -53
edsl/surveys/descriptors.py +56 -56
edsl/surveys/instructions/ChangeInstruction.py +49 -47
edsl/surveys/instructions/Instruction.py +65 -51
edsl/surveys/instructions/InstructionCollection.py +77 -77
edsl/templates/error_reporting/base.html +23 -23
edsl/templates/error_reporting/exceptions_by_model.html +34 -34
edsl/templates/error_reporting/exceptions_by_question_name.html +16 -16
edsl/templates/error_reporting/exceptions_by_type.html +16 -16
edsl/templates/error_reporting/interview_details.html +115 -115
edsl/templates/error_reporting/interviews.html +19 -10
edsl/templates/error_reporting/overview.html +4 -4
edsl/templates/error_reporting/performance_plot.html +1 -1
edsl/templates/error_reporting/report.css +73 -73
edsl/templates/error_reporting/report.html +117 -117
edsl/templates/error_reporting/report.js +25 -25
edsl/tools/__init__.py +1 -1
edsl/tools/clusters.py +192 -192
edsl/tools/embeddings.py +27 -27
edsl/tools/embeddings_plotting.py +118 -118
edsl/tools/plotting.py +112 -112
edsl/tools/summarize.py +18 -18
edsl/utilities/SystemInfo.py +28 -28
edsl/utilities/__init__.py +22 -22
edsl/utilities/ast_utilities.py +25 -25
edsl/utilities/data/Registry.py +6 -6
edsl/utilities/data/__init__.py +1 -1
edsl/utilities/data/scooter_results.json +1 -1
edsl/utilities/decorators.py +77 -77
edsl/utilities/gcp_bucket/cloud_storage.py +96 -96
edsl/utilities/interface.py +627 -627
edsl/{conjure → utilities}/naming_utilities.py +263 -263
edsl/utilities/repair_functions.py +28 -28
edsl/utilities/restricted_python.py +70 -70
edsl/utilities/utilities.py +424 -409
{edsl-0.1.37.dev6.dist-info → edsl-0.1.38.dist-info}/LICENSE +21 -21
{edsl-0.1.37.dev6.dist-info → edsl-0.1.38.dist-info}/METADATA +2 -1
edsl-0.1.38.dist-info/RECORD +277 -0
edsl/conjure/AgentConstructionMixin.py +0 -160
edsl/conjure/Conjure.py +0 -62
edsl/conjure/InputData.py +0 -659
edsl/conjure/InputDataCSV.py +0 -48
edsl/conjure/InputDataMixinQuestionStats.py +0 -182
edsl/conjure/InputDataPyRead.py +0 -91
edsl/conjure/InputDataSPSS.py +0 -8
edsl/conjure/InputDataStata.py +0 -8
edsl/conjure/QuestionOptionMixin.py +0 -76
edsl/conjure/QuestionTypeMixin.py +0 -23
edsl/conjure/RawQuestion.py +0 -65
edsl/conjure/SurveyResponses.py +0 -7
edsl/conjure/__init__.py +0 -9
edsl/conjure/examples/placeholder.txt +0 -0
edsl/conjure/utilities.py +0 -201
edsl-0.1.37.dev6.dist-info/RECORD +0 -283
{edsl-0.1.37.dev6.dist-info → edsl-0.1.38.dist-info}/WHEEL +0 -0

edsl/inference_services/models_available_cache.py CHANGED Viewed

@@ -1,118 +1,118 @@
-models_available = {
-    "openai": [
-        "gpt-3.5-turbo-1106",
-        "gpt-4-0125-preview",
-        "gpt-4-turbo-preview",
-        "gpt-3.5-turbo-16k",
-        "gpt-4-1106-preview",
-        "gpt-4-turbo-2024-04-09",
-        "gpt-3.5-turbo-16k-0613",
-        "gpt-4o-2024-05-13",
-        "gpt-4-turbo",
-        "gpt-3.5-turbo-0613",
-        "gpt-4",
-        "gpt-4-0613",
-        "gpt-3.5-turbo-0125",
-        "gpt-3.5-turbo",
-        "gpt-3.5-turbo-instruct",
-        "gpt-3.5-turbo-instruct-0914",
-        "gpt-3.5-turbo-0301",
-        "gpt-4-vision-preview",
-        "gpt-4-1106-vision-preview",
-        "gpt-4o",
-    ],
-    "anthropic": [
-        "claude-3-5-sonnet-20240620",
-        "claude-3-opus-20240229",
-        "claude-3-sonnet-20240229",
-        "claude-3-haiku-20240307",
-    ],
-    "deep_infra": [
-        "meta-llama/Llama-2-13b-chat-hf",
-        "mistralai/Mixtral-8x22B-Instruct-v0.1",
-        "Gryphe/MythoMax-L2-13b-turbo",
-        "mistralai/Mistral-7B-Instruct-v0.1",
-        "Austism/chronos-hermes-13b-v2",
-        "meta-llama/Llama-2-70b-chat-hf",
-        "mistralai/Mistral-7B-Instruct-v0.3",
-        "meta-llama/Llama-2-7b-chat-hf",
-        "Qwen/Qwen2-72B-Instruct",
-        "HuggingFaceH4/zephyr-orpo-141b-A35b-v0.1",
-        "cognitivecomputations/dolphin-2.6-mixtral-8x7b",
-        "bigcode/starcoder2-15b",
-        "microsoft/WizardLM-2-8x22B",
-        "codellama/CodeLlama-70b-Instruct-hf",
-        "Gryphe/MythoMax-L2-13b",
-        "microsoft/WizardLM-2-7B",
-        "01-ai/Yi-34B-Chat",
-        "bigcode/starcoder2-15b-instruct-v0.1",
-        "mistralai/Mixtral-8x7B-Instruct-v0.1",
-        "openchat/openchat-3.6-8b",
-        "meta-llama/Meta-Llama-3-8B-Instruct",
-        "microsoft/Phi-3-medium-4k-instruct",
-        "Phind/Phind-CodeLlama-34B-v2",
-        "google/codegemma-7b-it",
-        "mistralai/Mistral-7B-Instruct-v0.2",
-        "deepinfra/airoboros-70b",
-        "mistralai/Mixtral-8x22B-v0.1",
-        "llava-hf/llava-1.5-7b-hf",
-        "codellama/CodeLlama-34b-Instruct-hf",
-        "google/gemma-1.1-7b-it",
-        "lizpreciatior/lzlv_70b_fp16_hf",
-        "databricks/dbrx-instruct",
-        "nvidia/Nemotron-4-340B-Instruct",
-        "Qwen/Qwen2-7B-Instruct",
-        "meta-llama/Meta-Llama-3-70B-Instruct",
-        "openchat/openchat_3.5",
-    ],
-    "google": [
-        "gemini-1.0-pro",
-        "gemini-1.0-pro-001",
-        "gemini-1.0-pro-latest",
-        "gemini-1.0-pro-vision-latest",
-        "gemini-1.5-flash",
-        "gemini-1.5-flash-001",
-        "gemini-1.5-flash-001-tuning",
-        "gemini-1.5-flash-002",
-        "gemini-1.5-flash-8b",
-        "gemini-1.5-flash-8b-001",
-        "gemini-1.5-flash-8b-exp-0827",
-        "gemini-1.5-flash-8b-exp-0924",
-        "gemini-1.5-flash-8b-latest",
-        "gemini-1.5-flash-exp-0827",
-        "gemini-1.5-flash-latest",
-        "gemini-1.5-pro",
-        "gemini-1.5-pro-001",
-        "gemini-1.5-pro-002",
-        "gemini-1.5-pro-exp-0801",
-        "gemini-1.5-pro-exp-0827",
-        "gemini-1.5-pro-latest",
-        "gemini-pro",
-        "gemini-pro-vision",
-    ],
-    "bedrock": [
-        "amazon.titan-tg1-large",
-        "amazon.titan-text-lite-v1",
-        "amazon.titan-text-express-v1",
-        "anthropic.claude-instant-v1",
-        "anthropic.claude-v2:1",
-        "anthropic.claude-v2",
-        "anthropic.claude-3-sonnet-20240229-v1:0",
-        "anthropic.claude-3-haiku-20240307-v1:0",
-        "anthropic.claude-3-opus-20240229-v1:0",
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "cohere.command-text-v14",
-        "cohere.command-r-v1:0",
-        "cohere.command-r-plus-v1:0",
-        "cohere.command-light-text-v14",
-        "meta.llama3-8b-instruct-v1:0",
-        "meta.llama3-70b-instruct-v1:0",
-        "meta.llama3-1-8b-instruct-v1:0",
-        "meta.llama3-1-70b-instruct-v1:0",
-        "meta.llama3-1-405b-instruct-v1:0",
-        "mistral.mistral-7b-instruct-v0:2",
-        "mistral.mixtral-8x7b-instruct-v0:1",
-        "mistral.mistral-large-2402-v1:0",
-        "mistral.mistral-large-2407-v1:0",
-    ],
-}
+models_available = {
+    "openai": [
+        "gpt-3.5-turbo-1106",
+        "gpt-4-0125-preview",
+        "gpt-4-turbo-preview",
+        "gpt-3.5-turbo-16k",
+        "gpt-4-1106-preview",
+        "gpt-4-turbo-2024-04-09",
+        "gpt-3.5-turbo-16k-0613",
+        "gpt-4o-2024-05-13",
+        "gpt-4-turbo",
+        "gpt-3.5-turbo-0613",
+        "gpt-4",
+        "gpt-4-0613",
+        "gpt-3.5-turbo-0125",
+        "gpt-3.5-turbo",
+        "gpt-3.5-turbo-instruct",
+        "gpt-3.5-turbo-instruct-0914",
+        "gpt-3.5-turbo-0301",
+        "gpt-4-vision-preview",
+        "gpt-4-1106-vision-preview",
+        "gpt-4o",
+    ],
+    "anthropic": [
+        "claude-3-5-sonnet-20240620",
+        "claude-3-opus-20240229",
+        "claude-3-sonnet-20240229",
+        "claude-3-haiku-20240307",
+    ],
+    "deep_infra": [
+        "meta-llama/Llama-2-13b-chat-hf",
+        "mistralai/Mixtral-8x22B-Instruct-v0.1",
+        "Gryphe/MythoMax-L2-13b-turbo",
+        "mistralai/Mistral-7B-Instruct-v0.1",
+        "Austism/chronos-hermes-13b-v2",
+        "meta-llama/Llama-2-70b-chat-hf",
+        "mistralai/Mistral-7B-Instruct-v0.3",
+        "meta-llama/Llama-2-7b-chat-hf",
+        "Qwen/Qwen2-72B-Instruct",
+        "HuggingFaceH4/zephyr-orpo-141b-A35b-v0.1",
+        "cognitivecomputations/dolphin-2.6-mixtral-8x7b",
+        "bigcode/starcoder2-15b",
+        "microsoft/WizardLM-2-8x22B",
+        "codellama/CodeLlama-70b-Instruct-hf",
+        "Gryphe/MythoMax-L2-13b",
+        "microsoft/WizardLM-2-7B",
+        "01-ai/Yi-34B-Chat",
+        "bigcode/starcoder2-15b-instruct-v0.1",
+        "mistralai/Mixtral-8x7B-Instruct-v0.1",
+        "openchat/openchat-3.6-8b",
+        "meta-llama/Meta-Llama-3-8B-Instruct",
+        "microsoft/Phi-3-medium-4k-instruct",
+        "Phind/Phind-CodeLlama-34B-v2",
+        "google/codegemma-7b-it",
+        "mistralai/Mistral-7B-Instruct-v0.2",
+        "deepinfra/airoboros-70b",
+        "mistralai/Mixtral-8x22B-v0.1",
+        "llava-hf/llava-1.5-7b-hf",
+        "codellama/CodeLlama-34b-Instruct-hf",
+        "google/gemma-1.1-7b-it",
+        "lizpreciatior/lzlv_70b_fp16_hf",
+        "databricks/dbrx-instruct",
+        "nvidia/Nemotron-4-340B-Instruct",
+        "Qwen/Qwen2-7B-Instruct",
+        "meta-llama/Meta-Llama-3-70B-Instruct",
+        "openchat/openchat_3.5",
+    ],
+    "google": [
+        "gemini-1.0-pro",
+        "gemini-1.0-pro-001",
+        "gemini-1.0-pro-latest",
+        "gemini-1.0-pro-vision-latest",
+        "gemini-1.5-flash",
+        "gemini-1.5-flash-001",
+        "gemini-1.5-flash-001-tuning",
+        "gemini-1.5-flash-002",
+        "gemini-1.5-flash-8b",
+        "gemini-1.5-flash-8b-001",
+        "gemini-1.5-flash-8b-exp-0827",
+        "gemini-1.5-flash-8b-exp-0924",
+        "gemini-1.5-flash-8b-latest",
+        "gemini-1.5-flash-exp-0827",
+        "gemini-1.5-flash-latest",
+        "gemini-1.5-pro",
+        "gemini-1.5-pro-001",
+        "gemini-1.5-pro-002",
+        "gemini-1.5-pro-exp-0801",
+        "gemini-1.5-pro-exp-0827",
+        "gemini-1.5-pro-latest",
+        "gemini-pro",
+        "gemini-pro-vision",
+    ],
+    "bedrock": [
+        "amazon.titan-tg1-large",
+        "amazon.titan-text-lite-v1",
+        "amazon.titan-text-express-v1",
+        "anthropic.claude-instant-v1",
+        "anthropic.claude-v2:1",
+        "anthropic.claude-v2",
+        "anthropic.claude-3-sonnet-20240229-v1:0",
+        "anthropic.claude-3-haiku-20240307-v1:0",
+        "anthropic.claude-3-opus-20240229-v1:0",
+        "anthropic.claude-3-5-sonnet-20240620-v1:0",
+        "cohere.command-text-v14",
+        "cohere.command-r-v1:0",
+        "cohere.command-r-plus-v1:0",
+        "cohere.command-light-text-v14",
+        "meta.llama3-8b-instruct-v1:0",
+        "meta.llama3-70b-instruct-v1:0",
+        "meta.llama3-1-8b-instruct-v1:0",
+        "meta.llama3-1-70b-instruct-v1:0",
+        "meta.llama3-1-405b-instruct-v1:0",
+        "mistral.mistral-7b-instruct-v0:2",
+        "mistral.mixtral-8x7b-instruct-v0:1",
+        "mistral.mistral-large-2402-v1:0",
+        "mistral.mistral-large-2407-v1:0",
+    ],
+}

edsl/inference_services/rate_limits_cache.py CHANGED Viewed

@@ -1,25 +1,25 @@
-rate_limits = {
-    "openai": {
-        "date": "Tue, 02 Jul 2024 15:25:28 GMT",
-        "content-type": "application/json",
-        "transfer-encoding": "chunked",
-        "connection": "keep-alive",
-        "openai-organization": "user-wmu32omw8ulzzutk6mjhtqgk",
-        "openai-processing-ms": "760",
-        "openai-version": "2020-10-01",
-        "strict-transport-security": "max-age=31536000; includeSubDomains",
-        "x-ratelimit-limit-requests": "5000",
-        "x-ratelimit-limit-tokens": "600000",
-        "x-ratelimit-remaining-requests": "4999",
-        "x-ratelimit-remaining-tokens": "599978",
-        "x-ratelimit-reset-requests": "12ms",
-        "x-ratelimit-reset-tokens": "2ms",
-        "x-request-id": "req_971608f3647f660a0cd6537fbe21f69c",
-        "cf-cache-status": "DYNAMIC",
-        "set-cookie": "__cf_bm=MJfUk.0TXdjtiNkUUqlUO2gaN3wzm0iHsRQRWExy52o-1719933928-1.0.1.1-0xk9gFxy_mD1KzAsKQ_HpL2pdQJ90D4B5frt65xU.c9k9QwD0oTBILqXB0rykXNh04Pm1UB1.H_W9sFJVOcSaw; path=/; expires=Tue, 02-Jul-24 15:55:28 GMT; domain=.api.openai.com; HttpOnly; Secure; SameSite=None, _cfuvid=GbheRct_iw9_I8iLWmt5ZRcLYZ_QVnroCrAt8QMVsUg-1719933928399-0.0.1.1-604800000; path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None",
-        "server": "cloudflare",
-        "cf-ray": "89cfa6059bb9b68f-OTP",
-        "content-encoding": "gzip",
-        "alt-svc": 'h3=":443"; ma=86400',
-    }
-}
+rate_limits = {
+    "openai": {
+        "date": "Tue, 02 Jul 2024 15:25:28 GMT",
+        "content-type": "application/json",
+        "transfer-encoding": "chunked",
+        "connection": "keep-alive",
+        "openai-organization": "user-wmu32omw8ulzzutk6mjhtqgk",
+        "openai-processing-ms": "760",
+        "openai-version": "2020-10-01",
+        "strict-transport-security": "max-age=31536000; includeSubDomains",
+        "x-ratelimit-limit-requests": "5000",
+        "x-ratelimit-limit-tokens": "600000",
+        "x-ratelimit-remaining-requests": "4999",
+        "x-ratelimit-remaining-tokens": "599978",
+        "x-ratelimit-reset-requests": "12ms",
+        "x-ratelimit-reset-tokens": "2ms",
+        "x-request-id": "req_971608f3647f660a0cd6537fbe21f69c",
+        "cf-cache-status": "DYNAMIC",
+        "set-cookie": "__cf_bm=MJfUk.0TXdjtiNkUUqlUO2gaN3wzm0iHsRQRWExy52o-1719933928-1.0.1.1-0xk9gFxy_mD1KzAsKQ_HpL2pdQJ90D4B5frt65xU.c9k9QwD0oTBILqXB0rykXNh04Pm1UB1.H_W9sFJVOcSaw; path=/; expires=Tue, 02-Jul-24 15:55:28 GMT; domain=.api.openai.com; HttpOnly; Secure; SameSite=None, _cfuvid=GbheRct_iw9_I8iLWmt5ZRcLYZ_QVnroCrAt8QMVsUg-1719933928399-0.0.1.1-604800000; path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None",
+        "server": "cloudflare",
+        "cf-ray": "89cfa6059bb9b68f-OTP",
+        "content-encoding": "gzip",
+        "alt-svc": 'h3=":443"; ma=86400',
+    }
+}

edsl/inference_services/registry.py CHANGED Viewed

@@ -1,39 +1,41 @@
-from edsl.inference_services.InferenceServicesCollection import (
-    InferenceServicesCollection,
-)
-from edsl.inference_services.OpenAIService import OpenAIService
-from edsl.inference_services.AnthropicService import AnthropicService
-from edsl.inference_services.DeepInfraService import DeepInfraService
-from edsl.inference_services.GoogleService import GoogleService
-from edsl.inference_services.GroqService import GroqService
-from edsl.inference_services.AwsBedrock import AwsBedrockService
-from edsl.inference_services.AzureAI import AzureAIService
-from edsl.inference_services.OllamaService import OllamaService
-from edsl.inference_services.TestService import TestService
-from edsl.inference_services.TogetherAIService import TogetherAIService
-try:
-    from edsl.inference_services.MistralAIService import MistralAIService
-    mistral_available = True
-except Exception as e:
-    mistral_available = False
-services = [
-    OpenAIService,
-    AnthropicService,
-    DeepInfraService,
-    GoogleService,
-    GroqService,
-    AwsBedrockService,
-    AzureAIService,
-    OllamaService,
-    TestService,
-    TogetherAIService,
-]
-if mistral_available:
-    services.append(MistralAIService)
-default = InferenceServicesCollection(services)
+from edsl.inference_services.InferenceServicesCollection import (
+    InferenceServicesCollection,
+)
+from edsl.inference_services.OpenAIService import OpenAIService
+from edsl.inference_services.AnthropicService import AnthropicService
+from edsl.inference_services.DeepInfraService import DeepInfraService
+from edsl.inference_services.GoogleService import GoogleService
+from edsl.inference_services.GroqService import GroqService
+from edsl.inference_services.AwsBedrock import AwsBedrockService
+from edsl.inference_services.AzureAI import AzureAIService
+from edsl.inference_services.OllamaService import OllamaService
+from edsl.inference_services.TestService import TestService
+from edsl.inference_services.TogetherAIService import TogetherAIService
+from edsl.inference_services.PerplexityService import PerplexityService
+try:
+    from edsl.inference_services.MistralAIService import MistralAIService
+    mistral_available = True
+except Exception as e:
+    mistral_available = False
+services = [
+    OpenAIService,
+    AnthropicService,
+    DeepInfraService,
+    GoogleService,
+    GroqService,
+    AwsBedrockService,
+    AzureAIService,
+    OllamaService,
+    TestService,
+    TogetherAIService,
+    PerplexityService,
+]
+if mistral_available:
+    services.append(MistralAIService)
+default = InferenceServicesCollection(services)

edsl/inference_services/write_available.py CHANGED Viewed

@@ -1,10 +1,10 @@
-from edsl.inference_services.registry import default
-def write_available():
-    d = {}
-    for service in default.services:
-        d[service._inference_service_] = service.available()
-    with open("models_available_cache.py", "w") as f:
-        f.write(f"models_available = {d}")
+from edsl.inference_services.registry import default
+def write_available():
+    d = {}
+    for service in default.services:
+        d[service._inference_service_] = service.available()
+    with open("models_available_cache.py", "w") as f:
+        f.write(f"models_available = {d}")

edsl/jobs/Answers.py CHANGED Viewed

@@ -1,56 +1,56 @@
-"""This module contains the Answers class, which is a helper class to hold the answers to a survey."""
-from collections import UserDict
-from rich.table import Table
-from edsl.data_transfer_models import EDSLResultObjectInput
-class Answers(UserDict):
-    """Helper class to hold the answers to a survey."""
-    def add_answer(
-        self, response: EDSLResultObjectInput, question: "QuestionBase"
-    ) -> None:
-        """Add a response to the answers dictionary."""
-        answer = response.answer
-        comment = response.comment
-        generated_tokens = response.generated_tokens
-        # record the answer
-        if generated_tokens:
-            self[question.question_name + "_generated_tokens"] = generated_tokens
-        self[question.question_name] = answer
-        if comment:
-            self[question.question_name + "_comment"] = comment
-    def replace_missing_answers_with_none(self, survey) -> None:
-        """Replace missing answers with None. Answers can be missing if the agent skips a question."""
-        for question_name in survey.question_names:
-            if question_name not in self:
-                self[question_name] = None
-    def to_dict(self):
-        """Return a dictionary of the answers."""
-        return self.data
-    @classmethod
-    def from_dict(cls, d):
-        """Return an Answers object from a dictionary."""
-        return cls(d)
-    def rich_print(self):
-        """Display an object as a table."""
-        table = Table(title="Answers")
-        table.add_column("Attribute", style="bold")
-        table.add_column("Value")
-        to_display = self
-        for attr_name, attr_value in to_display.items():
-            table.add_row(attr_name, repr(attr_value))
-        return table
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
+"""This module contains the Answers class, which is a helper class to hold the answers to a survey."""
+from collections import UserDict
+from rich.table import Table
+from edsl.data_transfer_models import EDSLResultObjectInput
+class Answers(UserDict):
+    """Helper class to hold the answers to a survey."""
+    def add_answer(
+        self, response: EDSLResultObjectInput, question: "QuestionBase"
+    ) -> None:
+        """Add a response to the answers dictionary."""
+        answer = response.answer
+        comment = response.comment
+        generated_tokens = response.generated_tokens
+        # record the answer
+        if generated_tokens:
+            self[question.question_name + "_generated_tokens"] = generated_tokens
+        self[question.question_name] = answer
+        if comment:
+            self[question.question_name + "_comment"] = comment
+    def replace_missing_answers_with_none(self, survey) -> None:
+        """Replace missing answers with None. Answers can be missing if the agent skips a question."""
+        for question_name in survey.question_names:
+            if question_name not in self:
+                self[question_name] = None
+    def to_dict(self):
+        """Return a dictionary of the answers."""
+        return self.data
+    @classmethod
+    def from_dict(cls, d):
+        """Return an Answers object from a dictionary."""
+        return cls(d)
+    def rich_print(self):
+        """Display an object as a table."""
+        table = Table(title="Answers")
+        table.add_column("Attribute", style="bold")
+        table.add_column("Value")
+        to_display = self
+        for attr_name, attr_value in to_display.items():
+            table.add_row(attr_name, repr(attr_value))
+        return table
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()

edsl 0.1.37.dev6__py3-none-any.whl → 0.1.38__py3-none-any.whl

edsl 0.1.37.dev6py3-none-any.whl → 0.1.38py3-none-any.whl