Merge pull request #33 from DevoInc/release-next

Refactoring common.dates, fixing API non-ascii chars and minor fixes

Author: Worvast

.travis.yml

@@ -1,18 +1,26 @@
 language: python
 python:
 - '2.7'
-- '3.6'
+- '3.5'
 install:
 - pip install .
 - pip install pyyaml
 script:
 - python run_tests.py
 deploy:
-  provider: pypi
-  user: worvast
-  password:
-    secure: J3YPGEaDHD1H9pVQscrh4J2U18ptq8pM5UsjIKGe6WGlgiTMhR+WYRcdQSFIGSyKZMkdnLavSuvImcUzBSL6L3WqarRZ6HBgGXtxxHRVNmk96ZZlBN5qq0AUJzHN61x5JbG+OWzJMZE1HDo6zcD36KvaIAfKu3AyaEYeVes54PY5cLC/JH/HooOP0FS643kbttkiTYKmEajJiCgu/SiXH5dtfuz5GO0CXrEp0ww+FtcTmC9T9txyjS+IBIvbNPHJC9M5jg6bgu214fCIr5iGNZ8LQulRskBOsqhCRbyyWjuF0wgl3Dkefa0z3YJpl2KYHYW0bT0UY2J8WXnE66NT6js2sv/mNdcRAZjjzugcr9mr11FrLazIjNJwDwlSTtuNoys4E449wQZfQ4vUsUANwnsXQJAdujANS8O2Yuk65uIlgnNpYBxXI71OPYZ6dzhDOsAcwlUrS9jZi2+UWGtOXoZX3i3qLWwBHEASXNSN2WLZOVj3lTEyBB7WCbBqDANHCRLrkyHMrUkOP9ptE7lvATCVfHIO2axsaxNJRKHI6W53p+6uMRAt9u0LIKBB4hyZMo51j7xkq6uO4cQt2CINVU24gYajcalswtJ/Cr0onj26xx2g/xq19sU1L7rpp8OZGFnLPHptxV3ezTlhdk86ZfwOQI1TC4KPAQlRZARDeSk=
-  on:
-    tags: true
-  distributions: "sdist bdist_wheel"
-  skip_existing: true
+  - provider: pypi
+    user: worvast
+    password:
+      secure: YdcpCoGTzy1bmjMQH/Lxw5ZdLAlUUHvE7fq2n84BNjz1XiCokpoCKkR1OEC3SGiMNtpy3lJ5YvdHtEzfqmO1mUrwlHT9TyTx/fiKnA5nTWNVxIYtHzhuSL1Z1lopQIHU6QS5FXCXM0ZWs/47X0N7pLKz9V8Pu0g+aeC91swHCEGGDICrEbXFTbMFvJxcHyEIXk2NQ1q0T6cupNOsomQlZfO75SVZMUv/VXp0RpIRfn3qp5Q3XsR6aWP43Jb9IH/4PLLpTfsJpU+1kIsqr55FKy1WTWA89W/E1oXnaf5UK3GbpNuE9qguZn+RwvnRWDg1txvQxJD3tfeKQ5EZqNhB9HbcaYr6USWeA4drE/mVZZePZEMBXT2NSEFEO2dCEMiBBY9feMeTYryJLFgwiHxkc/yM4RnzKLF3MGGcow5IKVpgJYcoNrMS+Mb5/HH8a5E0A+wwHpztCKtOGTV4dGzWsomIPS1kK3FlMTEE1z8bF5ISX9O9dh4P08Uh4YciNShY7GTNvPO13Z7S38YGbDQeijj/Q2SA66zq8vebh37xtJ6BSA54BBFjrkkOBxfi024fsCs30FXvASj8Q2Tkr120VxA5D3OKo29pgWy1357YyCQrWmiLlY3KM/z5XkM0s6hDprirBlquw9+euaoKTBgvJqFb0/pJnqB8E8FBLboKg+A=
+    on:
+      tags: true
+      python: 3.5
+    distributions: sdist bdist_wheel
+    skip_existing: true
+    skip_cleanup: true
+  - provider: releases
+    api_key:
+      secure: pP/ky4BlJNU+tTEW0YSRzj92+CzM8upmnS6bIj4cLlV4crJXlrGs5PA4+07oaILLZxIRyeBR+VFXyebseCffyBPEVFC9GYsxUlq32F0p1HxX9w6LfK8Zf/FNQCdtcN62ahM3ZbuAQBftNtldQ885SwyjHVJo4ZUAjMvr4nB8+ZqAF8Oykgx0R24yVeq1N3TQbRF8nTbwcTgoXP37r0Pkuq6ljve3lV5SZi56a4h1aOSPxNAknBX9xz7Avv/NfgkZ7R+f+mk3juBZuPov02+3P7xHtCUi8yo/bNi96ufwXiWD9xZPjZDOK3owV9iwWR2E/MDcOpORvIh8Rim7i3kMx7vDOIDR3yyYR36FTh2DIbQVRLKxCix8uESxVy84DpaWEaCOzn0jx4ddD/+EGBVRTjWqddF3Pu5+cKFCx7BYKlIDNPtYq3fIfsUKqoA7OaqJAIbk5N+Fl6jaDbbui2FCZN8LymwzpOKHv68ILztDLGIDUd4u6NpJMMHjF4xdp1tSkLyVEIE9cmrWJFom4J2STh8Ji6bODUY2vNK2vvxohJ/Cp5qBXd4VvegZGQu6xmV8EBEtqHX7UO9uY308SIV9wtwSTKswJyoptkJLPgeFnA/gCdc26MFvfo5Lxo1Etx1W8nXJIfkMo103xEuybGW2U4A7KDcZXvjdnOR6oHKhtkE=
+    file: dist/devo_sdk-*.whl
+    on:
+      repo: Devo/python-sdk

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.6.1] - 2019-01-10
+#### Changed
+ * Refactoring of devo.common.dates from objects to simple functions
+ * Now API return bytes in Python 3 and str in Python 2 by default
+
+#### Fixed
+ * Problems with non ascii/utf-8 characters in API
+ * Travis CI autodeploy to pypi
+ 
+#### Added
+ * Travis CI upload wheel to release on github
+ 
 ## [1.6.0] - 2019-01-09
 #### Changed
  * Mild refactoring of Sender class
