docarray · samsja · Mar 28, 2023 · Mar 28, 2023
diff --git a/docarray/array/abstract_array.py b/docarray/array/abstract_array.py
@@ -25,7 +25,7 @@
 from docarray.utils._typing import change_cls_name
 
 if TYPE_CHECKING:
-    from docarray.proto import DocArrayProto, NodeProto
+    from docarray.proto import DocumentArrayProto, NodeProto
     from docarray.typing.tensor.abstract_tensor import AbstractTensor
 
 T = TypeVar('T', bound='AnyDocArray')
@@ -130,12 +130,12 @@ def _set_data_column(
 
     @classmethod
     @abstractmethod
-    def from_protobuf(cls: Type[T], pb_msg: 'DocArrayProto') -> T:
+    def from_protobuf(cls: Type[T], pb_msg: 'DocumentArrayProto') -> T:
         """create a Document from a protobuf message"""
         ...
 
     @abstractmethod
-    def to_protobuf(self) -> 'DocArrayProto':
+    def to_protobuf(self) -> 'DocumentArrayProto':
         """Convert DocArray into a Protobuf message"""
         ...
 

diff --git a/docarray/array/array/array.py b/docarray/array/array/array.py
@@ -32,7 +32,7 @@
     from pydantic.fields import ModelField
 
     from docarray.array.stacked.array_stacked import DocArrayStacked
-    from docarray.proto import DocArrayProto
+    from docarray.proto import DocumentArrayProto
     from docarray.typing import TorchTensor
     from docarray.typing.tensor.abstract_tensor import AbstractTensor
 
@@ -285,7 +285,7 @@ def traverse_flat(
         return flattened
 
     @classmethod
-    def from_protobuf(cls: Type[T], pb_msg: 'DocArrayProto') -> T:
+    def from_protobuf(cls: Type[T], pb_msg: 'DocumentArrayProto') -> T:
         """create a Document from a protobuf message
         :param pb_msg: The protobuf message from where to construct the DocArray
         """

diff --git a/docarray/array/array/io.py b/docarray/array/array/io.py
@@ -37,7 +37,7 @@
     import pandas as pd
 
     from docarray import DocArray
-    from docarray.proto import DocArrayProto
+    from docarray.proto import DocumentArrayProto
 
 T = TypeVar('T', bound='IOMixinArray')
 
@@ -108,19 +108,19 @@ def __init__(
         ...
 
     @classmethod
-    def from_protobuf(cls: Type[T], pb_msg: 'DocArrayProto') -> T:
+    def from_protobuf(cls: Type[T], pb_msg: 'DocumentArrayProto') -> T:
         """create a Document from a protobuf message
         :param pb_msg: The protobuf message from where to construct the DocArray
         """
         return cls(
             cls.document_type.from_protobuf(doc_proto) for doc_proto in pb_msg.docs
         )
 
-    def to_protobuf(self) -> 'DocArrayProto':
+    def to_protobuf(self) -> 'DocumentArrayProto':
         """Convert DocArray into a Protobuf message"""
-        from docarray.proto import DocArrayProto
+        from docarray.proto import DocumentArrayProto
 
-        da_proto = DocArrayProto()
+        da_proto = DocumentArrayProto()
         for doc in self:
             da_proto.docs.append(doc.to_protobuf())
 
@@ -551,9 +551,9 @@ def _load_binary_all(
                 compress = None
 
         if protocol is not None and protocol == 'protobuf-array':
-            from docarray.proto import DocArrayProto
+            from docarray.proto import DocumentArrayProto
 
-            dap = DocArrayProto()
+            dap = DocumentArrayProto()
             dap.ParseFromString(d)
 
             return cls.from_protobuf(dap)

diff --git a/docarray/array/stacked/array_stacked.py b/docarray/array/stacked/array_stacked.py
@@ -436,14 +436,14 @@ def from_protobuf(cls: Type[T], pb_msg: 'DocArrayStackedProto') -> T:
     def to_protobuf(self) -> 'DocArrayStackedProto':
         """Convert DocArray into a Protobuf message"""
         from docarray.proto import (
-            DocArrayProto,
             DocArrayStackedProto,
+            DocumentArrayProto,
             ListOfAnyProto,
             ListOfDocArrayProto,
             NdArrayProto,
         )
 
-        da_proto = DocArrayProto()
+        da_proto = DocumentArrayProto()
         for doc in self:
             da_proto.docs.append(doc.to_protobuf())
 

diff --git a/docarray/proto/__init__.py b/docarray/proto/__init__.py
@@ -3,8 +3,8 @@
 if __pb__version__.startswith('4'):
     from docarray.proto.pb.docarray_pb2 import (
         DictOfAnyProto,
-        DocArrayProto,
         DocArrayStackedProto,
+        DocumentArrayProto,
         DocumentProto,
         ListOfAnyProto,
         ListOfDocArrayProto,
@@ -14,8 +14,8 @@
 else:
     from docarray.proto.pb2.docarray_pb2 import (
         DictOfAnyProto,
-        DocArrayProto,
         DocArrayStackedProto,
+        DocumentArrayProto,
         DocumentProto,
         ListOfAnyProto,
         ListOfDocArrayProto,
@@ -24,12 +24,12 @@
     )
 
 __all__ = [
-    'DocArrayProto',
+    'DocumentArrayProto',
     'DocumentProto',
     'NdArrayProto',
     'NodeProto',
     'DocArrayStackedProto',
-    'DocArrayProto',
+    'DocumentArrayProto',
     'ListOfDocArrayProto',
     'ListOfAnyProto',
     'DictOfAnyProto',

diff --git a/docarray/proto/docarray.proto b/docarray/proto/docarray.proto
@@ -55,7 +55,7 @@ message NodeProto {
     // a sub Document
     DocumentProto document = 7;
     // a sub DocArray
-    DocArrayProto document_array = 8;
+    DocumentArrayProto document_array = 8;
     //any list
     ListOfAnyProto list = 9;
     //any set
@@ -91,13 +91,13 @@ message ListOfAnyProto {
   repeated NodeProto data = 1;
 }
 
-message DocArrayProto {
+message DocumentArrayProto {
     repeated DocumentProto docs = 1; // a list of Documents
 }
 
 
 message ListOfDocArrayProto {
-  repeated DocArrayProto data = 1;
+  repeated DocumentArrayProto data = 1;
 }
 
 message DocArrayStackedProto{

diff --git a/docarray/proto/pb/docarray_pb2.py b/docarray/proto/pb/docarray_pb2.py