hogql-parser 1.2.0__tar.gz → 1.2.8__tar.gz

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hogql_parser
-Version: 1.2.0
+Version: 1.2.8
 Summary: HogQL parser for internal PostHog use
 Home-page: https://github.com/PostHog/posthog/tree/master/common/hogql_parser
 Author: PostHog Inc.
@@ -17,6 +17,16 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-python
+Dynamic: summary
 
 # HogQL Parser
 

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/README.md

@@ -2,4 +2,4 @@
 
 Blazing fast HogQL parsing. This package can only work in the context of the PostHog Django app, as it imports from `posthog.hogql`.
 
-You can test changes locally by running `pip install ./hogql_parser`
+You can test changes locally by running `pip install ./hogql_parser`

hogql_parser-1.2.8/hogql_parser-stubs/__init__.pyi

@@ -0,0 +1,44 @@
+from posthog.hogql.ast import Program, SelectQuery, SelectSetQuery
+from posthog.hogql.base import AST
+
+def parse_expr(expr: str, /, *, is_internal: bool = False) -> AST:
+    """Parse the HogQL expression string into an AST.
+
+    If the expr `is_internal`, spans and notices won't be included in the AST.
+    """
+    ...
+
+def parse_order_expr(expr: str, /, *, is_internal: bool = False) -> AST:
+    """Parse the ORDER BY clause string into an AST.
+
+    If the expr `is_internal`, spans and notices won't be included in the AST.
+    """
+    ...
+
+def parse_select(expr: str, /, *, is_internal: bool = False) -> SelectQuery | SelectSetQuery:
+    """Parse the HogQL SELECT statement string into an AST.
+
+    If the expr `is_internal`, spans and notices won't be included in the AST.
+    """
+    ...
+
+def parse_full_template_string(expr: str, /, *, is_internal: bool = False) -> AST:
+    """Parse a Hog template string into an AST.
+
+    If the expr `is_internal`, spans and notices won't be included in the AST.
+    """
+    ...
+
+def parse_string_literal_text(value: str, /) -> str:
+    """Unquote the string (an identifier or a string literal).
+
+    If the expr is `internal`, spans and notices won't be included in the AST.
+    """
+    ...
+
+def parse_program(source: str, /, *, is_internal: bool = False) -> Program:
+    """Parse a Hog program.
+
+    If the expr `is_internal`, spans and notices won't be included in the AST.
+    """
+    ...

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/hogql_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: hogql-parser
-Version: 1.2.0
+Metadata-Version: 2.4
+Name: hogql_parser
+Version: 1.2.8
 Summary: HogQL parser for internal PostHog use
 Home-page: https://github.com/PostHog/posthog/tree/master/common/hogql_parser
 Author: PostHog Inc.
@@ -17,6 +17,16 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-python
+Dynamic: summary
 
 # HogQL Parser
 

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/hogql_parser.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ parser.cpp
 pyproject.toml
 setup.py
 string.cpp
+hogql_parser-stubs/__init__.pyi
 hogql_parser.egg-info/PKG-INFO
 hogql_parser.egg-info/SOURCES.txt
 hogql_parser.egg-info/dependency_links.txt

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/parser.cpp

@@ -2124,7 +2124,128 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
     RETURN_NEW_AST_NODE("ArrayAccess", "{s:N,s:N,s:O}", "array", object, "property", property, "nullish", Py_True);
   }
 
