Skip to content

Commit 8310b58

Browse files
committed
Merge branch 'master' into qa
2 parents bc8c383 + 0ecb6a4 commit 8310b58

117 files changed

Lines changed: 1665 additions & 11659 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

breadbox/breadbox/api/datasets.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ def get_feature_data(
160160
):
161161
"""
162162
Load data for each of the given dataset_id, feature_id pairs.
163-
This differs from the /get-features endpoint in the type of ID it
164-
accepts as input and the format of the response. This endpoint also
165-
does not do any filtering or grouping of feature values.
163+
This endpoint does not do any filtering or grouping of feature values.
166164
"""
167165
if len(dataset_ids) != len(feature_ids):
168166
raise UserError(

portal-backend/tests/depmap/data_explorer_2/context/test_custom_operators.py renamed to breadbox/tests/depmap_compute_embed/test_context.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
from depmap_compute.context import LegacyContextEvaluator
1+
from breadbox.depmap_compute_embed.context import ContextEvaluator
22

3+
# Our ContextEvaluator makes heavy use of an extension to the 3rd party library: json_logic
4+
# These tests ensure that behavior is continuing to work as expected.
35

46
def test_operator__not_in():
57
assert expressions_are_equivalent(
@@ -76,6 +78,6 @@ def expressions_are_equivalent(boolean_value, json_logic_expr):
7678
# These expressions don't use variables (just pure logic)
7779
var_name = "dummy variable"
7880
get_slice_data_mock = lambda _: {}
79-
result = LegacyContextEvaluator(context, get_slice_data_mock).is_match(var_name)
81+
result = ContextEvaluator(context, get_slice_data_mock).is_match(var_name) # pyright: ignore
8082

81-
return result == boolean_value
83+
return result == boolean_value

depmap-compute/README.md

Lines changed: 0 additions & 58 deletions
This file was deleted.

depmap-compute/depmap_compute/__init__.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)