edsl 0.1.39__py3-none-any.whl → 0.1.39.dev1__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 +116 -197
- edsl/__init__.py +7 -15
- edsl/__version__.py +1 -1
- edsl/agents/Agent.py +147 -351
- edsl/agents/AgentList.py +73 -211
- edsl/agents/Invigilator.py +50 -101
- edsl/agents/InvigilatorBase.py +70 -62
- edsl/agents/PromptConstructor.py +225 -143
- edsl/agents/__init__.py +1 -0
- edsl/agents/prompt_helpers.py +3 -3
- edsl/auto/AutoStudy.py +5 -18
- edsl/auto/StageBase.py +40 -53
- edsl/auto/StageQuestions.py +1 -2
- edsl/auto/utilities.py +6 -0
- edsl/config.py +2 -22
- edsl/conversation/car_buying.py +1 -2
- edsl/coop/PriceFetcher.py +1 -1
- edsl/coop/coop.py +47 -125
- edsl/coop/utils.py +14 -14
- edsl/data/Cache.py +27 -45
- edsl/data/CacheEntry.py +15 -12
- edsl/data/CacheHandler.py +12 -31
- edsl/data/RemoteCacheSync.py +46 -154
- edsl/data/__init__.py +3 -4
- edsl/data_transfer_models.py +1 -2
- edsl/enums.py +0 -27
- edsl/exceptions/__init__.py +50 -50
- edsl/exceptions/agents.py +0 -12
- edsl/exceptions/questions.py +6 -24
- edsl/exceptions/scenarios.py +0 -7
- edsl/inference_services/AnthropicService.py +19 -38
- edsl/inference_services/AwsBedrock.py +2 -0
- edsl/inference_services/AzureAI.py +2 -0
- edsl/inference_services/GoogleService.py +12 -7
- edsl/inference_services/InferenceServiceABC.py +85 -18
- edsl/inference_services/InferenceServicesCollection.py +79 -120
- edsl/inference_services/MistralAIService.py +3 -0
- edsl/inference_services/OpenAIService.py +35 -47
- edsl/inference_services/PerplexityService.py +3 -0
- edsl/inference_services/TestService.py +10 -11
- edsl/inference_services/TogetherAIService.py +3 -5
- edsl/jobs/Answers.py +14 -1
- edsl/jobs/Jobs.py +431 -356
- edsl/jobs/JobsChecks.py +10 -35
- edsl/jobs/JobsPrompts.py +4 -6
- edsl/jobs/JobsRemoteInferenceHandler.py +133 -205
- edsl/jobs/buckets/BucketCollection.py +3 -44
- edsl/jobs/buckets/TokenBucket.py +21 -53
- edsl/jobs/interviews/Interview.py +408 -143
- edsl/jobs/runners/JobsRunnerAsyncio.py +403 -88
- edsl/jobs/runners/JobsRunnerStatus.py +165 -133
- edsl/jobs/tasks/QuestionTaskCreator.py +19 -21
- edsl/jobs/tasks/TaskHistory.py +18 -38
- edsl/jobs/tasks/task_status_enum.py +2 -0
- edsl/language_models/KeyLookup.py +30 -0
- edsl/language_models/LanguageModel.py +236 -194
- edsl/language_models/ModelList.py +19 -28
- edsl/language_models/__init__.py +2 -1
- edsl/language_models/registry.py +190 -0
- edsl/language_models/repair.py +2 -2
- edsl/language_models/unused/ReplicateBase.py +83 -0
- edsl/language_models/utilities.py +4 -5
- edsl/notebooks/Notebook.py +14 -19
- edsl/prompts/Prompt.py +39 -29
- edsl/questions/{answer_validator_mixin.py → AnswerValidatorMixin.py} +2 -47
- edsl/questions/QuestionBase.py +214 -68
- edsl/questions/{question_base_gen_mixin.py → QuestionBaseGenMixin.py} +50 -57
- edsl/questions/QuestionBasePromptsMixin.py +3 -7
- edsl/questions/QuestionBudget.py +1 -1
- edsl/questions/QuestionCheckBox.py +3 -3
- edsl/questions/QuestionExtract.py +7 -5
- edsl/questions/QuestionFreeText.py +3 -2
- edsl/questions/QuestionList.py +18 -10
- edsl/questions/QuestionMultipleChoice.py +23 -67
- edsl/questions/QuestionNumerical.py +4 -2
- edsl/questions/QuestionRank.py +17 -7
- edsl/questions/{response_validator_abc.py → ResponseValidatorABC.py} +26 -40
- edsl/questions/SimpleAskMixin.py +3 -4
- edsl/questions/__init__.py +1 -2
- edsl/questions/derived/QuestionLinearScale.py +3 -6
- edsl/questions/derived/QuestionTopK.py +1 -1
- edsl/questions/descriptors.py +3 -17
- edsl/questions/question_registry.py +1 -1
- edsl/results/CSSParameterizer.py +1 -1
- edsl/results/Dataset.py +7 -170
- edsl/results/DatasetExportMixin.py +305 -168
- edsl/results/DatasetTree.py +8 -28
- edsl/results/Result.py +206 -298
- edsl/results/Results.py +131 -149
- edsl/results/ResultsDBMixin.py +238 -0
- edsl/results/ResultsExportMixin.py +0 -2
- edsl/results/{results_selector.py → Selector.py} +13 -23
- edsl/results/TableDisplay.py +171 -98
- edsl/results/__init__.py +1 -1
- edsl/scenarios/FileStore.py +239 -150
- edsl/scenarios/Scenario.py +193 -90
- edsl/scenarios/ScenarioHtmlMixin.py +3 -4
- edsl/scenarios/{scenario_join.py → ScenarioJoin.py} +6 -10
- edsl/scenarios/ScenarioList.py +244 -415
- edsl/scenarios/ScenarioListExportMixin.py +7 -0
- edsl/scenarios/ScenarioListPdfMixin.py +37 -15
- edsl/scenarios/__init__.py +2 -1
- edsl/study/ObjectEntry.py +1 -1
- edsl/study/SnapShot.py +1 -1
- edsl/study/Study.py +12 -5
- edsl/surveys/Rule.py +4 -5
- edsl/surveys/RuleCollection.py +27 -25
- edsl/surveys/Survey.py +791 -270
- edsl/surveys/SurveyCSS.py +8 -20
- edsl/surveys/{SurveyFlowVisualization.py → SurveyFlowVisualizationMixin.py} +9 -11
- edsl/surveys/__init__.py +2 -4
- edsl/surveys/descriptors.py +2 -6
- edsl/surveys/instructions/ChangeInstruction.py +2 -1
- edsl/surveys/instructions/Instruction.py +13 -4
- edsl/surveys/instructions/InstructionCollection.py +6 -11
- edsl/templates/error_reporting/interview_details.html +1 -1
- edsl/templates/error_reporting/report.html +1 -1
- edsl/tools/plotting.py +1 -1
- edsl/utilities/utilities.py +23 -35
- {edsl-0.1.39.dist-info → edsl-0.1.39.dev1.dist-info}/METADATA +10 -12
- edsl-0.1.39.dev1.dist-info/RECORD +277 -0
- {edsl-0.1.39.dist-info → edsl-0.1.39.dev1.dist-info}/WHEEL +1 -1
- edsl/agents/QuestionInstructionPromptBuilder.py +0 -128
- edsl/agents/QuestionTemplateReplacementsBuilder.py +0 -137
- edsl/agents/question_option_processor.py +0 -172
- edsl/coop/CoopFunctionsMixin.py +0 -15
- edsl/coop/ExpectedParrotKeyHandler.py +0 -125
- edsl/exceptions/inference_services.py +0 -5
- edsl/inference_services/AvailableModelCacheHandler.py +0 -184
- edsl/inference_services/AvailableModelFetcher.py +0 -215
- edsl/inference_services/ServiceAvailability.py +0 -135
- edsl/inference_services/data_structures.py +0 -134
- edsl/jobs/AnswerQuestionFunctionConstructor.py +0 -223
- edsl/jobs/FetchInvigilator.py +0 -47
- edsl/jobs/InterviewTaskManager.py +0 -98
- edsl/jobs/InterviewsConstructor.py +0 -50
- edsl/jobs/JobsComponentConstructor.py +0 -189
- edsl/jobs/JobsRemoteInferenceLogger.py +0 -239
- edsl/jobs/RequestTokenEstimator.py +0 -30
- edsl/jobs/async_interview_runner.py +0 -138
- edsl/jobs/buckets/TokenBucketAPI.py +0 -211
- edsl/jobs/buckets/TokenBucketClient.py +0 -191
- edsl/jobs/check_survey_scenario_compatibility.py +0 -85
- edsl/jobs/data_structures.py +0 -120
- edsl/jobs/decorators.py +0 -35
- edsl/jobs/jobs_status_enums.py +0 -9
- edsl/jobs/loggers/HTMLTableJobLogger.py +0 -304
- edsl/jobs/results_exceptions_handler.py +0 -98
- edsl/language_models/ComputeCost.py +0 -63
- edsl/language_models/PriceManager.py +0 -127
- edsl/language_models/RawResponseHandler.py +0 -106
- edsl/language_models/ServiceDataSources.py +0 -0
- edsl/language_models/key_management/KeyLookup.py +0 -63
- edsl/language_models/key_management/KeyLookupBuilder.py +0 -273
- edsl/language_models/key_management/KeyLookupCollection.py +0 -38
- edsl/language_models/key_management/__init__.py +0 -0
- edsl/language_models/key_management/models.py +0 -131
- edsl/language_models/model.py +0 -256
- edsl/notebooks/NotebookToLaTeX.py +0 -142
- edsl/questions/ExceptionExplainer.py +0 -77
- edsl/questions/HTMLQuestion.py +0 -103
- edsl/questions/QuestionMatrix.py +0 -265
- edsl/questions/data_structures.py +0 -20
- edsl/questions/loop_processor.py +0 -149
- edsl/questions/response_validator_factory.py +0 -34
- edsl/questions/templates/matrix/__init__.py +0 -1
- edsl/questions/templates/matrix/answering_instructions.jinja +0 -5
- edsl/questions/templates/matrix/question_presentation.jinja +0 -20
- edsl/results/MarkdownToDocx.py +0 -122
- edsl/results/MarkdownToPDF.py +0 -111
- edsl/results/TextEditor.py +0 -50
- edsl/results/file_exports.py +0 -252
- edsl/results/smart_objects.py +0 -96
- edsl/results/table_data_class.py +0 -12
- edsl/results/table_renderers.py +0 -118
- edsl/scenarios/ConstructDownloadLink.py +0 -109
- edsl/scenarios/DocumentChunker.py +0 -102
- edsl/scenarios/DocxScenario.py +0 -16
- edsl/scenarios/PdfExtractor.py +0 -40
- edsl/scenarios/directory_scanner.py +0 -96
- edsl/scenarios/file_methods.py +0 -85
- edsl/scenarios/handlers/__init__.py +0 -13
- edsl/scenarios/handlers/csv.py +0 -49
- edsl/scenarios/handlers/docx.py +0 -76
- edsl/scenarios/handlers/html.py +0 -37
- edsl/scenarios/handlers/json.py +0 -111
- edsl/scenarios/handlers/latex.py +0 -5
- edsl/scenarios/handlers/md.py +0 -51
- edsl/scenarios/handlers/pdf.py +0 -68
- edsl/scenarios/handlers/png.py +0 -39
- edsl/scenarios/handlers/pptx.py +0 -105
- edsl/scenarios/handlers/py.py +0 -294
- edsl/scenarios/handlers/sql.py +0 -313
- edsl/scenarios/handlers/sqlite.py +0 -149
- edsl/scenarios/handlers/txt.py +0 -33
- edsl/scenarios/scenario_selector.py +0 -156
- edsl/surveys/ConstructDAG.py +0 -92
- edsl/surveys/EditSurvey.py +0 -221
- edsl/surveys/InstructionHandler.py +0 -100
- edsl/surveys/MemoryManagement.py +0 -72
- edsl/surveys/RuleManager.py +0 -172
- edsl/surveys/Simulator.py +0 -75
- edsl/surveys/SurveyToApp.py +0 -141
- edsl/utilities/PrettyList.py +0 -56
- edsl/utilities/is_notebook.py +0 -18
- edsl/utilities/is_valid_variable_name.py +0 -11
- edsl/utilities/remove_edsl_version.py +0 -24
- edsl-0.1.39.dist-info/RECORD +0 -358
- /edsl/questions/{register_questions_meta.py → RegisterQuestionsMeta.py} +0 -0
- /edsl/results/{results_fetch_mixin.py → ResultsFetchMixin.py} +0 -0
- /edsl/results/{results_tools_mixin.py → ResultsToolsMixin.py} +0 -0
- {edsl-0.1.39.dist-info → edsl-0.1.39.dev1.dist-info}/LICENSE +0 -0
edsl/jobs/data_structures.py
DELETED
@@ -1,120 +0,0 @@
|
|
1
|
-
from typing import Optional, Literal
|
2
|
-
from dataclasses import dataclass, asdict
|
3
|
-
|
4
|
-
# from edsl.data_transfer_models import VisibilityType
|
5
|
-
from edsl.data.Cache import Cache
|
6
|
-
from edsl.jobs.buckets.BucketCollection import BucketCollection
|
7
|
-
from edsl.language_models.key_management.KeyLookup import KeyLookup
|
8
|
-
from edsl.jobs.runners.JobsRunnerStatus import JobsRunnerStatus
|
9
|
-
|
10
|
-
VisibilityType = Literal["private", "public", "unlisted"]
|
11
|
-
from edsl.Base import Base
|
12
|
-
|
13
|
-
|
14
|
-
@dataclass
|
15
|
-
class RunEnvironment:
|
16
|
-
cache: Optional[Cache] = None
|
17
|
-
bucket_collection: Optional[BucketCollection] = None
|
18
|
-
key_lookup: Optional[KeyLookup] = None
|
19
|
-
jobs_runner_status: Optional["JobsRunnerStatus"] = None
|
20
|
-
|
21
|
-
|
22
|
-
@dataclass
|
23
|
-
class RunParameters(Base):
|
24
|
-
n: int = 1
|
25
|
-
progress_bar: bool = False
|
26
|
-
stop_on_exception: bool = False
|
27
|
-
check_api_keys: bool = False
|
28
|
-
verbose: bool = True
|
29
|
-
print_exceptions: bool = True
|
30
|
-
remote_cache_description: Optional[str] = None
|
31
|
-
remote_inference_description: Optional[str] = None
|
32
|
-
remote_inference_results_visibility: Optional[VisibilityType] = "unlisted"
|
33
|
-
skip_retry: bool = False
|
34
|
-
raise_validation_errors: bool = False
|
35
|
-
disable_remote_cache: bool = False
|
36
|
-
disable_remote_inference: bool = False
|
37
|
-
job_uuid: Optional[str] = None
|
38
|
-
|
39
|
-
def to_dict(self, add_edsl_version=False) -> dict:
|
40
|
-
d = asdict(self)
|
41
|
-
if add_edsl_version:
|
42
|
-
from edsl import __version__
|
43
|
-
|
44
|
-
d["edsl_version"] = __version__
|
45
|
-
d["edsl_class_name"] = "RunConfig"
|
46
|
-
return d
|
47
|
-
|
48
|
-
@classmethod
|
49
|
-
def from_dict(cls, data: dict) -> "RunConfig":
|
50
|
-
return cls(**data)
|
51
|
-
|
52
|
-
def code(self):
|
53
|
-
return f"RunConfig(**{self.to_dict()})"
|
54
|
-
|
55
|
-
@classmethod
|
56
|
-
def example(cls) -> "RunConfig":
|
57
|
-
return cls()
|
58
|
-
|
59
|
-
|
60
|
-
@dataclass
|
61
|
-
class RunConfig:
|
62
|
-
environment: RunEnvironment
|
63
|
-
parameters: RunParameters
|
64
|
-
|
65
|
-
def add_environment(self, environment: RunEnvironment):
|
66
|
-
self.environment = environment
|
67
|
-
|
68
|
-
def add_bucket_collection(self, bucket_collection: BucketCollection):
|
69
|
-
self.environment.bucket_collection = bucket_collection
|
70
|
-
|
71
|
-
def add_cache(self, cache: Cache):
|
72
|
-
self.environment.cache = cache
|
73
|
-
|
74
|
-
def add_key_lookup(self, key_lookup: KeyLookup):
|
75
|
-
self.environment.key_lookup = key_lookup
|
76
|
-
|
77
|
-
|
78
|
-
"""This module contains the Answers class, which is a helper class to hold the answers to a survey."""
|
79
|
-
|
80
|
-
from collections import UserDict
|
81
|
-
from edsl.data_transfer_models import EDSLResultObjectInput
|
82
|
-
|
83
|
-
|
84
|
-
class Answers(UserDict):
|
85
|
-
"""Helper class to hold the answers to a survey."""
|
86
|
-
|
87
|
-
def add_answer(
|
88
|
-
self, response: EDSLResultObjectInput, question: "QuestionBase"
|
89
|
-
) -> None:
|
90
|
-
"""Add a response to the answers dictionary."""
|
91
|
-
answer = response.answer
|
92
|
-
comment = response.comment
|
93
|
-
generated_tokens = response.generated_tokens
|
94
|
-
# record the answer
|
95
|
-
if generated_tokens:
|
96
|
-
self[question.question_name + "_generated_tokens"] = generated_tokens
|
97
|
-
self[question.question_name] = answer
|
98
|
-
if comment:
|
99
|
-
self[question.question_name + "_comment"] = comment
|
100
|
-
|
101
|
-
def replace_missing_answers_with_none(self, survey: "Survey") -> None:
|
102
|
-
"""Replace missing answers with None. Answers can be missing if the agent skips a question."""
|
103
|
-
for question_name in survey.question_names:
|
104
|
-
if question_name not in self:
|
105
|
-
self[question_name] = None
|
106
|
-
|
107
|
-
def to_dict(self):
|
108
|
-
"""Return a dictionary of the answers."""
|
109
|
-
return self.data
|
110
|
-
|
111
|
-
@classmethod
|
112
|
-
def from_dict(cls, d):
|
113
|
-
"""Return an Answers object from a dictionary."""
|
114
|
-
return cls(d)
|
115
|
-
|
116
|
-
|
117
|
-
if __name__ == "__main__":
|
118
|
-
import doctest
|
119
|
-
|
120
|
-
doctest.testmod()
|
edsl/jobs/decorators.py
DELETED
@@ -1,35 +0,0 @@
|
|
1
|
-
from functools import wraps
|
2
|
-
from threading import RLock
|
3
|
-
import inspect
|
4
|
-
|
5
|
-
|
6
|
-
def synchronized_class(wrapped_class):
|
7
|
-
"""Class decorator that makes all methods thread-safe."""
|
8
|
-
|
9
|
-
# Add a lock to the class
|
10
|
-
setattr(wrapped_class, "_lock", RLock())
|
11
|
-
|
12
|
-
# Get all methods from the class
|
13
|
-
for name, method in inspect.getmembers(wrapped_class, inspect.isfunction):
|
14
|
-
# Skip magic methods except __getitem__, __setitem__, __delitem__
|
15
|
-
if name.startswith("__") and name not in [
|
16
|
-
"__getitem__",
|
17
|
-
"__setitem__",
|
18
|
-
"__delitem__",
|
19
|
-
]:
|
20
|
-
continue
|
21
|
-
|
22
|
-
# Create synchronized version of the method
|
23
|
-
def create_synchronized_method(method):
|
24
|
-
@wraps(method)
|
25
|
-
def synchronized_method(*args, **kwargs):
|
26
|
-
instance = args[0] # first arg is self
|
27
|
-
with instance._lock:
|
28
|
-
return method(*args, **kwargs)
|
29
|
-
|
30
|
-
return synchronized_method
|
31
|
-
|
32
|
-
# Replace the original method with synchronized version
|
33
|
-
setattr(wrapped_class, name, create_synchronized_method(method))
|
34
|
-
|
35
|
-
return wrapped_class
|
edsl/jobs/jobs_status_enums.py
DELETED
@@ -1,304 +0,0 @@
|
|
1
|
-
import re
|
2
|
-
import uuid
|
3
|
-
from datetime import datetime
|
4
|
-
from IPython.display import display, HTML
|
5
|
-
from edsl.jobs.JobsRemoteInferenceLogger import JobLogger
|
6
|
-
from edsl.jobs.jobs_status_enums import JobsStatus
|
7
|
-
|
8
|
-
|
9
|
-
class HTMLTableJobLogger(JobLogger):
|
10
|
-
def __init__(self, verbose=True, theme="auto", **kwargs):
|
11
|
-
super().__init__(verbose=verbose)
|
12
|
-
self.display_handle = display(HTML(""), display_id=True)
|
13
|
-
self.current_message = None
|
14
|
-
self.log_id = str(uuid.uuid4())
|
15
|
-
self.is_expanded = True
|
16
|
-
self.spinner_chars = ["◐", "◓", "◑", "◒"]
|
17
|
-
self.spinner_idx = 0
|
18
|
-
self.theme = theme # Can be "auto", "light", or "dark"
|
19
|
-
|
20
|
-
# Initialize CSS once when the logger is created
|
21
|
-
self._init_css()
|
22
|
-
|
23
|
-
def _init_css(self):
|
24
|
-
"""Initialize the CSS styles with enhanced theme support"""
|
25
|
-
css = """
|
26
|
-
<style>
|
27
|
-
/* Base theme variables */
|
28
|
-
:root {
|
29
|
-
--jl-bg-primary: #ffffff;
|
30
|
-
--jl-bg-secondary: #f5f5f5;
|
31
|
-
--jl-border-color: #e0e0e0;
|
32
|
-
--jl-text-primary: #24292e;
|
33
|
-
--jl-text-secondary: #586069;
|
34
|
-
--jl-link-color: #0366d6;
|
35
|
-
--jl-success-color: #28a745;
|
36
|
-
--jl-error-color: #d73a49;
|
37
|
-
--jl-header-bg: #f1f1f1;
|
38
|
-
}
|
39
|
-
|
40
|
-
/* Dark theme variables */
|
41
|
-
.theme-dark {
|
42
|
-
--jl-bg-primary: #1e1e1e;
|
43
|
-
--jl-bg-secondary: #252526;
|
44
|
-
--jl-border-color: #2d2d2d;
|
45
|
-
--jl-text-primary: #cccccc;
|
46
|
-
--jl-text-secondary: #999999;
|
47
|
-
--jl-link-color: #4e94ce;
|
48
|
-
--jl-success-color: #89d185;
|
49
|
-
--jl-error-color: #f14c4c;
|
50
|
-
--jl-header-bg: #333333;
|
51
|
-
}
|
52
|
-
|
53
|
-
/* High contrast theme variables */
|
54
|
-
.theme-high-contrast {
|
55
|
-
--jl-bg-primary: #000000;
|
56
|
-
--jl-bg-secondary: #1a1a1a;
|
57
|
-
--jl-border-color: #404040;
|
58
|
-
--jl-text-primary: #ffffff;
|
59
|
-
--jl-text-secondary: #cccccc;
|
60
|
-
--jl-link-color: #66b3ff;
|
61
|
-
--jl-success-color: #00ff00;
|
62
|
-
--jl-error-color: #ff0000;
|
63
|
-
--jl-header-bg: #262626;
|
64
|
-
}
|
65
|
-
|
66
|
-
.job-logger {
|
67
|
-
font-family: system-ui, -apple-system, sans-serif;
|
68
|
-
max-width: 800px;
|
69
|
-
margin: 10px 0;
|
70
|
-
color: var(--jl-text-primary);
|
71
|
-
box-shadow: 0 1px 3px rgba(0,0,0,0.12);
|
72
|
-
border-radius: 4px;
|
73
|
-
overflow: hidden;
|
74
|
-
}
|
75
|
-
|
76
|
-
.job-logger-header {
|
77
|
-
padding: 12px 16px;
|
78
|
-
background: var(--jl-header-bg);
|
79
|
-
border: none;
|
80
|
-
border-radius: 4px 4px 0 0;
|
81
|
-
cursor: pointer;
|
82
|
-
color: var(--jl-text-primary);
|
83
|
-
user-select: none;
|
84
|
-
font-weight: 500;
|
85
|
-
letter-spacing: 0.3px;
|
86
|
-
display: flex;
|
87
|
-
justify-content: space-between;
|
88
|
-
align-items: center;
|
89
|
-
}
|
90
|
-
|
91
|
-
.theme-select {
|
92
|
-
padding: 4px 8px;
|
93
|
-
border-radius: 4px;
|
94
|
-
border: 1px solid var(--jl-border-color);
|
95
|
-
background: var(--jl-bg-primary);
|
96
|
-
color: var(--jl-text-primary);
|
97
|
-
font-size: 0.9em;
|
98
|
-
}
|
99
|
-
|
100
|
-
.job-logger-table {
|
101
|
-
width: 100%;
|
102
|
-
border-collapse: separate;
|
103
|
-
border-spacing: 0;
|
104
|
-
background: var(--jl-bg-primary);
|
105
|
-
border: 1px solid var(--jl-border-color);
|
106
|
-
margin-top: -1px;
|
107
|
-
}
|
108
|
-
|
109
|
-
.job-logger-cell {
|
110
|
-
padding: 12px 16px;
|
111
|
-
border-bottom: 1px solid var(--jl-border-color);
|
112
|
-
line-height: 1.4;
|
113
|
-
}
|
114
|
-
|
115
|
-
.job-logger-label {
|
116
|
-
font-weight: 500;
|
117
|
-
color: var(--jl-text-primary);
|
118
|
-
width: 25%;
|
119
|
-
background: var(--jl-bg-secondary);
|
120
|
-
}
|
121
|
-
|
122
|
-
.job-logger-value {
|
123
|
-
color: var(--jl-text-secondary);
|
124
|
-
word-break: break-word;
|
125
|
-
}
|
126
|
-
|
127
|
-
.job-logger-status {
|
128
|
-
margin: 0;
|
129
|
-
padding: 12px 16px;
|
130
|
-
background-color: var(--jl-bg-secondary);
|
131
|
-
border: 1px solid var(--jl-border-color);
|
132
|
-
border-top: none;
|
133
|
-
border-radius: 0 0 4px 4px;
|
134
|
-
color: var(--jl-text-primary);
|
135
|
-
font-size: 0.95em;
|
136
|
-
}
|
137
|
-
</style>
|
138
|
-
|
139
|
-
<script>
|
140
|
-
class ThemeManager {
|
141
|
-
constructor(logId, initialTheme = 'auto') {
|
142
|
-
this.logId = logId;
|
143
|
-
this.currentTheme = initialTheme;
|
144
|
-
this.darkModeMediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
|
145
|
-
this.init();
|
146
|
-
}
|
147
|
-
|
148
|
-
init() {
|
149
|
-
this.setupThemeSwitcher();
|
150
|
-
this.updateTheme(this.currentTheme);
|
151
|
-
|
152
|
-
this.darkModeMediaQuery.addListener(() => {
|
153
|
-
if (this.currentTheme === 'auto') {
|
154
|
-
this.updateTheme('auto');
|
155
|
-
}
|
156
|
-
});
|
157
|
-
}
|
158
|
-
|
159
|
-
setupThemeSwitcher() {
|
160
|
-
const logger = document.querySelector(`#logger-${this.logId}`);
|
161
|
-
if (!logger) return;
|
162
|
-
|
163
|
-
const switcher = document.createElement('div');
|
164
|
-
switcher.className = 'theme-switcher';
|
165
|
-
switcher.innerHTML = `
|
166
|
-
<select id="theme-select-${this.logId}" class="theme-select">
|
167
|
-
<option value="auto">Auto</option>
|
168
|
-
<option value="light">Light</option>
|
169
|
-
<option value="dark">Dark</option>
|
170
|
-
<option value="high-contrast">High Contrast</option>
|
171
|
-
</select>
|
172
|
-
`;
|
173
|
-
|
174
|
-
const header = logger.querySelector('.job-logger-header');
|
175
|
-
header.appendChild(switcher);
|
176
|
-
|
177
|
-
const select = switcher.querySelector('select');
|
178
|
-
select.value = this.currentTheme;
|
179
|
-
select.addEventListener('change', (e) => {
|
180
|
-
this.updateTheme(e.target.value);
|
181
|
-
});
|
182
|
-
}
|
183
|
-
|
184
|
-
updateTheme(theme) {
|
185
|
-
const logger = document.querySelector(`#logger-${this.logId}`);
|
186
|
-
if (!logger) return;
|
187
|
-
|
188
|
-
this.currentTheme = theme;
|
189
|
-
|
190
|
-
logger.classList.remove('theme-light', 'theme-dark', 'theme-high-contrast');
|
191
|
-
|
192
|
-
if (theme === 'auto') {
|
193
|
-
const isDark = this.darkModeMediaQuery.matches;
|
194
|
-
logger.classList.add(isDark ? 'theme-dark' : 'theme-light');
|
195
|
-
} else {
|
196
|
-
logger.classList.add(`theme-${theme}`);
|
197
|
-
}
|
198
|
-
|
199
|
-
try {
|
200
|
-
localStorage.setItem('jobLoggerTheme', theme);
|
201
|
-
} catch (e) {
|
202
|
-
console.warn('Unable to save theme preference:', e);
|
203
|
-
}
|
204
|
-
}
|
205
|
-
}
|
206
|
-
|
207
|
-
window.initThemeManager = (logId, initialTheme) => {
|
208
|
-
new ThemeManager(logId, initialTheme);
|
209
|
-
};
|
210
|
-
</script>
|
211
|
-
"""
|
212
|
-
|
213
|
-
init_script = f"""
|
214
|
-
<script>
|
215
|
-
document.addEventListener('DOMContentLoaded', () => {{
|
216
|
-
window.initThemeManager('{self.log_id}', '{self.theme}');
|
217
|
-
}});
|
218
|
-
</script>
|
219
|
-
"""
|
220
|
-
|
221
|
-
display(HTML(css + init_script))
|
222
|
-
|
223
|
-
def _get_table_row(self, key: str, value: str) -> str:
|
224
|
-
"""Generate a table row with key-value pair"""
|
225
|
-
return f"""
|
226
|
-
<tr>
|
227
|
-
<td class="job-logger-cell job-logger-label">{key}</td>
|
228
|
-
<td class="job-logger-cell job-logger-value">{value if value else 'None'}</td>
|
229
|
-
</tr>
|
230
|
-
"""
|
231
|
-
|
232
|
-
def _linkify(self, text: str) -> str:
|
233
|
-
"""Convert URLs in text to clickable links"""
|
234
|
-
url_pattern = r'(https?://[^\s<>"]+|www\.[^\s<>"]+)'
|
235
|
-
return re.sub(
|
236
|
-
url_pattern,
|
237
|
-
r'<a href="\1" target="_blank" class="job-logger-link">\1</a>',
|
238
|
-
text,
|
239
|
-
)
|
240
|
-
|
241
|
-
def _get_spinner(self, status: JobsStatus) -> str:
|
242
|
-
"""Get the current spinner frame if status is running"""
|
243
|
-
if status == JobsStatus.RUNNING:
|
244
|
-
spinner = self.spinner_chars[self.spinner_idx]
|
245
|
-
self.spinner_idx = (self.spinner_idx + 1) % len(self.spinner_chars)
|
246
|
-
return f'<span style="margin-right: 8px;">{spinner}</span>'
|
247
|
-
elif status == JobsStatus.COMPLETED:
|
248
|
-
return (
|
249
|
-
'<span style="margin-right: 8px;" class="job-logger-success">✓</span>'
|
250
|
-
)
|
251
|
-
elif status == JobsStatus.FAILED:
|
252
|
-
return '<span style="margin-right: 8px;" class="job-logger-error">✗</span>'
|
253
|
-
return ""
|
254
|
-
|
255
|
-
def _get_html(self, status: JobsStatus = JobsStatus.RUNNING) -> str:
|
256
|
-
"""Generate the complete HTML display with theme support"""
|
257
|
-
info_rows = ""
|
258
|
-
for field, _ in self.jobs_info.__annotations__.items():
|
259
|
-
if field != "pretty_names":
|
260
|
-
value = getattr(self.jobs_info, field)
|
261
|
-
value = self._linkify(str(value)) if value else None
|
262
|
-
pretty_name = self.jobs_info.pretty_names.get(
|
263
|
-
field, field.replace("_", " ").title()
|
264
|
-
)
|
265
|
-
info_rows += self._get_table_row(pretty_name, value)
|
266
|
-
|
267
|
-
message_html = ""
|
268
|
-
if self.current_message:
|
269
|
-
spinner = self._get_spinner(status)
|
270
|
-
message_html = f"""
|
271
|
-
<div class="job-logger-status">
|
272
|
-
{spinner}<strong>Current Status:</strong> {self._linkify(self.current_message)}
|
273
|
-
</div>
|
274
|
-
"""
|
275
|
-
|
276
|
-
display_style = "block" if self.is_expanded else "none"
|
277
|
-
arrow = "▼" if self.is_expanded else "▶"
|
278
|
-
|
279
|
-
return f"""
|
280
|
-
<!-- #region Remove Inference Info -->
|
281
|
-
<div id="logger-{self.log_id}" class="job-logger">
|
282
|
-
<div class="job-logger-header">
|
283
|
-
<span>
|
284
|
-
<span id="arrow-{self.log_id}">{arrow}</span>
|
285
|
-
Job Status ({datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
|
286
|
-
</span>
|
287
|
-
</div>
|
288
|
-
<div id="content-{self.log_id}" style="display: {display_style};">
|
289
|
-
<table class="job-logger-table">
|
290
|
-
{info_rows}
|
291
|
-
</table>
|
292
|
-
{message_html}
|
293
|
-
</div>
|
294
|
-
</div>
|
295
|
-
<!-- # endregion -->
|
296
|
-
"""
|
297
|
-
|
298
|
-
def update(self, message: str, status: JobsStatus = JobsStatus.RUNNING):
|
299
|
-
"""Update the display with new message and current JobsInfo state"""
|
300
|
-
self.current_message = message
|
301
|
-
if self.verbose:
|
302
|
-
self.display_handle.update(HTML(self._get_html(status)))
|
303
|
-
else:
|
304
|
-
return None
|
@@ -1,98 +0,0 @@
|
|
1
|
-
from typing import Optional, TYPE_CHECKING, Protocol
|
2
|
-
import sys
|
3
|
-
from edsl.scenarios.FileStore import HTMLFileStore
|
4
|
-
from edsl.config import CONFIG
|
5
|
-
from edsl.coop.coop import Coop
|
6
|
-
|
7
|
-
|
8
|
-
class ResultsProtocol(Protocol):
|
9
|
-
"""Protocol defining the required interface for Results objects."""
|
10
|
-
|
11
|
-
@property
|
12
|
-
def has_unfixed_exceptions(self) -> bool: ...
|
13
|
-
|
14
|
-
@property
|
15
|
-
def task_history(self) -> "TaskHistoryProtocol": ...
|
16
|
-
|
17
|
-
|
18
|
-
class TaskHistoryProtocol(Protocol):
|
19
|
-
"""Protocol defining the required interface for TaskHistory objects."""
|
20
|
-
|
21
|
-
@property
|
22
|
-
def indices(self) -> list: ...
|
23
|
-
|
24
|
-
def html(self, cta: str, open_in_browser: bool, return_link: bool) -> str: ...
|
25
|
-
|
26
|
-
|
27
|
-
class RunParametersProtocol(Protocol):
|
28
|
-
"""Protocol defining the required interface for RunParameters objects."""
|
29
|
-
|
30
|
-
@property
|
31
|
-
def print_exceptions(self) -> bool: ...
|
32
|
-
|
33
|
-
|
34
|
-
class ResultsExceptionsHandler:
|
35
|
-
"""Handles exception reporting and display functionality."""
|
36
|
-
|
37
|
-
def __init__(
|
38
|
-
self, results: ResultsProtocol, parameters: RunParametersProtocol
|
39
|
-
) -> None:
|
40
|
-
self.results = results
|
41
|
-
self.parameters = parameters
|
42
|
-
|
43
|
-
self.open_in_browser = self._get_browser_setting()
|
44
|
-
self.remote_logging = self._get_remote_logging_setting()
|
45
|
-
|
46
|
-
def _get_browser_setting(self) -> bool:
|
47
|
-
"""Determine if exceptions should be opened in browser based on config."""
|
48
|
-
setting = CONFIG.get("EDSL_OPEN_EXCEPTION_REPORT_URL")
|
49
|
-
if setting == "True":
|
50
|
-
return True
|
51
|
-
elif setting == "False":
|
52
|
-
return False
|
53
|
-
else:
|
54
|
-
raise Exception(
|
55
|
-
"EDSL_OPEN_EXCEPTION_REPORT_URL must be either True or False"
|
56
|
-
)
|
57
|
-
|
58
|
-
def _get_remote_logging_setting(self) -> bool:
|
59
|
-
"""Get remote logging setting from coop."""
|
60
|
-
try:
|
61
|
-
coop = Coop()
|
62
|
-
return coop.edsl_settings["remote_logging"]
|
63
|
-
except Exception as e:
|
64
|
-
# print(e)
|
65
|
-
return False
|
66
|
-
|
67
|
-
def _generate_error_message(self, indices) -> str:
|
68
|
-
"""Generate appropriate error message based on number of exceptions."""
|
69
|
-
msg = f"Exceptions were raised in {len(indices)} interviews.\n"
|
70
|
-
if len(indices) > 5:
|
71
|
-
msg += f"Exceptions were raised in the following interviews: {indices}.\n"
|
72
|
-
return msg
|
73
|
-
|
74
|
-
def handle_exceptions(self) -> None:
|
75
|
-
"""Handle exceptions by printing messages and generating reports as needed."""
|
76
|
-
if not (
|
77
|
-
self.results.has_unfixed_exceptions and self.parameters.print_exceptions
|
78
|
-
):
|
79
|
-
return
|
80
|
-
|
81
|
-
# Print error message
|
82
|
-
error_msg = self._generate_error_message(self.results.task_history.indices)
|
83
|
-
print(error_msg, file=sys.stderr)
|
84
|
-
|
85
|
-
# Generate HTML report
|
86
|
-
filepath = self.results.task_history.html(
|
87
|
-
cta="Open report to see details.",
|
88
|
-
open_in_browser=self.open_in_browser,
|
89
|
-
return_link=True,
|
90
|
-
)
|
91
|
-
|
92
|
-
# Handle remote logging if enabled
|
93
|
-
if self.remote_logging:
|
94
|
-
filestore = HTMLFileStore(filepath)
|
95
|
-
coop_details = filestore.push(description="Error report")
|
96
|
-
print(coop_details)
|
97
|
-
|
98
|
-
print("Also see: https://docs.expectedparrot.com/en/latest/exceptions.html")
|
@@ -1,63 +0,0 @@
|
|
1
|
-
from typing import Any, Union
|
2
|
-
|
3
|
-
|
4
|
-
class ComputeCost:
|
5
|
-
def __init__(self, language_model: "LanguageModel"):
|
6
|
-
self.language_model = language_model
|
7
|
-
self._price_lookup = None
|
8
|
-
|
9
|
-
@property
|
10
|
-
def price_lookup(self):
|
11
|
-
if self._price_lookup is None:
|
12
|
-
from edsl.coop import Coop
|
13
|
-
|
14
|
-
c = Coop()
|
15
|
-
self._price_lookup = c.fetch_prices()
|
16
|
-
return self._price_lookup
|
17
|
-
|
18
|
-
def cost(self, raw_response: dict[str, Any]) -> Union[float, str]:
|
19
|
-
"""Return the dollar cost of a raw response."""
|
20
|
-
|
21
|
-
usage = self.get_usage_dict(raw_response)
|
22
|
-
from edsl.coop import Coop
|
23
|
-
|
24
|
-
c = Coop()
|
25
|
-
price_lookup = c.fetch_prices()
|
26
|
-
key = (self._inference_service_, self.model)
|
27
|
-
if key not in price_lookup:
|
28
|
-
return f"Could not find price for model {self.model} in the price lookup."
|
29
|
-
|
30
|
-
relevant_prices = price_lookup[key]
|
31
|
-
try:
|
32
|
-
input_tokens = int(usage[self.input_token_name])
|
33
|
-
output_tokens = int(usage[self.output_token_name])
|
34
|
-
except Exception as e:
|
35
|
-
return f"Could not fetch tokens from model response: {e}"
|
36
|
-
|
37
|
-
try:
|
38
|
-
inverse_output_price = relevant_prices["output"]["one_usd_buys"]
|
39
|
-
inverse_input_price = relevant_prices["input"]["one_usd_buys"]
|
40
|
-
except Exception as e:
|
41
|
-
if "output" not in relevant_prices:
|
42
|
-
return f"Could not fetch prices from {relevant_prices} - {e}; Missing 'output' key."
|
43
|
-
if "input" not in relevant_prices:
|
44
|
-
return f"Could not fetch prices from {relevant_prices} - {e}; Missing 'input' key."
|
45
|
-
return f"Could not fetch prices from {relevant_prices} - {e}"
|
46
|
-
|
47
|
-
if inverse_input_price == "infinity":
|
48
|
-
input_cost = 0
|
49
|
-
else:
|
50
|
-
try:
|
51
|
-
input_cost = input_tokens / float(inverse_input_price)
|
52
|
-
except Exception as e:
|
53
|
-
return f"Could not compute input price - {e}."
|
54
|
-
|
55
|
-
if inverse_output_price == "infinity":
|
56
|
-
output_cost = 0
|
57
|
-
else:
|
58
|
-
try:
|
59
|
-
output_cost = output_tokens / float(inverse_output_price)
|
60
|
-
except Exception as e:
|
61
|
-
return f"Could not compute output price - {e}"
|
62
|
-
|
63
|
-
return input_cost + output_cost
|