dara-components 1.18.9__py3-none-any.whl → 1.18.10__py3-none-any.whl

dara/components/common/table.py

@@ -380,7 +380,18 @@ class Column(BaseModel):
     sticky: Optional[str] = None
     tooltip: Optional[str] = None
     width: Optional[Union[int, str]] = None
-    type: Optional[Union[Literal['number'], Literal['string'], Literal['datetime']]] = None
+    type: Optional[
+        Union[
+            Literal['number'],
+            Literal['string'],
+            # Generic datetime, assumes datetime64[ns]
+            Literal['datetime'],
+            # Specific datetime64 types
+            Literal['datetime64[ns]'],
+            Literal['datetime64[ms]'],
+            Literal['datetime64[s]'],
+        ]
+    ] = None
 
     model_config = ConfigDict(use_enum_values=True)
 

dara/components/umd/dara.components.umd.js

@@ -61227,11 +61227,43 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     if (columns) {
       return columns.filter(
         (col) => {
-          var _a2;
-          return ((_a2 = col == null ? void 0 : col.formatter) == null ? void 0 : _a2.type) === "datetime" || col.type === "datetime" || col.filter === "datetime";
+          var _a2, _b2;
+          return ((_a2 = col == null ? void 0 : col.formatter) == null ? void 0 : _a2.type) === "datetime" || ((_b2 = col == null ? void 0 : col.type) == null ? void 0 : _b2.includes("datetime")) || col.filter === "datetime";
         }
-      ).map((c9) => c9.col_id);
+      ).map((c9) => [c9.col_id, c9.type]);
+    }
+    return [];
+  }
+  function extractDatetimeUnit(dtypeString) {
+    if (!dtypeString) {
+      return "ns";
+    }
+    const match2 = dtypeString.match(/datetime64\[(\w+)\]/);
+    return match2 ? match2[1] : "ns";
+  }
+  function parseTimestamp(timestamp, colType) {
+    if (!timestamp) {
+      return String(timestamp);
+    }
+    const unit = extractDatetimeUnit(colType);
+    let timestampMs;
+    switch (unit) {
+      case "s":
+        timestampMs = timestamp * 1e3;
+        break;
+      case "ms":
+        timestampMs = timestamp;
+        break;
+      case "us":
+        timestampMs = timestamp / 1e3;
+        break;
+      case "ns":
+        timestampMs = timestamp / 1e6;
+        break;
+      default:
+        return String(timestamp);
     }
+    return formatISO(new Date(timestampMs));
   }
   function cleanIndex(rows) {
     return rows.map((r9) => {
@@ -61303,14 +61335,20 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           });
         } else {
           processedColumns = columnsWithoutGeneratedIndex.map((column) => {
-            var _a2, _b2;
+            var _a2, _b2, _c2, _d2;
             const isIndex2 = column.startsWith(INDEX_COL);
+            let formatter;
+            if (((_a2 = fieldTypes[column]) == null ? void 0 : _a2.type) === "boolean") {
+              formatter = { type: "boolean" };
+            } else if (((_c2 = (_b2 = fieldTypes[column]) == null ? void 0 : _b2.type) != null ? _c2 : "").includes("datetime")) {
+              formatter = { type: "datetime" };
+            }
             return {
               col_id: column,
               sticky: isIndex2 ? "left" : void 0,
               label: extractColumnLabel(column, isIndex2),
-              type: (_a2 = fieldTypes[column]) == null ? void 0 : _a2.type,
-              formatter: ((_b2 = fieldTypes[column]) == null ? void 0 : _b2.type) === "boolean" ? { type: "boolean" } : void 0
+              type: (_d2 = fieldTypes[column]) == null ? void 0 : _d2.type,
+              formatter
             };
           });
           if (!props.include_index) {
@@ -61336,15 +61374,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         });
         return {
           data: response.data.map((row) => {
-            for (const val of datetimeColumns) {
-              if (typeof row[val] === "number") {
-                let timestamp = row[val];
-                if (timestamp < 1e12) {
-                  timestamp *= 1e3;
-                } else if (timestamp > 1e15) {
-                  timestamp /= 1e6;
-                }
-                row[val] = formatISO(new Date(timestamp));
+            for (const [colId, colType] of datetimeColumns) {
+              if (typeof row[colId] === "number") {
+                row[colId] = parseTimestamp(row[colId], colType);
               }
             }
             return row;

{dara_components-1.18.9.dist-info → dara_components-1.18.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-components
-Version: 1.18.9
+Version: 1.18.10
 Summary: Components for the Dara Framework
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: bokeh (>=3.1.0,<3.2.0)
 Requires-Dist: cai-causal-graph (>=0.3.6)
 Requires-Dist: certifi (>=2024.7.4)
-Requires-Dist: dara-core (==1.18.9)
+Requires-Dist: dara-core (==1.18.10)
 Requires-Dist: dill (>=0.3.0,<0.4.0)
 Requires-Dist: matplotlib (>=2.0.0)
 Requires-Dist: pandas (>=1.1.0,<3.0.0)
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 # Dara Components
 
-<img src="https://github.com/causalens/dara/blob/v1.18.9/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.18.10/img/dara_light.svg?raw=true">
 
 ![Master tests](https://github.com/causalens/dara/actions/workflows/tests.yml/badge.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)

{dara_components-1.18.9.dist-info → dara_components-1.18.10.dist-info}/RECORD

@@ -35,7 +35,7 @@ dara/components/common/spacer.py,sha256=ZRSl_fLntnumalaL41FYpBKDxOUgWgndkkLdDLl8
 dara/components/common/stack.py,sha256=FLw0IbQpW7l9A6LDS_KPCeQP0J7QKGYhVZ1RhAjBjpE,5562
 dara/components/common/switch.py,sha256=KjFUFT-1XHyJoJYkJLeEBgUb0fTArsFuWfowniTgl3E,1594
 dara/components/common/tabbed_card.py,sha256=zftir9hSj_l_dx2dPYis0NWy5q290sdg3Q1Nx8RvFbg,2344
-dara/components/common/table.py,sha256=P-qXaoFHMM69FiMH9T2Yeg0y0ZTx-89_JGj1Ls2_KbQ,24571
+dara/components/common/table.py,sha256=30W9pPZLANPqpZr_KL8u79qRq9Nw0WZvi4U9SlVXUTg,24843
 dara/components/common/text.py,sha256=bYgX_IhSLPa-KuWbcCSdrNgAL6MhYQRpCNtV5octUbQ,1990
 dara/components/common/textarea.py,sha256=F8dmyinylAjjXMhNwfiWInrCFuAnWuCPTsKKiEUkmOw,2106
 dara/components/common/time_utils.py,sha256=UbAws5HBptJ-xH-m4QRDDET-9leOQu9WdywmExBuqIc,1746
@@ -78,9 +78,9 @@ dara/components/smart/data_slicer/utils/core.py,sha256=4M_HA8oBzAkHklHgmaJ-qiKA3
 dara/components/smart/data_slicer/utils/data_preview.py,sha256=OAphjMrm3F76XmJ09X7sZSeOeKqGJFwN5ooo3qcyrG4,1722
 dara/components/smart/data_slicer/utils/plotting.py,sha256=TB00576kbA6y1eRuZBe09UAcZmluY4iJsKmYnXZ3hWQ,3389
 dara/components/smart/hierarchy.py,sha256=9-QzEtbvP-arejhjsgl4Y5o5KHHzg6H1IGmwrX63450,2905
-dara/components/umd/dara.components.umd.js,sha256=Hp3Gj2fB-gEJXSZNdalE4NYHoCn-cLtdfOLmrBxNZzQ,18315018
+dara/components/umd/dara.components.umd.js,sha256=jpocXPfEyjxMuAUd1JlVFlq8ij2_P9ASkgRFE6Z7Cf8,18315953
 dara/components/umd/style.css,sha256=Qm0_kcxXBDoXvvPTc7YCttkl1zMFifdcp-KufTunPNY,162729
-dara_components-1.18.9.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_components-1.18.9.dist-info/METADATA,sha256=MFvbhu-_2LB_H1vw5aIsqi_hzJfoF5PyTIIc1rDLJU8,2743
-dara_components-1.18.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_components-1.18.9.dist-info/RECORD,,
+dara_components-1.18.10.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_components-1.18.10.dist-info/METADATA,sha256=qdnMv3P9tS1Erg2dKtuNQFglgw1ihYcPTVDWbIvP0Nc,2746
+dara_components-1.18.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_components-1.18.10.dist-info/RECORD,,