Skip to content

Changed the visibility and updated the sendRequest method with proxy creds #123

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.

Sign up for GitHub

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

Open
TeaRiot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed the visibility and updated the sendRequest method with proxy creds #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 33 additions & 13 deletions src/OpenAi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,23 @@

class OpenAi
{
private string $engine = "davinci";
private string $model = "text-davinci-002";
private string $chatModel = "gpt-3.5-turbo";
private array $headers;
private array $contentTypes;
private int $timeout = 0;
private object $stream_method;
private string $customUrl = "";
private string $proxy = "";
private array $curlInfo = [];
protected string $engine = "davinci";
protected string $model = "text-davinci-002";
protected string $chatModel = "gpt-3.5-turbo";
protected array $headers;
protected array $contentTypes;
protected int $timeout = 0;
protected object $stream_method;
protected string $customUrl = "";
protected string $proxy = "";

/**
* format user:pass
* @var string
*/
protected string $proxyAccess = "";

protected array $curlInfo = [];

public function __construct($OPENAI_API_KEY)
{
Expand Down Expand Up @@ -447,6 +454,15 @@ public function setProxy(string $proxy)
$this->proxy = $proxy;
}

/**
* @param string $access
* @return void
*/
public function setProxyAccess(string $access)
{
$this->proxyAccess = $access;
}

/**
* @param string $customUrl
* @deprecated
Expand Down Expand Up @@ -503,7 +519,7 @@ public function setORG(string $org)
* @param array $opts
* @return bool|string
*/
private function sendRequest(string $url, string $method, array $opts = [])
protected function sendRequest(string $url, string $method, array $opts = [])
{
$post_fields = json_encode($opts);

Expand Down Expand Up @@ -534,6 +550,10 @@ private function sendRequest(string $url, string $method, array $opts = [])
$curl_info[CURLOPT_PROXY] = $this->proxy;
}

if (!empty($this->proxyAccess)) {
$curl_info[CURLOPT_PROXYUSERPWD] = $this->proxyAccess;
}

if (array_key_exists('stream', $opts) && $opts['stream']) {
$curl_info[CURLOPT_WRITEFUNCTION] = $this->stream_method;
}
Expand All @@ -549,14 +569,14 @@ private function sendRequest(string $url, string $method, array $opts = [])
curl_close($curl);

if (!$response) throw new Exception(curl_error($curl));

return $response;
}

/**
* @param string $url
*/
private function baseUrl(string &$url)
protected function baseUrl(string &$url)
{
if ($this->customUrl != "") {
$url = str_replace(Url::ORIGIN, $this->customUrl, $url);
Expand Down