Merge branch 'disaster_recovery_multiVersionSupport' into dr_for_profiling

Author: BrianMichell

.devcontainer/Dockerfile

@@ -1,21 +1,13 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
-  "build": {
-    "dockerfile": "Dockerfile.dev",
-    "context": ".."
-  },
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": {
-    // "post_create_script": "bash ./.devcontainer/post-install.sh"
-  },
-  // Forward 8787 to enable us to view dask dashboard
-  "forwardPorts": [8787],
+  "image": "mcr.microsoft.com/devcontainers/python:1-3.13-bookworm",
   // Configure tool-specific properties.
+  "features": {
+    "ghcr.io/va-h/devcontainers-features/uv:1": { "version": "0.8.15" }
+  },
   "customizations": {
-    // Configure properties specific to VS Code.
     "vscode": {
       "settings": {
+        "python.defaultInterpreterPath": "${containerWorkspaceFolder}/.venv/bin/python",
         "python.testing.pytestArgs": ["tests"],
         "python.testing.unittestEnabled": false,
         "python.testing.pytestEnabled": true
@@ -33,14 +25,17 @@
         "visualstudioexptteam.vscodeintellicode",
         "richie5um2.vscode-sort-json"
       ]
+    },
+    "jetbrains": {
+      "plugins": ["com.koxudaxi.pydantic", "com.koxudaxi.ruff"]
     }
   },
-  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  // "remoteUser": "root",
-  "updateRemoteUserUID": true,
   "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/mdio-python,type=bind",
   "workspaceFolder": "/workspaces/mdio-python",
-  "mounts": [
-    // "source=${localWorkspaceFolder}/../DATA/,target=/DATA/,type=bind,consistency=cached"
-  ]
+  // This installs the MDIO dev environment in the container. Put any customizations there.
+  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  // Forward 8787 to enable us to view the dask dashboard
+  "forwardPorts": [8787]
+  // Add any mounts you want to use here.
+  //"mounts": [ "source=${localWorkspaceFolder}/../DATA/,target=/DATA/,type=bind,consistency=cached" ]
 }

.devcontainer/Dockerfile.dev

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Sync the environment, installing the project editable and including dev dependencies
+uv sync
+
+# Set Git safe directory to avoid ownership issues
+git config --global --add safe.directory "$PWD"
+
+# Optional: If you need to reset GitHub host key for SSH (uncomment if necessary)
+# ssh-keygen -f "/home/vscode/.ssh/known_hosts" -R "github.com"

.devcontainer/devcontainer.json

@@ -211,7 +211,7 @@ def to_xarray_dataset(mdio_ds: Dataset) -> xr_Dataset:  # noqa: PLR0912
 
         # Add array attributes
         if v.metadata is not None:
-            metadata_dict = v.metadata.model_dump(exclude_none=True, exclude={"chunkGrid"})
+            metadata_dict = v.metadata.model_dump(exclude_none=True, exclude={"chunk_grid"})
             data_array.attrs.update(metadata_dict)
         if v.long_name:
             data_array.attrs["long_name"] = v.long_name

.devcontainer/post-create.sh

@@ -9,6 +9,7 @@
 
 import numpy as np
 from segy import SegyFile
+from segy.indexing import merge_cat_file
 
 from mdio.api.io import to_mdio
 from mdio.builder.schemas.dtype import ScalarType
@@ -132,6 +133,7 @@ def trace_worker(  # noqa: PLR0913
     if header_key in dataset.data_vars:  # Keeping the `if` here to allow for more worker configurations
         worker_variables.append(header_key)
     if raw_header_key in dataset.data_vars:
+
         do_reverse_transforms = True
         worker_variables.append(raw_header_key)
 
@@ -156,12 +158,13 @@ def trace_worker(  # noqa: PLR0913
     if raw_header_key in worker_variables:
         tmp_raw_headers = np.zeros_like(dataset[raw_header_key])
         tmp_raw_headers[not_null] = raw_headers.view("|V240")
+
         ds_to_write[raw_header_key] = Variable(
             ds_to_write[raw_header_key].dims,
             tmp_raw_headers,
             attrs=ds_to_write[raw_header_key].attrs,
             encoding=ds_to_write[raw_header_key].encoding,  # Not strictly necessary, but safer than not doing it.
-        )
+
 
     del raw_headers  # Manage memory
     data_variable = ds_to_write[data_variable_name]