Update 1.6.1 in version.py (#4656)

Co-authored-by: jiyongjung <jiyongjung@google.com>

README.md

@@ -63,6 +63,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-serving-api | tensorflow-transform | tfx-bsl
 ------------------------------------------------------------------------- | ---------------- | ----------- | ------- | ----------------- | -------------------------- | ------------------- | ------------------------- | ---------------------- | -------------------- | -------
 [GitHub master](https://github.com/tensorflow/tfx/blob/master/RELEASE.md) | 2.35.0           | 1.6.0       | 5.0.0   | nightly (1.x/2.x) | 1.6.0                      | 1.6.0               | 0.37.0                    | 2.7.0                  | 1.6.0                | 1.6.0
+[1.6.1](https://github.com/tensorflow/tfx/blob/v1.6.1/RELEASE.md)         | 2.35.0           | 1.6.0       | 5.0.0   | 1.15.5 / 2.7.0    | 1.6.0                      | 1.6.0               | 0.37.0                    | 2.7.0                  | 1.6.0                | 1.6.0
 [1.6.0](https://github.com/tensorflow/tfx/blob/v1.6.0/RELEASE.md)         | 2.35.0           | 1.6.0       | 5.0.0   | 1.15.5 / 2.7.0    | 1.6.0                      | 1.6.0               | 0.37.0                    | 2.7.0                  | 1.6.0                | 1.6.0
 [1.5.0](https://github.com/tensorflow/tfx/blob/v1.5.0/RELEASE.md)         | 2.34.0           | 1.5.0       | 5.0.0   | 1.15.2 / 2.7.0    | 1.5.0                      | 1.5.0               | 0.36.0                    | 2.7.0                  | 1.5.0                | 1.5.0
 [1.4.0](https://github.com/tensorflow/tfx/blob/v1.4.0/RELEASE.md)         | 2.33.0           | 1.4.0       | 5.0.0   | 1.15.0 / 2.6.0    | 1.4.0                      | 1.4.0               | 0.35.0                    | 2.6.0                  | 1.4.0                | 1.4.0

RELEASE.md

@@ -1,12 +1,8 @@
-# Version 1.6.0
+# Version 1.6.1
 
 ## Major Features and Improvements
 
-*   Added experimental support for TensorFlow Decision Forests models.
-*   Added Boolean type value artifacts.
-*   Function components defined with `@component` may now have optional/nullable
-    primitive type return values when `Optional[T]` is used in the return type
-    OutputDict.
+*   N/A
 
 ## Breaking Changes
 
@@ -23,23 +19,10 @@
 *   N/A
 
 ## Bug Fixes and Other Changes
-*   Depends on `numpy>=1.16,<2`.
-*   Depends on `absl-py>=0.9,<2.0.0`.
-*   Depends on `apache-beam[gcp]>=2.35,<3`.
-*   Depends on `ml-metadata>=1.6.0,<1.7.0`.
-*   Depends on `struct2tensor>=0.37.0,<0.38.0`.
-*   Depends on `tensorflow-data-validation>=1.6.0,<1.7.0`.
-*   Depends on `tensorflow-model-analysis>=0.37.0,<0.38.0`.
-*   Depends on `tensorflow-transform>=1.6.0,<1.7.0`.
-*   Depends on `tfx-bsl>=1.6.0,<1.7.0`.
-*   Depends on
-    `tensorflow>=1.15.5,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,<3`.
-*   Depends on `kfp>=1.8.5,<2'`.
-*   Pusher now copies the `saved_model.pb` file at last to prevent loading
-    SavedModel on invalid (partially available) directory state.
-*   Always disable caching for exit handlers in Kubeflow V2 runner to
-    reflect latest status of dependent dag.
 
+*   Fixed `Pusher` issue that didn't copy files other than
+    `saved_model.pb`.
+
 ## Documentation Updates
 
 *   N/A

tfx/components/pusher/executor.py

@@ -201,8 +201,12 @@ def Do(self, input_dict: Dict[str, List[types.Artifact]],
         # https://github.com/tensorflow/tensorflow/blob/d5b3c79b4804134d0d17bfce9f312151f6337dba/tensorflow/python/saved_model/save.py#L1445
         io_utils.copy_dir(
             model_path, serving_path, deny_regex_patterns=[r'saved_model\.pb'])
-        io_utils.copy_dir(
-            model_path, serving_path, allow_regex_patterns=[r'saved_model\.pb'])
+        saved_model_path = os.path.join(model_path, 'saved_model.pb')
+        if fileio.exists(saved_model_path):
+          io_utils.copy_file(
+              saved_model_path,
+              os.path.join(serving_path, 'saved_model.pb'),
+          )
         logging.info('Model written to serving path %s.', serving_path)
     else:
       raise NotImplementedError(

tfx/components/pusher/executor_test.py

@@ -69,12 +69,24 @@ def _MakeExecProperties(self, versioning='AUTO'):
   def assertDirectoryEmpty(self, path):
     self.assertEqual(len(fileio.listdir(path)), 0)
 
-  def assertDirectoryNotEmpty(self, path):
-    self.assertGreater(len(fileio.listdir(path)), 0)
+  def _GetNumberOfFiles(self, path):
+    print('xxx', path)
+    print(fileio.listdir(path))
+    return len(fileio.listdir(path))
 
   def assertPushed(self):
-    self.assertDirectoryNotEmpty(self._serving_model_dir)
-    self.assertDirectoryNotEmpty(self._model_push.uri)
+    self.assertGreater(self._GetNumberOfFiles(self._serving_model_dir), 0)
+    pushed_path = os.path.join(self._serving_model_dir,
+                               fileio.listdir(self._serving_model_dir)[0])
+    self.assertGreater(self._GetNumberOfFiles(pushed_path), 0)
+    model_path = self._executor.GetModelPath(self._input_dict)
+    self.assertEqual(
+        self._GetNumberOfFiles(pushed_path),
+        self._GetNumberOfFiles(model_path))
+    self.assertEqual(
+        self._GetNumberOfFiles(self._model_push.uri),
+        self._GetNumberOfFiles(model_path))
+
     self.assertEqual(1, self._model_push.get_int_custom_property('pushed'))
 
   def assertNotPushed(self):
@@ -213,13 +225,13 @@ def testDo_InfraBlessingAsModel(self):
     # Create dummy model
     blessed_model_path = path_utils.stamped_model_path(infra_blessing.uri)
     fileio.makedirs(blessed_model_path)
-    io_utils.write_string_file(
-        os.path.join(blessed_model_path, 'my-model'), '')
+    io_utils.write_string_file(os.path.join(blessed_model_path, 'my-model'), '')
 
-    self._executor.Do(
-        {standard_component_specs.INFRA_BLESSING_KEY: [infra_blessing]},
-        self._output_dict,
-        self._exec_properties)
+    self._input_dict = {
+        standard_component_specs.INFRA_BLESSING_KEY: [infra_blessing]
+    }
+    self._executor.Do(self._input_dict, self._output_dict,
+                      self._exec_properties)
 
     self.assertPushed()
     self.assertTrue(

tfx/version.py

@@ -14,4 +14,4 @@
 """Contains the version string of TFX."""
 
 # Note that setup.py uses this version.
-__version__ = '1.6.0'
+__version__ = '1.6.1'