Skip to content

Integrate Impressive Changes #9

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

Open
sibblegp wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Integrate Impressive Changes #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4b38c33
Initial code and tests for Button and API support
sdobz Jan 5, 2014
b4de975
Fixed missing custom parameter in order, implemented Decimal
sdobz Jan 5, 2014
10e1695
Implemented from_cents method, fixed possible bug in transfer
sdobz Jan 5, 2014
c847601
Made order_id more consistant and made models store their original data
sdobz Jan 6, 2014
a608a14
Cleaned button, added some error handling
sdobz Jan 7, 2014
329aea9
Added more error handling via _get and _post methods, made CoinbaseEr…
sdobz Jan 7, 2014
51c3bfe
Gave CoinbaseError a more informative string representation
sdobz Jan 7, 2014
be2b6ab
Gave CoinbaseError a LESS informative string representation
sdobz Jan 7, 2014
857cf5e
Fixed bug where qty was passed as data not a parameter
sdobz Jan 8, 2014
1fcb9b5
Get rid of "Price can't be blank"
sylvainblot Feb 14, 2014
c6d8407
Merge branch 'master' of https://github.com/sibblegp/coinbase_python
sdobz Feb 14, 2014
a66da38
Merge pull request #1 from sylvainblot/master
sdobz Feb 14, 2014
f787054
price_currency_iso in button api
sylvainblot Feb 15, 2014
7b18348
Merge pull request #2 from sylvainblot/master
sdobz Feb 15, 2014
3dd2e48
Removed support for old api_key sustem, added support for new api_key…
sdobz Mar 13, 2014
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
Prev Previous commit
Next Next commit
Added more error handling via _get and _post methods, made CoinbaseEr… 
…ror an exception
  • Loading branch information
@sdobz
sdobz committed Jan 7, 2014
commit 329aea9836f1431cdeba964d1e027de522bc6292
167 changes: 59 additions & 108 deletions coinbase/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
import json
import os
import inspect

#TODO: Switch to decimals from floats
#from decimal import Decimal
import copy

from .config import COINBASE_ENDPOINT, COINBASE_ITEMS_PER_PAGE
from .models import CoinbaseAmount, CoinbaseTransaction, CoinbaseUser, CoinbaseTransfer, CoinbaseError, CoinbaseButton, CoinbaseOrder
Expand Down Expand Up @@ -158,17 +156,47 @@ def _prepare_request(self):
#Check if the oauth token is expired and refresh it if necessary
self._check_oauth_expired()

_get = lambda self, url, data=None, params=None: self.make_request(self.session.get , url, data, params)
_post = lambda self, url, data=None, params=None: self.make_request(self.session.post , url, data, params)
_put = lambda self, url, data=None, params=None: self.make_request(self.session.put , url, data, params)
_delete = lambda self, url, data=None, params=None: self.make_request(self.session.delete, url, data, params)

def make_request(self, request_func, url, data=None, params=None):
if params:
# We don't want to change this object, it is passed by reference
params = copy.copy(params)
params.update(self.global_request_params)
else:
params = self.global_request_params

response = request_func(COINBASE_ENDPOINT + url, data=data, params=params)
response_parsed = response.json()

if response.status_code != 200:
if 'error' in response_parsed:
raise CoinbaseError(response_parsed['error'])
else:
raise CoinbaseError('Response code not 200, was {}'.format(response.status_code))

if 'success' in response_parsed and not response_parsed['success']:
if 'error' in response_parsed:
raise CoinbaseError(response_parsed['error'])
elif 'errors' in response_parsed:
raise CoinbaseError(response_parsed['errors'])
else:
raise CoinbaseError('Success was false in response, unknown error')

return response_parsed


@property
def balance(self):
"""
Retrieve coinbase's account balance

:return: CoinbaseAmount (float) with currency attribute
:return: CoinbaseAmount with currency attribute
"""

url = COINBASE_ENDPOINT + '/account/balance'
response = self.session.get(url, params=self.global_request_params)
response_parsed = response.json()
response_parsed = self._get('/account/balance')
return CoinbaseAmount(response_parsed['amount'], response_parsed['currency'])

@property
Expand All @@ -178,9 +206,7 @@ def receive_address(self):

:return: String address of account
"""
url = COINBASE_ENDPOINT + '/account/receive_address'
response = self.session.get(url, params=self.global_request_params)
response_parsed = response.json()
response_parsed = self._get('/account/receive_address')
return response_parsed['address']

@property
Expand All @@ -190,65 +216,41 @@ def contacts(self):

:return: List of contacts in the account
"""
url = COINBASE_ENDPOINT + '/contacts'
response = self.session.get(url, params=self.global_request_params)
return [contact['contact'] for contact in response.json()['contacts']]




