Merge pull request #390 from maxfordham/final-changes-for-import-export-excel

Final changes for import/export excel

Author: Arshadwaqas115

pixi.lock

@@ -44,7 +44,7 @@ dependencies = [
     "wcmatch", 
     "deepdiff",
     "datamodel-code-generator>=0.28.5",
-    "xlsxdatagrid>=0.3.2,<0.4",
+    "xlsxdatagrid>=0.3.3,<0.4",
 ]
 
 [project.urls]
@@ -72,6 +72,8 @@ platforms = ["linux-64"]
 
 [tool.pixi.pypi-dependencies]
 ipyautoui = { path = ".", editable = true }
+# datamodel-code-generator = { git = "https://github.com/Arshadwaqas115/datamodel-code-generator", branch = "main" }
+# xlsxdatagrid = { path = "/home/jovyan/xlsxdatagrid", editable = true }
 
 [tool.pixi.feature.tests.pypi-dependencies]
 pytest_examples = "*"

pyproject.toml

@@ -31,6 +31,7 @@ def pydantic_model_file_from_json_schema(json_schema, fpth):
             output=fpth,
             output_model_type=DataModelType.PydanticV2BaseModel,
             capitalise_enum_members=True,
+            field_include_all_keys=True
         )
 
 def pydantic_model_from_json_schema(json_schema: dict) -> ty.Type[BaseModel]:
@@ -76,18 +77,22 @@ def _init_model_schema(
         }
     if isinstance(schema, dict):
         if generate_pydantic_model_from_json_schema:
+            schema = replace_refs(schema, merge_props=True)
+            schema = {k: v for k, v in schema.items() if k != "$defs"}
             model = pydantic_model_from_json_schema(schema)
         else:
             model = None
+            schema = replace_refs(schema, merge_props=True)
+            schema = {k: v for k, v in schema.items() if k != "$defs"}
         # IDEA: Possible implementations -@jovyan at 8/24/2022, 12:05:02 PM
         # jsonschema_to_pydantic
         # https://koxudaxi.github.io/datamodel-code-generator/using_as_module/
     else:
         model = schema  # the "model" passed is a pydantic model
         schema = model.model_json_schema(by_alias=by_alias).copy()
-
-    schema = replace_refs(schema, merge_props=True)
-    schema = {k: v for k, v in schema.items() if k != "$defs"}
+        schema = replace_refs(schema, merge_props=True)
+        schema = {k: v for k, v in schema.items() if k != "$defs"}
+        
     return model, schema
 
 

src/ipyautoui/automapschema.py

@@ -210,14 +210,7 @@ def get_autoui(schema: ty.Union[ty.Type[BaseModel], dict], **kwargs):
             li = [caller.autoui, TitleDescription, ShowRaw, AutoUiFileMethods]
 
             class AutoUi(*li):
-                def _set_children(self):
-                    self.children = [
-                        w.HBox([self.bn_showraw, self.html_title]),
-                        self.html_description,
-                        self.vbx_error,
-                        self.vbx_widget,
-                        self.vbx_showraw,
-                    ]
+                pass
 
         else:
 

src/ipyautoui/autoui.py

@@ -143,7 +143,8 @@ class EditTsv(CopyToClipboard):
     allow_download = tr.Bool(default_value=True)
     exclude_metadata = tr.Bool(default_value=True)
     header_depth = tr.Int(default_value=1)
-    disable_text_editing = tr.Bool(default_value=False)
+    disable_text_editing = tr.Bool(default_value=True)
+    filename_suffix = tr.Unicode(default_value="", allow_none=True)
 
     @tr.observe("upload_status")
     def upload_status_onchange(self, on_change):
@@ -239,6 +240,12 @@ def create_file(self):
             is_transposed=self.transposed,
             exclude_metadata=self.exclude_metadata,
         )[0]
+        # Append suffix to filename if provided
+        if self.filename_suffix:
+            new_name = fpth.stem + self.filename_suffix + fpth.suffix
+            new_fpth = fpth.parent / new_name
+            fpth.rename(new_fpth)
+            fpth = new_fpth
         return fpth
 
     def _text(self, change):
@@ -249,7 +256,7 @@ def _text(self, change):
                 is_transposed=self.transposed,
                 model=self.model,
                 delimiter="\t",
-                header_depth=self.header_depth)
+            )
         if self.errors:
             self.vbx_errors.children = [
                 w.HTML(markdown(markdown_error(e))) for e in self.errors
@@ -265,7 +272,7 @@ def tsv_data(self):  # TODO: ensure header row unchanged
             is_transposed=self.transposed,
             model=self.model,
             delimiter="\t",
-            header_depth=self.header_depth)
+        )
 
     @property
     def pydantic_object(self):
@@ -484,6 +491,12 @@ def __init__(self, **kwargs):
 
         self.bn_confirmation.on_click(self._bn_check_upload)
         self.bn_cross.on_click(self._bn_cross_clicked)
+        
+        self.file_uploader = TempFileUploadProcessor(
+            fn_process=self._process_uploaded_file,
+            allowed_file_type=".xlsx",
+        )
+        
         super().__init__(**kwargs)
         self.value = value
         self.upload_status = "None"
@@ -495,9 +508,9 @@ def _update_changes(self, change):
 
     def _set_children(self):
         if self.allow_download:
-            self.vbx_bns.children = [self.bn_copy, self.bn_upload_text, self.mfdld, self.bn_confirmation, self.bn_cross]
+            self.vbx_bns.children = [self.bn_copy, self.bn_upload_text, self.mfdld, self.bn_confirmation, self.bn_cross, self.file_uploader]
         else:
