PyPI - datajunction-server - Versions diffs - 0.0.1a64.dev0__tar.gz → 0.0.1a64.dev2__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a64.dev0
+Version: 0.0.1a64.dev2
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a64.dev2"

@@ -370,6 +370,7 @@ async def validate_cube(  # pylint: disable=too-many-locals
                     selectinload(NodeRevision.parents),
                 ),
             ],
+            include_inactive=False,
         ),
         key=lambda x: metrics_sorting_order.get(x.name, 0),
     )

@@ -25,7 +25,6 @@ from datajunction_server.api.helpers import (
 )
 from datajunction_server.api.namespaces import create_node_namespace
 from datajunction_server.api.tags import get_tags_by_name
-from datajunction_server.constants import NODE_LIST_MAX
 from datajunction_server.database import DimensionLink
 from datajunction_server.database.attributetype import ColumnAttribute
 from datajunction_server.database.column import Column
@@ -280,16 +279,17 @@ async def list_all_nodes_with_details(
             Node.type == node_type if node_type else True,
             is_(Node.deactivated_at, None),
         )
-        .limit(NODE_LIST_MAX)
+        .order_by(NodeRevision.updated_at.desc())
+        .limit(settings.node_list_max)
     )  # Very high limit as a safeguard
     results = [
         NodeIndexItem(name=row[0], display_name=row[1], description=row[2], type=row[3])
         for row in (await session.execute(nodes_query)).all()
     ]
-    if len(results) == NODE_LIST_MAX:  # pragma: no cover
+    if len(results) == settings.node_list_max:  # pragma: no cover
         _logger.warning(
             "%s limit reached when returning all nodes, all nodes may not be captured in results",
-            NODE_LIST_MAX,
+            settings.node_list_max,
         )
     approvals = [
         approval.access_object.name

@@ -103,6 +103,9 @@ class Settings(
     db_keepalives_interval = 10
     db_keepalives_count = 5
+    # Maximum amount of nodes to return for requests to list all nodes
+    node_list_max = 10000
     @property
     def celery(self) -> Celery:
         """

@@ -18,6 +18,3 @@ GET_COLUMNS_TIMEOUT = timedelta(seconds=60)
 AUTH_COOKIE = "__dj"
 LOGGED_IN_FLAG_COOKIE = "__djlif"
-# Maximum amount of nodes to return for requests to list all nodes
-NODE_LIST_MAX = 1000

@@ -2185,20 +2185,19 @@ class FromJson(Function):  # pragma: no cover
 @FromJson.register  # type: ignore
-def infer_type(  # pragma: no cover
+def infer_type(
     json: ct.StringType,
     schema: ct.StringType,
     options: Optional[Function] = None,
 ) -> ct.StructType:
-    # TODO: Handle options?  # pylint: disable=fixme
     # pylint: disable=import-outside-toplevel
-    from datajunction_server.sql.parsing.backends.antlr4 import (
-        parse_rule,  # pragma: no cover
-    )
+    from datajunction_server.sql.parsing.backends.antlr4 import parse_rule
-    return ct.StructType(
-        *parse_rule(schema.value, "complexColTypeList")
-    )  # pragma: no cover
+    schema_type = re.sub(r"^'(.*)'$", r"\1", schema.value)
+    try:
+        return parse_rule(schema_type, "dataType")
+    except DJParseException:
+        return ct.StructType(*parse_rule(schema_type, "complexColTypeList"))
 class FromUnixtime(Function):

@@ -3,6 +3,7 @@
 Tests for ``datajunction_server.sql.functions``.
 """
 import pytest
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -1822,19 +1823,20 @@ async def test_format_string_func(session: AsyncSession):
 #     assert isinstance(query.select.projection[1].type, ct.StructType)  # type: ignore
-# TODO: Fix these two  # pylint: disable=fixme
-# @pytest.mark.asyncio
-# async def test_from_json_func(session: AsyncSession):
-#     """
-#     Test the `from_json` function
-#     """
-#     query = parse("SELECT from_json('1,2,3', 'a INT, b INT, c INT'), from_json('4,5,6', 'x INT, y INT, z INT')")
-#     exc = DJException()
-#     ctx = ast.CompileContext(session=session, exception=exc)
-#     await query.compile(ctx)
-#     assert not exc.errors
-#     assert isinstance(query.select.projection[0].type, Union[ct.StructType, ct.ListType])  # type: ignore
-#     assert isinstance(query.select.projection[1].type, Union[ct.StructType, ct.ListType])
+@pytest.mark.asyncio
+async def test_from_json_func(session: AsyncSession):
+    """
+    Test the `from_json` function
+    """
+    query = parse(
+        "SELECT from_json('1,2,3', 'a INT, b INT, c INT'), from_json('[\"a\",\"b\"]', 'ARRAY<STRING>')",
+    )
+    exc = DJException()
+    ctx = ast.CompileContext(session=session, exception=exc)
+    await query.compile(ctx)
+    assert not exc.errors
+    assert isinstance(query.select.projection[0].type, ct.StructType)  # type: ignore
+    assert isinstance(query.select.projection[1].type, ct.ListType)  # type: ignore
 @pytest.mark.asyncio

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a64.dev0"

datajunction-server 0.0.1a64.dev0__tar.gz → 0.0.1a64.dev2__tar.gz

datajunction-server 0.0.1a64.dev0tar.gz → 0.0.1a64.dev2tar.gz