Skip to content

Commit

Permalink
Merge 0e232a9 into 59aa5cc
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnation3406
jnation3406 committed Jun 6, 2019
2 parents 59aa5cc + 0e232a9 commit 00c1659
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 14 deletions.
24 changes: 10 additions & 14 deletions observation_portal/observations/management/commands/time_accounting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
from observation_portal.proposals.models import Proposal, Semester, TimeAllocation

import math
import logging

logger = logging.getLogger()


class Command(BaseCommand):
Expand All @@ -32,8 +29,10 @@ def handle(self, *args, **options):
instrument_type_str = options['instrument_type'] or 'All'
semester_str = options['semester']
dry_run_str = 'Dry Run Mode: ' if options['dry_run'] else ''
logger.info(
f"{dry_run_str}Running time accounting for Proposal(s): {proposal_str} and Instrument Type(s): {instrument_type_str} in Semester: {semester_str}")
print(
f"{dry_run_str}Running time accounting for Proposal(s): {proposal_str} and Instrument Type(s): {instrument_type_str} in Semester: {semester_str}",
file=self.stdout
)

if options['proposal']:
proposals = [Proposal.objects.get(id=options['proposal'])]
Expand Down Expand Up @@ -63,9 +62,6 @@ def handle(self, *args, **options):
'configuration_statuses__summary'
).order_by('start').distinct()

if len(observations) == 0:
continue

for observation in observations:
observation_type = observation.request.request_group.observation_type
configuration_time = timedelta(seconds=0)
Expand All @@ -79,20 +75,20 @@ def handle(self, *args, **options):
pass

attempted_time[observation_type] += (configuration_time.total_seconds() / 3600.0)
logger.info(
print(
"Proposal: {}, Instrument Type: {}, Used {} NORMAL hours, {} RAPID_RESPONSE hours, and {} TIME_CRITICAL hours".format(
proposal.id, instrument_type, attempted_time['NORMAL'], attempted_time['RAPID_RESPONSE'],
attempted_time['TIME_CRITICAL']
))
attempted_time['TIME_CRITICAL']), file=self.stdout
)

time_allocation = TimeAllocation.objects.get(proposal=proposal, instrument_type=instrument_type,
semester=semester)
if not math.isclose(time_allocation.std_time_used, attempted_time['NORMAL'], abs_tol=0.0001):
logger.warning("{} is different from existing NORMAL time {}".format(attempted_time['NORMAL'], time_allocation.std_time_used))
print("{} is different from existing NORMAL time {}".format(attempted_time['NORMAL'], time_allocation.std_time_used), file=self.stderr)
if not math.isclose(time_allocation.rr_time_used, attempted_time['RAPID_RESPONSE'], abs_tol=0.0001):
logger.warning("{} is different from existing RAPID_RESPONSE time {}".format(attempted_time['RAPID_RESPONSE'], time_allocation.rr_time_used))
print("{} is different from existing RAPID_RESPONSE time {}".format(attempted_time['RAPID_RESPONSE'], time_allocation.rr_time_used), file=self.stderr)
if not math.isclose(time_allocation.tc_time_used, attempted_time['TIME_CRITICAL'], abs_tol=0.0001):
logger.warning("{} is different from existing TIME_CRITICAL time {}".format(attempted_time['TIME_CRITICAL'], time_allocation.tc_time_used))
print("{} is different from existing TIME_CRITICAL time {}".format(attempted_time['TIME_CRITICAL'], time_allocation.tc_time_used), file=self.stderr)

if not options['dry_run']:
# Update the time allocation for this proposal accordingly
Expand Down
59 changes: 59 additions & 0 deletions observation_portal/observations/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from django.core import cache
from dateutil.parser import parse as datetime_parser
from datetime import timedelta
from io import StringIO
from django.core.management import call_command

from observation_portal.requestgroups.models import RequestGroup, Window, Location
from observation_portal.observations.time_accounting import configuration_time_used
Expand Down Expand Up @@ -1080,3 +1082,60 @@ def test_multiple_requests_leads_to_consistent_time_accounting(self):
self.time_allocation.refresh_from_db()
time_used += (config_end - config_start).total_seconds() / 3600.0
self.assertAlmostEqual(self.time_allocation.std_time_used, time_used, 5)