-  VISIT_UNSUPPORTED(ColumnExprBetween)
+  VISIT(ColumnExprBetween) {
+    // x [NOT] BETWEEN y AND z -> inclusive ends: (x >= y AND x <= z) or NOT: (x < y OR x > z)
+    PyObject* x = visitAsPyObject(ctx->columnExpr(0));
+    PyObject* low;
+    try {
+      low = visitAsPyObject(ctx->columnExpr(1));
+    } catch (...) {
+      Py_DECREF(x);
+      throw;
+    }
+    PyObject* high;
+    try {
+      high = visitAsPyObject(ctx->columnExpr(2));
+    } catch (...) {
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw;
+    }
+
+    if (ctx->NOT()) {
+      // (x < low) OR (x > high)
+      PyObject* lt_op = get_ast_enum_member("CompareOperationOp", "Lt");
+      PyObject* gt_op = get_ast_enum_member("CompareOperationOp", "Gt");
+      if (!lt_op || !gt_op) {
+        Py_XDECREF(lt_op);
+        Py_XDECREF(gt_op);
+        Py_DECREF(high);
+        Py_DECREF(low);
+        Py_DECREF(x);
+        throw PyInternalError();
+      }
+      Py_INCREF(x);
+      PyObject* lt = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", low, "op", lt_op);
+      if (!lt) {
+        Py_DECREF(gt_op);
+        Py_DECREF(high);
+        Py_DECREF(low);
+        Py_DECREF(x);
+        throw PyInternalError();
+      }
+      Py_INCREF(x);
+      PyObject* gt = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", high, "op", gt_op);
+      if (!gt) {
+        Py_DECREF(lt);
+        Py_DECREF(high);
+        Py_DECREF(low);
+        Py_DECREF(x);
+        throw PyInternalError();
+      }
+      PyObject* or_list = Py_BuildValue("[NN]", lt, gt);
+      if (!or_list) {
+        Py_DECREF(gt);
+        Py_DECREF(lt);
+        Py_DECREF(high);
+        Py_DECREF(low);
+        Py_DECREF(x);
+        throw PyInternalError();
+      }
+      PyObject* result = build_ast_node("Or", "{s:N}", "exprs", or_list);
+      if (!result) {
+        Py_DECREF(or_list);
+        Py_DECREF(high);
+        Py_DECREF(low);
+        Py_DECREF(x);
+        throw PyInternalError();
+      }
+      Py_DECREF(x);
+      return result;
+    }
+
+    // (x >= low) AND (x <= high)
+    PyObject* gte_op = get_ast_enum_member("CompareOperationOp", "GtEq");
+    PyObject* lte_op = get_ast_enum_member("CompareOperationOp", "LtEq");
+    if (!gte_op || !lte_op) {
+      Py_XDECREF(gte_op);
+      Py_XDECREF(lte_op);
+      Py_DECREF(high);
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw PyInternalError();
+    }
+
+    Py_INCREF(x);
+    PyObject* gte = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", low, "op", gte_op);
+    if (!gte) {
+      Py_DECREF(lte_op);
+      Py_DECREF(high);
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw PyInternalError();
+    }
+
+    Py_INCREF(x);
+    PyObject* lte = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", high, "op", lte_op);
+    if (!lte) {
+      Py_DECREF(gte);
+      Py_DECREF(high);
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw PyInternalError();
+    }
+    PyObject* and_list = Py_BuildValue("[NN]", gte, lte);
+    if (!and_list) {
+      Py_DECREF(lte);
+      Py_DECREF(gte);
+      Py_DECREF(high);
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw PyInternalError();
+    }
+    PyObject* result = build_ast_node("And", "{s:N}", "exprs", and_list);
+    if (!result) {
+      Py_DECREF(and_list);
+      Py_DECREF(high);
+      Py_DECREF(low);
+      Py_DECREF(x);
+      throw PyInternalError();
+    }
+
+    Py_DECREF(x);
+    return result;
+  }
 
   VISIT(ColumnExprParens) { return visit(ctx->columnExpr()); }
 

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/pyproject.toml

@@ -12,27 +12,25 @@ build = [ # Build CPython wheels on Linux and macOS, for x86 as well as ARM
 build-frontend = "build" # This is the successor to building with pip
 
 [tool.cibuildwheel.macos]
-archs = [ # We could also build a universal wheel, but separate ones are lighter individually
-    "x86_64",
-    "arm64",
-]
-before-build = [ # We need to install the libraries for each architecture separately
-    "brew uninstall --ignore-dependencies --force boost antlr4-cpp-runtime",
-    "brew fetch --force --bottle-tag=${ARCHFLAGS##'-arch '}_ventura boost antlr4-cpp-runtime",
-    "brew install $(brew --cache --bottle-tag=${ARCHFLAGS##'-arch '}_ventura boost antlr4-cpp-runtime)",
+before-build = [
+    "brew install boost antlr4-cpp-runtime",
 ]
 
 [tool.cibuildwheel.linux]
 before-all = [
     # manylinux_2_28 is based on AlmaLinux 8, which uses Fedora's dnf as its package manager
     "dnf install -y boost-devel unzip cmake curl uuid pkg-config",
+    # update cmake for antlr
+    "dnf install -y epel-release",
+    "dnf install -y cmake3",
+    "cmake3 --version",
     "curl https://www.antlr.org/download/antlr4-cpp-runtime-4.13.1-source.zip --output antlr4-source.zip",
     # Check that the downloaded archive is the expected runtime - a security measure
     "antlr_known_md5sum=\"c875c148991aacd043f733827644a76f\"",
     "antlr_found_ms5sum=\"$(md5sum antlr4-source.zip | cut -d' ' -f1)\"",
     'if [[ "$antlr_known_md5sum" != "$antlr_found_ms5sum" ]]; then exit 64; fi',
     "unzip antlr4-source.zip -d antlr4-source && cd antlr4-source",
-    "cmake .",
+    "cmake3 . -DBUILD_TESTING=OFF -DANTLR4_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5",
     "DESTDIR=out make install",
     "cp -r out/usr/local/include/antlr4-runtime /usr/include/",
     "cp out/usr/local/lib64/libantlr4-runtime.so* /usr/lib64/",

{hogql_parser-1.2.0 → hogql_parser-1.2.8}/setup.py

@@ -1,6 +1,7 @@
-from setuptools import setup, Extension
 import platform
 
+from setuptools import Extension, setup
+
 system = platform.system()
 if system not in ("Darwin", "Linux"):
     raise Exception("Only Linux and macOS are supported by hogql_parser")
@@ -32,7 +33,7 @@ module = Extension(
 
 setup(
     name="hogql_parser",
-    version="1.2.0",
+    version="1.2.8",
     url="https://github.com/PostHog/posthog/tree/master/common/hogql_parser",
     description="HogQL parser for internal PostHog use",
     author="PostHog Inc.",