Adding in full MTA api.

* Added in support for station search, route specific search, and several time limiting functions
Added in functional backend in flask
* starts flask app
* starts MTA app on another thread
* serves basic webpage which pull subway data from flask backend on button press.
This commit is contained in:
Lucas Oskorep
2021-06-15 19:36:33 -04:00
parent 3225a293a4
commit 103de4bc14
12 changed files with 14284 additions and 20 deletions

10
endpoints.json Normal file
View File

@@ -0,0 +1,10 @@
{
"ACE": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-ace",
"BDFM": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-bdfm",
"G": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-g",
"JZ": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-jz",
"NQRW": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-nqrw",
"L": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-l",
"SIR": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-si",
"1234567": "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs"
}

100
mta.py
View File

@@ -1,28 +1,97 @@
import asyncio
import requests
from typing import List
import json
from google.transit import gtfs_realtime_pb2
from protobuf_to_dict import protobuf_to_dict
from route import get_route_from_dict
from time import time
class MTA(object):
def __init__(self, api_key: str, train_lines=None, station_ids=None, timing_callbacks=None, alert_callbacks = None):
self.api_key = api_key
self.train_lines = train_lines if train_lines else []
self.station_ids = station_ids if station_ids else []
def __init__(self, api_key: str, train_lines, station_ids, timing_callbacks=None, alert_callbacks=None,
endpoints_file="./endpoints.json", callback_frequency=5, max_arrival_time=30):
self.header = {
"x-api-key": api_key
}
self.train_lines = train_lines
self.station_ids = station_ids
self.timing_callbacks = timing_callbacks if timing_callbacks else []
self.alert_callbacks = alert_callbacks if alert_callbacks else []
# self.alert_callbacks = alert_callbacks if alert_callbacks else []
self.is_running = False
self.callback_frequency = callback_frequency
self.max_arrival_time = max_arrival_time
with open(endpoints_file, "r") as f:
self.endpoints = json.load(f)
self.set_valid_endpoints()
# TODO: filter out anything from a train line we are not searching for
def set_valid_endpoints(self):
self.valid_endpoints = {}
for key, value in self.endpoints.items():
valid_lines = [x for x in self.train_lines if x in key]
if valid_lines:
self.valid_endpoints[value] = valid_lines
print(self.valid_endpoints)
def start_updates(self):
print("starting updates")
raise NotImplementedError("Have not implemented start updates yet")
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
loop.run_until_complete(self._get_updates())
async def process_callbacks(self):
raise NotImplementedError("Have not implemented callback processing yet")
def stop_updates(self):
self.is_running = False
async def get_data(self):
routes = []
for endpoint, valid_lines in self.valid_endpoints.items():
r = requests.get(endpoint, headers=self.header)
feed = gtfs_realtime_pb2.FeedMessage()
feed.ParseFromString(r.content)
subway_feed = protobuf_to_dict(feed)['entity']
routes.extend([x for x in [get_route_from_dict(x) for x in subway_feed] if x is not None])
return routes
@staticmethod
def valid_route(train_lines, station_ids, route, max_time):
if route.route_id not in train_lines:
return False
stops = route.stop_times
for stop in stops:
minutes_to_arrival = stop.arrival_minutes()
if stop.stop_id in station_ids:
if minutes_to_arrival > 0 and minutes_to_arrival < max_time:
return True
return False
async def get_route_information(self):
# Filter routes
valid_routes = [route for route in await self.get_data() if
MTA.valid_route(self.train_lines, self.station_ids, route, self.max_arrival_time)]
return valid_routes
async def _get_updates(self):
self.is_running = True
while (self.is_running):
t = time()
data = self.get_route_information()
data = await data
await self.process_callbacks(data)
await asyncio.sleep(self.callback_frequency - (time() - t))
# self.is_running = False
async def process_callbacks(self, data):
for callback in self.timing_callbacks:
await callback(data)
def add_train_line(self, train_line: str):
self.train_lines.append(train_line)
self.set_valid_endpoints()
def remove_train_line(self, train_line: str):
self.train_lines.remove(train_line)
self.set_valid_endpoints()
def add_station_id(self, station_id: str):
self.station_ids.append(station_id)
@@ -35,3 +104,16 @@ class MTA(object):
def remove_callback(self, callback_func):
self.timing_callbacks.remove(callback_func)
def convert_routes_to_station_first(self, routes):
station_first = {}
for station_id in self.station_ids:
line_first = {}
for train_line in self.train_lines:
valid_routes = [route.get_arrival_at(station_id) for route in routes if
self.valid_route([train_line], [station_id], route, self.max_arrival_time)]
if valid_routes:
line_first[train_line] = valid_routes
if line_first:
station_first[station_id] = line_first
return station_first

File diff suppressed because one or more lines are too long

View File

@@ -1,17 +1,59 @@
import os
from dotenv import load_dotenv
from mta import MTA
import threading
import time
from time import sleep
from pprint import pprint
load_dotenv()
async def mta_callback(data):
print("We are inside of hte call back now boizzzz")
print(data)
api_key = os.getenv('MTA_API_KEY', '')
mtaController = MTA(api_key)
mtaController.add_callback(mta_callback)
mtaController = MTA(
api_key,
["A", "C", "E", "1", "2", "3"],
["127S", "127N", "A27N", "A27S"]
)
async def mta_callback(routes):
print("We are inside of the call back now")
print(len(routes))
pprint(mtaController.convert_routes_to_station_first(routes))
class threadWrapper(threading.Thread):
def __init__(self, run):
threading.Thread.__init__(self)
self.run = run
def run(self):
self.run()
def start_mta():
mtaController.add_callback(mta_callback)
mtaController.start_updates()
def stop_mta():
sleep(10)
mtaController.stop_updates()
threadLock = threading.Lock()
threads = []
# Create new threads
thread1 = threadWrapper(start_mta)
thread2 = threadWrapper(stop_mta)
thread1.start()
thread2.start()
# Add threads to thread list
threads.append(thread1)
threads.append(thread2)
# Wait for all threads to complete
for t in threads:
t.join()
print ("Exiting Main Thread")

