Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Google PaLM support #14

Merged
merged 7 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
622 changes: 602 additions & 20 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions prr/service_registry.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from prr.services.providers.anthropic.complete import ServiceAnthropicComplete
from prr.services.providers.google.chat import ServiceGoogleChat
from prr.services.providers.google.complete import ServiceGoogleComplete
from prr.services.providers.openai.chat import ServiceOpenAIChat


Expand All @@ -13,6 +15,8 @@ def register(self, service_class):
def register_all_services(self):
self.register(ServiceOpenAIChat)
self.register(ServiceAnthropicComplete)
self.register(ServiceGoogleComplete)
self.register(ServiceGoogleChat)

def service_for_service_config(self, service_config):
key = service_config.service_key()
Expand Down
2 changes: 1 addition & 1 deletion prr/services/providers/anthropic/complete.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def run(self, prompt, service_config):

prompt_text = self.prompt_text()

client = anthropic.Client(config["ANTHROPIC_API_KEY"])
client = anthropic.Client(config.get("ANTHROPIC_API_KEY", None))

service_request = ServiceRequest(self.service_config, prompt_text)

Expand Down
104 changes: 104 additions & 0 deletions prr/services/providers/google/chat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
from google.cloud import aiplatform
from vertexai.preview.language_models import ChatModel, InputOutputTextPair

from prr.config import load_config
from prr.request import ServiceRequest
from prr.response import ServiceResponse

config = load_config()

aiplatform.init(
# your Google Cloud Project ID or number
# environment default used is not set
project=config.get("GOOGLE_PROJECT"),
meal marked this conversation as resolved.
Show resolved Hide resolved
# the Vertex AI region you will use
# defaults to us-central1
location=config.get("GOOGLE_LOCATION"),
# custom google.auth.credentials.Credentials
# environment default creds used if not set
# credentials=config[my_credentials],
)


class ServiceGoogleChat:
provider = "google"
service = "chat"

def run(self, prompt, service_config):
self.service_config = service_config
options = self.service_config.options
self.prompt = prompt

messages = self.messages_from_prompt()

model = ChatModel.from_pretrained(self.service_config.model_name())

service_request = ServiceRequest(self.service_config, {"messages": messages})

parameters = {
"temperature": options.temperature,
"max_output_tokens": options.max_tokens,
"top_p": options.top_p,
"top_k": options.top_k,
}

chat = model.start_chat(
context=f"""{self.context_from_messages()}""",
examples=[],
)

response = chat.send_message(
f"""{self.message_from_messages()}""", **parameters
)

service_response = ServiceResponse(response.text, {})

return service_request, service_response

def messages_from_prompt(self):
messages = self.prompt.messages

# prefer messages in prompt if they exist
if messages:
return messages

return [{"role": "user", "content": self.prompt.text()}]

def context_from_messages(self):
messages = self.prompt.messages

if messages:
for message in messages:
if message["role"] == "system":
context = message["content"]
else:
context = None

return context

def examples_from_messages(self):
messages = self.prompt.messages

if messages:
examples = []
for message in messages:
if message["role"] == "examples":
examples.append(
InputOutputTextPair(message["input"], message["output"])
)
else:
examples = []

return examples

def message_from_messages(self):
messages = self.prompt.messages

if messages:
for message in messages:
if message["role"] == "user":
message = message["content"]
else:
message = None

return message
70 changes: 70 additions & 0 deletions prr/services/providers/google/complete.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
from google.cloud import aiplatform
from vertexai.preview.language_models import TextGenerationModel

from prr.config import load_config
from prr.request import ServiceRequest
from prr.response import ServiceResponse

config = load_config()

aiplatform.init(
# your Google Cloud Project ID or number
# environment default used is not set
project=config.get("GOOGLE_PROJECT", None),
# the Vertex AI region you will use
# defaults to us-central1
location=config.get("GOOGLE_LOCATION", None),
# custom google.auth.credentials.Credentials
# environment default creds used if not set
# credentials=config[my_credentials],
)


class ServiceGoogleComplete:
provider = "google"
service = "complete"

def run(self, prompt, service_config):
self.service_config = service_config
options = self.service_config.options
self.prompt = prompt

prompt_text = self.prompt_text()

client = TextGenerationModel.from_pretrained(self.service_config.model_name())

service_request = ServiceRequest(self.service_config, prompt_text)

options = self.service_config.options

response = client.predict(
prompt_text,
max_output_tokens=options.max_tokens,
temperature=options.temperature,
top_k=options.top_k,
top_p=options.top_p,
)

service_response = ServiceResponse(
str(response),
{
"details": response,
},
)

return service_request, service_response

def prompt_text(self):
messages = self.prompt.messages

prompt_text = ""

if messages:
for message in messages:
if message["role"] != "assistant":
prompt_text += " " + message["content"]

else:
prompt_text = self.prompt.text()

return messages
2 changes: 1 addition & 1 deletion prr/services/providers/openai/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from prr.response import ServiceResponse

config = load_config()
openai.api_key = config["OPENAI_API_KEY"]
openai.api_key = config.get("OPENAI_API_KEY", None)


# OpenAI model provider class
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ anthropic = "^0.2.7"
rich = "^13.3.5"
Jinja2 = "^3.1.2"
pyyaml = "^6.0"
google-cloud-aiplatform = "^1.25.0"

[tool.poetry.dev-dependencies]
pre-commit = "^2.12.0"
Expand Down