Refactor/sql (#9)

Author: CrystalWindSnake

.github/workflows/main.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   run-all-test:
     runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright:v1.47.0-focal
     strategy:
       matrix:
         python-version:
@@ -22,7 +24,5 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install the project
         run: uv sync --locked --all-extras --dev
-      - name: install dependencies
-        run: uv run -m playwright install --with-deps
       - name: Run tests
         run: uv run pytest __tests

__tests/conftest.py

@@ -9,7 +9,7 @@
 @pytest.fixture(scope="session")
 def browser():
     pw = sync_playwright().start()
-    browser = pw.chromium.launch(headless=HEADLESS)
+    browser = pw.chromium.launch(headless=HEADLESS, timeout=3000)
     yield browser
     browser.close()
     pw.stop()

__tests/testing_web/conftest.py

@@ -3,6 +3,7 @@
 import duckdb
 from __tests.testing_web.context import Context
 from __tests.testing_web.server import TestServer
+from __tests.testing_web.memory_db import MemoryDb
 
 
 @pytest.fixture(scope="function")
@@ -18,6 +19,18 @@ def context(browser: Browser, start_server: TestServer):
     page.close()
 
 
+@pytest.fixture(scope="session")
+def global_memory_db():
+    dataset = MemoryDb()
+    yield dataset
+
+
+@pytest.fixture(scope="function")
+def memory_db(global_memory_db: MemoryDb):
+    global_memory_db.clear()
+    yield global_memory_db
+
+
 @pytest.fixture(scope="session", autouse=True)
 def start_server():
     server = TestServer()

__tests/testing_web/memory_db.py

@@ -0,0 +1,29 @@
+from typing import Dict
+from pybi.link_sql.duckdb_dataset import DuckdbDataFrameDataSet
+
+
+try:
+    import pandas
+except ImportError as e:
+    raise e
+
+
+class MemoryDb:
+    def __init__(self):
+        self.ds = DuckdbDataFrameDataSet()
+
+    def clear(self):
+        conn = self.ds._conn
+
+        tables = [
+            n[0]
+            for n in conn.execute("SELECT table_name FROM duckdb_tables()").fetchall()
+        ]
+        for table_name in tables:
+            conn.execute(f"DROP TABLE IF EXISTS {table_name};")
+
+    def from_dataframe(
+        self, dataframes_map: Dict[str, "pandas.DataFrame"]
+    ) -> DuckdbDataFrameDataSet:
+        self.ds.import_dataframe(dataframes_map)
+        return self.ds

__tests/testing_web/test_data_by_duckdb.py

@@ -1,5 +1,4 @@
 from __tests.testing_web.context import Context
-from instaui import ui
 import pandas as pd
 import pybi
 from . import utils

__tests/testing_web/test_data_column.py

@@ -0,0 +1,59 @@
+from __tests.testing_web.context import Context
+from __tests.testing_web.memory_db import MemoryDb
+import pandas as pd
+from __tests.utils import display, ListBox
+import pybi
+
+
+def test_distinct_from_data_view(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "foo", "bar"], "Age": [18, 19, 20]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
+
+    @context.register_page
+    def index():
+        dv1 = dataset["df"]
+        display.list_box(dv1["Name"].distinct())
+
+    context.open()
+    ListBox(context).should_have_text(["foo", "bar"])
+
+
+def test_distinct_from_query(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "foo", "bar"], "Age": [18, 19, 20]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
+
+    @context.register_page
+    def index():
+        dv1 = dataset["df"]
+        query = pybi.query(f"SELECT Name FROM {dv1}")
+        display.list_box(query["Name"].distinct())
+
+    context.open()
+    ListBox(context).should_have_text(["foo", "bar"])
+
+
+def test_flat_values_from_data_view(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "bar"], "Age": [18, 19]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
+
+    @context.register_page
+    def index():
+        dv1 = dataset["df"]
+        display.list_box(dv1["Name"].flat_values())
+
+    context.open()
+    ListBox(context).should_have_text(["foo", "bar"])
+
+
+def test_flat_values_from_query(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "bar"], "Age": [18, 19]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
+
+    @context.register_page
+    def index():
+        dv1 = dataset["df"]
+        query = pybi.query(f"SELECT Name FROM {dv1}")
+        display.list_box(query["Name"].flat_values())
+
+    context.open()
+    ListBox(context).should_have_text(["foo", "bar"])

__tests/testing_web/test_data_view.py

@@ -1,14 +1,14 @@
 from __tests.testing_web.context import Context
+from __tests.testing_web.memory_db import MemoryDb
 from instaui import ui
 import pandas as pd
 import pybi
-from __tests.utils import Table, Select
+from __tests.utils import Table, Select, display, ListBox
 
 
-def test_base(context: Context):
+def test_base(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo", "foo", "bar"], "Age": [18, 19, 20]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
@@ -21,10 +21,11 @@ def index():
     Table(context).should_values_any_cell("18.5")
 
 
-def test_upstream_data_view_update_affects_downstream(context: Context):
+def test_upstream_data_view_update_affects_downstream(
+    context: Context, memory_db: MemoryDb
+):
     data = {"Name": ["foo", "foo", "bar"], "Age": [18, 19, 20]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
@@ -47,10 +48,9 @@ def index():
     table.should_values_not_any_cell("bar")
 
 
-def test_selected_multiple_columns(context: Context):
+def test_selected_multiple_columns(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo"], "Age": [18], "class": [1]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
@@ -65,41 +65,35 @@ def index():
     table.should_values_not_any_cell("1")
 
 
-def test_computed_binding(context: Context):
+def test_computed_binding(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo", "bar"], "Age": [18, 19]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
         table = dataset["df"]
         dv = pybi.data_view(f"SELECT * FROM {table}")
 
         @ui.computed(inputs=[dv])
-        def result(names):
-            return str(names)
+        def value_r0_c0(source):
+            return source["values"][0][0]
 
-        pybi.label(result)
+        ui.label(value_r0_c0)
 
     context.open()
-    context.should_see("[['foo', 18], ['bar', 19]]", equal_to=True)
+    context.should_see("foo")
 
 
-def test_selected_column_computed_binding(context: Context):
+def test_selected_column_computed_binding(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo", "bar"]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
         table = dataset["df"]
         dv = pybi.data_view(f"SELECT * FROM {table}")
 
-        @ui.computed(inputs=[dv["Name"]])
-        def result(names):
-            return str(names)
-
-        pybi.label(result)
+        display.list_box(dv["Name"])
 
     context.open()
-    context.should_see("['foo', 'bar']", equal_to=True)
+    ListBox(context).should_have_text(["foo", "bar"])

__tests/testing_web/test_query.py

@@ -1,14 +1,13 @@
 from __tests.testing_web.context import Context
-from instaui import ui
+from __tests.testing_web.memory_db import MemoryDb
 import pandas as pd
 import pybi
 from __tests.utils import Table
 
 
-def test_base(context: Context):
+def test_base(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo", "foo", "bar"], "Age": [18, 19, 20]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
@@ -21,10 +20,9 @@ def index():
     Table(context).should_values_any_cell("18.5")
 
 
-def test_select_columns(context: Context):
+def test_select_columns(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo"], "Age": [18], "class": [1]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():

__tests/testing_web/test_select.py

@@ -1,14 +1,14 @@
 from __tests.testing_web.context import Context
+from __tests.testing_web.memory_db import MemoryDb
 from instaui import ui
 import pandas as pd
 import pybi
-from __tests.utils import Select
+from __tests.utils import Select, display, ListBox
 
 
-def test_options(context: Context):
+def test_options(context: Context, memory_db: MemoryDb):
     data = {"Name": ["foo", "foo", "bar"]}
-
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
@@ -21,47 +21,40 @@ def index():
     select.should_options_have_count(2)
     select.should_options_have_text("foo", "bar")
 
-def test_no_option_selected(context: Context):
-    data = {"Name": ['foo', 'bar']}
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+
+def test_no_option_selected(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "bar"]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
         table = dataset["df"]
         dv = pybi.data_view(f"SELECT * FROM {table}")
 
-        @ui.computed(inputs=[dv["Name"]])
-        def result(names):
-            return str(names)
-
         pybi.select(dv["Name"])
-        pybi.label(result)
+        display.list_box(dv["name"])
 
     context.open()
     select = Select(context)
     select.should_not_selected_any()
-    context.should_see("['foo', 'bar']", equal_to=True)
+    ListBox(context).should_have_text(["foo", "bar"])
 
-def test_selection_impact(context: Context):
-    data = {"Name":['foo','bar']}
-    dataset = pybi.duckdb.from_pandas({"df": pd.DataFrame(data)})
+
+def test_selection_impact(context: Context, memory_db: MemoryDb):
+    data = {"Name": ["foo", "bar"]}
+    dataset = memory_db.from_dataframe({"df": pd.DataFrame(data)})
 
     @context.register_page
     def index():
         table = dataset["df"]
         dv = pybi.data_view(f"SELECT * FROM {table}")
 
-        @ui.computed(inputs=[dv["Name"]])
-        def result(names):
-            return str(names)
-
         pybi.select(dv["Name"])
-        pybi.label(result)
+        display.list_box(dv["Name"])
 
     context.open()
     select = Select(context)
-    context.should_see("['foo', 'bar']", equal_to=True)
+    list_box = ListBox(context)
+    list_box.should_have_text(["foo", "bar"])
     select.select_item("foo")
-    context.should_see("['foo']", equal_to=True)
-    
-
+    list_box.should_have_text(["foo"])

__tests/testing_web/utils.py

@@ -1,10 +1,8 @@
 from pathlib import Path
 import os
-import re
 import pandas as pd
 import duckdb
 
-from __tests.testing_web.context import Context
 
 __DIR__ = Path(__file__).parent / ".dataset"