Restrict Harm category to the sublist only Gemini support (#295)

* Restrict Harm category to the sublist only Gemini support

* Update text.py

* Update safety_types.py

* Update safety_types.py

* Update safety_types.py

* split module

Change-Id: Ia94b262d4e27511ca2e4eeb02cb5bd617a772463

* add palm safety

Change-Id: Ia1cb199148619ebbc26638d5983b435245904971

* switch imports

Change-Id: I2853a88d7acc51a78174c97e30bde8eb24e1d457

---------

Co-authored-by: Mark Daoust <[email protected]>

Author: aertoria

google/generativeai/answer.py

@@ -206,9 +206,7 @@ def _make_generate_answer_request(
     contents = content_types.to_contents(contents)
 
     if safety_settings:
-        safety_settings = safety_types.normalize_safety_settings(
-            safety_settings, harm_category_set="new"
-        )
+        safety_settings = safety_types.normalize_safety_settings(safety_settings)
 
     if inline_passages is not None and semantic_retriever is not None:
         raise ValueError(

google/generativeai/discuss.py

@@ -27,7 +27,7 @@
 from google.generativeai import string_utils
 from google.generativeai.types import discuss_types
 from google.generativeai.types import model_types
-from google.generativeai.types import safety_types
+from google.generativeai.types import palm_safety_types
 
 
 def _make_message(content: discuss_types.MessageOptions) -> glm.Message:
@@ -521,7 +521,7 @@ def _build_chat_response(
     response = type(response).to_dict(response)
     response.pop("messages")
 
-    response["filters"] = safety_types.convert_filters_to_enums(response["filters"])
+    response["filters"] = palm_safety_types.convert_filters_to_enums(response["filters"])
 
     if response["candidates"]:
         last = response["candidates"][0]

google/generativeai/generative_models.py

@@ -79,9 +79,7 @@ def __init__(
         if "/" not in model_name:
             model_name = "models/" + model_name
         self._model_name = model_name
-        self._safety_settings = safety_types.to_easy_safety_dict(
-            safety_settings, harm_category_set="new"
-        )
+        self._safety_settings = safety_types.to_easy_safety_dict(safety_settings)
         self._generation_config = generation_types.to_generation_config_dict(generation_config)
         self._tools = content_types.to_function_library(tools)
 
@@ -149,10 +147,10 @@ def _prepare_request(
         merged_gc = self._generation_config.copy()
         merged_gc.update(generation_config)
 
-        safety_settings = safety_types.to_easy_safety_dict(safety_settings, harm_category_set="new")
+        safety_settings = safety_types.to_easy_safety_dict(safety_settings)
         merged_ss = self._safety_settings.copy()
         merged_ss.update(safety_settings)
-        merged_ss = safety_types.normalize_safety_settings(merged_ss, harm_category_set="new")
+        merged_ss = safety_types.normalize_safety_settings(merged_ss)
 
         return glm.GenerateContentRequest(
             model=self._model_name,

google/generativeai/text.py

@@ -26,7 +26,7 @@
 from google.generativeai.types import text_types
 from google.generativeai.types import model_types
 from google.generativeai import models
-from google.generativeai.types import safety_types
+from google.generativeai.types import palm_safety_types
 
 DEFAULT_TEXT_MODEL = "models/text-bison-001"
 EMBEDDING_MAX_BATCH_SIZE = 100
@@ -81,7 +81,7 @@ def _make_generate_text_request(
     max_output_tokens: int | None = None,
     top_p: int | None = None,
     top_k: int | None = None,
-    safety_settings: safety_types.SafetySettingOptions | None = None,
+    safety_settings: palm_safety_types.SafetySettingOptions | None = None,
     stop_sequences: str | Iterable[str] | None = None,
 ) -> glm.GenerateTextRequest:
     """
@@ -108,9 +108,7 @@ def _make_generate_text_request(
     """
     model = model_types.make_model_name(model)
     prompt = _make_text_prompt(prompt=prompt)
-    safety_settings = safety_types.normalize_safety_settings(
-        safety_settings, harm_category_set="old"
-    )
+    safety_settings = palm_safety_types.normalize_safety_settings(safety_settings)
     if isinstance(stop_sequences, str):
         stop_sequences = [stop_sequences]
     if stop_sequences:
@@ -138,7 +136,7 @@ def generate_text(
     max_output_tokens: int | None = None,
     top_p: float | None = None,
     top_k: float | None = None,
-    safety_settings: safety_types.SafetySettingOptions | None = None,
+    safety_settings: palm_safety_types.SafetySettingOptions | None = None,
     stop_sequences: str | Iterable[str] | None = None,
     client: glm.TextServiceClient | None = None,
     request_options: dict[str, Any] | None = None,
@@ -240,11 +238,11 @@ def _generate_response(
     response = client.generate_text(request, **request_options)
     response = type(response).to_dict(response)
 
-    response["filters"] = safety_types.convert_filters_to_enums(response["filters"])
-    response["safety_feedback"] = safety_types.convert_safety_feedback_to_enums(
+    response["filters"] = palm_safety_types.convert_filters_to_enums(response["filters"])
+    response["safety_feedback"] = palm_safety_types.convert_safety_feedback_to_enums(
         response["safety_feedback"]
     )
-    response["candidates"] = safety_types.convert_candidate_enums(response["candidates"])
+    response["candidates"] = palm_safety_types.convert_candidate_enums(response["candidates"])
 
     return Completion(_client=client, **response)
 

google/generativeai/types/discuss_types.py

@@ -22,7 +22,7 @@
 import google.ai.generativelanguage as glm
 from google.generativeai import string_utils
 
-from google.generativeai.types import safety_types
+from google.generativeai.types import palm_safety_types
 from google.generativeai.types import citation_types
 
 
@@ -169,7 +169,7 @@ class ChatResponse(abc.ABC):
     temperature: Optional[float]
     candidate_count: Optional[int]
     candidates: List[MessageDict]
-    filters: List[safety_types.ContentFilterDict]
+    filters: List[palm_safety_types.ContentFilterDict]
     top_p: Optional[float] = None
     top_k: Optional[float] = None