Better error handling

Author: Padeanu

src/PRIP/tests/test_prip_station_mock.py

@@ -21,6 +21,8 @@
     ("/Products?$filter=OriginDate eq 2022-06-26T06:14:55.468Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=PublicationDate eq 2022-06-26T06:30:34.558Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=Online eq true&$expand=Attributes", PRIP_PRODUCT),
+    ("/Products?$filter=Online invalid_op invalid_value&$expand=Attributes", None),
+    ("/Products?$filter=invalid_operator invalid_op invalid_value&$expand=Attributes", None),
     ("/Products?$filter=ContentDate/Start eq 2022-06-26T05:05:33.863Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=ContentDate/End eq 2022-06-26T05:10:38.849Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=OData.CSC.Intersects(area=geography'SRID=4326;POLYGON((-60 0,-62 -10,-58 -10,-56 0,-60 0))')&$expand=Attributes", PRIP_PRODUCT),

src/common/odata_lexer.py

@@ -1,7 +1,7 @@
 from odata_query.grammar import ODataLexer, ODataParser
 from odata_query.visitor import NodeVisitor
 from odata_query.ast import String, DateTime, Boolean, Compare, Identifier, Attribute, BoolOp, Call, CollectionLambda
-
+from odata_query.exceptions import UnknownFunctionException, ParsingException
 
 class FilterExtractor(NodeVisitor):
     """
@@ -171,17 +171,19 @@ def parse_odata_filter(query: str):
     # Strip leading "$filter=" if present
     if query.startswith("$filter="):
         query = query[len("$filter="):]
-
-    # Tokenize the query string using ODataLexer
-    lexer = ODataLexer()
-    tokens = lexer.tokenize(query)
-
-    # Parse tokens into an AST using ODataParser
-    parser = ODataParser()
-    ast = parser.parse(tokens)
-
-    # Extract filters from the AST using FilterExtractor visitor
-    extractor = FilterExtractor()
-    extractor.visit(ast)
+    try:
+        # Tokenize the query string using ODataLexer
+        lexer = ODataLexer()
+        tokens = lexer.tokenize(query)
+
+        # Parse tokens into an AST using ODataParser
+        parser = ODataParser()
+        ast = parser.parse(tokens)
+
+        # Extract filters from the AST using FilterExtractor visitor
+        extractor = FilterExtractor()
+        extractor.visit(ast)
+    except (UnknownFunctionException, ParsingException):
+        return {}
 
     return extractor.result