Shipping v1.0.0

georideapilib/api.py

@@ -22,7 +22,8 @@ from georideapilib.exception import (
     UnauthorizedException
 )
 
-GEORIDE_API_HOST = "https://api.georide.fr"
+GEORIDE_API_HOST = "https://api.georide.com"
+GEORIDE_SOCKET_HOST = "https://socket.georide.com"
 GEORIDE_API_ENDPOINT_LOGIN = "/user/login"
 GEORIDE_API_ENDPOINT_NEW_TOKEN = "/user/new-token"
 GEORIDE_API_ENDPOINT_LOGOUT = "/user/logout"

georideapilib/objects/GeoRideTracker.py

@@ -495,26 +495,26 @@ class GeoRideTracker(metaclass=JsonMgtMetaClass): # pylint: disable=R0904,R0902
             cls.json_field_protect(json,'isOldTracker', False),
             cls.json_field_protect(json,'autoLockFreezedTo'),
             cls.json_field_protect(json,'fixtime'),
-            json['role'], # Mandatory
+            cls.json_field_protect(json,'role', "owner"),
-            json['lastPaymentDate'],# Mandatory
+            cls.json_field_protect(json,'lastPaymentDate', None),
             cls.json_field_protect(json,'giftCardId'),
             cls.json_field_protect(json,'expires'),
             cls.json_field_protect(json,'activationDate'),
-            json['odometer'],#Mandatory
+            cls.json_field_protect(json,'odometer', False),
             cls.json_field_protect(json,'isStolen', False),
             cls.json_field_protect(json,'isCrashed', False),
             cls.json_field_protect(json,'crashDetectionDisabled'),
-            json['speed'], # Mandatory
+            cls.json_field_protect(json,'speed', 0), # Mandatory
-            json['moving'], # Mandatory
+            cls.json_field_protect(json,'moving', False),
             cls.json_field_protect(json,'positionId', -1),
-            json['latitude'], # Mandatory
+            cls.json_field_protect(json,'latitude', 47.0),
-            json['longitude'], # Mandatory
+            cls.json_field_protect(json,'longitude', -1.0),
             cls.json_field_protect(json,'altitude', 0),
             cls.json_field_protect(json,'lockedPositionId'),
             cls.json_field_protect(json,'lockedLatitude'),
             cls.json_field_protect(json,'lockedLongitude'),
-            json['isLocked'], # Mandatory
+            cls.json_field_protect(json,'isLocked', False),
-            json['canSeePosition'],# Mandatory
+            cls.json_field_protect(json,'canSeePosition', False),
             cls.json_field_protect(json,'canLock', False),
             cls.json_field_protect(json,'canUnlock', False),
             cls.json_field_protect(json,'canShare', False),
@@ -523,7 +523,7 @@ class GeoRideTracker(metaclass=JsonMgtMetaClass): # pylint: disable=R0904,R0902
             cls.json_field_protect(json,'canSeeStatistics', False),
             cls.json_field_protect(json,'canSendBrokenDownSignal', False),
             cls.json_field_protect(json,'canSendStolenSignal', False),
-            json['status'],# Mandatory
+            cls.json_field_protect(json,'status', 'unknown'),
             cls.json_field_protect(json,'subscriptionId', -1),
             cls.json_field_protect(json,'externalBatteryVoltage', -1.0),
             cls.json_field_protect(json,'internalBatteryVoltage', -1.0),

georideapilib/socket.py

@@ -2,7 +2,7 @@
 import logging
 import socketio
 
-from georideapilib.api import GEORIDE_API_HOST
+from georideapilib.api import GEORIDE_SOCKET_HOST
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -104,7 +104,7 @@ class GeoRideSocket():
     def connect(self, auth_token):
         """ connect to the georide socket"""
         if self._initialised is not False:
-            sio.connect(GEORIDE_API_HOST, headers={'token': auth_token})
+            sio.connect(GEORIDE_SOCKET_HOST, headers={'token': auth_token})
             sio.wait()
         else:
             _LOGGER.error("Please call init() before")

setup.py

@@ -19,16 +19,16 @@ CURRENT_DIR = os.path.dirname(__file__)
 setup(
     name='georideapilib',
     packages=['georideapilib', 'georideapilib.objects'],  # this must be the same as the name above
-    version='0.9.4',
+    version='1.0.0',
     description='Lib to control GeoRide tracker devices with theire rest api',
     author='Matthieu DUVAL',
     author_email='georideapilib@duval-dev.fr',
     # use the URL to the github repo
     url='https://github.com/hacf/georide-api',
-    download_url='https://codeload.github.com/hacf/georide-api/tar.gz/0.9.3',
+    download_url='https://codeload.github.com/hacf/georide-api/tar.gz/1.0.0',
     keywords=['rest', 'georide', 'api', 'grutier', 'GeoRide'],  # arbitrary keywords
     classifiers=[],
-    install_requires=["python-socketio[client]==4.6.1"],
+    install_requires=["python-socketio[client]==5.8.0"],
     tests_require=[
         'pytest>=3.7',
         'pytest-pep8',