fix: Session related issues.

bgpranking/querying.py

@@ -62,6 +62,7 @@ class Querying():
         d = self.__normalize_date(date)
         if source:
             key = f'{d}|{source}|{asn}|{ipversion}'
+            return self.ranking.get(key)
         else:
             key = f'{d}|asns|{ipversion}'
             return self.ranking.zscore(key, asn)
@@ -78,7 +79,7 @@ class Querying():
             return descriptions
         return descriptions[sorted(descriptions.keys(), reverse=True)[0]]
 
-    def get_prefix_ips(self, asn: int, prefix: str, date: Dates=datetime.date.today(), source: str=''):
+    def get_prefix_ips(self, asn: int, prefix: str, date: Dates=datetime.date.today(), source: str='', ipversion: str='v4'):
         if source:
             sources = [source]
         else:
@@ -91,13 +92,19 @@ class Querying():
             [prefix_ips[ip].append(source) for ip in ips]
         return prefix_ips
 
-    def get_asn_history(self, asn: int, period: int=100, source: str='', ipversion: str='v4'):
+    def get_asn_history(self, asn: int, period: int=100, source: str='', ipversion: str='v4', date: Dates=datetime.date.today()):
         to_return = []
-        today = datetime.date.today()
+
+        if isinstance(date, str):
+            date = parse(date).date()
+        if date + timedelta(days=period / 3) > datetime.date.today():
+            # the period to display will be around the date passed at least 2/3 before the date, at most 1/3 after
+            date = datetime.date.today()
+
         for i in range(period):
-            date = today - timedelta(days=i)
+            d = date - timedelta(days=i)
-            rank = self.asn_rank(asn, date, source, ipversion)
+            rank = self.asn_rank(asn, d, source, ipversion)
             if rank is None:
                 rank = 0
-            to_return.insert(0, (date.isoformat(), rank))
+            to_return.insert(0, (d.isoformat(), rank))
         return to_return

website/web/__init__.py

@@ -64,6 +64,7 @@ def index():
 def asn_details():
     load_session()
     q = Querying()
+    sources = q.get_sources(date=session['date'])
     ranks = q.asn_details(**session)
     prefix = get_request_parameter('prefix')
     if prefix:
@@ -72,12 +73,11 @@ def asn_details():
         prefix_ips.sort(key=lambda entry: len(entry[1]), reverse=True)
     else:
         prefix_ips = []
-    return render_template('asn.html', ranks=ranks, prefix_ips=prefix_ips, **session)
+    return render_template('asn.html', sources=sources, ranks=ranks, prefix_ips=prefix_ips, **session)
 
 
 @app.route('/asn_history', methods=['GET', 'POST'])
 def asn_history():
     load_session()
-    session.pop('date', None)
     q = Querying()
     return json.dumps(q.get_asn_history(**session))

website/web/static/linegraph.js

@@ -60,7 +60,7 @@ function xAxis() {
 
 function yAxis() {
   var tickCount = 20,
-      tickSize = 3,
+      tickSize = 1,
       tickPadding = 1,
       ticks = y.ticks(tickCount),
       tickFormat = y.tickFormat(tickCount);