chore: finalize search behavior

Author: jbarreau

src/datasource_rpc/forestadmin/datasource_rpc/datasource.py

@@ -70,10 +70,12 @@ def create_collection(self, collection_name, collection_schema):
                 collection.add_rpc_action(action_name, action_schema)
 
         collection._schema["charts"] = {name: None for name in collection_schema["charts"]}
-        collection._schema["searchable"] = collection_schema["searchable"]
-        collection._schema["countable"] = collection_schema["countable"]
         collection.add_segments(collection_schema["segments"])
 
+        if collection_schema["countable"]:
+            collection.enable_count()
+        collection.enable_search()
+
         self.add_collection(collection)
 
     def wait_for_connection(self):
@@ -87,8 +89,10 @@ def wait_for_connection(self):
 
     async def internal_reload(self):
         has_changed = self.introspect()
-        if has_changed and self.reload_method is not None:
-            await call_user_function(self.reload_method)
+        if has_changed:
+            await Agent.get_instance().reload()
+        # if has_changed and self.reload_method is not None:
+        #     await call_user_function(self.reload_method)
 
     async def run(self):
         self.wait_for_connection()

src/datasource_toolkit/forestadmin/datasource_toolkit/datasource_customizer/collection_customizer.py

@@ -550,13 +550,6 @@ async def _disable_count():
         self.stack.queue_customization(_disable_count)
         return self
 
-    def bypass_search(self) -> Self:
-        async def _bypass_search():
-            cast(SearchCollectionDecorator, self.stack.search.get_collection(self.collection_name)).bypass_search()
-
-        self.stack.queue_customization(_bypass_search)
-        return self
-
     def replace_search(self, definition: SearchDefinition) -> Self:
         """Replace the behavior of the search bar
         Args:

src/datasource_toolkit/forestadmin/datasource_toolkit/decorators/search/collections.py

@@ -33,29 +33,18 @@ def __init__(self, collection: Collection, datasource: Datasource[BoundCollectio
         super().__init__(collection, datasource)
         self._replacer: SearchDefinition = None
         self._searchable = len(self._get_searchable_fields(self.child_collection, False)) > 0
-        self._bypass_searchable = False
 
     def disable_search(self):
         self._searchable = False
         self.mark_schema_as_dirty()
 
-    def bypass_search(self):
-        # only used when a disable search was done on server RPC
-        self._bypass_searchable = True
-        self.mark_schema_as_dirty()
-
     def replace_search(self, replacer: SearchDefinition):
         self._replacer = replacer
         self._searchable = True
         self.mark_schema_as_dirty()
 
     def _refine_schema(self, sub_schema: CollectionSchema) -> CollectionSchema:
-        if sub_schema["searchable"] is True:
-            self._bypass_searchable = True
-        return {
-            **sub_schema,
-            "searchable": self._searchable if self._bypass_searchable is False else True,
-        }
+        return {**sub_schema, "searchable": self._searchable}
 
     def _default_replacer(self, search: str, extended: bool) -> ConditionTree:
         searchable_fields = self._get_searchable_fields(self.child_collection, extended)
@@ -66,7 +55,7 @@ def _default_replacer(self, search: str, extended: bool) -> ConditionTree:
     async def _refine_filter(
         self, caller: User, _filter: Union[Optional[PaginatedFilter], Optional[Filter]]
     ) -> Optional[Union[PaginatedFilter, Filter]]:
-        if _filter is None or self._bypass_searchable:
+        if _filter is None:
             return _filter
 
         # Search string is not significant