@@ -14,8 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 #### Fixed
  * API responses blank lines and splitted lines
  * Problems with API CLI and automatic shutdowns
-
-
+ 
 ## [1.5.1] - 2018-12-28
 #### Fixed
  * devo.common buffer now receive data when CSV response

README.md

@@ -1,7 +1,7 @@
 
 [![master Build Status](https://travis-ci.com/DevoInc/python-sdk.svg?branch=master)](https://travis-ci.com/DevoInc/python-sdk) [![LICENSE](https://img.shields.io/dub/l/vibe-d.svg)](https://github.com/DevoInc/python-sdk/blob/master/LICENSE)
 
-[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-1.6.0-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
+[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-1.6.1-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
 
 
 # Devo Python SDK

devo/__version__.py

@@ -1,6 +1,6 @@
 __description__ = 'Devo Python Library.'
 __url__ = 'http://www.devo.com'
-__version__ = "1.6.0"
+__version__ = "1.6.1"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'

devo/api/client.py

@@ -8,7 +8,7 @@
 import ssl
 import sys
 import requests
-from devo.common import DateParser, Buffer
+from devo.common import Buffer, default_from, default_to
 
 PY3 = sys.version_info[0] > 2
 
@@ -272,7 +272,7 @@ def _call_stream(self, payload=None):
                 self.socket.recv(4096))
             if result:
                 try:
-                    while self.buffer.decode(self.socket.recv(4096)):
+                    while self.buffer.buffering(self.socket.recv(4096)):
                         pass
                 except socket.timeout:
                     while not self.buffer.is_empty() or self.buffer.close:
@@ -293,8 +293,8 @@ def _get_payload(query, query_id, dates, opts):
         :param opts: destination -> Destination for the results
         :return: Return the formed payload
         """
-        payload = {"from": int(DateParser.default_from(dates['from']) / 1000),
-                   "to": int(DateParser.default_to(dates['to']) / 1000) if
+        payload = {"from": int(default_from(dates['from']) / 1000),
+                   "to": int(default_to(dates['to']) / 1000) if
                          dates['to'] is not None else None,
                    "mode": {"type": opts['response']}}
 

devo/common/__init__.py

@@ -1,4 +1,9 @@
-from .dates.dateparser import DateParser
+from .dates.dateparser import parse, parse_string, parse_expression, default_from, \
+    default_to
+from .dates.dateoperations import month, week, day, hour, minute, second, now, \
+    now_without_ms, today, yesterday, parse_functions
+from .dates.dateutils import to_millis, trunc_time, trunc_time_minute, \
+    test_date_format, get_timestamp
 from .generic.configuration import Configuration
 from .logging.log import get_log, set_formatter, set_handler
 from .data import Buffer, ChainDict

devo/common/data/buffer.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 """Simple Buffer generic class for use of some package functions."""
 from threading import Thread
+from sys import version_info
+
 
 try:
     import Queue
@@ -13,18 +15,38 @@ class DevoBufferException(Exception):
     pass
 
 
+def clrf():
+    """clrf character in"""
+    return b"\r\n" if version_info[0] > 2 else "\r\n"
+
+
+def get_response_split(api_response):
+    """Get split for each event, if csv or other, and in bytes or str"""
+    if version_info[0] > 2:
+        return b"\n" if api_response is "csv" else b"\r\n"
+    else:
+        return "\n" if api_response is "csv" else "\r\n"
+
+
+def empty():
+    """Empty string in bytes or str if py2 or py3"""
+    return bytes() if version_info[0] > 2 else str()
+
+
 class Buffer(object):
     """ Simple Buffer class """
     def __init__(self, buffer_max_size=1000, api_response="json/compact"):
         self.queue = Queue.Queue(maxsize=buffer_max_size)
         self.thread = None
-        self.temp = ""
-        self.temp_event = ""
+        self.temp = empty()
+        self.temp_event = empty()
+        self.response_split = get_response_split(api_response)
+        self.clrf = clrf()
         self.octet = 0
         self.error = None
         self.close = False
         self.timeout = None
-        self.response_split = "\n" if api_response is "csv" else "\r\n"
+        self.api_response = api_response
 
     def is_alive(self):
         return self.thread.isAlive()
@@ -61,30 +83,28 @@ def get(self, processor=None, block=True, timeout=None):
 
     def process_first_line(self, data):
         """ process first line of the Query call (For delete headers) """
-        if not isinstance(data, str):
-            data = data.decode('utf8')
 
-        if "200 OK" in data.split("\r\n\r\n")[0]:
-            return self.decode(data[data.find("\r\n\r\n")+4:]), None
+        if version_info[0] > 2:
+            ok = b"200 OK"
+        else:
+            ok = "200 OK"
+
+        if ok in data.split(self.clrf+self.clrf)[0]:
+            return self.buffering(data[data.find(self.clrf+self.clrf)+4:]), None
 
         self.error = data
         return False, data
 
-    def decode(self, data):
-        if not isinstance(data, str):
-            data = data.decode('utf8')
-        return self.buffering(data)
-
     def buffering(self, data):
         if not self.octet:
-            pointer = data.find("\r\n") + 2
+            pointer = data.find(self.clrf) + 2
             size = int(data[:pointer], 16)
             data = self.temp_event + data[pointer:]
             self.octet = len(self.temp_event) + size
-            self.temp_event = ""
+            self.temp_event = empty()
 
         if len(self.temp + data) < self.octet or \
-                (not self.octet and not data.find("\r\n")):
+                (not self.octet and not data.find(self.clrf)):
             self.temp += data
             return not self.close
 
@@ -108,11 +128,8 @@ def process_recv(self, data):
         self.octet = 0
         if len(self.temp.strip()):
             data = self.temp
-            self.temp = ""
-            if data.find("\r\n") == 0:
+            self.temp = empty()
+            if data.find(self.clrf) == 0:
                 data = data[2:]
             return self.buffering(data)
         return not self.close
-
-    def close(self):
-        self.close = True

devo/common/dates/__init__.py

@@ -1,3 +1,6 @@
-from .dateparser import DateParser
-from .dateoperations import DateOperations
-from .dateutils import DateUtils
+from .dateparser import parse, parse_string, parse_expression, default_from, \
+    default_to
+from .dateoperations import month, week, day, hour, minute, second, now, \
+    now_without_ms, today, yesterday, parse_functions
+from .dateutils import to_millis, trunc_time, trunc_time_minute, \
+    test_date_format, get_timestamp