response_parsed = self._get('/contacts')
return [contact['contact'] for contact in response_parsed['contacts']]

def buy_price(self, qty=1):
"""
Return the buy price of BitCoin in USD
:param qty: Quantity of BitCoin to price
:return: CoinbaseAmount (float) with currency attribute
:return: CoinbaseAmount with currency attribute
"""
url = COINBASE_ENDPOINT + '/prices/buy'
params = {'qty': qty}
params.update(self.global_request_params)
response = self.session.get(url, params=params)
results = response.json()
return CoinbaseAmount(results['amount'], results['currency'])
response_parsed = self._get('/prices/buy', data=json.dumps({"qty": qty}))
return CoinbaseAmount(response_parsed['amount'], response_parsed['currency'])

def sell_price(self, qty=1):
"""
Return the sell price of BitCoin in USD
:param qty: Quantity of BitCoin to price
:return: CoinbaseAmount (float) with currency attribute
:return: CoinbaseAmount with currency attribute
"""
url = COINBASE_ENDPOINT + '/prices/sell'
params = {'qty': qty}
params.update(self.global_request_params)
response = self.session.get(url, params=params)
response_parsed = response.json()
response_parsed = self._get('/prices/sell', data=json.dumps({"qty": qty}))
return CoinbaseAmount(response_parsed['amount'], response_parsed['currency'])

# @property
# def user(self):
# url = COINBASE_ENDPOINT + '/account/receive_address'
# response = self.session.get(url)
# return response.json()


def buy_btc(self, qty, pricevaries=False):
"""
Buy BitCoin from Coinbase for USD
:param qty: BitCoin quantity to be bought
:param pricevaries: Boolean value that indicates whether or not the transaction should
be processed if Coinbase cannot gaurentee the current price.
be processed if Coinbase cannot guarantee the current price.
:return: CoinbaseTransfer with all transfer details on success or
CoinbaseError with the error list received from Coinbase on failure
"""
url = COINBASE_ENDPOINT + '/buys'
request_data = {
"qty": qty,
"agree_btc_amount_varies": pricevaries
}
response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/buys', data=json.dumps(request_data))
return CoinbaseTransfer(response_parsed['transfer'])


Expand All @@ -259,14 +261,7 @@ def sell_btc(self, qty):
:return: CoinbaseTransfer with all transfer details on success or
CoinbaseError with the error list received from Coinbase on failure
"""
url = COINBASE_ENDPOINT + '/sells'
request_data = {
"qty": qty,
}
response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/sells', data=json.dumps({"qty": qty}))
return CoinbaseTransfer(response_parsed['transfer'])


Expand All @@ -279,7 +274,6 @@ def request(self, from_email, amount, notes='', currency='BTC'):
:param currency: Currency of the request
:return: CoinbaseTransaction with status and details
"""
url = COINBASE_ENDPOINT + '/transactions/request_money'

if currency == 'BTC':
request_data = {
Expand All @@ -299,10 +293,7 @@ def request(self, from_email, amount, notes='', currency='BTC'):
}
}

response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/transactions/request_money', data=json.dumps(request_data))
return CoinbaseTransaction(response_parsed['transaction'])

def send(self, to_address, amount, notes='', currency='BTC'):
Expand All @@ -314,7 +305,6 @@ def send(self, to_address, amount, notes='', currency='BTC'):
:param currency: Currency to send
:return: CoinbaseTransaction with status and details
"""
url = COINBASE_ENDPOINT + '/transactions/send_money'

if currency == 'BTC':
request_data = {
Expand All @@ -335,10 +325,7 @@ def send(self, to_address, amount, notes='', currency='BTC'):
}
}

response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/transactions/send_money', data=json.dumps(request_data))
return CoinbaseTransaction(response_parsed['transaction'])


Expand All @@ -348,7 +335,6 @@ def transactions(self, count=30):
:param count: How many transactions to retrieve
:return: List of CoinbaseTransaction objects
"""
url = COINBASE_ENDPOINT + '/transactions'
pages = count / 30 + 1
transactions = []

Expand All @@ -357,10 +343,7 @@ def transactions(self, count=30):
for page in xrange(1, pages + 1):

if not reached_final_page:
params = {'page': page}
params.update(self.global_request_params)
response = self.session.get(url=url, params=params)
response_parsed = response.json()
response_parsed = self._get('/transactions', params={'page': page})

