Merge pull request #161 from amadeus4dev/update-trip-parser

Remove trip parser v2 and add v3

Author: tsolakoua

amadeus/namespaces/_travel.py

@@ -1,7 +1,7 @@
 from amadeus.client.decorator import Decorator
 from amadeus.travel._analytics import Analytics
 from amadeus.travel._predictions import Predictions
-from amadeus.travel._trip_parser_jobs import TripParser
+from amadeus.travel._trip_parser import TripParser
 from amadeus.travel._encoder import from_file, from_base64
 
 
@@ -10,7 +10,7 @@ def __init__(self, client):
         Decorator.__init__(self, client)
         self.analytics = Analytics(client)
         self.predictions = Predictions(client)
-        self.trip_parser_jobs = TripParser(client)
+        self.trip_parser = TripParser(client)
 
     def from_file(self, file):
         return from_file(file)

amadeus/travel/__init__.py

@@ -1,5 +1,5 @@
 from ._analytics import Analytics
 from ._predictions import TripPurpose, FlightDelay
-from ._trip_parser_jobs import TripParser
+from ._trip_parser import TripParser
 
 __all__ = ['Analytics', 'TripPurpose', 'FlightDelay', 'TripParser']

amadeus/travel/_encoder.py

@@ -15,8 +15,5 @@ def from_base64(base64):
 # Takes a Base64 and returns a dict
 def __build_trip_parser_body(base64):
     return {
-        'data': {
-            'type': 'trip-parser-job',
-            'content': base64,
-        },
+            'payload': base64,
     }

amadeus/travel/_trip_parser.py

@@ -0,0 +1,30 @@
+from amadeus.client.decorator import Decorator
+
+
+class TripParser(Decorator, object):
+    def __init__(self, client):
+        Decorator.__init__(self, client)
+
+    def post(self, body):
+        '''
+        Sends the request for the parsing with the
+        booking details and input parameters.
+
+        .. code-block:: python
+
+            amadeus.travel.trip_parser.post(
+            '{
+                "payload": "base64string"
+             }'
+
+        You can call our helper functions with your booking details
+        in a file or the content encoded in Base64
+
+        .. code-block:: python
+            amadeus.travel.trip_parser.post(amadeus.travel.from_file(path_to_file))
+            amadeus.travel.trip_parser.post(amadeus.travel.from_base64(base64))
+
+        :rtype: amadeus.Response
+        :raises amadeus.ResponseError: if the request could not be completed
+        '''
+        return self.client.post('/v3/travel/trip-parser', body)

amadeus/travel/_trip_parser_jobs.py

@@ -122,12 +122,6 @@ Travel/TripParser
 .. autoclass:: amadeus.travel.TripParser
   :members: post
 
-.. autoclass:: amadeus.travel.trip_parser_jobs.status.TripParserStatus
-  :members: get
-
-.. autoclass:: amadeus.travel.trip_parser_jobs.result.TripParserResult
-  :members: get
-
 ReferenceData/Locations
 =======================
 

amadeus/travel/trip_parser_jobs/__init__.py

@@ -17,20 +17,14 @@
                + '/encoder_specs_file.eml'
         base64 = 'Ym9va2luZw=='
         body = {
-            'data': {
-                'type': 'trip-parser-job',
-                'content': base64,
-            },
+            'payload': base64,
         }
         expect(from_file(file)).to(equal(body))
 
 with description('Travel/From Base64'):
     with it('should generate the defined POST body from base64'):
         base64 = 'Ym9va2luZw=='
         body = {
-            'data': {
-                'type': 'trip-parser-job',
-                'content': base64,
-            },
+            'payload': base64,
         }
         expect(from_base64(base64)).to(equal(body))