okta-expression-parser 0.4.0__tar.gz → 0.4.2__tar.gz

{okta_expression_parser-0.4.0 → okta_expression_parser-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: okta-expression-parser
-Version: 0.4.0
+Version: 0.4.2
 Summary: Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language
 Author: Mathew Moon
 Author-email: me@mathewmoon.net
@@ -8,6 +8,7 @@ Requires-Python: >=3.11,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: sly (>=0.5,<0.6)
 Description-Content-Type: text/markdown
 

{okta_expression_parser-0.4.0 → okta_expression_parser-0.4.2}/okta_expression_parser/lexer.py

@@ -42,14 +42,14 @@ class ExpressionLexer(Lexer):
     # String containing ignored characters
     ignore = " \t"
 
-    AND = r"and|And|AND"
+    AND = r"and|And|AND|&&"
     NE = r"(!=|ne|NE|Ne)"
     NOT = r"!|not|Not|NOT"
     GTE = ">="
     GT = ">"
     LT = "<"
     LTE = "<="
-    OR = r"or|OR|Or"
+    OR = r"or|OR|Or|\|\|"
     EQ = r"(==|eq|EQ|Eq)"
     BOOL = r"(true|false|True|False|TRUE|FALSE)"
     MEMBEROFGROUPCONTAINS = "isMemberOfGroupNameContains"

{okta_expression_parser-0.4.0 → okta_expression_parser-0.4.2}/okta_expression_parser/parser.py

@@ -14,6 +14,19 @@ from .expression_classes.arrays import _ArrayType
 from .lexer import ExpressionLexer
 
 
+# Sly doesn't really facilitate configuring logging from the caller, so we're going to
+# suppress all logging below the level specified in the LOG_LEVEL environment variable.
+log_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "EXCEPTION"]
+
+log_level = environ.get("LOG_LEVEL", "ERROR")
+
+log_rank = log_levels.index(log_level)
+
+for level_name in list(reversed(log_levels))[:log_rank +1]:
+    log_attr = level_name.lower()
+    setattr(sly.yacc.SlyLogger, log_attr, lambda self, msg, *args, **kwargs: None)
+
+
 class ExpressionParser(sly.Parser):
     #: Writes grammar rules to a file for debugging
     debugfile = environ.get("OKTA_EXPRESSION_PARSER_LOG_FILE")
@@ -34,7 +47,7 @@ class ExpressionParser(sly.Parser):
         group_ids: List[str] = [],
         user_profile: Dict[str, Any] = {},
         log_to_stdout: bool = False,
-        log_level: str = "INFO",
+        log_level: str = environ.get("LOG_LEVEL", "ERROR"),
         expression_classes: ModuleType = _default_expression_classes,
         group_data: dict = {},
     ) -> None:

{okta_expression_parser-0.4.0 → okta_expression_parser-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "okta-expression-parser"
-version = "0.4.0"
+version = "0.4.2"
 description = "Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language"
 authors = ["Mathew Moon <me@mathewmoon.net>"]
 readme = "README.md"