radarsys_met Commit - r311:6467cbbb1e89

Fix mix experiment and scheduler

jespinoza -

r311:6467cbbb1e89

parent child

Context file:

r311:6467cbbb1e89

Collapse all files

.env +1 -1

             PGDATA=/var/lib/postgresql/data
             LC_ALL=C.UTF-8
             TZ=America/Lima
-            DOCKER_DATA=/Volumes/dockers/radarsys/
+            DOCKER_DATA=/data/dockers/radarsys/
             LOCAL_IP=192.168.1.128

.gitignore +1 0

             migrations/
+            *.sqlite
             .vscode/
             *.pyc
             .env

apps/jars/models.py +1 -9

                         if data['configurations']['byId'][key]['device_type'] in ('dds', 'cgs'):
                             data['configurations']['allIds'].remove(key)
                             data['configurations']['byId'].pop(key)
-                        elif data['configurations']['byId'][key]['device_type'] == 'jars':
-                            data['configurations']['byId'][key] = self.parms_to_dict()['configurations']['byId'][str(self.pk)]
                         elif data['configurations']['byId'][key]['device_type'] == 'rc':
                                 data['configurations']['byId'][key]['pulses'] = ''
                                 data['configurations']['byId'][key]['delays'] = ''
                     rc_ids = [pk for pk in data['configurations']['allIds'] if data['configurations']['byId'][pk]['device_type']=='rc']
-                    mix_ids = [pk for pk in rc_ids if data['configurations']['byId'][pk]['mix']]
+                    if len(rc_ids)==0:
-                    if mix_ids:
-                        params = data['configurations']['byId'][mix_ids[0]]['parameters']
-                        rc = data['configurations']['byId'][params.split('-')[0].split('|')[0]]
-                        rc['mix'] = True
-                        data['configurations']['byId'][rc['id']] = rc
-                    elif len(rc_ids)==0:
                         self.message = 'Missing RC configuration'
                         return False

apps/main/forms.py +1 -1

                 class Meta:
                     model = Experiment
-                    exclude = ['status']
+                    exclude = ['task', 'status']
             class LocationForm(forms.ModelForm):
                 class Meta:

apps/main/models.py +17 -15

                 def parms_to_dict(self):
-                    params = Params()
+                    params = Params({})
                     params.add(self.jsonify(), 'campaigns')
                     for exp in Experiment.objects.filter(campaign = self):
                 freq = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
                 start_time = models.TimeField(default='00:00:00')
                 end_time = models.TimeField(default='23:59:59')
+                task = models.CharField(max_length=36, default='', blank=True, null=True)
                 status = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
                 class Meta:
                     confs = Configuration.objects.filter(experiment=self, type=0)
                     self.pk = None