class TestTimeAccountingCommand(TestObservationApiBase):
def setUp(self):
super().setUp()
self.time_allocation = mixer.blend(TimeAllocation, instrument_type='1M0-SCICAM-SBIG', semester=self.semester,
proposal=self.proposal, std_allocation=100, rr_allocation=100,
tc_allocation=100, ipp_time_available=100)

def _add_observation(self, state, time_completed):
observation = Observation.objects.create(request=self.requestgroup.requests.first(), state=state, site='tst', enclosure='domb', telescope='1m0a',
start=datetime(2016,9,5,22,35,39), end=datetime(2016,9,5,23,35,40))
config_status = ConfigurationStatus.objects.create(observation=observation, configuration=self.requestgroup.requests.first().configurations.first(),
state=state, instrument_name='xx03', guide_camera_name='xx03')
Summary.objects.create(configuration_status=config_status, start=datetime(2016,9,5,22,35,39),
end=datetime(2016,9,5,23,35,40), time_completed=time_completed, state=state)
return observation

def test_with_no_obs_command_reports_no_time_used(self):
command_output = StringIO()
command_err = StringIO()
call_command('time_accounting', f'-p{self.proposal.id}', '-i1M0-SCICAM-SBIG', f'-s{self.semester.id}', stdout=command_output, stderr=command_err)
command_out = command_output.getvalue()
self.assertIn('Used 0 NORMAL hours, 0 RAPID_RESPONSE hours, and 0 TIME_CRITICAL hours', command_out)
self.assertNotIn('is different from existing', command_err)
self.time_allocation.refresh_from_db()
self.assertEqual(self.time_allocation.std_time_used, 0)
self.assertEqual(self.time_allocation.rr_time_used, 0)
self.assertEqual(self.time_allocation.tc_time_used, 0)

def test_with_one_obs_command_reports_time_used_and_modifies_time(self):
command_output = StringIO()
command_err = StringIO()
observation = self._add_observation(state='COMPLETED', time_completed=1000)
# reset time used to 0 since creating the observation already modified it
self.time_allocation.std_time_used = 0
self.time_allocation.save()
call_command('time_accounting', f'-p{self.proposal.id}', '-i1M0-SCICAM-SBIG', f'-s{self.semester.id}', stdout=command_output, stderr=command_err)
time_used = (observation.configuration_statuses.first().summary.end - observation.configuration_statuses.first().summary.start).total_seconds() / 3600.0
self.assertIn(f'Used {time_used} NORMAL hours, 0 RAPID_RESPONSE hours, and 0 TIME_CRITICAL hours', command_output.getvalue())
self.assertIn('is different from existing', command_err.getvalue())
self.time_allocation.refresh_from_db()
self.assertAlmostEqual(self.time_allocation.std_time_used, time_used)

def test_with_one_obs_command_reports_dry_run_doesnt_modify_time(self):
command_output = StringIO()
command_err = StringIO()
observation = self._add_observation(state='COMPLETED', time_completed=1000)
# reset time used to 0 since creating the observation already modified it
self.time_allocation.std_time_used = 0
self.time_allocation.save()
call_command('time_accounting', f'-p{self.proposal.id}', '-i1M0-SCICAM-SBIG', f'-s{self.semester.id}', '-d', stdout=command_output, stderr=command_err)
time_used = (observation.configuration_statuses.first().summary.end - observation.configuration_statuses.first().summary.start).total_seconds() / 3600.0
self.assertIn(f'Used {time_used} NORMAL hours, 0 RAPID_RESPONSE hours, and 0 TIME_CRITICAL hours', command_output.getvalue())
self.assertIn('is different from existing', command_err.getvalue())
self.time_allocation.refresh_from_db()
self.assertEqual(self.time_allocation.std_time_used, 0)

0 comments on commit 00c1659

Please sign in to comment.