Skip to content
Snippets Groups Projects
Unverified Commit fc8f9a43 authored by James Briggs's avatar James Briggs Committed by GitHub
Browse files

Merge branch 'main' into readme-fix

parents 0e995c9b d063a20f
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,7 @@ class OpenAIEncoder(BaseEncoder): ...@@ -20,6 +20,7 @@ class OpenAIEncoder(BaseEncoder):
def __init__( def __init__(
self, self,
name: Optional[str] = None, name: Optional[str] = None,
openai_base_url: Optional[str] = None,
openai_api_key: Optional[str] = None, openai_api_key: Optional[str] = None,
openai_org_id: Optional[str] = None, openai_org_id: Optional[str] = None,
score_threshold: float = 0.82, score_threshold: float = 0.82,
...@@ -29,11 +30,14 @@ class OpenAIEncoder(BaseEncoder): ...@@ -29,11 +30,14 @@ class OpenAIEncoder(BaseEncoder):
name = EncoderDefault.OPENAI.value["embedding_model"] name = EncoderDefault.OPENAI.value["embedding_model"]
super().__init__(name=name, score_threshold=score_threshold) super().__init__(name=name, score_threshold=score_threshold)
api_key = openai_api_key or os.getenv("OPENAI_API_KEY") api_key = openai_api_key or os.getenv("OPENAI_API_KEY")
base_url = openai_base_url or os.getenv("OPENAI_BASE_URL")
openai_org_id = openai_org_id or os.getenv("OPENAI_ORG_ID") openai_org_id = openai_org_id or os.getenv("OPENAI_ORG_ID")
if api_key is None: if api_key is None:
raise ValueError("OpenAI API key cannot be 'None'.") raise ValueError("OpenAI API key cannot be 'None'.")
try: try:
self.client = openai.Client(api_key=api_key, organization=openai_org_id) self.client = openai.Client(
base_url=base_url, api_key=api_key, organization=openai_org_id
)
except Exception as e: except Exception as e:
raise ValueError( raise ValueError(
f"OpenAI API client failed to initialize. Error: {e}" f"OpenAI API client failed to initialize. Error: {e}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment