Skip to content

Update child function runs #1980

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.

Sign up for GitHub

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

Merged
ilbum merged 3 commits into from
Dec 18, 2025
Merged

Update child function runs #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ccbe9
Update child function runs
diptanu Dec 17, 2025
b541e71
chore: run make fmt
ilbum Dec 18, 2025
958c58f
Merge branch 'main' into update-child-function-runs
diptanu Dec 18, 2025
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
21 changes: 19 additions & 2 deletions server/src/http_objects_v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ pub struct FunctionRun {
pub status: FunctionRunStatus,
pub outcome: Option<FunctionRunOutcome>,
pub failure_reason: Option<FunctionRunFailureReason>,
pub child_function_run_id: Option<String>,
pub child_function_run_ids: Vec<String>,
pub application_version: String,
pub allocations: Vec<Allocation>,
pub created_at: u128,
Expand All @@ -219,6 +219,7 @@ impl FunctionRun {
pub fn from_data_model_function_run(
function_run: data_model::FunctionRun,
allocations: Vec<Allocation>,
child_function_run_ids: Vec<String>,
) -> Self {
let failure_reason = match &function_run.outcome {
Some(data_model::FunctionRunOutcome::Failure(reason)) => Some((*reason).into()),
Expand All @@ -230,7 +231,7 @@ impl FunctionRun {
application: function_run.application,
namespace: function_run.namespace,
outcome: function_run.outcome.map(|outcome| outcome.into()),
child_function_run_id: function_run.child_function_call.map(|id| id.to_string()),
child_function_run_ids,
failure_reason,
status: function_run.status.into(),
application_version: function_run.version,
Expand Down Expand Up @@ -314,15 +315,31 @@ impl Request {
.or_default()
.push(allocation.into());
}

let mut children_by_parent: HashMap<String, Vec<String>> = HashMap::new();
for function_call in ctx.function_calls.values() {
if let Some(parent_id) = &function_call.parent_function_call_id {
children_by_parent
.entry(parent_id.to_string())
.or_default()
.push(function_call.function_call_id.to_string());
}
}

let mut function_runs = vec![];
for function_run in ctx.function_runs.values() {
let allocations = allocs_by_function_call_id
.get(&function_run.id.to_string())
.cloned()
.unwrap_or_default();
let child_function_run_ids = children_by_parent
.get(&function_run.id.to_string())
.cloned()
.unwrap_or_default();
function_runs.push(FunctionRun::from_data_model_function_run(
function_run.clone(),
allocations,
child_function_run_ids,
));
}
let failure_reason = match &ctx.outcome {
Expand Down
4 changes: 3 additions & 1 deletion server/src/routes_internal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,9 @@ async fn list_unallocated_function_runs(
.filter_map(|unallocated_function_run_id| {
state.function_runs.get(unallocated_function_run_id)
})
.map(|t| http_objects_v1::FunctionRun::from_data_model_function_run(*t.clone(), vec![]))
.map(|t| {
http_objects_v1::FunctionRun::from_data_model_function_run(*t.clone(), vec![], vec![])
})
.collect();

Ok(Json(UnallocatedFunctionRuns {
Expand Down