Merge feature/implement-new-dataset-format into feautre/refactore-com…

…ponent-package

src/fondant/core/component_spec.py

@@ -161,17 +161,13 @@ def image(self, value: str) -> None:
     def tags(self) -> t.List[str]:
         return self._specification.get("tags", None)
 
-    @property
-    def index(self):
-        return Field(name="index", location=self._specification["index"].location)
-
     @property
     def consumes(self) -> t.Mapping[str, Field]:
         """The fields consumed by the component as an immutable mapping."""
         return types.MappingProxyType(
             {
                 name: Field(name=name, type=Type.from_json(field))
-                for name, field in self._specification.get("produces", {}).items()
+                for name, field in self._specification.get("consumes", {}).items()
             },
         )
 

src/fondant/core/manifest.py

@@ -7,7 +7,6 @@
 from collections import OrderedDict
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from types import MappingProxyType
 
 import jsonschema.exceptions
 from fsspec import open as fs_open
@@ -173,7 +172,7 @@ def field_mapping(self) -> t.Mapping[str, t.List[str]]:
            }
         """
         field_mapping = {}
-        for field_name, field in self.fields.items():
+        for field_name, field in {"Index": self.index, **self.fields}.items():
             location = (
                 f"{self.base_path}/{self.pipeline_name}/{self.run_id}{field.location}"
             )
@@ -183,17 +182,16 @@ def field_mapping(self) -> t.Mapping[str, t.List[str]]:
                 field_mapping[location] = [field_name]
 
         # Sort field mapping that the first dataset contains the index
-        index_location = (
-            f"{self.base_path}/{self.pipeline_name}/{self.run_id}{self.index.location}"
-        )
         sorted_keys = sorted(
-            field_mapping.keys(), key=lambda key: index_location == key, reverse=True
+            field_mapping.keys(),
+            key=lambda key: "Index" in field_mapping[key],
+            reverse=True,
         )
         sorted_field_mapping = OrderedDict(
             (key, field_mapping[key]) for key in sorted_keys
         )
 
-        return MappingProxyType(sorted_field_mapping)
+        return types.MappingProxyType(sorted_field_mapping)
 
     @property
     def run_id(self) -> str:
@@ -238,7 +236,7 @@ def add_or_update_field(self, field: Field, overwrite: bool = False):
         else:
             self._specification["fields"][field.name] = {
                 "location": f"/{self.component_id}",
-                "type": field.type.name,
+                "type": field.type.to_json(),
             }
 
     def _add_or_update_index(self, field: Field, overwrite: bool = True):
@@ -268,7 +266,7 @@ def remove_field(self, name: str) -> None:
 
         del self._specification["fields"][name]
 
-    def evolve(  # noqa : PLR0912 (too many branches)
+    def evolve(  # : PLR0912 (too many branches)
         self,
         component_spec: ComponentSpec,
         *,
@@ -301,7 +299,7 @@ def evolve(  # noqa : PLR0912 (too many branches)
 
         # Add or update all produced fields defined in the component spec
         for name, field in component_spec.produces.items():
-            # If field was part not part of the input manifest, add field to output manifest.
+            # If field was not part of the input manifest, add field to output manifest.
             # If field was part of the input manifest and got produced by the component, update
             # the manifest field.
             evolved_manifest.add_or_update_field(field, overwrite=True)

src/fondant/core/schema.py

@@ -162,7 +162,6 @@ def __eq__(self, other):
         return False
 
 
-@dataclass
 class Field:
     """Class representing a single field or column in a Fondant dataset."""
 

tests/core/examples/evolution_examples/1/output_manifest.json

@@ -26,7 +26,12 @@
          "location":"/example_component"
       },
       "embeddings_data": {
-         "type": "list<item: float>",
+         "type": {
+            "type": "array",
+            "items": {
+               "type": "float32"
+            }
+         },
          "location":"/example_component"
       }
    }

tests/core/test_manifest.py

@@ -236,10 +236,11 @@ def test_field_mapping(valid_manifest):
     assert field_mapping == OrderedDict(
         {
             "gs://bucket/test_pipeline/test_pipeline_12345/component2": [
+                "Index",
                 "height",
                 "width",
             ],
             "gs://bucket/test_pipeline/test_pipeline_12345/component1": ["images"],
             "gs://bucket/test_pipeline/test_pipeline_12345/component3": ["caption"],
-        }
+        },
     )