handle utf-8 encoding in command

StanfordBioinformatics · Aug 11, 2017 · 8e4c2de · 8e4c2de
1 parent 9cc3462
commit 8e4c2de
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/loomengine/master/api/migrations/0001_initial.py b/loomengine/master/api/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-08-08 23:44
+# Generated by Django 1.11 on 2017-08-11 21:46
 from __future__ import unicode_literals
 
 import api.models
@@ -402,7 +402,6 @@ class Migration(migrations.Migration):
                 ('interpreter', models.CharField(blank=True, max_length=1024)),
                 ('environment', jsonfield.fields.JSONField(blank=True, validators=[api.models.validators.validate_environment])),
                 ('resources', jsonfield.fields.JSONField(blank=True, validators=[api.models.validators.validate_resources])),
-                ('comments', models.TextField(blank=True)),
                 ('import_comments', models.TextField(blank=True)),
                 ('imported_from_url', models.TextField(blank=True, validators=[api.models.validators.validate_url])),
                 ('imported', models.BooleanField(default=False)),

diff --git a/loomengine/master/api/models/templates.py b/loomengine/master/api/models/templates.py
@@ -47,7 +47,6 @@ class Template(BaseModel):
     resources = jsonfield.JSONField(
         blank=True,
         validators=[validators.validate_resources])
-    comments = models.TextField(blank=True)
     import_comments = models.TextField(blank=True)
     imported_from_url = models.TextField(
         blank=True,

diff --git a/loomengine/master/api/serializers/templates.py b/loomengine/master/api/serializers/templates.py
@@ -60,7 +60,6 @@ class Meta:
     'md5',
     'datetime_created',
     'command',
-    'comments',
     'import_comments',
     'imported_from_url',
     'is_leaf',
@@ -94,7 +93,6 @@ class Meta:
     # write-only
     _template_id = serializers.CharField(write_only=True, required=False)
     command = serializers.CharField(required=False, write_only=True)
-    comments = serializers.CharField(required=False, write_only=True)
     import_comments = serializers.CharField(required=False, write_only=True)
     imported_from_url = serializers.CharField(required=False, write_only=True)
     interpreter = serializers.CharField(required=False, write_only=True)
@@ -135,7 +133,6 @@ class Meta:
     name = serializers.CharField(required=False)
     datetime_created = serializers.DateTimeField(format='iso-8601', required=False)
     command = serializers.CharField(required=False)
-    comments = serializers.CharField(required=False)
     import_comments = serializers.CharField(required=False)
     imported_from_url = serializers.CharField(required=False)
     is_leaf = serializers.BooleanField(required=False)
@@ -588,7 +585,6 @@ class SummaryTemplateSerializer(TemplateSerializer):
     # write-only fields
     _template_id = serializers.CharField(write_only=True, required=False)
     command = serializers.CharField(required=False, write_only=True)
-    comments = serializers.CharField(required=False, write_only=True)
     import_comments = serializers.CharField(required=False, write_only=True)
     imported_from_url = serializers.CharField(required=False, write_only=True)
     interpreter = serializers.CharField(required=False, write_only=True)

diff --git a/loomengine/worker/task_monitor.py b/loomengine/worker/task_monitor.py
@@ -152,7 +152,7 @@ def _create_run_script(self):
                     self.settings['WORKING_DIR'],
                     self.LOOM_RUN_SCRIPT_NAME),
                       'w') as f:
-                f.write(user_command + '\n')
+                f.write(user_command.encode('utf-8') + '\n')
         except Exception as e:
             error = self._get_error_text(e)
             self._fail(detail='Creating run script failed. %s' % error)