Skip to content

Commit

Permalink
[Breaking Change] get_resource_samples returns `APIResourceSampleRe…
Browse files Browse the repository at this point in the history
…sults` instead of dict

Additionally, add optional filter parameter to `get_resource_timelines`
  • Loading branch information
Mythicaeda authored and cartermak committed Sep 7, 2023
1 parent 681debc commit 7b2c49b
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/aerie_cli/aerie_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,8 @@ def exec_sim_query():
sim_dataset_id = resp["simulationDatasetId"]
return sim_dataset_id

def get_resource_timelines(self, plan_id: int):
samples = self.get_resource_samples(self.get_simulation_dataset_ids_by_plan_id(plan_id)[0])
api_resource_timeline = ApiResourceSampleResults.from_dict(samples)
return api_resource_timeline
def get_resource_timelines(self, plan_id: int, state_names: List=None):
return self.get_resource_samples(self.get_simulation_dataset_ids_by_plan_id(plan_id)[0], state_names)

def get_resource_samples(self, simulation_dataset_id: int, state_names: List=None):
"""Pull resource samples from a simulation dataset, optionally filtering for specific states
Expand Down Expand Up @@ -518,9 +516,7 @@ def get_resource_samples(self, simulation_dataset_id: int, state_names: List=Non
raise ValueError(f"Unknown resource profile type: {profile_type}")

resources[name] = values
return {
"resourceSamples": resources
}
return ApiResourceSampleResults.from_dict({"resourceSamples": resources})

def get_simulation_results(self, sim_dataset_id: int) -> str:

Expand Down

0 comments on commit 7b2c49b

Please sign in to comment.