fix: Handle the streaming of JSON delimited by newlines

yeesian · copybara-github · commit acc82c5e4f66 · 2025-01-28T16:38:37.000-08:00
PiperOrigin-RevId: 720749340
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "1.79.0"
+    ".": "1.78.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,35 +1,5 @@
 # Changelog
 
-## [1.79.0](https://github.com/googleapis/python-aiplatform/compare/v1.78.0...v1.79.0) (2025-01-28)
-
-
-### Features
-
-* Add machine_spec, data_persistent_disk_spec, network_spec, euc_config, shielded_vm_config to `.google.cloud.aiplatform.v1beta1.NotebookRuntime` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Add machine_spec, data_persistent_disk_spec, network_spec, euc_config, shielded_vm_config to message `.google.cloud.aiplatform.v1.NotebookRuntime` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Add per-modality token count break downs for GenAI APIs ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Add per-modality token count break downs for GenAI APIs ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Add speculative decoding spec to DeployedModel proto ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Enable FeatureGroup IAM Methods in v1beta1 API version ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Enable FeatureView Service Account in v1 API version ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Enable UpdateFeatureMonitor in v1beta1 API version ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Expose code execution tool API to v1 ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* GenAI Evaluation: Release GenAI Evaluation SDK Autorater Config/Tuning/Evaluation to vertexai.preview module. ([4531d08](https://github.com/googleapis/python-aiplatform/commit/4531d08c1c9c4a1949f532be9d2beddc53d154b1))
-* Reasoning Engine v1 GAPIC release ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Remove autorater config related visibility v1beta1 ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Update supported locations ([50a66b7](https://github.com/googleapis/python-aiplatform/commit/50a66b778fec5d5bfc87536888e0b835bd8d9db2))
-* Upload aggregate metrics and generative models used in an evaluation to GCS. ([713ffac](https://github.com/googleapis/python-aiplatform/commit/713ffac6f6f19408bf629dedc06450cee493dae2))
-
-
-### Documentation
-
-* Deprecate `is_default` in message `.google.cloud.aiplatform.v1.NotebookRuntimeTemplate` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Deprecate `is_default` in message `.google.cloud.aiplatform.v1beta1.NotebookRuntimeTemplate` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Deprecate `service_account` in message `.google.cloud.aiplatform.v1.NotebookRuntime` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Deprecate `service_account` in message `.google.cloud.aiplatform.v1.NotebookRuntimeTemplate` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Deprecate `service_account` in message `.google.cloud.aiplatform.v1beta1.NotebookRuntime` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-* Deprecate `service_account` in message `.google.cloud.aiplatform.v1beta1.NotebookRuntimeTemplate` ([4620e6f](https://github.com/googleapis/python-aiplatform/commit/4620e6f0b0623e18b6e676f4183e972c8ad7e89e))
-
 ## [1.78.0](https://github.com/googleapis/python-aiplatform/compare/v1.77.0...v1.78.0) (2025-01-21)
 
 
diff --git a/google/cloud/aiplatform/gapic_version.py b/google/cloud/aiplatform/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/instance/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/instance/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/instance_v1/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/instance_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/params/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/params/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/params_v1/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/params_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/prediction/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/prediction/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/predict/prediction_v1/gapic_version.py b/google/cloud/aiplatform/v1/schema/predict/prediction_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/trainingjob/definition/gapic_version.py b/google/cloud/aiplatform/v1/schema/trainingjob/definition/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1/schema/trainingjob/definition_v1/gapic_version.py b/google/cloud/aiplatform/v1/schema/trainingjob/definition_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/instance/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/instance/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/instance_v1beta1/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/instance_v1beta1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/params/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/params/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/params_v1beta1/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/params_v1beta1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/prediction/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/prediction/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/prediction_v1beta1/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/predict/prediction_v1beta1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition_v1beta1/gapic_version.py b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition_v1beta1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform/version.py b/google/cloud/aiplatform/version.py
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-__version__ = "1.79.0"
+__version__ = "1.78.0"
diff --git a/google/cloud/aiplatform_v1/gapic_version.py b/google/cloud/aiplatform_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/google/cloud/aiplatform_v1beta1/gapic_version.py b/google/cloud/aiplatform_v1beta1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.79.0"  # {x-release-please-version}
+__version__ = "1.78.0"  # {x-release-please-version}
diff --git a/pypi/_vertex_ai_placeholder/version.py b/pypi/_vertex_ai_placeholder/version.py
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-__version__ = "1.79.0"
+__version__ = "1.78.0"
diff --git a/samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-aiplatform",
-    "version": "1.79.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1beta1.json b/samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1beta1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-aiplatform",
-    "version": "1.79.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/tests/unit/vertex_langchain/test_reasoning_engines.py b/tests/unit/vertex_langchain/test_reasoning_engines.py
@@ -2234,60 +2234,58 @@ class ToParsedJsonTest(parameterized.TestCase):
             obj=httpbody_pb2.HttpBody(
                 content_type="application/json", data=b'{"a": 1, "b": "hello"}'
             ),
-            expected={"a": 1, "b": "hello"},
+            expected=[{"a": 1, "b": "hello"}],
         ),
         dict(
             testcase_name="invalid_json",
             obj=httpbody_pb2.HttpBody(
                 content_type="application/json", data=b'{"a": 1, "b": "hello"'
             ),
-            expected=httpbody_pb2.HttpBody(
-                content_type="application/json", data=b'{"a": 1, "b": "hello"'
-            ),
+            expected=['{"a": 1, "b": "hello"'],  # returns the unparsed string
         ),
         dict(
             testcase_name="missing_content_type",
             obj=httpbody_pb2.HttpBody(data=b'{"a": 1}'),
-            expected=httpbody_pb2.HttpBody(data=b'{"a": 1}'),
+            expected=[httpbody_pb2.HttpBody(data=b'{"a": 1}')],
         ),
         dict(
             testcase_name="missing_data",
             obj=httpbody_pb2.HttpBody(content_type="application/json"),
-            expected=None,
+            expected=[None],
         ),
         dict(
             testcase_name="wrong_content_type",
             obj=httpbody_pb2.HttpBody(content_type="text/plain", data=b"hello"),
-            expected=httpbody_pb2.HttpBody(content_type="text/plain", data=b"hello"),
+            expected=[httpbody_pb2.HttpBody(content_type="text/plain", data=b"hello")],
         ),
         dict(
             testcase_name="empty_data",
             obj=httpbody_pb2.HttpBody(content_type="application/json", data=b""),
-            expected=None,
+            expected=[None],
         ),
         dict(
             testcase_name="unicode_data",
             obj=httpbody_pb2.HttpBody(
                 content_type="application/json", data='{"a": "你好"}'.encode("utf-8")
             ),
-            expected={"a": "你好"},
+            expected=[{"a": "你好"}],
         ),
         dict(
             testcase_name="nested_json",
             obj=httpbody_pb2.HttpBody(
                 content_type="application/json", data=b'{"a": {"b": 1}}'
             ),
-            expected={"a": {"b": 1}},
+            expected=[{"a": {"b": 1}}],
         ),
         dict(
-            testcase_name="error_handling",
+            testcase_name="multiline_json",
             obj=httpbody_pb2.HttpBody(
-                content_type="application/json", data=b'{"a": 1, "b": "hello"'
-            ),
-            expected=httpbody_pb2.HttpBody(
-                content_type="application/json", data=b'{"a": 1, "b": "hello"'
+                content_type="application/json",
+                data=b'{"a": {"b": 1}}\n{"a": {"b": 2}}',
             ),
+            expected=[{"a": {"b": 1}}, {"a": {"b": 2}}],
         ),
     )
     def test_to_parsed_json(self, obj, expected):
-        self.assertEqual(_utils.to_parsed_json(obj), expected)
+        for got, want in zip(_utils.yield_parsed_json(obj), expected):
+            self.assertEqual(got, want)
diff --git a/vertexai/reasoning_engines/_reasoning_engines.py b/vertexai/reasoning_engines/_reasoning_engines.py
@@ -840,9 +840,9 @@ def _method(self, **kwargs) -> Iterable[Any]:
             ),
         )
         for chunk in response:
-            parsed_json = _utils.to_parsed_json(chunk)
-            if parsed_json is not None:
-                yield parsed_json
+            for parsed_json in _utils.yield_parsed_json(chunk):
+                if parsed_json is not None:
+                    yield parsed_json
 
     _method.__name__ = method_name
     _method.__doc__ = doc
diff --git a/vertexai/reasoning_engines/_utils.py b/vertexai/reasoning_engines/_utils.py
@@ -17,7 +17,7 @@
 import json
 import types
 import typing
-from typing import Any, Callable, Dict, Mapping, Optional, Sequence, Union
+from typing import Any, Callable, Dict, Iterable, Mapping, Optional, Sequence, Union
 
 import proto
 
@@ -90,36 +90,42 @@ def to_dict(message: proto.Message) -> JsonDict:
     return result
 
 
-def to_parsed_json(body: httpbody_pb2.HttpBody) -> Any:
+def yield_parsed_json(body: httpbody_pb2.HttpBody) -> Iterable[Any]:
     """Converts the contents of the httpbody message to JSON format.
 
     Args:
         body (httpbody_pb2.HttpBody):
             Required. The httpbody body to be converted to a JSON.
 
-    Returns:
+    Yields:
         Any: A JSON object or the original body if it is not JSON or None.
     """
     content_type = getattr(body, "content_type", None)
     data = getattr(body, "data", None)
 
     if content_type is None or data is None or "application/json" not in content_type:
-        return body
+        yield body
+        return
 
     try:
         utf8_data = data.decode("utf-8")
     except Exception as e:
         _LOGGER.warning(f"Failed to decode data: {data}. Exception: {e}")
-        return body
+        yield body
+        return
 
     if not utf8_data:
-        return None
+        yield None
+        return
 
-    try:
-        return json.loads(utf8_data)
-    except Exception as e:
-        _LOGGER.warning(f"Failed to parse JSON: {utf8_data}. Exception: {e}")
-        return body  # Return the raw body on error
+    # Handle the case of multiple dictionaries delimited by newlines.
+    for line in utf8_data.split("\n"):
+        if line:
+            try:
+                line = json.loads(line)
+            except Exception as e:
+                _LOGGER.warning(f"failed to parse json: {line}. Exception: {e}")
+            yield line
 
 
 def generate_schema(
@@ -195,9 +201,9 @@ def generate_schema(
         #     * https://github.com/pydantic/pydantic/issues/1270
         #     * https://stackoverflow.com/a/58841311
         #     * https://github.com/pydantic/pydantic/discussions/4872
-        if typing.get_origin(annotation) is typing.Union and type(
-            None
-        ) in typing.get_args(annotation):
+        if typing.get_origin(annotation) is Union and type(None) in typing.get_args(
+            annotation
+        ):
             # for "typing.Optional" arguments, function_arg might be a
             # dictionary like
             #

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "1.79.0"`
	`2`	`+ ".": "1.78.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "1.79.0" # {x-release-please-version}`
	`16`	`+__version__ = "1.78.0" # {x-release-please-version}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-__version__ = "1.79.0"`
	`18`	`+__version__ = "1.78.0"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`],`
`9`	`9`	`"language": "PYTHON",`
`10`	`10`	`"name": "google-cloud-aiplatform",`
`11`		`- "version": "1.79.0"`
	`11`	`+ "version": "0.1.0"`
`12`	`12`	`},`
`13`	`13`	`"snippets": [`
`14`	`14`	`{`