36
route.py Normal file
View File

@@ -0,0 +1,36 @@
from stop import get_stop_from_dict
def get_route_from_dict(obj):
if "trip_update" in obj and "stop_time_update" in obj["trip_update"]:
# data we need is here create object
id = obj["id"]
route_id = obj["trip_update"]["trip"]["route_id"]
stop_times = [valid_stop for valid_stop in
[get_stop_from_dict(x) for x in obj["trip_update"]["stop_time_update"]]
if valid_stop is not None]
return Route(id, route_id, stop_times)
else:
return None
class Route(object):
def __init__(self, id, route_id, stop_times):
self.id = id
self.route_id = route_id
self.stop_times = stop_times
def get_arrival_at(self, stop_id):
"""
returns the routes stop time at a given stop ID in minutes
if not found, returns None
:param stop_id: stop ID of arrival station
:return: arrival time in minutes
"""
for stop in self.stop_times:
if stop.stop_id == stop_id:
return stop.arrival_minutes()
return None
def __str__(self):
return f"id:{self.id} | route_id:{self.route_id}| stop_times:{self.stop_times}"

69
server.py Normal file
View File

@@ -0,0 +1,69 @@
import os
import threading
from flask import Flask, jsonify, render_template, request
from mta import MTA
from pprint import pprint
app = Flask(__name__)
app.secret_key = "SuperSecretDontEvenTryToGuessMeGGEZNoRe"
app.debug = True
app._static_folder = os.path.abspath("templates/static/")
subway_data = {}
@app.route("/", methods=["GET"])
def index():
title = "Create the input image"
return render_template("layouts/index.html", title=title)
@app.route("/mta_data", methods=["POST"])
def get_mta_data():
content = request.json
return jsonify(
subway_data
)
if __name__ == "__main__":
api_key = os.getenv('MTA_API_KEY', '')
mtaController = MTA(
api_key,
["A", "C", "E", "1", "2", "3"],
["127S", "127N", "A27N", "A27S"]
)
async def mta_callback(routes):
global subway_data
print("We are inside of the call back now")
print(len(routes))
subway_data = mtaController.convert_routes_to_station_first(routes)
pprint(subway_data)
class threadWrapper(threading.Thread):
def __init__(self, run):
threading.Thread.__init__(self)
self.run = run
def run(self):
self.run()
def start_mta():
mtaController.add_callback(mta_callback)
mtaController.start_updates()
threadLock = threading.Lock()
threads = [threadWrapper(start_mta)]
for t in threads:
t.start()
app.run("0.0.0.0", port=5000)
# Wait for all threads to complete
for t in threads:
t.join()
print("Exiting Main Thread")

0
server_test.py Normal file
View File

24
stop.py Normal file
View File

@@ -0,0 +1,24 @@
from time import time
from datetime import datetime
from math import trunc
def get_stop_from_dict(obj):
if "arrival" in obj and "departure" in obj and "stop_id" in obj:
return Stop(obj["arrival"]["time"], obj["departure"]["time"], obj["stop_id"])
return None
class Stop(object):
def __init__(self, arrival_time, departure_time, stop_id):
self.arrival_time = arrival_time
self.departure_time = departure_time
self.stop_id = stop_id
def arrival_minutes(self):
return trunc(((datetime.fromtimestamp(self.arrival_time) - datetime.now()).total_seconds()) / 60)
def __str__(self):
now = datetime.now()
time = datetime.fromtimestamp(self.arrival_time)
time_minutes = trunc(((time - now).total_seconds()) / 60)
return f"arr:{time_minutes}|dep:{self.departure_time}|stop_id:{self.stop_id}"

1498
stops.txt Normal file

File diff suppressed because it is too large Load Diff

12439
subway_timing_sample.json Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/css/style.css">
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="/static/js/DataRequests.js"></script>
<meta charset="UTF-8">
<title>SUBWAY DISPLAY!</title>
</head>
<body>
Yo This will be a kickass display coming soon^tm
<br>
<span>
new test
</span>
<br>
<span>
<button id="test_button">Test Button</button>
</span>
<br>
<span id="result">
</span>
<footer>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</footer>
</body>
</html>

View File

@@ -0,0 +1,33 @@
$(document).ready(function () {
function clearCanvas() {
var canvas = document.getElementById("inputCanvas");
var ctx = canvas.getContext("2d");
ctx.clearRect(0, 0, canvas.width, canvas.height);
}
function getData() {
$.ajax({
type: "POST",
//the url where you want to sent the userName and password to
url: '/mta_data',
contentType: "application/json",
dataType: "json",
async: true,
//json object to sent to the authentication url
data: JSON.stringify({"test_dict":"test_value"}, null, '\t'),
success: function (data, text) {
$("#result").text(JSON.stringify(data));
},
error: function (request, status, error) {
alert(request.responseText);
}
});
}
$("#test_button").click(function () {
getData();
});
});