TFX 0.22.2 Patch Release (#2632)

* Update RELEASE.md

* Update version.py

* Update metadata.py

Author: dhruvesh09

RELEASE.md

@@ -1,26 +1,29 @@
-# Version 0.22.1
+# Version 0.22.2
 
 ## Major Features and Improvements
 
+*   N/A
+
 ## Bug fixes and other changes
-*   Depends on 'tensorflowjs>=2.0.1.post1,<3' for `[all]` dependency.
-*   Fixed the name of the usage telemetry when tfx templates are used.
-*   Depends on `tensorflow-data-validation>=0.22.2,<0.23.0`.
-*   Depends on `tensorflow-model-analysis>=0.22.2,<0.23.0`.
-*   Depends on `tfx-bsl>=0.22.1,<0.23.0`.
-*   Depends on `ml-metadata>=0.22.1,<0.23.0`.
+
+*   Reuse Examples artifact type introduced in TFX 0.23 to allow older release jobs running together with TFX 0.23+ release.
+
+### Deprecations
+
+*   N/A
 
 ## Breaking changes
-N/A
+
+*   N/A
 
 ### For pipeline authors
-N/A
+
+*   N/A
 
 ### For component authors
-N/A
+
+*   N/A
 
 ## Documentation updates
-N/A
 
-## Deprecations
-N/A
+*   N/A

tfx/orchestration/metadata.py

@@ -178,11 +178,27 @@ def store(self) -> metadata_store.MetadataStore:
   def _prepare_artifact_type(
       self, artifact_type: metadata_store_pb2.ArtifactType
   ) -> metadata_store_pb2.ArtifactType:
+    """Prepares artifact type."""
     if artifact_type.id:
       return artifact_type
-    type_id = self.store.put_artifact_type(
-        artifact_type=artifact_type, can_add_fields=True)
-    artifact_type.id = type_id
+    try:
+      type_id = self.store.put_artifact_type(
+          artifact_type=artifact_type, can_add_fields=True)
+      artifact_type.id = type_id
+    # The patch fix to cherry pick into 0.21 and 0.22 release for working
+    # together with 0.23+ releases with the same MLMD instance. In 0.23, there
+    # is an Examples type change which adds additional properties, while the
+    # older release Examples type failed to be registered, as it contains less
+    # fields.
+    # Note in 0.23+ release, mlmd.errors.AlreadyExistsError is used.
+    except tf.errors.AlreadyExistsError:
+      if artifact_type.name == 'Examples':
+        stored_type = self.store.get_artifact_type(artifact_type.name)
+        artifact_type.id = stored_type.id
+        absl.logging.warning('Reusing a type registered by newer release.')
+      else:
+        raise
+
     return artifact_type
 
   def update_artifact_state(self, artifact: metadata_store_pb2.Artifact,

tfx/version.py

@@ -15,4 +15,4 @@
 """Contains the version string of TFX."""
 
 # Note that setup.py uses this version.
-__version__ = '0.22.1'
+__version__ = '0.22.2'