-                    self.name = '{} [{:%Y/%m/%d}]'.format(self.name, datetime.now())
+                    self.name = '{} [{:%Y-%m-%d}]'.format(self.name, datetime.now())
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                     '''
                     result = 2
+                    confs = []
-                    confs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
+                    allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
+                    rc_mix = [conf for conf in allconfs if conf.device.device_type.name=='rc' and conf.mix]
+                    if rc_mix:
+                        for conf in allconfs:
+                            if conf.device.device_type.name == 'rc' and  not conf.mix:
+                                continue
+                            confs.append(conf)
+                    else:
+                        confs = allconfs
                     #Only Configured Devices.
                     for conf in confs:
                         if conf.device.status in (0, 4):
                             return result
                     for conf in confs:
                         conf.stop_device()
-                        #conf.write_device()
+                        conf.write_device()
                         conf.start_device()
-                        print conf.device.name+' has started...'
+                        time.sleep(1)
                     return result
                             result = 0
                             continue
                         conf.stop_device()
-                        print conf.device.name+' has stopped...'
                     return result
                 def parms_to_dict(self):
-                    params = Params()
+                    params = Params({})
                     params.add(self.jsonify(), 'experiments')
                     configurations = Configuration.objects.filter(experiment=self, type=0)
             class Configuration(PolymorphicModel):
                 template = models.BooleanField(default=False)
                 name = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
                 experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE)
                 device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
                 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
                 created_date = models.DateTimeField(auto_now_add=True)
                 programmed_date = models.DateTimeField(auto_now=True)
                 parameters = models.TextField(default='{}')
                 message = ""
                 class Meta:
                 def parms_to_dict(self):
-                    params = Params()
+                    params = Params({})
                     params.add(self.jsonify(), 'configurations')
                     if self.device.device_type.name=='rc':

apps/main/tasks.py +36 -13

@@ -1,5 +1,6
1	from __future__ import absolute_import	1	from __future__ import absolute_import
2		2
		3	from radarsys.celery import app
3	from celery import task	4	from celery import task
4	from datetime import timedelta, datetime	5	from datetime import timedelta, datetime
5		6
@@ -7,25 +8,47 from .models import Experiment
7		8
8	@task	9	@task
9	def task_start(id_exp):	10	def task_start(id_exp):
10
11	exp = Experiment.objects.get(pk=id_exp)	11	exp = Experiment.objects.get(pk=id_exp)
12		12	status = exp.status
13	return exp.start()	13	if exp.status == 2:
		14	print('Experiment {} already running start task not executed'.format(exp))
		15	return 2
		16	if status == 3:
		17	now = datetime.now()
		18	start = datetime.combine(now.date(), exp.start_time)
		19	end = datetime.combine(now.date(), exp.end_time)
		20	if end < start:
		21	end += timedelta(1)
		22	try:
		23	print('Starting exp:{}'.format(exp))
		24	exp.status = exp.start()
		25	except:
		26	print('Error')
		27	exp.status = 0
		28	if exp.status == 2:
		29	task = task_stop.apply_async((id_exp,), eta=end+timedelta(hours=5))
		30	exp.task = task.id
		31	exp.save()
		32	return exp.status
14		33
15	@task	34	@task
16	def task_stop(id_exp):	35	def task_stop(id_exp):
17
18	exp = Experiment.objects.get(pk=id_exp)	36	exp = Experiment.objects.get(pk=id_exp)
		37	if exp.status == 2:
		38	try:
		39	print('Stopping exp:{}'.format(exp))
		40	exp.status = exp.stop()
		41	except:
		42	print('Error')
		43	exp.status = 0
19		44
20	return exp.stop()	45	now = datetime.now()
21		46	start = datetime.combine(now.date()+timedelta(1), exp.start_time)
22	def kill_tasks():	47	task = task_start.apply_async((id_exp, ), eta=start+timedelta(hours=5))
23		48	exp.task = task.id
24	i = task.control.inspect()	49	exp.status = 3
25	tasks = i.scheduled()	50	exp.save()
26	print tasks	51	return exp.status
27	#if tasks:
28	# print dir(tasks[0])
29		52
30	#Task to get status	53	#Task to get status
31	@task	54	@task

apps/main/templates/experiment.html +4 0

                             <i class="fa fa-3x fa-puzzle-piece"></i>
                            {%endif%}
                                <h4>{{item}}<br><small>{{item.device.ip_address}}</small>
+            		       {%if experiment.status == 3 %}
+            		       <span class="label label-info">Configured</span>
+            		       {%else%}
             		       <span class="label label-{{item.device.status_color}}">{{item.device.get_status_display}}</span>
+                                   {%endif%}
             		   </h4>
                          </a>
                     </div>

apps/main/templates/operation.html +1 -3

             <h3>Current Campaigns</h3>
             <br>
             <div class="bootcards-list">
               <div class="panel panel-default">
                 <div class="list-group">
             	  <p class="list-group-item-text">From: {{item.start_date}}</p>
             	  <p class="list-group-item-text">To: {{item.end_date}}</p>
             	  </div>
             	</div>
                 </a>
                 {% endfor %}
               </div>
             </div>
             {% endif %}

apps/main/views.py +13 -11

             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm, FilterForm, ChangeIpForm
-            from .tasks import task_start, task_stop, task_status, kill_tasks
+            from .tasks import task_start
             from apps.rc.forms import RCConfigurationForm, RCLineCode, RCMixConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from apps.rc.models import RCConfiguration, RCLine, RCLineType
             from apps.dds.models import DDSConfiguration
+            from radarsys.celery import app
             from django.contrib.auth.decorators import login_required
             from django.contrib.auth.decorators import user_passes_test
             from django.contrib.admin.views.decorators import staff_member_required
             @user_passes_test(lambda u:u.is_staff)
             def experiment_mix_delete(request, id_exp):
-                conf = RCConfiguration.objects.get(experiment=id_exp, mix=True)
+                conf = RCConfiguration.objects.get(experiment=id_exp, mix=True, type=0)
                 values = conf.parameters.split('-')
                 conf.parameters = '-'.join(values[:-1])
                 conf.save()
                 now = datetime.now()
                 for exp in experiments:
                     start = datetime.combine(datetime.now().date(), exp.start_time)
-                    end = datetime.combine(datetime.now().date(), exp.start_time)
+                    end = datetime.combine(datetime.now().date(), exp.end_time)
                     if end < start:
                         end += timedelta(1)
                         continue
                     if now > start and now <= end:
-                        task = task_start.delay(exp.pk)
+                        exp.status = 3
+                        exp.save()
+                        task = task_start.delay(exp.id)
                         exp.status = task.wait()
                         if exp.status==0:
                             messages.error(request, 'Experiment {} not start'.format(exp))
                         if exp.status==2:
-                            task = task_stop.apply_async((exp.pk,), eta=end+timedelta(hours=5))
                             messages.success(request, 'Experiment {} started'.format(exp))
                     else:
                         task = task_start.apply_async((exp.pk, ), eta=start+timedelta(hours=5))
-                        task = task_stop.apply_async((exp.pk,), eta=end+timedelta(hours=5))
+                        exp.task = task.id
                         exp.status = 3
                         messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, start))
                 for exp in experiments:
+                    if exp.task:
+                        app.control.revoke(exp.task)
                     if exp.status == 2:
-                        task = task_stop.delay(exp.pk)
+                        exp.stop()
-                        exp.status = task.wait()
                         messages.warning(request, 'Experiment {} stopped'.format(exp))
+                    exp.status = 1
                     exp.save()
-                    else:
-                        messages.error(request, 'Experiment {} not running'.format(exp))
-                kill_tasks()
                 return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

radarsys/celery.py +1 0

             # Using a string here means the worker will not have to
             # pickle the object when using Windows.
             app.config_from_object('django.conf:settings')
+            app.conf.broker_transport_options = {'visibility_timeout': 86400}
             app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages