forked from yndx-metrika/logs_api_integration
-
Notifications
You must be signed in to change notification settings - Fork 1
Добавляет новые поля для clickHouse и парсинг параметров #1
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.
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
vusoltsev
wants to merge
1
commit into
olegfedoseev:master
Choose a base branch
from
n1ru:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "visits_fields": [ | ||
| "ym:s:region", | ||
| "ym:s:cityName", | ||
| "ym:s:microdistrict", | ||
| "ym:s:district", | ||
| "ym:s:street", | ||
| "ym:s:from", | ||
| "ym:s:fromBlock" | ||
| ], | ||
|
|
||
| "hits_fields": [ | ||
| "ym:pv:app", | ||
| "ym:pv:hitType", | ||
| "ym:pv:offerID", | ||
| "ym:pv:region", | ||
| "ym:pv:cityName", | ||
| "ym:pv:microdistrict", | ||
| "ym:pv:district", | ||
| "ym:pv:street", | ||
| "ym:pv:page", | ||
| "ym:pv:from", | ||
| "ym:pv:fromBlock", | ||
| "ym:pv:rubric", | ||
| "ym:pv:realtyType", | ||
| "ym:pv:dealType", | ||
| "ym:pv:special", | ||
| "ym:pv:premium", | ||
| "ym:pv:top", | ||
| "ym:pv:highlight", | ||
| "ym:pv:autoraiseX2", | ||
| "ym:pv:autoraiseX4", | ||
| "ym:pv:autoraiseX8", | ||
| "ym:pv:price", | ||
| "ym:pv:numberRooms", | ||
| "ym:pv:ownerOffer", | ||
| "ym:pv:phone" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| #!/usr/bin/env python | ||
| # -*- coding: utf-8 -*- | ||
| from urlparse import urlparse | ||
| import logging | ||
|
|
||
| def get_data_from_params(prefix, params, field, url): | ||
| logger = logging.getLogger('logs_api') | ||
| try: | ||
| action = params.keys()[0] | ||
|
|
||
| if field == prefix + 'hitType': | ||
| return action | ||
|
|
||
| if field == prefix + 'app' and params[action].has_key('app'): | ||
| return params[action]['app'] | ||
|
|
||
| if field == prefix + 'offerID': | ||
| return get_offerId_from_url(url) | ||
|
|
||
| if params[action].has_key('region'): | ||
|
|
||
| if type(params[action]['region']) is dict: | ||
| region = params[action]['region'].keys()[0] | ||
| city = params[action]['region'][region].keys()[0] | ||
| else: | ||
| region = params[action]['region'] | ||
| city = None | ||
|
|
||
| if field == prefix + 'region': | ||
| return region | ||
|
|
||
| if city != None: | ||
| if field == prefix + 'cityName': | ||
| return city | ||
| if field == prefix + 'microdistrict' and params[action]['region'][region][city].has_key(u'Микрорайон'): | ||
| return params[action]['region'][region][city][u'Микрорайон'] | ||
| if field == prefix + 'district'and params[action]['region'][region][city].has_key(u'Район'): | ||
| return params[action]['region'][region][city][u'Район'] | ||
| if field == prefix + 'street' and params[action]['region'][region][city].has_key(u'Улица'): | ||
| return params[action]['region'][region][city][u'Улица'] | ||
|
|
||
| if params[action].has_key('from'): | ||
| from_p = params[action]['from'].keys()[0] if type(params[action]['from']) is dict else params[action]['from'] | ||
|
|
||
| if field == prefix + 'from': | ||
| return from_p | ||
| if field == prefix + 'fromBlock' and type(params[action]['from']) is dict: | ||
| return params[action]['from'][from_p] | ||
|
|
||
| if field == prefix + 'page' and params[action].has_key('page'): | ||
| return params[action]['page'] | ||
|
|
||
| if params[action].has_key('rubric'): | ||
| rubric = params[action]['rubric'].keys()[0] if type(params[action]['rubric']) is dict else params[action]['rubric'] | ||
|
|
||
| if field == prefix + 'rubric': | ||
| return rubric | ||
| if field == prefix + 'realtyType' and rubric == 'flats': | ||
| return params[action]['rubric'][rubric] | ||
|
|
||
| if field == prefix + 'dealType' and params[action].has_key('dealType'): | ||
| return params[action]['dealType'] | ||
|
|
||
| if field == prefix + 'price' and params[action].has_key('price') and params[action]['price'] != 0: | ||
| return params[action]['price'] | ||
|
|
||
| if field == prefix + 'numberRooms' and params[action].has_key('numberRooms'): | ||
| return params[action]['numberRooms'] | ||
|
|
||
| if field == prefix + 'ownerOffer' and params[action].has_key('ownerOffer'): | ||
| return params[action]['ownerOffer'] | ||
|
|
||
| offer_services = params[action]['offerServices'] if params[action].has_key('offerServices') else {} | ||
|
|
||
| if field == prefix + 'special': | ||
| return 'true' if offer_services.has_key('special') else 'false' | ||
|
|
||
| if field == prefix + 'premium': | ||
| return 'true' if offer_services.has_key('premium') else 'false' | ||
|
|
||
| if field == prefix + 'highlight': | ||
| return 'true' if offer_services.has_key('highlight') else 'false' | ||
|
|
||
| if field == prefix + 'autoraiseX2': | ||
| return 'true' if offer_services.has_key('autoraiseX2') else 'false' | ||
|
|
||
| if field == prefix + 'autoraiseX4': | ||
| return 'true' if offer_services.has_key('autoraiseX4') else 'false' | ||
|
|
||
| if field == prefix + 'autoraiseX8': | ||
| return 'true' if offer_services.has_key('autoraiseX8') else 'false' | ||
|
|
||
| if field == prefix + 'top': | ||
| return 'true' if offer_services.has_key('top') else 'false' | ||
|
|
||
| if field == prefix + 'phone' and params[action].has_key('phone'): | ||
| return params[action]['phone'] | ||
|
|
||
| except TypeError, e: | ||
| logger.warning('%s the nesting structure does not match' % field) | ||
|
|
||
| return '' | ||
|
|
||
| def get_offerId_from_url(url): | ||
| url_params = urlparse(url) | ||
| path = url_params.path.split('/') | ||
| if len(path) > 1 and path[1] == 'view': | ||
| return path[2] | ||
| return '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Почему названия полей стали с маленькой буквы? Вроде в кликхаусе принято с большой
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Максим попросил сделать с маленькой, ему так проще сказал