Now ignoring .vscode

.gitignore

@@ -161,4 +161,5 @@ test_all.py
 build.*
 cleanup.*
 publish.*
-publish-release.*
+publish-release.*
+.vscode

pyrmv/__init__.py

@@ -36,5 +36,5 @@ __license__ = "MIT License"
 __author__ = "Profitroll"
 
 from . import raw
-from .methods import *
-from .errors import *
+from . import errors
+from .methods import *

pyrmv/errors/api_errors.py

@@ -0,0 +1,55 @@
+class ApiAuthError(Exception):
+    """
+    Access denied for accessId provided.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class ApiQuotaError(Exception):
+    """
+    Quota exceeded for accessId provided.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class ApiTooManyRequests(Exception):
+    """
+    Too many requests.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class ApiParamError(Exception):
+    """Exception raised for errors in the input arguments.
+
+    ### Attributes:
+        * errorCode: Client error code from HAFAS ReST Request Errors.
+        * errorText: Description of an error occurred.
+    """
+
+    def __init__(self, errorCode: str, errorText: str):
+        self.errorCode = errorCode
+        self.errorText = errorText
+        super().__init__(self.errorText)
+
+    def __str__(self):
+        return f'{self.errorCode} -> {self.errorText}'
+
+class ApiFormatError(Exception):
+    """
+    Response format not supported.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__

pyrmv/errors/int_errors.py

@@ -0,0 +1,29 @@
+class IntError(Exception):
+    """
+    Internal RMV server error.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class IntGatewayError(Exception):
+    """
+    Communication error with RMV backend systems.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class IntTimeoutError(Exception):
+    """
+    Timeout during service processing.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__

pyrmv/errors/ps_errors.py

@@ -0,0 +1,13 @@
+class PsIncorrectParamError(Exception):
+    """
+    An invalid parameter combination was requested, i.e. the
+    defined range of stable segments encompassed all public
+    transport sections or it was attempted to search
+    forward/backward from the end/beginning of the
+    connection.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__

pyrmv/errors/sot_errors.py

