Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes #31

Merged
merged 2 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion qualibrate/orchestration/qualibration_orchestrator.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
ExecutionHistoryItem,
)
from qualibrate.outcome import Outcome
from qualibrate.parameters import RunnableParameters
from qualibrate.qualibration_graph import QualibrationGraph
from qualibrate.utils.naming import get_full_class_path

Expand All @@ -22,6 +23,7 @@ def __init__(
self._graph: Optional[QualibrationGraph] = None
self.parameters_class = create_model(
"OrchestratorParameters",
__base__=RunnableParameters,
**{ # type: ignore
name: (type(value), value) for name, value in parameters.items()
},
Expand All @@ -45,7 +47,10 @@ def cleanup(self) -> None:
self.final_outcomes = {}

def serialize(self) -> Mapping[str, Any]:
return {"__class__": get_full_class_path(self.__class__)}
return {
"__class__": get_full_class_path(self.__class__),
"parameters": self.parameters_class.serialize(),
}

def get_execution_history(self) -> ExecutionHistory:
return ExecutionHistory(items=self._execution_history)
Expand Down
10 changes: 8 additions & 2 deletions qualibrate/run_summary/base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import datetime
from typing import Dict, List, Optional, Sequence
from typing import Any, Dict, List, Mapping, Optional, Sequence

from pydantic import BaseModel, Field, computed_field
from pydantic import BaseModel, Field, computed_field, field_serializer

from qualibrate.outcome import Outcome
from qualibrate.parameters import RunnableParameters
Expand All @@ -26,3 +26,9 @@ class BaseRunSummary(BaseModel):
@computed_field
def run_duration(self) -> float:
return round((self.completed_at - self.created_at).total_seconds(), 3)

@field_serializer("parameters")
def serialize_parameters(
self, parameters: RunnableParameters
) -> Mapping[str, Any]:
return parameters.model_dump(serialize_as_any=True)