Skip to content

speed improvement! #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philipithomas merged 3 commits into from
Feb 24, 2017
Merged

speed improvement! #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f47675
speed improvement!
philipithomas Jun 30, 2016
58c079a
update yapf version
philipithomas Jul 1, 2016
971e3d8
final format change
philipithomas Jul 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
yapf==0.6.2
yapf==0.10.0
pytest==2.8.7
31 changes: 24 additions & 7 deletions staffjoy/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import time
from datetime import datetime
from copy import copy
import requests

from staffjoy.config import config_from_env
from staffjoy.exceptions import UnauthorizedException, NotFoundException, BadRequestException

MICROSECONDS_PER_SECOND = 10**6


class Resource:
# Seconds to sleep between requests (bc of rate limits)
REQUEST_SLEEP = 0.5
# Slow each request to this (bc of rate limits)
REQUEST_TIME_MICROSECONDS = 0.3 * MICROSECONDS_PER_SECOND # 0.3 seconds

PATH = "" # URL path added to base, including route variables
ID_NAME = None # What is this ID called in the route of children?
Expand Down Expand Up @@ -71,10 +74,11 @@ def get_all(cls, parent=None, **params):
base_obj = cls(key=parent.key, route=route, config=parent.config)
"""Perform a read request against the resource"""

start = datetime.now()
r = requests.get(base_obj._url(),
auth=(base_obj.key, ""),
params=params)
time.sleep(cls.REQUEST_SLEEP)
cls._delay_for_ratelimits(start)

if r.status_code not in cls.TRUTHY_CODES:
return base_obj._handle_request_exception(r)
Expand Down Expand Up @@ -121,8 +125,9 @@ def _handle_request_exception(request):

def fetch(self):
"""Perform a read request against the resource"""
start = datetime.now()
r = requests.get(self._url(), auth=(self.key, ""))
time.sleep(self.REQUEST_SLEEP)
self._delay_for_ratelimits(start)

if r.status_code not in self.TRUTHY_CODES:
return self._handle_request_exception(r)
Expand All @@ -144,16 +149,18 @@ def _process_meta(self, response):
def delete(self):
"""Delete the object"""

start = datetime.now()
r = requests.delete(self._url(), auth=(self.key, ""))
time.sleep(self.REQUEST_SLEEP)
self._delay_for_ratelimits(start)

if r.status_code not in self.TRUTHY_CODES:
return self._handle_request_exception(r)

def patch(self, **kwargs):
"""Change attributes of the item"""
start = datetime.now()
r = requests.patch(self._url(), auth=(self.key, ""), data=kwargs)
time.sleep(self.REQUEST_SLEEP)
self._delay_for_ratelimits(start)

if r.status_code not in self.TRUTHY_CODES:
return self._handle_request_exception(r)
Expand All @@ -175,8 +182,9 @@ def create(cls, parent=None, **kwargs):

obj = cls(key=parent.key, route=route, config=parent.config)

start = datetime.now()
response = requests.post(obj._url(), auth=(obj.key, ""), data=kwargs)
time.sleep(cls.REQUEST_SLEEP)
cls._delay_for_ratelimits(start)

if response.status_code not in cls.TRUTHY_CODES:
return cls._handle_request_exception(response)
Expand All @@ -191,6 +199,15 @@ def create(cls, parent=None, **kwargs):
def get_id(self):
return self.data.get("id", self.route.get(self.ID_NAME))

@classmethod
def _delay_for_ratelimits(cls, start):
"""If request was shorter than max request time, delay"""
stop = datetime.now()
duration_microseconds = (stop - start).microseconds
if duration_microseconds < cls.REQUEST_TIME_MICROSECONDS:
time.sleep((cls.REQUEST_TIME_MICROSECONDS - duration_microseconds)
/ MICROSECONDS_PER_SECOND)

def __str__(self):
return "{} id {}".format(self.__class__.__name__,
self.route.get(self.ID_NAME))