Skip to content
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
4 changes: 1 addition & 3 deletions orchestrator/core/samplestore/csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,7 @@ def _entity_from_csv_entry(self, row: pd.Series) -> Entity:
"""

entity_id = row[self.sourceDescription.identifierColumn]
observedCalcValue, observedPropertyAndIdentifierColumns = (
self._observed_property_values_from_row(row)
)
observedCalcValue, _ = self._observed_property_values_from_row(row)

constitutive_property_values = []
for cp in self.sourceDescription.constitutiveProperties:
Expand Down
6 changes: 3 additions & 3 deletions orchestrator/modules/operators/orchestrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ def explore_operation_function_wrapper(
actuatorConfigurationIdentifiers=operation_info.actuatorConfigurationIdentifiers,
)

discoverySpace, operation, output = orchestrate_explore_operation(
_, _, output = orchestrate_explore_operation(
base_operation_configuration=base_operation_configuration,
project_context=discovery_space.project_context,
discovery_space=discovery_space,
Expand Down Expand Up @@ -827,7 +827,7 @@ def orchestrate(
base_operation_configuration.operation.module.operationType
== orchestrator.core.operation.config.DiscoveryOperationEnum.SEARCH
):
discoverySpace, operation, output = orchestrate_explore_operation(
_, _, output = orchestrate_explore_operation(
base_operation_configuration=base_operation_configuration,
project_context=project_context,
discovery_space=discovery_space,
Expand All @@ -839,7 +839,7 @@ def orchestrate(
"Implementing operations as classes is only supported for explore operations"
)
else:
discoverySpace, operation, output = orchestrate_operation_function(
_, _, output = orchestrate_operation_function(
base_operation_configuration=base_operation_configuration,
project_configuration=project_context,
discovery_space=discovery_space,
Expand Down
2 changes: 1 addition & 1 deletion orchestrator/schema/measurementspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def propertyWithIdentifierInSpace(self, identifier):
if identifier not in targetPropertyIdentifiers + observedPropertyIdentifiers:
# Check if its virtual
try:
prop, method = VirtualObservedProperty.parseIdentifier(identifier)
prop, _ = VirtualObservedProperty.parseIdentifier(identifier)
except ValueError:
validMetric = False
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def parse_arguments_and_execute_wrapper(
trainer_controller_args,
tune_config,
file_logger_config,
aim_config,
_aim_config,
quantized_lora_config,
fusedops_kernels_config,
attention_and_distributed_packing_config,
exp_metadata,
_exp_metadata,
) = tuning.sft_trainer.parse_arguments(parser, job_config)

if not os.path.isdir(training_args.output_dir):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ def parse_arguments_and_execute_wrapper(
trainer_controller_args,
tune_config,
file_logger_config,
aim_config,
_aim_config,
quantized_lora_config,
fusedops_kernels_config,
attention_and_distributed_packing_config,
mlflow_config,
exp_metadata,
_mlflow_config,
_exp_metadata,
) = tuning.sft_trainer.parse_arguments(parser, job_config)

if not os.path.isdir(training_args.output_dir):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ def parse_arguments_and_execute_wrapper(
trainer_controller_args,
tune_config,
file_logger_config,
aim_config,
_aim_config,
quantized_lora_config,
fusedops_kernels_config,
attention_and_distributed_packing_config,
fast_moe_config,
mlflow_config,
exp_metadata,
_mlflow_config,
_exp_metadata,
) = tuning.sft_trainer.parse_arguments(parser, job_config)

if not os.path.isdir(training_args.output_dir):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ def parse_arguments_and_execute_wrapper(
trainer_controller_args,
tune_config,
file_logger_config,
aim_config,
_aim_config,
hf_resource_scanner_config,
quantized_lora_config,
fusedops_kernels_config,
attention_and_distributed_packing_config,
fast_moe_config,
mlflow_config,
exp_metadata,
_mlflow_config,
_exp_metadata,
) = tuning.sft_trainer.parse_arguments(parser, job_config)

if not os.path.isdir(training_args.output_dir):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def parse_arguments_and_execute_wrapper(
attention_and_distributed_packing_config,
fast_moe_config,
tracker_configs,
exp_metadata,
_exp_metadata,
) = tuning.sft_trainer.parse_arguments(parser, job_config)

if not os.path.isdir(training_args.output_dir):
Expand Down
2 changes: 1 addition & 1 deletion plugins/operators/ray_tune/ado_ray_tune/samplers.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __init__(
self._entity_space = entity_space

if isinstance(space, dict) and space:
resolved_vars, domain_vars, grid_vars = parse_spec_vars(space)
_resolved_vars, domain_vars, grid_vars = parse_spec_vars(space)
if domain_vars or grid_vars:
self.logger.warning(
ray.tune.search.UNRESOLVED_SEARCH_SPACE.format(
Expand Down
4 changes: 2 additions & 2 deletions plugins/operators/ray_tune/ado_ray_tune/space_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def calculate_mutual_information(
) -> MutualInformationOutput:
"Returns a dict whose keys are data_columns and whose value is the MI for that column"

X, y, cluster_labels = get_clusters(
X, _y, cluster_labels = get_clusters(
df,
data_columns,
columns_to_mask,
Expand Down Expand Up @@ -286,7 +286,7 @@ def mi_diff_over_time(
all_below_threshold = False
change_in_ranks = True
if last_mi is not None:
diff_d, max_diff, max_diff_label = diff_of_values(last_mi, new_mi)
diff_d, max_diff, _max_diff_label = diff_of_values(last_mi, new_mi)
all_below_threshold = max_diff < threshold_diff
diff_ds.append(diff_d)
if diffs_over_time is None:
Expand Down
2 changes: 1 addition & 1 deletion tests/core/test_entitysource.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_csv_sample_store_description(
csv_sample_store_parameters,
):

location, params = csv_sample_store_parameters
_location, params = csv_sample_store_parameters
desc = CSVSampleStoreDescription.model_validate(params)

catalog = desc.catalog
Expand Down
2 changes: 1 addition & 1 deletion tests/metastore/test_resourcestore.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def test_add_invalid_resource(resource_store, operation_resource):
# Try adding the OperationResource config instead of the actual resource
with pytest.raises(
ValueError,
match="Cannot add resource, .*, that is not a subclass of ADOResource",
match=r"Cannot add resource, .*, that is not a subclass of ADOResource",
):
resource_store.addResource(resource=operation_resource.config)

Expand Down
8 changes: 4 additions & 4 deletions tests/samplestore/create/test_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
def test_resource_creation(
resource_generator_from_file, create_resources, sql_store, request
):
resource_kind, generator = resource_generator_from_file
_resource_kind, generator = resource_generator_from_file
resource = request.getfixturevalue(generator)()
create_resources(resources=[resource], db=sql_store)
assert sql_store.containsResourceWithIdentifier(identifier=resource.identifier)
Expand All @@ -19,19 +19,19 @@ def test_resource_creation(
def test_invalid_resource_creation(
resource_generator_from_file, create_resources, sql_store, request
):
resource_kind, generator = resource_generator_from_file
_resource_kind, generator = resource_generator_from_file
resource = request.getfixturevalue(generator)()
with pytest.raises(
ValueError,
match="Cannot add resource, .*, that is not a subclass of ADOResource",
match=r"Cannot add resource, .*, that is not a subclass of ADOResource",
):
create_resources(resources=[resource.config], db=sql_store)


def test_resource_cannot_be_created_twice(
resource_generator_from_file, create_resources, sql_store, request
):
resource_kind, generator = resource_generator_from_file
_resource_kind, generator = resource_generator_from_file
resource = request.getfixturevalue(generator)()
create_resources(resources=[resource], db=sql_store)
with pytest.raises(
Expand Down
2 changes: 1 addition & 1 deletion tests/samplestore/delete/test_delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def test_resource_deletion(
resource_generator_from_db, delete_resource, sql_store, request
):
resource_kind, generator = resource_generator_from_db
_resource_kind, generator = resource_generator_from_db
resource = request.getfixturevalue(generator)()
delete_resource(resource.identifier)
assert not sql_store.containsResourceWithIdentifier(identifier=resource.identifier)
Expand Down
60 changes: 35 additions & 25 deletions tests/samplestore/get/test_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,13 @@ def test_measurement_results_for_operation(
operation_id = random_identifier()
results = []

sample_store, requests, request_ids = simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
sample_store, requests, _request_ids = (
simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
)
)

# We return requests sorted by requestIndex
Expand Down Expand Up @@ -154,11 +156,13 @@ def test_measurement_requests_for_operation(
operation_id = random_identifier()
results = []

sample_store, requests, request_ids = simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
sample_store, requests, _request_ids = (
simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
)
)

# We return requests sorted by requestIndex
Expand Down Expand Up @@ -215,11 +219,13 @@ def test_measurement_request_by_id(
measurements_per_result = 2
operation_id = random_identifier()

sample_store, requests, request_ids = simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
sample_store, requests, _request_ids = (
simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
)
)

to_be_found: MeasurementRequest = random.choice(requests)
Expand Down Expand Up @@ -260,11 +266,13 @@ def test_experiments_in_operation(
measurements_per_result = 2
operation_id = random_identifier()

sample_store, requests, request_ids = simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
sample_store, _requests, _request_ids = (
simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
)
)

retrieved_experiment_references = sample_store.experiments_in_operation(
Expand All @@ -287,11 +295,13 @@ def test_entity_identifiers_in_operation(
measurements_per_result = 2
operation_id = random_identifier()

sample_store, requests, request_ids = simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
sample_store, requests, _request_ids = (
simulate_ml_multi_cloud_random_walk_operation(
number_entities=number_entities,
number_requests=number_requests,
measurements_per_result=measurements_per_result,
operation_id=operation_id,
)
)

entity_ids = set()
Expand Down
4 changes: 2 additions & 2 deletions tests/schema/test_entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def test_identifier_from_property_values(
entity_for_parameterized_experiment: tuple[Entity, Experiment],
):

test_entity, test_experiment = entity_for_parameterized_experiment
test_entity, _test_experiment = entity_for_parameterized_experiment

constitutive_property_values = test_entity.constitutive_property_values

Expand Down Expand Up @@ -328,7 +328,7 @@ def test_identifier_from_property_values(
def test_value_error_duplicate_constitutive_properties(
entity_for_parameterized_experiment: tuple[Entity, Experiment],
):
test_entity, test_experiment = entity_for_parameterized_experiment
test_entity, _test_experiment = entity_for_parameterized_experiment
constitutive_property_values = test_entity.constitutive_property_values

assert (
Expand Down
2 changes: 1 addition & 1 deletion tests/schema/test_property_value.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def test_type_detection(property_value: tuple[PropertyValue, type]):
def test_uncertain_property_value(property_value):
"""Test the uncertain property works"""

val, value_type = property_value
val, _value_type = property_value
assert val.isUncertain() is False

uncertain_val = PropertyValue(
Expand Down
2 changes: 1 addition & 1 deletion tests/schema/test_virtual_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_virtual_properties(virtual_properties):


def test_virtual_property_identifiers(virtual_properties):
virtual_property, values, results = virtual_properties
virtual_property, _values, _results = virtual_properties

assert (
virtual_property.identifier
Expand Down