Merge pull request #2653 from dhruvesh09/r0.24.0

Fix issue where invalid artifact proto could be passed to MLMD and TFX 0.24.1 Patch Release

Author: charlesccychen

README.md

@@ -62,6 +62,7 @@ but other *untested* combinations may also work.
 tfx                                                                       | apache-beam[gcp] | ml-metadata | pyarrow | tensorflow        | tensorflow-data-validation | tensorflow-metadata | tensorflow-model-analysis | tensorflow-transform | tfx-bsl |
 ------------------------------------------------------------------------- | ---------------- | ----------- | --------| ----------------- | -------------------------- | ------------------- | ------------------------- | -------------------- | ------- |
 [GitHub master](https://github.com/tensorflow/tfx/blob/master/RELEASE.md) | 2.24.0           | 0.24.0      | 0.17.0  | nightly (1.x/2.x) | 0.24.1                     | 0.24.0              | 0.24.3                    | 0.24.1               | 0.24.1  |
+0.24.1                                                                    | 2.24.0           | 0.24.0      | 0.17.0  | 1.15.0 / 2.3.0    | 0.24.1                     | 0.24.0              | 0.24.3                    | 0.24.1               | 0.24.1  |
 0.24.0                                                                    | 2.24.0           | 0.24.0      | 0.17.0  | 1.15.0 / 2.3.0    | 0.24.1                     | 0.24.0              | 0.24.3                    | 0.24.1               | 0.24.1  |
 0.23.0                                                                    | 2.23.0           | 0.23.0      | 0.17.0  | 1.15.0 / 2.3.0    | 0.23.0                     | 0.23.0              | 0.23.0                    | 0.23.0               | 0.23.0  |
 0.22.1                                                                    | 2.21.0           | 0.22.1      | 0.16.0  | 1.15.0 / 2.2.0    | 0.22.2                     | 0.22.2              | 0.22.2                    | 0.22.0               | 0.22.1  |

RELEASE.md

@@ -1,28 +1,12 @@
-# Version 0.24.0
+# Version 0.24.1
 
 ## Major Features and Improvements
 
-*   Use TFXIO and batched extractors by default in Evaluator.
-*   Supported custom split configuration for ExampleGen and its downstream
-    components. Instead of hardcoded 'train' and 'eval' splits, TFX components
-    now can process the custom splits generated by ExampleGen. For details,
-    please refer to [ExampleGen doc](https://github.com/tensorflow/tfx/blob/r0.24.0/docs/guide/examplegen.md#custom-examplegen)
-*   Added python 3.8 support.
+*   N/A
 
 ## Bug fixes and other changes
 
-*   Supported CAIP Runtime 2.2 for online prediction pusher.
-*   Used 'python -m ' style for container entrypoints.
-*   Stopped depending on `google-resumable-media`.
-*   Stopped depending on `Werkzeug`.
-*   Depends on `absl-py>=0.9,<0.11`.
-*   Depends on `apache-beam[gcp]>=2.24,<3`.
-*   Depends on `ml-metadata>=0.24,<0.25`.
-*   Depends on `protobuf>=3.12.2,<4`.
-*   Depends on `tensorflow-data-validation>=0.24.1,<0.25`.
-*   Depends on `tensorflow-model-analysis>=0.24.3,<0.25`.
-*   Depends on `tensorflow-transform>=0.24.1,<0.25`.
-*   Depends on `tfx-bsl>=0.24.1,<0.25`.
+*   Fixes issues where custom property access of a missing property created an invalid MLMD Artifact protobuf message.
 
 ## Breaking changes
 
@@ -42,4 +26,4 @@
 
 ## Deprecations
 
-*   Deprecated python 3.5 support.
+*   N/A

tfx/types/artifact.py

@@ -465,10 +465,14 @@ def set_int_custom_property(self, key: Text, value: int):
 
   def get_string_custom_property(self, key: Text) -> Text:
     """Get a custom property of string type."""
+    if key not in self._artifact.custom_properties:
+      return ''
     return self._artifact.custom_properties[key].string_value
 
   def get_int_custom_property(self, key: Text) -> int:
     """Get a custom property of int type."""
+    if key not in self._artifact.custom_properties:
+      return 0
     return self._artifact.custom_properties[key].int_value
 
   def copy_from(self, other: 'Artifact'):

tfx/types/artifact_test.py

@@ -237,6 +237,9 @@ def testArtifactTypeFunctionAndProto(self):
       self.assertEqual(my_artifact.float2, 222.2)
       self.assertEqual(my_artifact.string1, '111')
       self.assertEqual(my_artifact.string2, '222')
+      self.assertEqual(my_artifact.get_string_custom_property('invalid'), '')
+      self.assertEqual(my_artifact.get_int_custom_property('invalid'), 0)
+      self.assertNotIn('invalid', my_artifact._artifact.custom_properties)
 
   def testInvalidArtifact(self):
     with self.assertRaisesRegexp(

tfx/version.py

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