@@ -0,0 +1,49 @@
+class SotAlreadyArrivedError(Exception):
+    """
+    Trip already arrived.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SotNotStartedError(Exception):
+    """
+    Trip not started.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SotCancelledError(Exception):
+    """
+    Trip cancelled.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SotAllTrainsFilteredError(Exception):
+    """
+    All trips filtered.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SotStayOnTripError(Exception):
+    """
+    No change. Stay on trip.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__

pyrmv/errors/svc_errors.py

@@ -0,0 +1,145 @@
+class SvcParamError(Exception):
+    """Exception raised for errors in the input arguments.
+
+    ### Attributes:
+        * errorCode: Client error code from HAFAS ReST Request Errors.
+        * errorText: Description of an error occurred.
+    """
+
+    def __init__(self, errorCode: str, errorText: str):
+        self.errorCode = errorCode
+        self.errorText = errorText
+        super().__init__(self.errorText)
+
+    def __str__(self):
+        return f'{self.errorCode} -> {self.errorText}'
+
+class SvcLocationError(Exception):
+    """
+    Location missing or invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcLocationArrivalError(Exception):
+    """
+    Arrival location missing or invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcLocationDepartureError(Exception):
+    """
+    Departure location missing or invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcLocationViaError(Exception):
+    """
+    Unknown change stop.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcLocationEqualError(Exception):
+    """
+    Origin/destination or vias are equal.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcLocationNearError(Exception):
+    """
+    Origin and destination are too close.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcDatetimeError(Exception):
+    """
+    Date/time are missing or invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcDatetimePeriodError(Exception):
+    """
+    Date/time are not in timetable or allowed period.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcProductError(Exception):
+    """
+    Product field missing or invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcContextError(Exception):
+    """
+    Context is invalid.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcNoResultError(Exception):
+    """
+    No result found.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcSearchError(Exception):
+    """
+    Unsuccessful search.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__
+
+class SvcNoMatchError(Exception):
+    """
+    No match found.
+    """
+    def __init__(self):
+        super().__init__(self.__doc__)
+
+    def __str__(self):
+        return self.__doc__

pyrmv/errors/unknown_error.py

@@ -0,0 +1,15 @@
+class UnknownError(Exception):
+    """Exception raised but error is not known.
+
+    ### Attributes:
+        * errorCode: Client error code from HAFAS ReST Request Errors.
+        * errorText: Description of an error occurred.
+    """
+
+    def __init__(self, errorCode: str, errorText: str):
+        self.errorCode = errorCode
+        self.errorText = errorText
+        super().__init__(self.errorText)
+
+    def __str__(self):
+        return f'{self.errorCode} -> {self.errorText}'

pyrmv/raw/board_arrival.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import List, Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -26,6 +28,8 @@ def board_arrival(accessId: str,
 
     output = get("https://www.rmv.de/hapi/arrivalBoard", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/board_departure.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import List, Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -26,6 +28,8 @@ def board_departure(accessId: str,
 
     output = get("https://www.rmv.de/hapi/departureBoard", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/him_search.py

@@ -1,8 +1,11 @@
 from requests import get
-from typing import Dict, Union
+from typing import Dict, OrderedDict, Union
 from xmltodict import parse as xmlparse
 from datetime import datetime
 
+from pyrmv.utility.find_exception import find_exception
+from pyrmv.utility.bitmask import weekdays_to_bitmask
+
 try:
     from typing import Literal
 except ImportError:
@@ -15,7 +18,7 @@ def him_search(accessId: str,
         dateE: Union[str, datetime] = None,
         timeB: Union[str, datetime] = None,
         timeE: Union[str, datetime] = None,
-        weekdays: Dict[str, bool] = None,
+        weekdays: Union[str, OrderedDict[str, bool]] = None,
         himIds: Union[str, list] = None,
         hierarchicalView: bool = False,
         operators: Union[str, list] = None,
@@ -35,7 +38,7 @@ def him_search(accessId: str,
         regions: Union[str, list] = None,
         himtext: Union[str, list] = None,
         himtexttags: Union[str, list] = None,
-        additionalfields: Union[str, list] = None,
+        additionalfields: Union[str, list, dict] = None,
         poly: bool = False,
         searchmode: Literal["MATCH", "NOMATCH", "TFMATCH"] = None,
         affectedJourneyMode: Literal["ALL", "OFF"] = None,
@@ -50,40 +53,40 @@ def him_search(accessId: str,
     Read more about this in section 2.37. "HIM Search (himsearch)" of HAFAS ReST Documentation.  
 
     ### Args:
-        * accessId (str): _description_
-        * json (bool, optional): _description_. Defaults to True.
-        * dateB (Union[str, datetime], optional): _description_. Defaults to None.
-        * dateE (Union[str, datetime], optional): _description_. Defaults to None.
-        * timeB (Union[str, datetime], optional): _description_. Defaults to None.
-        * timeE (Union[str, datetime], optional): _description_. Defaults to None.
-        * weekdays (Dict[str, bool], optional): _description_. Defaults to None.
-        * himIds (Union[str, list], optional): _description_. Defaults to None.
-        * hierarchicalView (bool, optional): _description_. Defaults to False.
-        * operators (Union[str, list], optional): _description_. Defaults to None.
-        * categories (Union[str, list], optional): _description_. Defaults to None.
-        * channels (Union[str, list], optional): _description_. Defaults to None.
-        * companies (Union[str, list], optional): _description_. Defaults to None.
-        * lines (Union[str, list], optional): _description_. Defaults to None.
-        * lineids (Union[str, list], optional): _description_. Defaults to None.
-        * stations (Union[str, list], optional): _description_. Defaults to None.
-        * fromstation (str, optional): _description_. Defaults to None.
-        * tostation (str, optional): _description_. Defaults to None.
-        * bothways (bool, optional): _description_. Defaults to None.
-        * trainnames (Union[str, list], optional): _description_. Defaults to None.
-        * metas (Union[str, list], optional): _description_. Defaults to None.
-        * himcategory (str, optional): _description_. Defaults to None.
-        * himtags (Union[str, list], optional): _description_. Defaults to None.
-        * regions (Union[str, list], optional): _description_. Defaults to None.
-        * himtext (Union[str, list], optional): _description_. Defaults to None.
-        * himtexttags (Union[str, list], optional): _description_. Defaults to None.
-        * additionalfields (Union[str, list], optional): _description_. Defaults to None.
-        * poly (bool, optional): _description_. Defaults to False.
-        * searchmode (Literal["MATCH", "NOMATCH", "TFMATCH"], optional): _description_. Defaults to None.
-        * affectedJourneyMode (Literal["ALL", "OFF"], optional): _description_. Defaults to None.
-        * affectedJourneyStopMode (Literal["ALL", "IMP", "OFF"], optional): _description_. Defaults to None.
-        * orderBy (Union[str, list], optional): _description_. Defaults to None.
-        * minprio (Union[str, int], optional): _description_. Defaults to None.
-        * maxprio (Union[str, int], optional): _description_. Defaults to None.
+        * accessId (str): Access ID for identifying the requesting client. Get your key on [RMV website](https://opendata.rmv.de/site/start.html).
+        * json (bool, optional): Whether response should be retrieved as JSON. XML is returned if False. Defaults to True.
+        * dateB (Union[str, datetime], optional): Sets the event period start date. Represented in the format `YYYY-MM-DD`. By default the current server date is used. Defaults to None.
+        * dateE (Union[str, datetime], optional): Sets the event period end date. Represented in the format `YYYY-MM-DD`. By default the current server date is used. Defaults to None.
+        * timeB (Union[str, datetime], optional): Sets the event period start time. Represented in the format `hh:mm[:ss]` in 24h nomenclature. Seconds will be ignored for requests. By default the current server time is used. Defaults to None.
+        * timeE (Union[str, datetime], optional): Sets the event period end time. Represented in the format `hh:mm[:ss]` in 24h nomenclature. Seconds will be ignored for requests. By default the current server time is used. Defaults to None.
+        * weekdays (Union[str, OrderedDict[str, bool]], optional): Bitmask or an OrderedDict for validity of HIM messages based on weekdays. OrderedDict must be formatted as follows: `OrderedDict(Monday=bool, Tuesday=bool, Wednesday=bool, Thursday=bool, Friday=bool, Saturday=bool, Sunday=bool)`. Each character of a bitmask represents a weekday starting on monday. Example: Only find HIM Messages valid from monday to friday: `1111100`. Defaults to None.
+        * himIds (Union[str, list], optional): List of HIM message IDs as a list or as a string separated by comma. Defaults to None.
+        * hierarchicalView (bool, optional): Return parent messages with childs. Defaults to False.
+        * operators (Union[str, list], optional): List of operators as a list or as a string separated by comma. Defaults to None.
+        * categories (Union[str, list], optional): List of train categories as a list or as a string separated by comma. Defaults to None.
+        * channels (Union[str, list], optional): List of channels as a list or as a string separated by comma. Defaults to None.
+        * companies (Union[str, list], optional): List of companies as a list or as a string separated by comma. Defaults to None.
+        * lines (Union[str, list], optional): Only HIM messages for the given line are part of the result. To filter multiple lines, separate the codes by comma. Defaults to None.
+        * lineids (Union[str, list], optional): Only HIM messages for the given line (identified by its line ID) are part of the result. To filter multiple lines, separate the line IDs by comma. Defaults to None.
+        * stations (Union[str, list], optional): List of (external) station ids to be filtered for as a list or as a string separated by comma. Defaults to None.
+        * fromstation (str, optional): Filter messages by line segment starting at this station given as (external) station id. Defaults to None.
+        * tostation (str, optional): Filter messages by line segment travelling in direction of this station given as (external) station id. Defaults to None.
+        * bothways (bool, optional): If enabled, messages in both directions - from 'fromstation' to 'tostation' as well as from 'tostation' to 'fromstation' are returned. Defaults to None.
+        * trainnames (Union[str, list], optional): List of train name to be filtered for as a list or as a string separated by comma. Defaults to None.
+        * metas (Union[str, list], optional): List of predefined filters as a list or as a string separated by comma. Defaults to None.
+        * himcategory (str, optional): HIM category, e.g. Works and/or Disturbance. Value depends on your HAFAS server data. Defaults to None.
+        * himtags (Union[str, list], optional): HIM Tags. Value depends on your HAFAS server data. Return HIM messages having these tag(s) only. Multiple values are separated by comma. Note: HIM tags differ from HIM text tags. Defaults to None.
+        * regions (Union[str, list], optional): Filter for HIM messages based on regions defined in HAFAS raw data. As a list or as a string separated by comma. Available regions can be retrieved by /datainfo service. Defaults to None.
+        * himtext (Union[str, list], optional): Filter for HIM messages containing the given free text message as a list or as a string separated by comma. Defaults to None.
+        * himtexttags (Union[str, list], optional): Return HIM texts having this text tag(s) only. Multiple values are separated by comma. Note: HIM text tags differ from HIM tags. Defaults to None.
+        * additionalfields (Union[str, list, dict], optional): List of additional fields and values to be filtered for. Two filter options are available: Filter by key only: `additionalfields=key` or filter by key and value: `additionalfields={key:value}`. Multiple filters are separated by comma like `additionalfields=[keyA,keyB]` or `additionalfields={key:value}`. Defaults to None.
+        * poly (bool, optional): Enables/disables returning of geo information for affected edges and regions if available and enabled in the backend. Defaults to False.
+        * searchmode (Literal["MATCH", "NOMATCH", "TFMATCH"], optional): HIM search mode. `"NOMATCH"` iterate over all HIM messages available. `"MATCH"` iterate over all trips to find HIM messages. `"TFMATCH"` uses filters defined `metas` parameter. Defaults to None.
+        * affectedJourneyMode (Literal["ALL", "OFF"], optional): Define how to return affected journeys `"OFF"`: do not return affected journeys. `"ALL"`: return affected journeys. Defaults to None.
+        * affectedJourneyStopMode (Literal["ALL", "IMP", "OFF"], optional): Define how to return stops of affected journeys. `"IMP"`: return important stops of affected journeys. `"OFF"`: do not return stops of affected journeys. `"ALL"`: return all affected stops of affected journeys. Defaults to None.
+        * orderBy (Union[str, list], optional): Define the Order the returned messages by fields and directions. Multiple, string comma separated or list entries are supported. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * minprio (Union[str, int], optional): Filter for HIM messages having at least this priority. Defaults to None.
+        * maxprio (Union[str, int], optional): Filter for HIM messages having this priority as maximum. Defaults to None.
 
     ### Returns:
         * dict: Output from RMV. Dict will contain "errorCode" and "errorText" if exception occurs.
@@ -109,12 +112,20 @@ def him_search(accessId: str,
                     payload[str(var)] = val.strftime("%H:%M")
                 else:
                     payload[str(var)] = val
+        elif str(var) == "weekdays":
+            if val != None:
+                if isinstance(val, OrderedDict):
+                    payload[str(var)] = weekdays_to_bitmask(val)
+                else:
+                    payload[str(var)] = val
         elif str(var) not in ["json", "headers", "payload"]:
             if val != None:
                 payload[str(var)] = val
 
     output = get("https://www.rmv.de/hapi/himsearch", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/journey_detail.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import List, Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -26,6 +28,8 @@ def journey_detail(accessId: str,
 
     output = get("https://www.rmv.de/hapi/journeyDetail", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/stop_by_coords.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -60,6 +62,8 @@ def stop_by_coords(accessId: str,
 
     output = get("https://www.rmv.de/hapi/location.nearbystops", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/stop_by_name.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -74,6 +76,8 @@ def stop_by_name(accessId: str,
 
     output = get("https://www.rmv.de/hapi/location.name", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/trip_find.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import List, Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -169,22 +171,22 @@ def trip_find(accessId: str,
         * lines (Union[str, list], optional): Only journeys running the given line are part of the result. If the line should not be part of the be trip, negate it by putting ! in front of it. Defaults to None.
         * lineids (Union[str, list], optional): Only journeys running the given line (identified by its line ID) are part of the result. If the line should not be part of the be trip, negate it by putting ! in front of it. Defaults to None.
         * avoidPaths (List[Literal["SW", "EA", "ES", "RA", "CB"]], optional): Only path not having the given properties will be part of the result. "SW": Stairway; "EA": Elevator; "ES": Escalator; "RA": Ramp; "CB": Convey Belt. Example: Use paths without ramp and stairway: `avoidPaths="SW", "RA"`. Defaults to None.
-        * originWalk (Union[str, list], optional): Enables/disables using footpaths in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * originBike (Union[str, list], optional): Enables/disables using bike routes in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station or mode change point, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * originCar (Union[str, list], optional): Enables/disables using car in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * originTaxi (Union[str, list], optional): Enables/disables using taxi rides in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * originPark (Union[str, list], optional): Enables/disables using Park and Ride in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * originWalk (Union[str, list], optional): Enables/disables using footpaths in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * originBike (Union[str, list], optional): Enables/disables using bike routes in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station or mode change point, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * originCar (Union[str, list], optional): Enables/disables using car in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * originTaxi (Union[str, list], optional): Enables/disables using taxi rides in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * originPark (Union[str, list], optional): Enables/disables using Park and Ride in the beginning of a trip when searching from an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
         * originMeta (Union[str, list], optional): Enables using one or more predefined individual transport meta profile at the beginning of a trip. Defaults to None.
-        * destWalk (Union[str, list], optional): Enables/disables using footpaths at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * destBike (Union[str, list], optional): Enables/disables using bike routes at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * destCar (Union[str, list], optional): Enables/disables using car routes at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * destTaxi (Union[str, list], optional): Enables/disables using taxi rides at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * destPark (Union[str, list], optional): Enables/disables using Park and Ride at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * destWalk (Union[str, list], optional): Enables/disables using footpaths at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * destBike (Union[str, list], optional): Enables/disables using bike routes at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * destCar (Union[str, list], optional): Enables/disables using car routes at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * destTaxi (Union[str, list], optional): Enables/disables using taxi rides at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * destPark (Union[str, list], optional): Enables/disables using Park and Ride at the end of a trip when searching to an address. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
         * destMeta (Union[str, list], optional): Enables using one or more predefined individual transport meta profile at the end of a trip. Defaults to None.
-        * totalWalk (Union[str, list], optional): Enables/disables using footpaths for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * totalBike (Union[str, list], optional): Enables/disables using bike routes for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * totalCar (Union[str, list], optional): Enables/disables using car routes for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
-        * totalTaxi (Union[str, list], optional): Enables/disables using taxi rides for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * totalWalk (Union[str, list], optional): Enables/disables using footpaths for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * totalBike (Union[str, list], optional): Enables/disables using bike routes for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * totalCar (Union[str, list], optional): Enables/disables using car routes for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
+        * totalTaxi (Union[str, list], optional): Enables/disables using taxi rides for the whole trip. To fine-tune the minimum and/or maximum distance to the next public transport station, provide these values as a list or as a string separated by comma. These values are expressed in meters. Read more about this in HAFAS ReST Documentation. Defaults to None.
         * totalMeta (Union[str, list], optional): Enables using one or more predefined individual transport meta profile for a trip. Defaults to None.
         * gisProducts (str, optional): Filter on GIS product, e.g. specific sharing provider. Currently, only exclusion of certain providers is available by adding ! in front of the provider meta code. Defaults to None.
         * includeIv (bool, optional): Enables/disables search for individual transport routes. Defaults to False.
@@ -232,6 +234,8 @@ def trip_find(accessId: str,
 
     output = get("https://www.rmv.de/hapi/trip", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/raw/trip_recon.py

@@ -2,6 +2,8 @@ from requests import get
 from typing import List, Union
 from xmltodict import parse as xmlparse
 
+from pyrmv.utility.find_exception import find_exception
+
 try:
     from typing import Literal
 except ImportError:
@@ -26,6 +28,8 @@ def trip_recon(accessId: str,
 
     output = get("https://www.rmv.de/hapi/recon", params=payload, headers=headers)
 
+    find_exception(output.json())
+
     if json:
         return output.json()
     else:

pyrmv/utility/bitmask.py

@@ -0,0 +1,21 @@
+from typing import OrderedDict
+
+
+def weekdays_to_bitmask(data: OrderedDict[str, bool]) -> str:
+    """Convert ordered dict with weekdays to a bitmask.
+
+    ### Args:
+        * data (OrderedDict[str, bool]): OrderedDict formatted as follows: OrderedDict(Monday=bool, Tuesday=bool, Wednesday=bool, Thursday=bool, Friday=bool, Saturday=bool, Sunday=bool)
+
+    ### Returns:
+        * str: _description_
+    """    
+    output = ""
+    if len(data) != 7:
+        raise ValueError("OrderedDict must be formatted as follows: OrderedDict(Monday=bool, Tuesday=bool, Wednesday=bool, Thursday=bool, Friday=bool, Saturday=bool, Sunday=bool)")
+    for day in data:
+        if data[day]:
+            output += "1"
+        else:
+            output += "0"
+    return output

pyrmv/utility/find_exception.py

@@ -0,0 +1,102 @@
+from pyrmv.errors.api_errors import ApiAuthError, ApiFormatError, ApiParamError, ApiQuotaError, ApiTooManyRequests
+from pyrmv.errors.int_errors import IntError, IntGatewayError, IntTimeoutError
+from pyrmv.errors.ps_errors import PsIncorrectParamError
+from pyrmv.errors.sot_errors import SotAllTrainsFilteredError, SotAlreadyArrivedError, SotCancelledError, SotNotStartedError, SotStayOnTripError
+from pyrmv.errors.svc_errors import SvcContextError, SvcDatetimeError, SvcDatetimePeriodError, SvcLocationArrivalError, SvcLocationDepartureError, SvcLocationEqualError, SvcLocationError, SvcLocationNearError, SvcLocationViaError, SvcNoMatchError, SvcNoResultError, SvcProductError, SvcSearchError
+from pyrmv.errors.unknown_error import UnknownError
+
+def find_exception(data: dict):
+    """Scan returned dict for errorCode from RMV.
+    Raises different exceptions if errorCode is not None. 
+
+    ### Args:
+        * data (dict): Response from RMV as a dict.
+
+    ### Raises:
+        * Any: Formatted as "errorCode -> errorText" if ApiParamError and UnknownError or as a single massage for others.
+    """    
+    if "errorCode" in data:
+
+        if data["errorCode"] == "API_AUTH":
+            raise ApiAuthError()
+
+        elif data["errorCode"] == "API_QUOTA":
+            raise ApiQuotaError()
+
+        elif data["errorCode"] == "API_TOO_MANY_REQUESTS":
+            raise ApiTooManyRequests()
+            
+        elif data["errorCode"] == "API_PARAM":
+            raise ApiParamError(errorCode=data["errorCode"], errorText=data["errorText"])
+
+        elif data["errorCode"] == "API_FORMAT":
+            raise ApiFormatError()
+
+        elif data["errorCode"] == "SVC_LOC":
+            raise SvcLocationError()
+
+        elif data["errorCode"] == "SVC_LOC_ARR":
+            raise SvcLocationArrivalError()
+
+        elif data["errorCode"] == "SVC_LOC_DEP":
+            raise SvcLocationDepartureError()
+
+        elif data["errorCode"] == "SVC_LOC_VIA":
+            raise SvcLocationViaError()
+
+        elif data["errorCode"] == "SVC_LOC_EQUAL":
+            raise SvcLocationEqualError()
+
+        elif data["errorCode"] == "SVC_LOC_NEAR":
+            raise SvcLocationNearError()
+
+        elif data["errorCode"] == "SVC_DATATIME":
+            raise SvcDatetimeError()
+
+        elif data["errorCode"] == "SVC_DATATIME_PERIOD":
+            raise SvcDatetimePeriodError()
+
+        elif data["errorCode"] == "SVC_PROD":
+            raise SvcProductError()
+
+        elif data["errorCode"] == "SVC_CTX":
+            raise SvcContextError()
+
+        elif data["errorCode"] == "SVC_NO_RESULT":
+            raise SvcNoResultError()
+
+        elif data["errorCode"] == "SVC_FAILED_SEARCH":
+            raise SvcSearchError()
+
+        elif data["errorCode"] == "SVC_NO_MATCH":
+            raise SvcNoMatchError()
+
+        elif data["errorCode"] == "INT_ERR":
+            raise IntError()
+
+        elif data["errorCode"] == "INT_GATEWAY":
+            raise IntGatewayError()
+
+        elif data["errorCode"] == "INT_TIMEOUT":
+            raise IntTimeoutError()
+
+        elif data["errorCode"] == "SOT_AT_DEST":
+            raise SotAlreadyArrivedError()
+
+        elif data["errorCode"] == "SOT_BEFORE_START":
+            raise SotNotStartedError()
+
+        elif data["errorCode"] == "SOT_CANCELLED":
+            raise SotCancelledError()
+
+        elif data["errorCode"] == "SOT_ALL_TRAINS_FILTERED":
+            raise SotAllTrainsFilteredError()
+
+        elif data["errorCode"] == "SOT_STAY_IN_CURRENT_CONNECTION":
+            raise SotStayOnTripError()
+
+        elif data["errorCode"] == "PARTIALSEARCH_INCORRECT_PARAM":
+            raise PsIncorrectParamError()
+
+        else:
+            raise UnknownError(errorCode=data["errorCode"], errorText=data["errorText"])