generated from oracle/template-repo
-
Notifications
You must be signed in to change notification settings - Fork 9
Update OCI model deployment clients to inherit from OpenAI #36
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
Draft
qiuosier
wants to merge
5
commits into
oracle:main
Choose a base branch
from
qiuosier:odsc_openai_update
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f661e95
Update OCI model deployment clients to inherit from OpenAI clients.
qiuosier 5e58d9a
Add model_name with odsc-llm as default.
qiuosier 1f8904f
Update comments.
qiuosier e1ac5ed
Update readme.
qiuosier 19a9b7c
Update tests.
qiuosier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,21 @@ | ||
# Copyright (c) 2025 Oracle and/or its affiliates. | ||
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ | ||
|
||
from langchain_oci.chat_models.oci_data_science import ( | ||
ChatOCIModelDeployment, | ||
ChatOCIModelDeploymentTGI, | ||
ChatOCIModelDeploymentVLLM, | ||
) | ||
from langchain_oci.chat_models import ChatOCIModelDeployment | ||
from langchain_oci.chat_models.oci_generative_ai import ChatOCIGenAI | ||
from langchain_oci.embeddings.oci_data_science_model_deployment_endpoint import ( | ||
OCIModelDeploymentEndpointEmbeddings, | ||
) | ||
from langchain_oci.embeddings.oci_generative_ai import OCIGenAIEmbeddings | ||
from langchain_oci.llms.oci_data_science_model_deployment_endpoint import ( | ||
BaseOCIModelDeployment, | ||
OCIModelDeploymentLLM, | ||
OCIModelDeploymentTGI, | ||
OCIModelDeploymentVLLM, | ||
) | ||
from langchain_oci.llms import BaseOCIModelDeployment, OCIModelDeploymentLLM | ||
from langchain_oci.llms.oci_generative_ai import OCIGenAI, OCIGenAIBase | ||
|
||
__all__ = [ | ||
"ChatOCIGenAI", | ||
"ChatOCIModelDeployment", | ||
"ChatOCIModelDeploymentTGI", | ||
"ChatOCIModelDeploymentVLLM", | ||
"OCIGenAIEmbeddings", | ||
"OCIModelDeploymentEndpointEmbeddings", | ||
"OCIGenAIBase", | ||
"OCIGenAI", | ||
"BaseOCIModelDeployment", | ||
"OCIModelDeploymentLLM", | ||
"OCIModelDeploymentTGI", | ||
"OCIModelDeploymentVLLM", | ||
] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,33 @@ | ||
# Copyright (c) 2025 Oracle and/or its affiliates. | ||
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ | ||
|
||
from langchain_oci.chat_models.oci_data_science import ( | ||
ChatOCIModelDeployment, | ||
ChatOCIModelDeploymentTGI, | ||
ChatOCIModelDeploymentVLLM, | ||
) | ||
from langchain_oci.chat_models.oci_generative_ai import ChatOCIGenAI | ||
|
||
try: | ||
from langchain_oci.chat_models.oci_data_science import ChatOCIModelDeployment | ||
|
||
except ModuleNotFoundError as ex: | ||
# Default message | ||
message = ex.msg | ||
# For langchain_openai, show the message with pip install command. | ||
if ex.name == "langchain_openai": | ||
message = ( | ||
"No module named langchain_openai. " | ||
"Please install it with `pip install langchain_openai`" | ||
) | ||
|
||
# Create a placeholder class here so that | ||
# users can import the class without error. | ||
# Users will see the error message when they try to initialize an instance. | ||
class ChatOCIModelDeployment: | ||
"""Placeholder class for ChatOCIModelDeployment | ||
when langchain-openai is not installed.""" | ||
|
||
def __init__(self, *args, **kwargs): | ||
raise ModuleNotFoundError(message) | ||
|
||
|
||
__all__ = [ | ||
"ChatOCIGenAI", | ||
"ChatOCIModelDeployment", | ||
"ChatOCIModelDeploymentTGI", | ||
"ChatOCIModelDeploymentVLLM", | ||
] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can give some more user friendly message, that we rely on the langchain_openai and delegate inferencing to this library?