basic case

Change-Id: I8fe1310f45c86aa01ea1b589410cbaacad1a2b63

Author: MarkDaoust

google/generativeai/generative_models.py

@@ -123,8 +123,8 @@ def _prepare_request(
         contents: content_types.ContentsType,
         generation_config: generation_types.GenerationConfigType | None = None,
         safety_settings: safety_types.SafetySettingOptions | None = None,
-        tools: content_types.FunctionLibraryType | None,
-        tool_config: content_types.ToolConfigType | None,
+        tools: content_types.FunctionLibraryType | None = None,
+        tool_config: content_types.ToolConfigType | None = None,
     ) -> protos.GenerateContentRequest:
         """Creates a `protos.GenerateContentRequest` from raw inputs."""
         tools_lib = self._get_tools_lib(tools)
@@ -435,9 +435,14 @@ def __init__(
         self._last_received: generation_types.BaseGenerateContentResponse | None = None
         self.enable_automatic_function_calling = enable_automatic_function_calling
 
-    def to_dict(self):
-        request = self.model._prepare_request(contents = self.history)
-        return type(request).to_dict(use_integers_for_enums=False, including_default_value_fields=False)
+    def to_dict(self, tools=True):
+        if tools == True and self.model._tools is not None:
+            pass  # raise ValueError("")
+
+        request = self.model._prepare_request(contents=self.history)
+        return type(request).to_dict(
+            request, use_integers_for_enums=False, including_default_value_fields=False
+        )
 
     @classmethod
     def from_dict(cls, obj):
@@ -448,7 +453,8 @@ def from_dict(cls, obj):
             tool_config=request.tool_config,
             tools=request.tools,
             safety_settings=request.safety_settings,
-            system_instruction=request.system_instruction)
+            system_instruction=request.system_instruction,
+        )
 
         return model.start_chat(history=request.contents)
 

tests/test_chat.py

@@ -97,7 +97,6 @@ def setUp(self):
         self.client = MockGenerativeServiceClient(self)
         client_lib._client_manager.clients["generative"] = self.client
 
-
     def test_chat(self):
         # Multi turn chat
         model = generative_models.GenerativeModel("gemini-pro")
@@ -706,6 +705,40 @@ def test_chat_with_request_options(self):
         request_options["retry"] = None
         self.assertEqual(request_options, self.observed_kwargs[0])
 
+    def test_serialize(self):
+        def add(x, y):
+            return x + y
+
+        model = generative_models.GenerativeModel(
+            model_name=",models/gemini-1.5-flash",
+            generation_config={"max_output_tokens": 65},
+            tools=[add],
+            safety_settings="block_none",
+            system_instruction="you are a cat",
+        )
+
+        chat = model.start_chat(
+            history=[
+                {"role": "user", "parts": "hello"},
+                {"role": "model", "parts": "meow!"},
+                {
+                    "role": "user",
+                    "parts": [
+                        "what's this picture?",
+                        {"mime_type": "image/png", "data": b"PNG!"},
+                    ],
+                },
+            ]
+        )
+
+        chat_json = chat.to_dict()
+
+        new_chat = generative_models.ChatSession.from_dict(chat_json)
+
+        new_chat_json = chat.to_dict()
+
+        self.assertEqual(chat_json, new_chat_json)
+
 
 if __name__ == "__main__":
     absltest.main()

tests/test_generative_models.py

@@ -667,6 +667,5 @@ def test_count_tokens_called_with_request_options(self):
         self.assertEqual(request_options, self.observed_kwargs[0])
 
 
-
 if __name__ == "__main__":
     absltest.main()