1.2wip

Author: makowskid

README.md

@@ -203,35 +203,14 @@ $jobResultObject = $jobResult->getResultObject();
 
 ## OPTIONAL custom configuration
 
-This might come useful if you want to have more control over polling requests.
-
-This is the contents of the published config file:
-
-```php
-return [
-    'api_key' => env('SHARP_API_KEY'),
-    'base_url' => env('SHARP_API_BASE_URL', 'https://sharpapi.com/api/v1'), // as ENV is mock server needed
-    // how long (in seconds) the client should wait in polling mode for results
-    'api_job_status_polling_wait' => env('SHARP_API_JOB_STATUS_POLLING_WAIT', 180),
-    // how many seconds the client should wait between each result request
-    // usually Retry-After header is used (default 10s), this value won't have an effect unless
-    // api_job_status_use_polling_interval is set to TRUE
-    'api_job_status_polling_interval' => env('SHARP_API_JOB_STATUS_POLLING_INTERVAL', 10),
-    'api_job_status_use_polling_interval' => env('SHARP_API_JOB_STATUS_USE_POLLING_INTERVAL', false),
-    // for affiliate program members use
-    'user_agent' => env('SHARP_API_USER_AGENT', 'SharpAPILaravelAgent/1.1.0'),
-];
-```
-
 So you can overwrite these values with `.env` settings:
 
 ```php
-SHARP_API_KEY=8bKzQl3cwckfVsnsN8T8p4BsACkziEQJ72U4pXpQ
+SHARP_API_KEY=XXX_key_XXX
 SHARP_API_JOB_STATUS_POLLING_WAIT=200
 SHARP_API_JOB_STATUS_USE_POLLING_INTERVAL=true
 SHARP_API_JOB_STATUS_POLLING_INTERVAL=5
 SHARP_API_BASE_URL=MOCK_SERVER
-SHARP_API_USER_AGENT="SharpAPILaravelAgent/1.1.0"
 ```
 
 ---

composer.json

@@ -37,7 +37,8 @@
     "php": "^8.1",
     "guzzlehttp/guzzle": "^7.0",
     "kongulov/interact-with-enum": "^1.0",
-    "spatie/laravel-data": "^3.0|^4.0"
+    "spatie/laravel-data": "^3.0|^4.0",
+    "spatie/url": "^2.4"
   },
   "require-dev": {
     "laravel/pint": "^1.0",

config/sharpapi-client.php

@@ -13,5 +13,4 @@
     'api_job_status_polling_interval' => env('SHARP_API_JOB_STATUS_POLLING_INTERVAL', 10),
     'api_job_status_use_polling_interval' => env('SHARP_API_JOB_STATUS_USE_POLLING_INTERVAL', false),
     // for affiliate program members use
-    'user_agent' => env('SHARP_API_USER_AGENT', 'SharpAPILaravelAgent/1.1.0'),
 ];

src/Dto/SharpApiJob.php

@@ -15,7 +15,7 @@ public function __construct(
         public string $id,
         public string $type,
         public string $status,
-        public ?string $result
+        public ?stdClass $result
     ) {
     }
 
@@ -56,7 +56,7 @@ public function getStatus(): SharpApiJobStatusEnum
      */
     public function getResultJson(): string|bool|null
     {
-        return $this->result ? json_encode(json_decode($this->result), JSON_PRETTY_PRINT) : null;
+        return $this->result ? json_encode($this->result, JSON_PRETTY_PRINT) : null;
     }
 
     /**
@@ -66,7 +66,7 @@ public function getResultJson(): string|bool|null
      */
     public function getResultArray(): ?array
     {
-        return $this->result ? json_decode($this->result, true) : null;
+        return (array) $this->result;
     }
 
     /**
@@ -76,6 +76,6 @@ public function getResultArray(): ?array
      */
     public function getResultObject(): ?stdClass
     {
-        return $this->result ? json_decode($this->result) : null;
+        return $this->result;
     }
 }

src/SharpApiService.php

@@ -15,6 +15,7 @@
 use SharpAPI\SharpApiService\Dto\SharpApiSubscriptionInfo;
 use SharpAPI\SharpApiService\Enums\SharpApiJobStatusEnum;
 use SharpAPI\SharpApiService\Enums\SharpApiJobTypeEnum;
+use Spatie\Url\Url;
 
 class SharpApiService
 {
@@ -42,7 +43,7 @@ public function __construct()
         $this->setApiBaseUrl(config('sharpapi-client.base_url', 'https://sharpapi.com/api/v1'));
         $this->setApiJobStatusPollingInterval((int) config('sharpapi-client.api_job_status_polling_interval', 5));
         $this->setApiJobStatusPollingWait((int) config('sharpapi-client.api_job_status_polling_wait', 180));
-        $this->setUserAgent(config('sharpapi-client.user_agent'));
+        $this->setUserAgent('SharpAPILaravelAgent/1.2.0');
     }
 
     /**
@@ -139,6 +140,7 @@ private function makeRequest(
 
     private function parseStatusUrl(ResponseInterface $response)
     {
+        \Log::debug('DBG parseStatusUrl:', [json_decode($response->getBody()->__toString(), true)['status_url']]);
         return json_decode($response->getBody()->__toString(), true)['status_url'];
     }
 
@@ -183,13 +185,24 @@ public function fetchResults(string $statusUrl): SharpApiJob
             } // otherwise wait a bit more and try again
             sleep($retryAfter);
         } while (true);
+
         $data = json_decode($response->getBody()->__toString(), true)['data'];
+        \Log::debug('DBG data:', $data);
+
+        $url = Url::fromString($statusUrl);
+        if(count($url->getSegments()) == 5) { // shared job result URL
+            \Log::debug('DBG 5 segments:'.$url);
+            $result = json_decode($data['attributes']['result']);
+        } else {    // 7 segments, 1-to-1 job to result url
+            \Log::debug('DBG 7 segments:'.$url);
+            $result = (object)$data['attributes']['result'];
+        }
 
         return new SharpApiJob(
             id: $data['id'],
             type: $data['attributes']['type'],
             status: $data['attributes']['status'],
-            result: $data['attributes']['result'] ?? null
+            result: $result ?? null
         );
     }
 
@@ -539,7 +552,8 @@ public function summarizeText(
         string $text,
         ?string $language = null,
         ?int $maxLength = null,
-        ?string $voiceTone = null
+        ?string $voiceTone = null,
+        ?string $context = null
     ): string {
         $response = $this->makeRequest(
             'POST',
@@ -549,6 +563,7 @@ public function summarizeText(
                 'language' => $language,
                 'max_length' => $maxLength,
                 'voice_tone' => $voiceTone,
+                'context' => $context,
             ]);
 
         return $this->parseStatusUrl($response);
@@ -565,7 +580,8 @@ public function generateKeywords(
         string $text,
         ?string $language = null,
         ?int $maxQuantity = null,
-        ?string $voiceTone = null
+        ?string $voiceTone = null,
+        ?string $context = null
     ): string {
         $response = $this->makeRequest(
             'POST',
@@ -575,6 +591,7 @@ public function generateKeywords(
                 'language' => $language,
                 'max_quantity' => $maxQuantity,
                 'voice_tone' => $voiceTone,
+                'context' => $context,
             ]);
 
         return $this->parseStatusUrl($response);