Add video metadata and error to File

google/generativeai/types/file_types.py

@@ -18,6 +18,7 @@
 from typing import Union
 from typing_extensions import TypedDict
 
+from google.rpc.status_pb2 import Status
 from google.generativeai.client import get_default_file_client
 
 import google.ai.generativelanguage as glm
@@ -29,7 +30,7 @@ def __init__(self, proto: glm.File | File | dict):
             proto = proto.to_proto()
         self._proto = glm.File(proto)
 
-    def to_proto(self):
+    def to_proto(self) -> glm.File:
         return self._proto
 
     @property
@@ -72,6 +73,14 @@ def uri(self) -> str:
     def state(self) -> glm.File.State:
         return self._proto.state
 
+    @property
+    def video_metadata(self) -> glm.VideoMetadata:
+        return self._proto.video_metadata
+
+    @property
+    def error(self) -> Status:
+        return self._proto.error
+
     def delete(self):
         client = get_default_file_client()
         client.delete_file(name=self.name)

tests/test_files.py

@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.generativeai.types import file_types
+
+import collections
+import datetime
+import os
+from typing import Iterable, Union
+import pathlib
+
+import google
+import google.ai.generativelanguage as glm
+
+import google.generativeai as genai
+from google.generativeai import client as client_lib
+from absl.testing import parameterized
+
+
+class FileServiceClient(client_lib.FileServiceClient):
+    def __init__(self, test):
+        self.test = test
+        self.observed_requests = []
+        self.responses = collections.defaultdict(list)
+
+    def create_file(
+        self,
+        path: Union[str, pathlib.Path, os.PathLike],
+        *,
+        mime_type: Union[str, None] = None,
+        name: Union[str, None] = None,
+        display_name: Union[str, None] = None,
+        resumable: bool = True,
+    ) -> glm.File:
+        self.observed_requests.append(
+            dict(
+                path=path,
+                mime_type=mime_type,
+                name=name,
+                display_name=display_name,
+                resumable=resumable,
+            )
+        )
+        return self.responses["create_file"].pop(0)
+
+    def get_file(
+        self,
+        request: glm.GetFileRequest,
+        **kwargs,
+    ) -> glm.File:
+        self.observed_requests.append(request)
+        return self.responses["get_file"].pop(0)
+
+    def list_files(
+        self,
+        request: glm.ListFilesRequest,
+        **kwargs,
+    ) -> Iterable[glm.File]:
+        self.observed_requests.append(request)
+        for f in self.responses["list_files"].pop(0):
+            yield f
+
+    def delete_file(
+        self,
+        request: glm.DeleteFileRequest,
+        **kwargs,
+    ):
+        self.observed_requests.append(request)
+        return
+
+
+class UnitTests(parameterized.TestCase):
+    def setUp(self):
+        self.client = FileServiceClient(self)
+
+        client_lib._client_manager.clients["file"] = self.client
+
+    @property
+    def observed_requests(self):
+        return self.client.observed_requests
+
+    @property
+    def responses(self):
+        return self.client.responses
+
+    def test_video_metadata(self):
+        self.responses["create_file"].append(
+            glm.File(
+                uri="https://test",
+                state="ACTIVE",
+                video_metadata=dict(video_duration=datetime.timedelta(seconds=30)),
+                error=dict(code=7, message="ok?"),
+            )
+        )
+
+        f = genai.upload_file(path="dummy")
+        self.assertEqual(google.rpc.status_pb2.Status(code=7, message="ok?"), f.error)
+        self.assertEqual(
+            glm.VideoMetadata(dict(video_duration=datetime.timedelta(seconds=30))), f.video_metadata
+        )
+
+    @parameterized.named_parameters(
+        [
+            dict(
+                testcase_name="FileDataDict",
+                file_data=dict(file_uri="https://test_uri"),
+            ),
+            dict(
+                testcase_name="FileDict",
+                file_data=dict(uri="https://test_uri"),
+            ),
+            dict(
+                testcase_name="FileData",
+                file_data=glm.FileData(file_uri="https://test_uri"),
+            ),
+            dict(
+                testcase_name="glm.File",
+                file_data=glm.File(uri="https://test_uri"),
+            ),
+            dict(
+                testcase_name="file_types.File",
+                file_data=file_types.File(dict(uri="https://test_uri")),
+            ),
+        ]
+    )
+    def test_to_file_data(self, file_data):
+        file_data = file_types.to_file_data(file_data)
+        self.assertEqual(glm.FileData(file_uri="https://test_uri"), file_data)