Use UTC datetimes everywhere

history/management/commands/alert_fail_cases.py

@@ -1,7 +1,8 @@
 import datetime
+from django.utils import timezone
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from history.models import PredictionTest, TradeRecommendation, get_time
+from history.models import PredictionTest, TradeRecommendation
 
 
 class Command(BaseCommand):
@@ -35,11 +36,10 @@ def handle(self, *args, **options):
         print(last_pt.created_on)
         print(last_trade.created_on)
 
-        # 7 hours thing is a hack for MST vs UTC timezone issues
-        is_trader_running = last_trade.created_on > (
-            get_time() - datetime.timedelta(hours=int(7)) - datetime.timedelta(minutes=int(15)))
-        is_trainer_running = last_pt.created_on > (get_time() - datetime.timedelta(hours=int(7)) -
-                                                   datetime.timedelta(minutes=int(15)))
+        # Since USE_TZ=True, created_on is already UTC, like timezone.now()
+        fifteen_ago = timezone.now() - datetime.timedelta(minutes=15)
+        is_trader_running = last_trade.created_on > fifteen_ago
+        is_trainer_running = last_pt.created_on > fifteen_ago
 
         if not is_trader_running:
             self.alert_email("not is_trader_running")

history/management/commands/compare_perf.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from history.tools import get_fee_amount
+from history.tools import get_fee_amount, utc_to_mst_str
 from history.models import Price, TradeRecommendation, PerformanceComp
 import datetime
 
@@ -61,5 +61,5 @@ def handle(self, *args, **options):
                              weighted_avg_nn_rec=weighted_avg_nn_rec,
                              directionally_same=directionally_same,
                              directionally_same_int=1 if directionally_same else 0,
-                             created_on_str=(tr_timerange_end - datetime.timedelta(hours=7)).strftime('%Y-%m-%d %H:%M'))
+                             created_on_str=utc_to_mst_str(tr_timerange_end))
         pc.save()

history/management/commands/pull_balance.py

@@ -1,6 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from history.tools import get_exchange_rate_to_btc, get_exchange_rate_btc_to_usd, get_deposit_balance
+from history.tools import (get_exchange_rate_to_btc, get_exchange_rate_btc_to_usd, get_deposit_balance,
+                           utc_to_mst_str)
 from history.models import Balance, Trade
 import datetime
 from django.db import transaction
@@ -40,13 +41,10 @@ def handle(self, *args, **options):
                     b.save()
 
         for b in Balance.objects.filter(date_str='0'):
-            # django timezone stuff , FML
-            b.date_str = datetime.datetime.strftime(b.created_on - datetime.timedelta(hours=int(7)), '%Y-%m-%d %H:%M')
+            b.date_str = utc_to_mst_str(b.created_on)
             b.save()
 
         # normalize trade recommendations too.  merp
         for tr in Trade.objects.filter(created_on_str=''):
-            # django timezone stuff , FML
-            tr.created_on_str = datetime.datetime.strftime(
-                tr.created_on - datetime.timedelta(hours=int(7)), '%Y-%m-%d %H:%M')
+            tr.created_on_str = utc_to_mst_str(tr.created_on)
             tr.save()

history/management/commands/pull_deposits.py

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 import datetime
-from history.tools import get_utc_unixtime
+from history.tools import get_utc_unixtime, utc_to_mst_str
 from history.models import Deposit
 
 
@@ -35,6 +35,5 @@ def handle(self, *args, **options):
             d.status = status
             d.created_on = created_on
             d.modified_on = created_on
-            d.created_on_str = datetime.datetime.strftime(
-                created_on - datetime.timedelta(hours=int(7)), '%Y-%m-%d %H:%M')
+            d.created_on_str = utc_to_mst_str(created_on)
             d.save()

history/management/commands/pull_prices.py

@@ -1,3 +1,4 @@
+from history.tools import utc_to_mst_str
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
@@ -25,5 +26,5 @@ def handle(self, *args, **options):
             p.lowestask = price[ticker]['lowestAsk']
             p.highestbid = price[ticker]['highestBid']
             p.symbol = ticker
-            p.created_on_str = str(p.created_on)
+            p.created_on_str = utc_to_mst_str(p.created_on)
             p.save()

