Update typing

foamlib/_files/_files.py

@@ -224,17 +224,28 @@ def __setitem__(
                 kind in (Kind.FIELD, Kind.BINARY_FIELD)
             ) and self.class_ == "dictionary":
                 if not is_sequence(data):
-                    class_ = "volScalarField"
-                elif (len(data) == 3 and not is_sequence(data[0])) or len(data[0]) == 3:
-                    class_ = "volVectorField"
-                elif (len(data) == 6 and not is_sequence(data[0])) or len(data[0]) == 6:
-                    class_ = "volSymmTensorField"
-                elif (len(data) == 9 and not is_sequence(data[0])) or len(data[0]) == 9:
-                    class_ = "volTensorField"
-                else:
-                    class_ = "volScalarField"
+                    self.class_ = "volScalarField"
+                elif data:
+                    if isinstance(data[0], (int, float)):
+                        self.class_ = "volScalarField"
+                    elif (
+                        is_sequence(data[0])
+                        and data[0]
+                        and isinstance(data[0][0], (int, float))
+                    ):
+                        if len(data[0]) == 3:
+                            self.class_ = "volVectorField"
+                        elif len(data[0]) == 6:
+                            self.class_ = "volSymmTensorField"
+                        elif len(data[0]) == 9:
+                            self.class_ = "volTensorField"
+                    elif len(data) == 3:
+                        self.class_ = "volVectorField"
+                    elif len(data) == 6:
+                        self.class_ = "volSymmTensorField"
+                    elif len(data) == 9:
+                        self.class_ = "volTensorField"
 
-                self.class_ = class_
                 self[keywords] = data
 
             else:

foamlib/_files/_parsing.py

@@ -258,11 +258,8 @@ def _flatten_result(
         return ret
 
     def __getitem__(
-        self, keywords: str | tuple[str, ...]
+        self, keywords: tuple[str, ...]
     ) -> FoamFileBase._DataEntry | EllipsisType:
-        if isinstance(keywords, str):
-            keywords = (keywords,)
-
         _, data, _ = self._parsed[keywords]
         return data
 
@@ -290,10 +287,7 @@ def put(
             if keywords != k and keywords == k[: len(keywords)]:
                 del self._parsed[k]
 
-    def __delitem__(self, keywords: str | tuple[str, ...]) -> None:
-        if isinstance(keywords, str):
-            keywords = (keywords,)
-
+    def __delitem__(self, keywords: tuple[str, ...]) -> None:
         start, end = self.entry_location(keywords)
         del self._parsed[keywords]
 

foamlib/_files/_serialization.py

@@ -4,11 +4,12 @@
 import itertools
 import sys
 from enum import Enum, auto
+from typing import cast
 
 if sys.version_info >= (3, 9):
-    from collections.abc import Mapping
+    from collections.abc import Mapping, Sequence
 else:
-    from typing import Mapping
+    from typing import Mapping, Sequence
 
 from ._base import FoamFileBase
 from ._util import is_sequence
@@ -65,21 +66,26 @@ def dumps(
         return b"uniform " + dumps(data, kind=Kind.SINGLE_ENTRY)
 
     if kind in (Kind.FIELD, Kind.BINARY_FIELD) and is_sequence(data):
-        if isinstance(data[0], (int, float)):
+        if data and isinstance(data[0], (int, float)):
             tensor_kind = b"scalar"
-        elif len(data[0]) == 3:
-            tensor_kind = b"vector"
-        elif len(data[0]) == 6:
-            tensor_kind = b"symmTensor"
-        elif len(data[0]) == 9:
-            tensor_kind = b"tensor"
+        elif is_sequence(data[0]) and isinstance(data[0][0], (int, float)):
+            if len(data[0]) == 3:
+                tensor_kind = b"vector"
+            if is_sequence(data[0]) and len(data[0]) == 6:
+                tensor_kind = b"symmTensor"
+            if is_sequence(data[0]) and len(data[0]) == 9:
+                tensor_kind = b"tensor"
+            else:
+                return dumps(data)
         else:
             return dumps(data)
 
         if kind == Kind.BINARY_FIELD:
             if tensor_kind == b"scalar":
+                data = cast(Sequence[float], data)
                 contents = b"(" + array.array("d", data).tobytes() + b")"
             else:
+                data = cast(Sequence[Sequence[float]], data)
                 contents = (
                     b"("
                     + array.array("d", itertools.chain.from_iterable(data)).tobytes()

foamlib/_files/_util.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Any
+from typing import TYPE_CHECKING
 
 if sys.version_info >= (3, 9):
     from collections.abc import Sequence
@@ -13,8 +13,11 @@
 else:
     from typing_extensions import TypeGuard
 
+if TYPE_CHECKING:
+    from ._base import FoamFileBase
+
 
 def is_sequence(
-    value: Any,
-) -> TypeGuard[Sequence[Any]]:
+    value: FoamFileBase.Data,
+) -> TypeGuard[Sequence[FoamFileBase.Data]]:
     return isinstance(value, Sequence) and not isinstance(value, str)

tests/test_files/test_parsing.py

@@ -71,4 +71,4 @@ def test_parse_value() -> None:
         {"(air and water)": {"type": "constant", "sigma": 0.07}}
     ]
     assert Parsed(b"[]")[()] == FoamFile.DimensionSet()
-    assert Parsed(b"object f.1;")["object"] == "f.1"
+    assert Parsed(b"object f.1;")[("object",)] == "f.1"