-            self.vbx_bns.children = [self.bn_copy, self.bn_upload_text, self.bn_confirmation, self.bn_cross]
+            self.vbx_bns.children = [self.bn_copy, self.bn_upload_text, self.bn_confirmation, self.bn_cross, self.file_uploader]
         self.hbx_main.children = [self.vbx_bns, self.text, self.ddiff, self.output]
         self.children = [self.vbx_errors, self.hbx_main]
 
@@ -549,6 +562,9 @@ def _bn_check_upload(self, onclick):
 
     def _bn_cross_clicked(self, onclick):
         self.show_upload_button_and_hide_deepdiff(upload_disabled=False)
+        
+    def _process_uploaded_file(self, path: Path):
+        pass
 
     def show_upload_button_and_hide_deepdiff(self, upload_disabled=True):
         # Hide check button and show upload button as well as text area
@@ -590,7 +606,6 @@ def deepdiff_to_crud(self, diff: DeepDiff):
                 path_list = delta.path(output_format="list")
                 primary_key = str(path_list[0])  # first key (primary key)
                 changes.deletions.append(primary_key)
-    
 
         if "values_changed" in diff:
             for delta in diff["values_changed"]:
@@ -653,23 +668,8 @@ def __init__(self, **kwargs):
         # Ensure text editing is disabled by default
         kwargs.setdefault("disable_text_editing", True)
 
-        # Create uploader before parent init so it's available during layout build
-        self.file_uploader = TempFileUploadProcessor(
-            fn_process=self._process_uploaded_file,
-            allowed_file_type=".xlsx",
-        )
-
         # Initialize base class
         super().__init__(**kwargs)
-        self.last_upload_metadata = None
-
-    def _set_children(self):
-        super()._set_children()
-        buttons = list(self.vbx_bns.children)
-        if self.file_uploader not in buttons:
-            insert_at = 1 if buttons else 0
-            buttons.insert(insert_at, self.file_uploader)
-            self.vbx_bns.children = tuple(buttons)
 
     def _text(self, change):
         pass
@@ -684,7 +684,6 @@ def _process_uploaded_file(self, path: Path):
             data, errors = xdg.read_excel(
                 path,
                 is_transposed=self.transposed,
-                header_depth=self.header_depth,
                 model=self.model,
             )
         except Exception:

src/ipyautoui/custom/edittsv.py

@@ -1,10 +1,10 @@
 from deepdiff import DeepDiff
-from pydantic import RootModel, create_model
-from ipyautoui.custom.edittsv import Changes, EditTsvWithDiff
+from pydantic import RootModel, create_model, ConfigDict
+from ipyautoui.custom.edittsv import Changes, EditTsvFileUpload
 import traitlets as tr
 import typing as ty
 
-class EditTsvWithDiffAndKeyMapping(EditTsvWithDiff):
+class EditTsvWithDiffAndKeyMapping(EditTsvFileUpload):
     primary_key_name = tr.List(tr.Unicode(),
         default_value=None,
         allow_none=True,
@@ -14,24 +14,57 @@ class EditTsvWithDiffAndKeyMapping(EditTsvWithDiff):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         if self.exclude_fields_from_model:
+            # Get original schema from RootModel BEFORE we replace it
+            original_schema = self.model.model_json_schema()
+            
             inner_model = self.model.model_fields['root'].annotation.__args__[0]
-            # Keep alias names in the new model
+            
+            # Preserve the original model_config
+            original_config = getattr(inner_model, 'model_config', {})
+
+            config_dict = dict(original_config) if original_config else {}
+            
+            # Keep alias names in the new model and preserve json_schema_extra
             fields = {}
             for name, field in inner_model.model_fields.items():
                 converted_name = field.alias or name
                 if converted_name not in self.exclude_fields_from_model:
                     alias = field.alias or name
-                    fields[alias] = (field.annotation, field.default)
+                    # Preserve the field with all its metadata
+                    fields[alias] = (field.annotation, field)
 
+            # Create new model with preserved config
             stripped_inner = create_model(
                 inner_model.__name__,
+                __config__=ConfigDict(**config_dict) if config_dict else None,
                 **fields,
             )
-            self.model = type(
-                self.model.__name__,
-                (RootModel[list[stripped_inner]],),
-                {},
-            )
+            
+            # Create new RootModel wrapping the stripped inner model
+            class StrippedRootModel(RootModel[list[stripped_inner]]):
+                @classmethod
+                def model_json_schema(cls, **kwargs):
+                    """Override to preserve datagrid_index_name and other schema metadata."""
+                    schema = super().model_json_schema(**kwargs)
+                    # Preserve top-level schema metadata from original RootModel
+                    for key in ['datagrid_index_name', 'hide_nan', 'format', 'is_transposed']:
+                        if key in original_schema:
+                            schema[key] = original_schema[key]
+                    
+                    # Modify datagrid_index_name: remove 'title', append 'name' at end
+                    if 'datagrid_index_name' in schema:
+                        index_list = schema['datagrid_index_name']
+                        if index_list and isinstance(index_list, list) and 'title' in index_list:
+                            # Remove 'title' and append 'name' at the end
+                            schema['datagrid_index_name'] = [
+                                item for item in index_list if item != 'title'
+                            ]
+                            schema['datagrid_index_name'].append('name')
+                    
+                    return schema
+            
+            StrippedRootModel.__name__ = self.model.__name__
+            self.model = StrippedRootModel
 
     def _bn_upload_text(self, on_click):
         # hide grid/errors