history/management/commands/trade.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
-from history.models import Price, PredictionTest, Trade, TradeRecommendation, Balance, get_time, ClassifierTest
-from history.tools import get_utc_unixtime, print_and_log
+from history.models import Price, PredictionTest, Trade, TradeRecommendation, Balance, ClassifierTest
+from history.tools import get_utc_unixtime, print_and_log, utc_to_mst_str
 import datetime
 import time
 from history.poloniex import poloniex
@@ -192,7 +192,7 @@ def run_predictor(self, nn_index):
                                  confidence=confidence,
                                  recommendation=recommend,
                                  net_amount=-1 if recommend == 'SELL' else (1 if recommend == 'BUY' else 0),
-                                 created_on_str=str(get_time().strftime('%Y-%m-%d %H:%M')))
+                                 created_on_str=utc_to_mst_str(timezone.now()))
         tr.save()
         self.trs[nn_index] = tr
         return recommend

history/migrations/0004_auto_20160409_1213.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('history', '0003_auto_20160330_1920'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='balance',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='balance',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='classifiertest',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='classifiertest',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='deposit',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='deposit',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='performancecomp',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='performancecomp',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='predictiontest',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='predictiontest',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='price',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='price',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='trade',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='trade',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='traderecommendation',
+            name='created_on',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='traderecommendation',
+            name='modified_on',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

history/models.py

@@ -1,13 +1,12 @@
 from __future__ import unicode_literals
-from django.utils import timezone
 import datetime
 from pybrain.datasets import SupervisedDataSet
 from pybrain.tools.shortcuts import buildNetwork
 from pybrain.supervised.trainers import BackpropTrainer
 from django.db import models
 from history.tools import create_sample_row, get_fee_amount
-from django.utils.timezone import localtime
 from django.conf import settings
+from django.utils import timezone
 from django.core.urlresolvers import reverse
 import cgi
 import time
@@ -33,12 +32,12 @@
 
 
 def get_time():
-    return localtime(timezone.now())
+    return timezone.localtime(timezone.now())
 
 
 class TimeStampedModel(models.Model):
-    created_on = models.DateTimeField(null=False, default=get_time, db_index=True)
-    modified_on = models.DateTimeField(null=False, default=get_time)
+    created_on = models.DateTimeField(null=False, auto_now_add=True, db_index=True)
+    modified_on = models.DateTimeField(null=False, auto_now=True)
 
     def get_readonly_fields(self, request, obj=None):
         return [f.name for f in self._meta.get_fields()]
@@ -49,10 +48,6 @@ def has_add_permission(self, request, obj=None):
     def has_delete_permission(self, request, obj=None):
         return False
 
-    def save(self, *args, **kwargs):
-        self.modified_on = get_time()
-        return super(TimeStampedModel, self).save(*args, **kwargs)
-
     class Meta:
         abstract = True
 
@@ -62,8 +57,8 @@ def url_to_edit_object(self):
 
 
 class AbstractedTesterClass(models.Model):
-    created_on = models.DateTimeField(null=False, default=get_time)
-    modified_on = models.DateTimeField(null=False, default=get_time)
+    created_on = models.DateTimeField(null=False, auto_now_add=True)
+    modified_on = models.DateTimeField(null=False, auto_now=True)
 
     def get_readonly_fields(self, request, obj=None):
         return [f.name for f in self._meta.get_fields()]
@@ -74,10 +69,6 @@ def has_add_permission(self, request, obj=None):
     def has_delete_permission(self, request, obj=None):
         return False
 
-    def save(self, *args, **kwargs):
-        self.modified_on = get_time()
-        return super(AbstractedTesterClass, self).save(*args, **kwargs)
-
     class Meta:
         abstract = True
 

history/tools.py

@@ -1,6 +1,8 @@
 import time
+import pytz
 import datetime
 from django.conf import settings
+from django.utils import timezone
 from django.core.exceptions import ImproperlyConfigured
 
 
@@ -11,14 +13,17 @@ def print_and_log(log_string):
 
 
 def get_utc_unixtime():
-    import time
-    import datetime
-
     d = datetime.datetime.now()
     unixtime = time.mktime(d.timetuple())
     return int(unixtime)
 
 
+def utc_to_mst_str(dt):
+    mst = pytz.timezone('MST')
+    local = timezone.localtime(dt, mst)
+    return datetime.datetime.strftime(local, '%Y-%m-%d %H:%M')
+
+
 def create_sample_row(data, i, size):
     sample = ()
     for k in range(0, size):

history/views.py

@@ -1,6 +1,7 @@
+import pytz
 from django.contrib.admin.views.decorators import staff_member_required
 from history.models import (
-    PredictionTest, Price, Trade, Balance, TradeRecommendation, get_time, PerformanceComp,
+    PredictionTest, Price, Trade, Balance, TradeRecommendation, PerformanceComp,
     ClassifierTest)
 from django.shortcuts import render_to_response
 from django.utils import timezone
@@ -383,8 +384,9 @@ def nn_chart_view(request):
     trainer_last_seen = None
     try:
         last_pt = PredictionTest.objects.filter(type='mock').order_by('-created_on').first()
-        is_trainer_running = last_pt.created_on > (get_time() - datetime.timedelta(minutes=int(15)))
-        trainer_last_seen = (last_pt.created_on - datetime.timedelta(hours=int(7))).strftime('%a %H:%M')
+        fifteen_ago = timezone.now() - datetime.timedelta(minutes=15)
+        is_trainer_running = last_pt.created_on > fifteen_ago
+        trainer_last_seen = timezone.localtime(last_pt.created_on).strftime('%a %H:%M')
     except Exception:
         is_trainer_running = False
 
@@ -402,11 +404,11 @@ def nn_chart_view(request):
         cht = get_line_chart(pts, symbol, parameter)
         charts.append(cht)
         options = []
-        chartnames.append("container"+str(i))
+        chartnames.append("container" + str(i))
         metas.append({
             'name': parameter,
             'container_class': 'show',
-            'class': "container"+str(i),
+            'class': "container" + str(i),
             'options': options,
         })
 
@@ -473,8 +475,9 @@ def c_chart_view(request):
     trainer_last_seen = None
     try:
         last_pt = ClassifierTest.objects.filter(type='mock').order_by('-created_on').first()
-        is_trainer_running = last_pt.created_on > (get_time() - datetime.timedelta(minutes=int(15)))
-        trainer_last_seen = (last_pt.created_on - datetime.timedelta(hours=int(7))).strftime('%a %H:%M')
+        fifteen_ago = timezone.now() - datetime.timedelta(minutes=15)
+        is_trainer_running = last_pt.created_on > fifteen_ago
+        trainer_last_seen = timezone.localtime(last_pt.created_on).strftime('%a %H:%M')
     except Exception:
         is_trainer_running = False
 
@@ -564,7 +567,8 @@ def profit_view(request):
     # get data
     data = {}
     for t in Trade.objects.filter(symbol=symbol, status='fill').order_by('-created_on').all():
-        date = datetime.datetime.strftime(t.created_on-datetime.timedelta(hours=7), '%Y-%m-%d')
+        mst_dt = timezone.localtime(t.created_on, pytz.timezone('MST'))
+        date = datetime.datetime.strftime(mst_dt, '%Y-%m-%d')
         if date not in data.keys():
             data[date] = {'buyvol': [], 'sellvol': [], 'buy': [], 'sell': [], 'bal': 0.00}
         data[date][t.type].append(t.price)
@@ -663,8 +667,9 @@ def optimize_view(request):
 
     last_trade = TradeRecommendation.objects.order_by('-created_on').first()
     if last_trade:
-        trader_last_seen = (last_trade.created_on - datetime.timedelta(hours=int(7))).strftime('%a %H:%M')
-        is_trader_running = last_trade.created_on > (get_time() - datetime.timedelta(minutes=int(15)))
+        fifteen_ago = timezone.now() - datetime.timedelta(minutes=15)
+        trader_last_seen = timezone.localtime(last_trade.created_on).strftime('%a %H:%M')
+        is_trader_running = last_trade.created_on > fifteen_ago
     else:
         trader_last_seen = None
         is_trader_running = False