11import logging
2- from typing import Any , Optional
2+ from typing import Optional
33
44from sqlalchemy import func , or_ , not_
55from sqlalchemy .orm import Session
@@ -112,7 +112,7 @@ def search_experiments(
112112 # Keep experiments without any score sets
113113 not_ (Experiment .score_sets .any ()),
114114 # Keep experiments where score sets exist but have no meta_analyzes_score_sets
115- Experiment .score_sets .any (not_ (ScoreSet .meta_analyzes_score_sets .any ()))
115+ Experiment .score_sets .any (not_ (ScoreSet .meta_analyzes_score_sets .any ())),
116116 )
117117 )
118118 else :
@@ -132,27 +132,27 @@ def search_experiments(
132132
133133
134134def enrich_experiment_with_num_score_sets (
135- item_update : Experiment , user_data : Optional [UserData ]
135+ item_update : Experiment , user_data : Optional [UserData ]
136136) -> experiment .Experiment :
137137 """
138138 Validate and update the number of score set in experiment. The superseded score set is excluded.
139139 Data structure: experiment{score_set_urns, num_score_sets}
140140 """
141141 filter_superseded_score_set_tails = [
142- find_superseded_score_set_tail (
143- score_set ,
144- Action .READ ,
145- user_data
146- ) for score_set in item_update .score_sets
142+ find_superseded_score_set_tail (score_set , Action .READ , user_data ) for score_set in item_update .score_sets
147143 ]
148- filtered_score_set_urns = sorted ({
149- score_set .urn
150- for score_set in filter_superseded_score_set_tails
151- if score_set is not None and score_set .urn is not None
152- })
153-
154- updated_experiment = experiment .Experiment .from_orm (item_update ).copy (update = {
155- "num_score_sets" : len (filtered_score_set_urns ),
156- "score_set_urns" : filtered_score_set_urns ,
157- })
144+ filtered_score_set_urns = sorted (
145+ {
146+ score_set .urn
147+ for score_set in filter_superseded_score_set_tails
148+ if score_set is not None and score_set .urn is not None
149+ }
150+ )
151+
152+ updated_experiment = experiment .Experiment .from_orm (item_update ).copy (
153+ update = {
154+ "num_score_sets" : len (filtered_score_set_urns ),
155+ "score_set_urns" : filtered_score_set_urns ,
156+ }
157+ )
158158 return updated_experiment
0 commit comments