nova-trame 0.11.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

nova/trame/model/remote_file_input.py

@@ -1,6 +1,8 @@
 """Model state for RemoteFileInput."""
 
 import os
+from functools import cmp_to_key
+from locale import strcoll
 from typing import Any, Union
 
 
@@ -17,8 +19,11 @@ class RemoteFileInputModel:
     def get_base_paths(self) -> list[dict[str, Any]]:
         return [{"path": base_path, "directory": True} for base_path in self.base_paths]
 
-    def scan_current_path(self, current_path: str, showing_all_files: bool) -> tuple[list[dict[str, Any]], bool]:
+    def scan_current_path(
+        self, current_path: str, showing_all_files: bool, filter: str
+    ) -> tuple[list[dict[str, Any]], bool]:
         failed = False
+        filter = filter.split("/")[-1]
 
         try:
             if current_path and (not self.valid_subpath(current_path) or not os.path.exists(current_path)):
@@ -32,13 +37,24 @@ class RemoteFileInputModel:
                 scan_path = os.path.dirname(current_path)
 
             for entry in os.scandir(scan_path):
-                if self.valid_entry(entry, showing_all_files):
+                if self.valid_entry(entry, showing_all_files) and (not filter or entry.name.startswith(filter)):
                     files.append({"path": entry.name, "directory": entry.is_dir()})
         except OSError:
             files = self.get_base_paths()
             failed = True
 
-        sorted_files = sorted(files, key=lambda entry: str(entry["path"]).lower())
+        def _sort_files(a: dict[str, Any], b: dict[str, Any]) -> int:
+            if a["directory"] and not b["directory"]:
+                return -1
+            if b["directory"] and not a["directory"]:
+                return 1
+
+            path_a = a["path"].lower()
+            path_b = b["path"].lower()
+
+            return strcoll(path_a, path_b)
+
+        sorted_files = sorted(files, key=cmp_to_key(_sort_files))
 
         return (sorted_files, failed)
 
@@ -86,13 +102,8 @@ class RemoteFileInputModel:
         if subpath == "":
             return False
 
-        try:
-            real_path = os.path.realpath(subpath)
-        except TypeError:
-            return False
-
         for base_path in self.base_paths:
-            if real_path.startswith(base_path):
+            if subpath.startswith(base_path):
                 return True
 
         return False

nova/trame/view/components/remote_file_input.py

@@ -1,7 +1,7 @@
 """View implementation for RemoteFileInput."""
 
 from functools import partial
-from typing import Any, Optional, cast
+from typing import Any, Optional, Union, cast
 
 from trame.app import get_server
 from trame.widgets import client, html
