🔵 Mv to resources/table

Author: pierrecamilleri

frictionless/resources/table.py

@@ -14,7 +14,6 @@
 from ..indexer import Indexer
 from ..platform import platform
 from ..resource import Resource
-from ..schema.fields_info import FieldsInfo
 from ..system import system
 from ..table import Header, Lookup, Row, Table
 from ..transformer import Transformer
@@ -677,3 +676,53 @@ def write(
         self, target: Optional[Union[Resource, Any]] = None, **options: Any
     ) -> TableResource:
         return self.write_table(target, **options)
+
+
+class _FieldInfo:
+    """Private class to store additional data alongside a field."""
+
+    def __init__(self, field: Field, field_number: int):
+        """field_number: 1-indexed rank of the field"""
+        self.field = field
+        self.field_number = field_number
+        self.cell_reader = field.create_cell_reader()
+        self.cell_writer = field.create_cell_writer()
+
+
+class FieldsInfo:
+    """Helper class to store additional data to a collection of fields
+
+    This class is not Public API, and should be used only in non-public
+    interfaces.
+    """
+
+    def __init__(self, fields: List[Field]):
+        self._fields: List[_FieldInfo] = [
+            _FieldInfo(field, i + 1) for i, field in enumerate(fields)
+        ]
+
+    def ls(self) -> List[str]:
+        """List all field names"""
+        return [fi.field.name for fi in self._fields]
+
+    def get(self, field_name: str) -> _FieldInfo:
+        """Get a Field by its name
+
+        Raises:
+            ValueError: Field with name fieldname does not exist
+        """
+        try:
+            return next(fi for fi in self._fields if fi.field.name == field_name)
+        except StopIteration:
+            raise ValueError(f"'{field_name}' is not in fields data")
+
+    def get_copies(self) -> List[Field]:
+        """Return field copies"""
+        return [fi.field.to_copy() for fi in self._fields]
+
+    def rm(self, field_name: str):
+        try:
+            i = self.ls().index(field_name)
+            del self._fields[i]
+        except ValueError:
+            raise ValueError(f"'{field_name}' is not in fields data")

frictionless/schema/fields_info.py

@@ -1,47 +1,3 @@
 from typing import List
 
 from frictionless.schema.field import Field
-
-
-class FieldInfo:
-    """Private class to store additional data to a field"""
-
-    def __init__(self, field: Field, field_number: int):
-        """field_number: 1-indexed rank of the field"""
-        self.field = field
-        self.field_number = field_number
-        self.cell_reader = field.create_cell_reader()
-        self.cell_writer = field.create_cell_writer()
-
-
-class FieldsInfo:
-    def __init__(self, fields: List[Field]):
-        self._fields: List[FieldInfo] = [
-            FieldInfo(field, i + 1) for i, field in enumerate(fields)
-        ]
-
-    def ls(self) -> List[str]:
-        """List all field names"""
-        return [fi.field.name for fi in self._fields]
-
-    def get(self, field_name: str) -> FieldInfo:
-        """Get a Field by its name
-
-        Raises:
-            ValueError: Field with name fieldname does not exist
-        """
-        try:
-            return next(fi for fi in self._fields if fi.field.name == field_name)
-        except StopIteration:
-            raise ValueError(f"'{field_name}' is not in fields data")
-
-    def get_copies(self) -> List[Field]:
-        """Return field copies"""
-        return [fi.field.to_copy() for fi in self._fields]
-
-    def rm(self, field_name: str):
-        try:
-            i = self.ls().index(field_name)
-            del self._fields[i]
-        except ValueError:
-            raise ValueError(f"'{field_name}' is not in fields data")

frictionless/table/row.py

@@ -2,16 +2,18 @@
 
 from functools import cached_property
 from itertools import zip_longest
-from typing import Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from .. import errors, helpers
 from ..platform import platform
-from ..schema.fields_info import FieldsInfo
 
 # NOTE:
 # Currently dict.update/setdefault/pop/popitem/clear is not disabled (can be confusing)
 # We can consider adding row.header property to provide more comprehensive API
 
+if TYPE_CHECKING:
+    from ..resources.table import FieldsInfo
+
 
 # TODO: add types
 class Row(Dict[str, Any]):