embed BuiltinSortKind

pylib/anki/_backend/__init__.py

@@ -42,7 +42,6 @@ assert rsbridge.buildhash() == anki.buildinfo.buildhash
 # by external libraries (eg aqt) should be exported in the module that
 # refers to them, eg collection.py
 SchedTimingToday = pb.SchedTimingTodayOut
-BuiltinSortKind = pb.BuiltinSearchOrder.BuiltinSortKind
 BackendCard = pb.Card
 BackendNote = pb.Note
 Tag = pb.Tag

pylib/anki/collection.py

@@ -58,12 +58,14 @@ ConfigBoolKey = _pb.ConfigBool.Key  # pylint: disable=no-member
 EmptyCardsReport = _pb.EmptyCardsReport
 NoteWithEmptyCards = _pb.NoteWithEmptyCards
 GraphPreferences = _pb.GraphPreferences
+BuiltinSortKind = _pb.SortOrder.Builtin.Kind  # pylint: disable=no-member
 
 # pylint: disable=no-member
 if TYPE_CHECKING:
     from anki.lang import FormatTimeSpanContextValue, TRValue
 
     ConfigBoolKeyValue = _pb.ConfigBool.KeyValue
+    BuiltinSortKindValue = _pb.SortOrder.Builtin.KindValue
 
 
 class Collection:
@@ -460,11 +462,7 @@ class Collection:
     def find_cards(
         self,
         query: str,
-        order: Union[
+        order: Union[bool, str, BuiltinSortKindValue] = False,
-            bool,
-            str,
-            _pb.BuiltinSearchOrder.BuiltinSortKindValue,  # pylint: disable=no-member
-        ] = False,
         reverse: bool = False,
     ) -> Sequence[int]:
         if isinstance(order, str):
@@ -476,7 +474,7 @@ class Collection:
                 mode = _pb.SortOrder(none=_pb.Empty())
         else:
             mode = _pb.SortOrder(
-                builtin=_pb.BuiltinSearchOrder(kind=order, reverse=reverse)
+                builtin=_pb.SortOrder.Builtin(kind=order, reverse=reverse)
             )
         return self.backend.search_cards(search=query, order=mode)
 

pylib/tests/test_find.py

@@ -1,8 +1,7 @@
 # coding: utf-8
 import pytest
 
-from anki._backend import BuiltinSortKind
+from anki.collection import BuiltinSortKind, ConfigBoolKey
-from anki.collection import ConfigBoolKey
 from anki.consts import *
 from tests.shared import getEmptyCol, isNearCutoff
 

rslib/backend.proto

@@ -729,24 +729,8 @@ message SearchCardsOut {
 }
 
 message SortOrder {
-  oneof value {
+  message Builtin {
-    Empty from_config = 1;
+    enum Kind {
-    Empty none = 2;
-    string custom = 3;
-    BuiltinSearchOrder builtin = 4;
-  }
-}
-
-message SearchNotesIn {
-  string search = 1;
-}
-
-message SearchNotesOut {
-  repeated int64 note_ids = 2;
-}
-
-message BuiltinSearchOrder {
-  enum BuiltinSortKind {
       NOTE_CREATION = 0;
       NOTE_MOD = 1;
       NOTE_FIELD = 2;
@@ -761,8 +745,23 @@ message BuiltinSearchOrder {
       CARD_DECK = 11;
       CARD_TEMPLATE = 12;
     }
-  BuiltinSortKind kind = 1;
+    Kind kind = 1;
     bool reverse = 2;
+  }
+  oneof value {
+    Empty from_config = 1;
+    Empty none = 2;
+    string custom = 3;
+    Builtin builtin = 4;
+  }
+}
+
+message SearchNotesIn {
+  string search = 1;
+}
+
+message SearchNotesOut {
+  repeated int64 note_ids = 2;
 }
 
 message SearchTerm {

rslib/src/backend/mod.rs

@@ -6,10 +6,9 @@ use crate::{
     backend::dbproxy::db_command_bytes,
     backend_proto as pb,
     backend_proto::{
-        builtin_search_order::BuiltinSortKind as SortKindProto,
         concatenate_searches_in::Separator as BoolSeparatorProto,
-        sort_order::Value as SortOrderProto, AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty,
+        sort_order::builtin::Kind as SortKindProto, sort_order::Value as SortOrderProto,
-        RenderedTemplateReplacement,
+        AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty, RenderedTemplateReplacement,
     },
     card::{Card, CardID},
     card::{CardQueue, CardType},