if response_parsed['num_pages'] == page:
reached_final_page = True
Expand All @@ -376,7 +359,6 @@ def transfers(self, count=30):
:param count: How many transfers to retrieve
:return: List of CoinbaseTransfer objects
"""
url = COINBASE_ENDPOINT + '/transfers'
pages = count / 30 + 1
transfers = []

Expand All @@ -385,12 +367,7 @@ def transfers(self, count=30):
for page in xrange(1, pages + 1):

if not reached_final_page:
params = {'page': page}
params.update(self.global_request_params)
response = self.session.get(url=url, params=params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._get('/transfers', params={'page': page})

if response_parsed['num_pages'] == page:
reached_final_page = True
Expand All @@ -406,9 +383,7 @@ def get_transaction(self, transaction_id):
:param transaction_id: Unique transaction identifier
:return: CoinbaseTransaction object with transaction details
"""
url = COINBASE_ENDPOINT + '/transactions/' + str(transaction_id)
response = self.session.get(url, params=self.global_request_params)
response_parsed = response.json()
response_parsed = self._get('/transactions/{id}'.format(id=transaction_id))
return CoinbaseTransaction(response_parsed['transaction'])

def get_user_details(self):
Expand All @@ -417,9 +392,7 @@ def get_user_details(self):

:return: CoinbaseUser object with user details
"""
url = COINBASE_ENDPOINT + '/users'
response = self.session.get(url, params=self.global_request_params)
response_parsed = response.json()
response_parsed = self._get('/users')

user_details = response_parsed['users'][0]['user']

Expand Down Expand Up @@ -447,16 +420,12 @@ def generate_receive_address(self, callback_url=None):
:param callback_url: The URL to receive instant payment notifications
:return: The new string address
"""
url = COINBASE_ENDPOINT + '/account/generate_receive_address'
request_data = {
"address": {
"callback_url": callback_url
}
}
response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/account/generate_receive_address', data=json.dumps(request_data))
return response_parsed['address']

def create_button(self, name,
Expand Down Expand Up @@ -501,13 +470,10 @@ def create_button(self, name,
:param price5: Suggested price 5
:return: A CoinbaseButton object
"""
url = COINBASE_ENDPOINT + '/buttons'
price = str(price)

request_data = {
"button": {
"name": name,
"price": price,
"price": str(price),
"currency": currency,
"type": type,
"style": style,
Expand All @@ -533,10 +499,7 @@ def create_button(self, name,
for key in none_keys:
del request_data['button'][key]

response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/buttons', data=json.dumps(request_data))
return CoinbaseButton(response_parsed['button'])

def create_order(self, code):
Expand All @@ -545,12 +508,7 @@ def create_order(self, code):
:param code: The code of the button for which you wish to create an order
:return: A CoinbaseOrder object
"""
url = COINBASE_ENDPOINT + '/buttons/{code}/create_order'.format(code=code)

response = self.session.post(url=url, params=self.global_request_params)
response_parsed = response.json()
if response_parsed['success'] is False:
return CoinbaseError(response_parsed['errors'])
response_parsed = self._post('/buttons/{code}/create_order'.format(code=code))
return CoinbaseOrder(response_parsed['order'])

def get_order(self, order_id):
Expand All @@ -559,10 +517,7 @@ def get_order(self, order_id):
:param order_id: The order id to be retrieved
:return: A CoinbaseOrder object
"""
url = COINBASE_ENDPOINT + '/orders/{id}'.format(id=order_id)

response = self.session.get(url=url, params=self.global_request_params)
response_parsed = response.json()
response_parsed = self._get('/orders/{id}'.format(id=order_id))
return CoinbaseOrder(response_parsed['order'])

def orders(self, count=30):
Expand All @@ -571,7 +526,6 @@ def orders(self, count=30):
:param count: How many orders to retrieve
:return: List of CoinbaseOrder objects
"""
url = COINBASE_ENDPOINT + '/orders'
pages = count / 30 + 1
orders = []

Expand All @@ -580,10 +534,7 @@ def orders(self, count=30):
for page in xrange(1, pages + 1):

if not reached_final_page:
params = {'page': page}
params.update(self.global_request_params)
response = self.session.get(url=url, params=params)
response_parsed = response.json()
response_parsed = self._get('/orders', params={'page': page})

if response_parsed['num_pages'] == page:
reached_final_page = True
Expand Down
4 changes: 1 addition & 3 deletions coinbase/models/error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
__author__ = 'kroberts'



class CoinbaseError(object):
class CoinbaseError(BaseException):

def __init__(self, errorList):
self.error = errorList
Loading