feat:distinct order by (#11)

Author: CrystalWindSnake

__tests/testing_web/test_data_column.py

@@ -12,10 +12,10 @@ def test_distinct_from_data_view(context: Context, memory_db: MemoryDb):
     @context.register_page
     def index():
         dv1 = dataset["df"]
-        display.list_box(dv1["Name"].distinct())
+        display.list_box(dv1["Name"].distinct(order_by="ASC"))
 
     context.open()
-    ListBox(context).should_have_text(["foo", "bar"])
+    ListBox(context).should_have_text(["bar", "foo"])
 
 
 def test_distinct_from_query(context: Context, memory_db: MemoryDb):
@@ -26,10 +26,10 @@ def test_distinct_from_query(context: Context, memory_db: MemoryDb):
     def index():
         dv1 = dataset["df"]
         query = pybi.query(f"SELECT Name FROM {dv1}")
-        display.list_box(query["Name"].distinct())
+        display.list_box(query["Name"].distinct(order_by="ASC"))
 
     context.open()
-    ListBox(context).should_have_text(["foo", "bar"])
+    ListBox(context).should_have_text(["bar", "foo"])
 
 
 def test_flat_values_from_data_view(context: Context, memory_db: MemoryDb):

src/pybi/link_sql/_mixin.py

@@ -5,6 +5,7 @@
     Any,
     Dict,
     List,
+    Literal,
     Optional,
     Union,
     TypedDict,
@@ -105,7 +106,7 @@ def get_source_type(self) -> _const.TSourceType:
         pass
 
     @abstractmethod
-    def distinct(self) -> List:
+    def distinct(self, *, order_by: Optional[Literal["ASC", "DESC"]] = None) -> List:
         pass
 
     @abstractmethod

src/pybi/link_sql/data_column.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Dict
+from typing import Dict, Literal, Optional
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
 from instaui.vars.mixin_types.observable import ObservableMixin
 
@@ -40,10 +40,9 @@ def flat_values(
     ):
         return self.__source.flat_values()
 
-    def distinct(self):
-        query_name = get_store().gen_query(
-            f"SELECT DISTINCT {self.field} FROM {self.source_name}"
-        )
+    def distinct(self, *, order_by: Optional[Literal["ASC", "DESC"]] = None):
+        sql = f"SELECT DISTINCT {self.field} FROM {self.source_name}{f' ORDER BY {self.field} {order_by}' if order_by else ''}"
+        query_name = get_store().gen_query(sql)
         return _server_query.create_source(query_name).flat_values()
 
 
@@ -80,8 +79,7 @@ def source_name(self) -> str:
     def get_source_type(self):
         return "query"
 
-    def distinct(self):
-        query_name = get_store().gen_query(
-            f"SELECT DISTINCT {self.field} FROM {self.source_name}"
-        )
+    def distinct(self, *, order_by: Optional[Literal["ASC", "DESC"]] = None):
+        sql = f"SELECT DISTINCT {self.field} FROM {self.source_name}{f' ORDER BY {self.field} {order_by}' if order_by else ''}"
+        query_name = get_store().gen_query(sql)
         return _server_query.create_source(query_name).flat_values()