online source: formatting
This commit is contained in:
Frederik Jaeckel
parent
0a143e8768
commit
2166da5509
1 changed files with 76 additions and 53 deletions
|
|
@ -4,7 +4,10 @@
|
|||
# full copyright notices and license terms.
|
||||
|
||||
from string import Template
|
||||
import requests, logging, html2text, re
|
||||
import requests
|
||||
import logging
|
||||
import html2text
|
||||
import re
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
from trytond.model import ModelView, ModelSQL, fields
|
||||
|
|
@ -35,7 +38,8 @@ sel_rgxdatefmt = [
|
|||
('%b %d %Y', 'mon dd yyyy'),
|
||||
]
|
||||
|
||||
fields_check = ['url', 'nsin', 'isin', 'symbol', 'text', 'http_state', \
|
||||
fields_check = [
|
||||
'url', 'nsin', 'isin', 'symbol', 'text', 'http_state',
|
||||
'fnddate', 'fndrate', 'fndident']
|
||||
|
||||
|
||||
|
|
@ -51,32 +55,40 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
__name__ = 'investment.source'
|
||||
|
||||
name = fields.Char(string='Name', required=True)
|
||||
query_method = fields.Selection(string='Method', required=True,
|
||||
query_method = fields.Selection(
|
||||
string='Method', required=True,
|
||||
help='Select the method to retrieve the data.',
|
||||
selection='get_query_methods')
|
||||
url = fields.Char(string='URL', states=STATES_WEB, depends=DEPENDS_WEB)
|
||||
nohtml = fields.Boolean(string='Remove HTML',
|
||||
nohtml = fields.Boolean(
|
||||
string='Remove HTML',
|
||||
help='Removes HTML tags before the text is interpreted.',
|
||||
states={
|
||||
'invisible': STATES_WEB['invisible'],
|
||||
}, depends=DEPENDS_WEB)
|
||||
rgxdate = fields.Char(string='Date',
|
||||
rgxdate = fields.Char(
|
||||
string='Date',
|
||||
help='Regex code to find the date in the downloaded HTML file.',
|
||||
states=STATES_WEB, depends=DEPENDS_WEB)
|
||||
rgxdatefmt = fields.Selection(string='Date format', selection=sel_rgxdatefmt,
|
||||
rgxdatefmt = fields.Selection(
|
||||
string='Date format', selection=sel_rgxdatefmt,
|
||||
states=STATES_WEB, depends=DEPENDS_WEB)
|
||||
rgxrate = fields.Char(string='Rate',
|
||||
rgxrate = fields.Char(
|
||||
string='Rate',
|
||||
help='Regex code to find the rate in the downloaded HTML file.',
|
||||
states=STATES_WEB, depends=DEPENDS_WEB)
|
||||
rgxdecimal = fields.Selection(string='Decimal Separator',
|
||||
rgxdecimal = fields.Selection(
|
||||
string='Decimal Separator',
|
||||
help='Decimal separator for converting the market value into a number.',
|
||||
selection=sel_rgxdecimal, states=STATES_WEB, depends=DEPENDS_WEB)
|
||||
rgxident = fields.Char(string='Identifier',
|
||||
rgxident = fields.Char(
|
||||
string='Identifier',
|
||||
help='Regex code to find the identifier in the downloaded HTML file.',
|
||||
states={
|
||||
'invisible': STATES_WEB['invisible'],
|
||||
}, depends=DEPENDS_WEB)
|
||||
rgxidtype = fields.Selection(string='ID-Type', selection=sel_rgxidtype,
|
||||
rgxidtype = fields.Selection(
|
||||
string='ID-Type', selection=sel_rgxidtype,
|
||||
help='Type of identifier used to validate the result.',
|
||||
states={
|
||||
'required': Bool(Eval('rgxident', '')),
|
||||
|
|
@ -84,27 +96,32 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
}, depends=DEPENDS_WEB+['rgxident'])
|
||||
|
||||
# field to test requests
|
||||
used_url = fields.Function(fields.Char(string='Used URL', readonly=True,
|
||||
used_url = fields.Function(fields.Char(
|
||||
string='Used URL', readonly=True,
|
||||
help='This URL is used to retrieve the HTML file.',
|
||||
states={'invisible': STATES_WEB['invisible']}, depends=DEPENDS_WEB),
|
||||
'on_change_with_used_url')
|
||||
nsin = fields.Function(fields.Char(string='NSIN'),
|
||||
'on_change_with_nsin', setter='set_test_value')
|
||||
isin = fields.Function(fields.Char(string='ISIN'),
|
||||
'on_change_with_isin', setter='set_test_value')
|
||||
symbol = fields.Function(fields.Char(string='Symbol'),
|
||||
'on_change_with_symbol', setter='set_test_value')
|
||||
http_state = fields.Function(fields.Char(string='HTTP-State',
|
||||
nsin = fields.Function(fields.Char(
|
||||
string='NSIN'), 'on_change_with_nsin', setter='set_test_value')
|
||||
isin = fields.Function(fields.Char(
|
||||
string='ISIN'), 'on_change_with_isin', setter='set_test_value')
|
||||
symbol = fields.Function(fields.Char(
|
||||
string='Symbol'), 'on_change_with_symbol', setter='set_test_value')
|
||||
http_state = fields.Function(fields.Char(
|
||||
string='HTTP-State',
|
||||
readonly=True), 'on_change_with_http_state')
|
||||
text = fields.Function(fields.Text(string='Result',
|
||||
readonly=True), 'on_change_with_text')
|
||||
fnddate = fields.Function(fields.Date(string='Date', readonly=True,
|
||||
text = fields.Function(fields.Text(
|
||||
string='Result', readonly=True), 'on_change_with_text')
|
||||
fnddate = fields.Function(fields.Date(
|
||||
string='Date', readonly=True,
|
||||
help='Date found during test query.'),
|
||||
'on_change_with_fnddate')
|
||||
fndrate = fields.Function(fields.Numeric(string='Rate', readonly=True,
|
||||
fndrate = fields.Function(fields.Numeric(
|
||||
string='Rate', readonly=True,
|
||||
help='Rate found during test query.', digits=(16, 4)),
|
||||
'on_change_with_fndrate')
|
||||
fndident = fields.Function(fields.Char(string='Identifier', readonly=True,
|
||||
fndident = fields.Function(fields.Char(
|
||||
string='Identifier', readonly=True,
|
||||
help='Identifier found during test query.'),
|
||||
'on_change_with_fndident')
|
||||
|
||||
|
|
@ -256,7 +273,8 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
"""
|
||||
OSourc = Pool().get('investment.source')
|
||||
|
||||
result = OSourc.run_query_method(self, self.isin, self.nsin,
|
||||
result = OSourc.run_query_method(
|
||||
self, self.isin, self.nsin,
|
||||
self.symbol, debug=True)
|
||||
if result is not None:
|
||||
self.text = result.get('text', None)
|
||||
|
|
@ -306,7 +324,8 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
if (asset_code or '').lower() != code.lower():
|
||||
# fail
|
||||
logger.warning(
|
||||
'update_rate: got wrong code "%(wrong)s" - expected "%(exp)s"' % {
|
||||
'update_rate: got wrong code ' +
|
||||
'"%(wrong)s" - expected "%(exp)s"' % {
|
||||
'exp': asset_code,
|
||||
'wrong': code,
|
||||
})
|
||||
|
|
@ -322,8 +341,7 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
# check if exists
|
||||
if Rate.search_count([
|
||||
('asset.id', '=', asset.id),
|
||||
('date', '=', to_create['date']),
|
||||
]) == 0:
|
||||
('date', '=', to_create['date'])]) == 0:
|
||||
Rate.create([to_create])
|
||||
return True
|
||||
else:
|
||||
|
|
@ -353,20 +371,23 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
dec_sep = [',', '.']
|
||||
dec_sep.remove(self.rgxdecimal)
|
||||
|
||||
result = result.replace(dec_sep[0], '').replace(self.rgxdecimal, '.')
|
||||
result = result.replace(
|
||||
dec_sep[0], '').replace(self.rgxdecimal, '.')
|
||||
try:
|
||||
result = Decimal(result)
|
||||
except :
|
||||
except Exception:
|
||||
result = None
|
||||
elif field_name == 'rgxdate':
|
||||
try:
|
||||
result = datetime.strptime(result, self.rgxdatefmt).date()
|
||||
except :
|
||||
except Exception:
|
||||
result = None
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
def read_from_website(cls, updtsource, isin=None, nsin=None, symbol=None, debug=False):
|
||||
def read_from_website(
|
||||
cls, updtsource, isin=None, nsin=None,
|
||||
symbol=None, debug=False):
|
||||
""" read from url, extract values
|
||||
"""
|
||||
result = {}
|
||||
|
|
@ -410,7 +431,9 @@ class OnlineSource(ModelSQL, ModelView):
|
|||
result['date'] = updtsource.get_regex_result(html, 'rgxdate')
|
||||
result['code'] = updtsource.get_regex_result(html, 'rgxident')
|
||||
else:
|
||||
logger.error('read_from_website: %(code)s, url: %(url)s, redirects: [%(redirects)s]' % {
|
||||
logger.error(
|
||||
'read_from_website: ' +
|
||||
'%(code)s, url: %(url)s, redirects: [%(redirects)s]' % {
|
||||
'code': res1.status_code,
|
||||
'url': res1.url,
|
||||
'redirects': ', '.join([x.url for x in res1.history]),
|
||||
|
|
|
|||
Loading…
Reference in a new issue