From 2e0eb5ec95d76d9a8283ef28d6f8c7b074388929 Mon Sep 17 00:00:00 2001
From: Daiyi Peng <daiyip@google.com>
Date: Fri, 22 Sep 2023 13:18:05 -0700
Subject: [PATCH] Register more OpenAI models.

PiperOrigin-RevId: 567700881
---
 langfun/core/llms/__init__.py | 13 +++++++-
 langfun/core/llms/openai.py   | 57 ++++++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/langfun/core/llms/__init__.py b/langfun/core/llms/__init__.py
index 1e7c4db..88ca03a 100644
--- a/langfun/core/llms/__init__.py
+++ b/langfun/core/llms/__init__.py
@@ -25,10 +25,21 @@
 from langfun.core.llms.openai import OpenAI
 
 from langfun.core.llms.openai import Gpt4
+from langfun.core.llms.openai import Gpt4_0613
+from langfun.core.llms.openai import Gpt4_0314
 from langfun.core.llms.openai import Gpt4_32K
-from langfun.core.llms.openai import Gpt35
+from langfun.core.llms.openai import Gpt4_32K_0613
+from langfun.core.llms.openai import Gpt4_32K_0314
+
 from langfun.core.llms.openai import Gpt35Turbo
+from langfun.core.llms.openai import Gpt35Turbo_0613
+from langfun.core.llms.openai import Gpt35Turbo_0301
 from langfun.core.llms.openai import Gpt35Turbo16K
+from langfun.core.llms.openai import Gpt35Turbo16K_0613
+from langfun.core.llms.openai import Gpt35Turbo16K_0301
+
+from langfun.core.llms.openai import Gpt35
+
 from langfun.core.llms.openai import Gpt3
 from langfun.core.llms.openai import Gpt3Curie
 from langfun.core.llms.openai import Gpt3Babbage
diff --git a/langfun/core/llms/openai.py b/langfun/core/llms/openai.py
index 0ea1319..47cb10d 100644
--- a/langfun/core/llms/openai.py
+++ b/langfun/core/llms/openai.py
@@ -42,9 +42,17 @@ class OpenAI(lf.LanguageModel):
   model: pg.typing.Annotated[
       Literal[
           'gpt-4',
+          'gpt-4-0613',
+          'gpt-4-0314',
           'gpt-4-32k',
+          'gpt-4-32k-0613',
+          'gpt-4-32k-0314',
           'gpt-3.5-turbo',
+          'gpt-3.5-turbo-0613',
+          'gpt-3.5-turbo-0301',
           'gpt-3.5-turbo-16k',
+          'gpt-3.5-turbo-16k-0613',
+          'gpt-3.5-turbo-16k-0301',
           'text-davinci-003',
           'davinci',
           'curie',
@@ -54,13 +62,6 @@ class OpenAI(lf.LanguageModel):
       'The name of the model to use.',
   ] = 'gpt-3.5-turbo'
 
-  _CHAT_MODELS = frozenset([
-      'gpt-4',
-      'gpt-4-32k',
-      'gpt-3.5-turbo',
-      'gpt-3.5-turbo-16k',
-  ])
-
   api_key: Annotated[
       str | None,
       (
@@ -103,7 +104,7 @@ def dir(cls):
   @property
   def is_chat_model(self):
     """Returns True if the model is a chat model."""
-    return self.model in OpenAI._CHAT_MODELS
+    return self.model.startswith(('gpt-4', 'gpt-3.5-turbo'))
 
   def _get_request_args(
       self, options: lf.LMSamplingOptions) -> dict[str, Any]:
@@ -208,11 +209,31 @@ class Gpt4(OpenAI):
   model = 'gpt-4'
 
 
+class Gpt4_0613(Gpt4):    # pylint:disable=invalid-name
+  """GPT-4 0613."""
+  model = 'gpt-4-0613'
+
+
+class Gpt4_0314(Gpt4):   # pylint:disable=invalid-name
+  """GPT-4 0314."""
+  model = 'gpt-4-0314'
+
+
 class Gpt4_32K(Gpt4):       # pylint:disable=invalid-name
   """GPT-4 with 32K context window size."""
   model = 'gpt-4-32k'
 
 
+class Gpt4_32K_0613(Gpt4_32K):    # pylint:disable=invalid-name
+  """GPT-4 32K 0613."""
+  model = 'gpt-4-32k-0613'
+
+
+class Gpt4_32K_0314(Gpt4_32K):   # pylint:disable=invalid-name
+  """GPT-4 32K 0314."""
+  model = 'gpt-4-32k-0314'
+
+
 class Gpt35(OpenAI):
   """GPT-3.5. 4K max tokens, trained up on data up to Sep, 2021."""
   model = 'text-davinci-003'
@@ -223,11 +244,31 @@ class Gpt35Turbo(Gpt35):
   model = 'gpt-3.5-turbo'
 
 
+class Gpt35Turbo_0613(Gpt35Turbo):   # pylint:disable=invalid-name
+  """Gtp 3.5 Turbo 0613."""
+  model = 'gpt-3.5-turbo-0613'
+
+
+class Gpt35Turbo_0301(Gpt35Turbo):   # pylint:disable=invalid-name
+  """Gtp 3.5 Turbo 0301."""
+  model = 'gpt-3.5-turbo-0301'
+
+
 class Gpt35Turbo16K(Gpt35Turbo):
   """Latest GPT-3.5 model with 16K context window size."""
   model = 'gpt-3.5-turbo-16k'
 
 
+class Gpt35Turbo16K_0613(Gpt35Turbo):   # pylint:disable=invalid-name
+  """Gtp 3.5 Turbo 16K 0613."""
+  model = 'gpt-3.5-turbo-16k-0613'
+
+
+class Gpt35Turbo16K_0301(Gpt35Turbo):   # pylint:disable=invalid-name
+  """Gtp 3.5 Turbo 16K 0301."""
+  model = 'gpt-3.5-turbo-16k-0301'
+
+
 class Gpt3(OpenAI):
   """Most capable GPT-3 model (Davinci) 2K context window size.