@@ -22,7 +22,7 @@ class RemoteFileInput:
 
     def __init__(
         self,
-        v_model: Optional[str] = None,
+        v_model: Optional[Union[tuple[str, Any], str]] = None,
         allow_files: bool = True,
         allow_folders: bool = False,
         allow_nonexistent_path: bool = False,
@@ -35,8 +35,9 @@ class RemoteFileInput:
 
         Parameters
         ----------
-        v_model : str
-            The v-model for the input field.
+        v_model : tuple[str, Any] or str, optional
+            The v-model for this component. If this references a Pydantic configuration variable, then this component
+            will attempt to load a label, hint, and validation rules from the configuration for you automatically.
         allow_files : bool
             If true, the user can save a file selection.
         allow_folders : bool
@@ -100,19 +101,17 @@ class RemoteFileInput:
                     vuetify.VIcon("mdi-folder-open")
 
                     with vuetify.VDialog(
-                        v_model=self.vm.get_dialog_state_name(),
-                        activator="parent",
-                        persistent=True,
-                        **self.dialog_props,
+                        v_model=self.vm.get_dialog_state_name(), activator="parent", **self.dialog_props
                     ):
                         with vuetify.VCard(classes="pa-4"):
                             vuetify.VCardTitle(input.label)
                             vuetify.VTextField(
-                                v_model=self.v_model,
+                                v_model=self.vm.get_filter_state_name(),
                                 classes="mb-4 px-4",
                                 label="Current Selection",
                                 __events=["change"],
                                 change=(self.vm.select_file, "[$event.target.value]"),
+                                update_modelValue=(self.vm.filter_paths, "[$event]"),
                             )
 
                             if self.allow_files and self.extensions:
@@ -174,15 +173,19 @@ class RemoteFileInput:
         server = get_server(None, client_type="vue3")
         binding = TrameBinding(server.state)
 
+        if isinstance(self.v_model, tuple):
+            model_name = self.v_model[0]
+        else:
+            model_name = self.v_model
+
         self.vm = RemoteFileInputViewModel(self.model, binding)
 
         self.vm.dialog_bind.connect(self.vm.get_dialog_state_name())
         self.vm.file_list_bind.connect(self.vm.get_file_list_state_name())
+        self.vm.filter_bind.connect(self.vm.get_filter_state_name())
         self.vm.on_close_bind.connect(client.JSEval(exec=f"{self.vm.get_dialog_state_name()} = false;").exec)
         self.vm.on_update_bind.connect(
-            client.JSEval(
-                exec=f"{self.v_model} = $event; flushState('{self.v_model.split('.')[0].split('[')[0]}');"
-            ).exec
+            client.JSEval(exec=f"{model_name} = $event; flushState('{model_name.split('.')[0].split('[')[0]}');").exec
         )
         self.vm.showing_all_bind.connect(self.vm.get_showing_all_state_name())
         self.vm.valid_selection_bind.connect(self.vm.get_valid_selection_state_name())

nova/trame/view_model/remote_file_input.py

@@ -19,12 +19,13 @@ class RemoteFileInputViewModel:
         self.id = RemoteFileInputViewModel.counter
         RemoteFileInputViewModel.counter += 1
 
-        self.previous_value = ""
         self.showing_all_files = False
         self.showing_base_paths = True
+        self.previous_value = ""
         self.value = ""
         self.dialog_bind = binding.new_bind()
         self.file_list_bind = binding.new_bind()
+        self.filter_bind = binding.new_bind()
         self.showing_all_bind = binding.new_bind()
         self.valid_selection_bind = binding.new_bind()
         self.on_close_bind = binding.new_bind()
@@ -35,18 +36,26 @@ class RemoteFileInputViewModel:
         self.populate_file_list()
 
     def close_dialog(self, cancel: bool = False) -> None:
-        if cancel:
-            self.value = self.previous_value
+        if not cancel:
             self.on_update_bind.update_in_view(self.value)
+        else:
+            self.value = self.previous_value
 
+        self.filter_bind.update_in_view(self.value)
         self.on_close_bind.update_in_view(None)
 
+    def filter_paths(self, filter: str) -> None:
+        self.populate_file_list(filter)
+
     def get_dialog_state_name(self) -> str:
         return f"nova__dialog_{self.id}"
 
     def get_file_list_state_name(self) -> str:
         return f"nova__file_list_{self.id}"
 
+    def get_filter_state_name(self) -> str:
+        return f"nova__filter_{self.id}"
+
     def get_showing_all_state_name(self) -> str:
         return f"nova__showing_all_{self.id}"
 
@@ -66,19 +75,19 @@ class RemoteFileInputViewModel:
         self.showing_all_bind.update_in_view(self.showing_all_files)
         self.populate_file_list()
 
-    def populate_file_list(self) -> None:
-        files = self.scan_current_path()
+    def populate_file_list(self, filter: str = "") -> None:
+        files = self.scan_current_path(filter)
         self.file_list_bind.update_in_view(files)
 
-    def scan_current_path(self) -> list[dict[str, Any]]:
-        files, self.showing_base_paths = self.model.scan_current_path(self.value, self.showing_all_files)
+    def scan_current_path(self, filter: str) -> list[dict[str, Any]]:
+        files, self.showing_base_paths = self.model.scan_current_path(self.value, self.showing_all_files, filter)
 
         return files
 
     def select_file(self, file: Union[dict[str, str], str]) -> None:
         new_path = self.model.select_file(file, self.value, self.showing_base_paths)
         self.set_value(new_path)
-        self.on_update_bind.update_in_view(self.value)
+        self.filter_bind.update_in_view(self.value)
 
         self.valid_selection_bind.update_in_view(self.model.valid_selection(new_path))
         self.populate_file_list()

{nova_trame-0.11.1.dist-info → nova_trame-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nova-trame
-Version: 0.11.1
+Version: 0.12.0
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify

{nova_trame-0.11.1.dist-info → nova_trame-0.12.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/remote_file_input.py,sha256=GRvWepYcFPjyrMOCI-mgr8GvDSYNag2oGqG-QY1Jfbw,3280
+nova/trame/model/remote_file_input.py,sha256=9KAf31ZHzpsh_aXUrNcF81Q5jvUZDWCzW1QATKls-Jk,3675
 nova/trame/view/components/__init__.py,sha256=fopr6mVqcpDcVYK9ue7SLUHyswgvRPcFESTq86mu1R8,128
 nova/trame/view/components/input_field.py,sha256=CvVbuMuSu-vgRgyZsooscGw2nbxBbyangvrx2GmzuS8,12243
-nova/trame/view/components/remote_file_input.py,sha256=FaS1TxFBdNp8xB6CicC5iAX4kSdwePwRCiyTas0d_Tc,8233
+nova/trame/view/components/remote_file_input.py,sha256=k2yrwkell_g0sGnWR9XLL1LxkmFLr8-AGhduo8E-N4A,8669
 nova/trame/view/components/visualization/__init__.py,sha256=kDX1fkbtAgXSGlqhlMNhYYoYrq-hfS636smjgLsh6gg,84
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=foZCMoqbuahT5dtqIQvm8C4ZJcY9P211eJEcpQJltmM,3421
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
@@ -16,9 +16,9 @@ nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163
 nova/trame/view/theme/assets/vuetify_config.json,sha256=1EwlDUHZiM45MWgnHSQKgLH_d0IZ1iaXjl3eXxGc2EI,4832
 nova/trame/view/theme/theme.py,sha256=lHeXZPGiS1Ezn3aiKpoEyarLgxOyatWOzYSApX9VI3M,11402
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/remote_file_input.py,sha256=EU8jrU_3_BQqvta5-owSotHG0LAxLbTp6INqk3TdIZc,2986
-nova_trame-0.11.1.dist-info/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
-nova_trame-0.11.1.dist-info/METADATA,sha256=d5nFsxphTE0zomScgQHrmgLRwFOshOtyxbfGuRfBpcM,1240
-nova_trame-0.11.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-nova_trame-0.11.1.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.11.1.dist-info/RECORD,,
+nova/trame/view_model/remote_file_input.py,sha256=WHWCQkZBGeKLe1aTPbtVNI8tn-PDt64mi1-561uuBpQ,3320
+nova_trame-0.12.0.dist-info/LICENSE,sha256=MOqZ8tPMKy8ZETJ2-HEvFTZ7dYNlg3gXmBkV-Y9i8bw,1061
+nova_trame-0.12.0.dist-info/METADATA,sha256=q7FycKbwTX_JY6zo5fa9Ep59ZCcv1zUr__HsGSaiwNg,1240
+nova_trame-0.12.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+nova_trame-0.12.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.12.0.dist-info/RECORD,,