Plugin: AI Helper: Rename class URL to avoid conflict

christianbeeznest · web-flow · commit e51ad8de21cf · 2023-01-20T02:09:03.000+01:00
Author: @christianbeeznest
diff --git a/plugin/ai_helper/src/openai/OpenAi.php b/plugin/ai_helper/src/openai/OpenAi.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once 'Url.php';
+require_once 'OpenAiUrl.php';
 
 class OpenAi
 {
@@ -35,7 +35,7 @@ public function __construct(
      */
     public function listModels()
     {
-        $url = Url::fineTuneModel();
+        $url = OpenAiUrl::fineTuneModel();
 
         return $this->sendRequest($url, 'GET');
     }
@@ -48,7 +48,7 @@ public function listModels()
     public function retrieveModel($model)
     {
         $model = "/$model";
-        $url = Url::fineTuneModel().$model;
+        $url = OpenAiUrl::fineTuneModel().$model;
 
         return $this->sendRequest($url, 'GET');
     }
@@ -70,7 +70,7 @@ public function completion($opts, $stream = null)
         }
 
         $opts['model'] = $opts['model'] ?? $this->model;
-        $url = Url::completionsURL();
+        $url = OpenAiUrl::completionsURL();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -82,7 +82,7 @@ public function completion($opts, $stream = null)
      */
     public function createEdit($opts)
     {
-        $url = Url::editsUrl();
+        $url = OpenAiUrl::editsUrl();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -94,7 +94,7 @@ public function createEdit($opts)
      */
     public function image($opts)
     {
-        $url = Url::imageUrl()."/generations";
+        $url = OpenAiUrl::imageUrl()."/generations";
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -106,7 +106,7 @@ public function image($opts)
      */
     public function imageEdit($opts)
     {
-        $url = Url::imageUrl()."/edits";
+        $url = OpenAiUrl::imageUrl()."/edits";
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -118,7 +118,7 @@ public function imageEdit($opts)
      */
     public function createImageVariation($opts)
     {
-        $url = Url::imageUrl()."/variations";
+        $url = OpenAiUrl::imageUrl()."/variations";
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -130,7 +130,7 @@ public function createImageVariation($opts)
      */
     public function moderation($opts)
     {
-        $url = Url::moderationUrl();
+        $url = OpenAiUrl::moderationUrl();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -142,7 +142,7 @@ public function moderation($opts)
      */
     public function uploadFile($opts)
     {
-        $url = Url::filesUrl();
+        $url = OpenAiUrl::filesUrl();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -152,7 +152,7 @@ public function uploadFile($opts)
      */
     public function listFiles()
     {
-        $url = Url::filesUrl();
+        $url = OpenAiUrl::filesUrl();
 
         return $this->sendRequest($url, 'GET');
     }
@@ -165,7 +165,7 @@ public function listFiles()
     public function retrieveFile($fileId)
     {
         $fileId = "/$fileId";
-        $url = Url::filesUrl().$fileId;
+        $url = OpenAiUrl::filesUrl().$fileId;
 
         return $this->sendRequest($url, 'GET');
     }
@@ -178,7 +178,7 @@ public function retrieveFile($fileId)
     public function retrieveFileContent($fileId)
     {
         $fileId = "/$fileId/content";
-        $url = Url::filesUrl().$fileId;
+        $url = OpenAiUrl::filesUrl().$fileId;
 
         return $this->sendRequest($url, 'GET');
     }
@@ -191,7 +191,7 @@ public function retrieveFileContent($fileId)
     public function deleteFile($fileId)
     {
         $fileId = "/$fileId";
-        $url = Url::filesUrl().$fileId;
+        $url = OpenAiUrl::filesUrl().$fileId;
 
         return $this->sendRequest($url, 'DELETE');
     }
@@ -203,7 +203,7 @@ public function deleteFile($fileId)
      */
     public function createFineTune($opts)
     {
-        $url = Url::fineTuneUrl();
+        $url = OpenAiUrl::fineTuneUrl();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
@@ -213,7 +213,7 @@ public function createFineTune($opts)
      */
     public function listFineTunes()
     {
-        $url = Url::fineTuneUrl();
+        $url = OpenAiUrl::fineTuneUrl();
 
         return $this->sendRequest($url, 'GET');
     }
@@ -226,7 +226,7 @@ public function listFineTunes()
     public function retrieveFineTune($fineTuneId)
     {
         $fineTuneId = "/$fineTuneId";
-        $url = Url::fineTuneUrl().$fineTuneId;
+        $url = OpenAiUrl::fineTuneUrl().$fineTuneId;
 
         return $this->sendRequest($url, 'GET');
     }
@@ -239,7 +239,7 @@ public function retrieveFineTune($fineTuneId)
     public function cancelFineTune($fineTuneId)
     {
         $fineTuneId = "/$fineTuneId/cancel";
-        $url = Url::fineTuneUrl().$fineTuneId;
+        $url = OpenAiUrl::fineTuneUrl().$fineTuneId;
 
         return $this->sendRequest($url, 'POST');
     }
@@ -252,7 +252,7 @@ public function cancelFineTune($fineTuneId)
     public function listFineTuneEvents($fineTuneId)
     {
         $fineTuneId = "/$fineTuneId/events";
-        $url = Url::fineTuneUrl().$fineTuneId;
+        $url = OpenAiUrl::fineTuneUrl().$fineTuneId;
 
         return $this->sendRequest($url, 'GET');
     }
@@ -265,7 +265,7 @@ public function listFineTuneEvents($fineTuneId)
     public function deleteFineTune($fineTuneId)
     {
         $fineTuneId = "/$fineTuneId";
-        $url = Url::fineTuneModel().$fineTuneId;
+        $url = OpenAiUrl::fineTuneModel().$fineTuneId;
 
         return $this->sendRequest($url, 'DELETE');
     }
@@ -277,7 +277,7 @@ public function deleteFineTune($fineTuneId)
      */
     public function embeddings($opts)
     {
-        $url = Url::embeddings();
+        $url = OpenAiUrl::embeddings();
 
         return $this->sendRequest($url, 'POST', $opts);
     }
diff --git a/plugin/ai_helper/src/openai/OpenAiUrl.php b/plugin/ai_helper/src/openai/OpenAiUrl.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-class Url
+class OpenAiUrl
 {
     public const ORIGIN = 'https://api.openai.com';
     public const API_VERSION = 'v1';

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`/* For licensing terms, see /license.txt */`
`3`	`3`
`4`		`-require_once 'Url.php';`
	`4`	`+require_once 'OpenAiUrl.php';`
`5`	`5`
`6`	`6`	`class OpenAi`
`7`	`7`	`{`
`@@ -35,7 +35,7 @@ public function __construct(`
`35`	`35`	`*/`
`36`	`36`	`public function listModels()`
`37`	`37`	`{`
`38`		`- $url = Url::fineTuneModel();`
	`38`	`+ $url = OpenAiUrl::fineTuneModel();`
`39`	`39`
`40`	`40`	`return $this->sendRequest($url, 'GET');`
`41`	`41`	`}`
`@@ -48,7 +48,7 @@ public function listModels()`
`48`	`48`	`public function retrieveModel($model)`
`49`	`49`	`{`
`50`	`50`	`$model = "/$model";`
`51`		`- $url = Url::fineTuneModel().$model;`
	`51`	`+ $url = OpenAiUrl::fineTuneModel().$model;`
`52`	`52`
`53`	`53`	`return $this->sendRequest($url, 'GET');`
`54`	`54`	`}`
`@@ -70,7 +70,7 @@ public function completion($opts, $stream = null)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`$opts['model'] = $opts['model'] ?? $this->model;`
`73`		`- $url = Url::completionsURL();`
	`73`	`+ $url = OpenAiUrl::completionsURL();`
`74`	`74`
`75`	`75`	`return $this->sendRequest($url, 'POST', $opts);`
`76`	`76`	`}`
`@@ -82,7 +82,7 @@ public function completion($opts, $stream = null)`
`82`	`82`	`*/`
`83`	`83`	`public function createEdit($opts)`
`84`	`84`	`{`
`85`		`- $url = Url::editsUrl();`
	`85`	`+ $url = OpenAiUrl::editsUrl();`
`86`	`86`
`87`	`87`	`return $this->sendRequest($url, 'POST', $opts);`
`88`	`88`	`}`
`@@ -94,7 +94,7 @@ public function createEdit($opts)`
`94`	`94`	`*/`
`95`	`95`	`public function image($opts)`
`96`	`96`	`{`
`97`		`- $url = Url::imageUrl()."/generations";`
	`97`	`+ $url = OpenAiUrl::imageUrl()."/generations";`
`98`	`98`
`99`	`99`	`return $this->sendRequest($url, 'POST', $opts);`
`100`	`100`	`}`
`@@ -106,7 +106,7 @@ public function image($opts)`
`106`	`106`	`*/`
`107`	`107`	`public function imageEdit($opts)`
`108`	`108`	`{`
`109`		`- $url = Url::imageUrl()."/edits";`
	`109`	`+ $url = OpenAiUrl::imageUrl()."/edits";`
`110`	`110`
`111`	`111`	`return $this->sendRequest($url, 'POST', $opts);`
`112`	`112`	`}`
`@@ -118,7 +118,7 @@ public function imageEdit($opts)`
`118`	`118`	`*/`
`119`	`119`	`public function createImageVariation($opts)`
`120`	`120`	`{`
`121`		`- $url = Url::imageUrl()."/variations";`
	`121`	`+ $url = OpenAiUrl::imageUrl()."/variations";`
`122`	`122`
`123`	`123`	`return $this->sendRequest($url, 'POST', $opts);`
`124`	`124`	`}`
`@@ -130,7 +130,7 @@ public function createImageVariation($opts)`
`130`	`130`	`*/`
`131`	`131`	`public function moderation($opts)`
`132`	`132`	`{`
`133`		`- $url = Url::moderationUrl();`
	`133`	`+ $url = OpenAiUrl::moderationUrl();`
`134`	`134`
`135`	`135`	`return $this->sendRequest($url, 'POST', $opts);`
`136`	`136`	`}`
`@@ -142,7 +142,7 @@ public function moderation($opts)`
`142`	`142`	`*/`
`143`	`143`	`public function uploadFile($opts)`
`144`	`144`	`{`
`145`		`- $url = Url::filesUrl();`
	`145`	`+ $url = OpenAiUrl::filesUrl();`
`146`	`146`
`147`	`147`	`return $this->sendRequest($url, 'POST', $opts);`
`148`	`148`	`}`
`@@ -152,7 +152,7 @@ public function uploadFile($opts)`
`152`	`152`	`*/`
`153`	`153`	`public function listFiles()`
`154`	`154`	`{`
`155`		`- $url = Url::filesUrl();`
	`155`	`+ $url = OpenAiUrl::filesUrl();`
`156`	`156`
`157`	`157`	`return $this->sendRequest($url, 'GET');`
`158`	`158`	`}`
`@@ -165,7 +165,7 @@ public function listFiles()`
`165`	`165`	`public function retrieveFile($fileId)`
`166`	`166`	`{`
`167`	`167`	`$fileId = "/$fileId";`
`168`		`- $url = Url::filesUrl().$fileId;`
	`168`	`+ $url = OpenAiUrl::filesUrl().$fileId;`
`169`	`169`
`170`	`170`	`return $this->sendRequest($url, 'GET');`
`171`	`171`	`}`
`@@ -178,7 +178,7 @@ public function retrieveFile($fileId)`
`178`	`178`	`public function retrieveFileContent($fileId)`
`179`	`179`	`{`
`180`	`180`	`$fileId = "/$fileId/content";`
`181`		`- $url = Url::filesUrl().$fileId;`
	`181`	`+ $url = OpenAiUrl::filesUrl().$fileId;`
`182`	`182`
`183`	`183`	`return $this->sendRequest($url, 'GET');`
`184`	`184`	`}`
`@@ -191,7 +191,7 @@ public function retrieveFileContent($fileId)`
`191`	`191`	`public function deleteFile($fileId)`
`192`	`192`	`{`
`193`	`193`	`$fileId = "/$fileId";`
`194`		`- $url = Url::filesUrl().$fileId;`
	`194`	`+ $url = OpenAiUrl::filesUrl().$fileId;`
`195`	`195`
`196`	`196`	`return $this->sendRequest($url, 'DELETE');`
`197`	`197`	`}`
`@@ -203,7 +203,7 @@ public function deleteFile($fileId)`
`203`	`203`	`*/`
`204`	`204`	`public function createFineTune($opts)`
`205`	`205`	`{`
`206`		`- $url = Url::fineTuneUrl();`
	`206`	`+ $url = OpenAiUrl::fineTuneUrl();`
`207`	`207`
`208`	`208`	`return $this->sendRequest($url, 'POST', $opts);`
`209`	`209`	`}`
`@@ -213,7 +213,7 @@ public function createFineTune($opts)`
`213`	`213`	`*/`
`214`	`214`	`public function listFineTunes()`
`215`	`215`	`{`
`216`		`- $url = Url::fineTuneUrl();`
	`216`	`+ $url = OpenAiUrl::fineTuneUrl();`
`217`	`217`
`218`	`218`	`return $this->sendRequest($url, 'GET');`
`219`	`219`	`}`
`@@ -226,7 +226,7 @@ public function listFineTunes()`
`226`	`226`	`public function retrieveFineTune($fineTuneId)`
`227`	`227`	`{`
`228`	`228`	`$fineTuneId = "/$fineTuneId";`
`229`		`- $url = Url::fineTuneUrl().$fineTuneId;`
	`229`	`+ $url = OpenAiUrl::fineTuneUrl().$fineTuneId;`
`230`	`230`
`231`	`231`	`return $this->sendRequest($url, 'GET');`
`232`	`232`	`}`
`@@ -239,7 +239,7 @@ public function retrieveFineTune($fineTuneId)`
`239`	`239`	`public function cancelFineTune($fineTuneId)`
`240`	`240`	`{`
`241`	`241`	`$fineTuneId = "/$fineTuneId/cancel";`
`242`		`- $url = Url::fineTuneUrl().$fineTuneId;`
	`242`	`+ $url = OpenAiUrl::fineTuneUrl().$fineTuneId;`
`243`	`243`
`244`	`244`	`return $this->sendRequest($url, 'POST');`
`245`	`245`	`}`
`@@ -252,7 +252,7 @@ public function cancelFineTune($fineTuneId)`
`252`	`252`	`public function listFineTuneEvents($fineTuneId)`
`253`	`253`	`{`
`254`	`254`	`$fineTuneId = "/$fineTuneId/events";`
`255`		`- $url = Url::fineTuneUrl().$fineTuneId;`
	`255`	`+ $url = OpenAiUrl::fineTuneUrl().$fineTuneId;`
`256`	`256`
`257`	`257`	`return $this->sendRequest($url, 'GET');`
`258`	`258`	`}`
`@@ -265,7 +265,7 @@ public function listFineTuneEvents($fineTuneId)`
`265`	`265`	`public function deleteFineTune($fineTuneId)`
`266`	`266`	`{`
`267`	`267`	`$fineTuneId = "/$fineTuneId";`
`268`		`- $url = Url::fineTuneModel().$fineTuneId;`
	`268`	`+ $url = OpenAiUrl::fineTuneModel().$fineTuneId;`
`269`	`269`
`270`	`270`	`return $this->sendRequest($url, 'DELETE');`
`271`	`271`	`}`
`@@ -277,7 +277,7 @@ public function deleteFineTune($fineTuneId)`
`277`	`277`	`*/`
`278`	`278`	`public function embeddings($opts)`
`279`	`279`	`{`
`280`		`- $url = Url::embeddings();`
	`280`	`+ $url = OpenAiUrl::embeddings();`
`281`	`281`
`282`	`282`	`return $this->sendRequest($url, 'POST', $opts);`
`283`	`283`	`}`