Skip to content
Closed

Main #15

Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "sergix44/gradio-client-php",
"name": "doublechen/gradio-client-php",
"description": "Gradio client for PHP",
"keywords": [
"SergiX44",
"gradio-client-php"
],
"homepage": "https://github.com/SergiX44/gradio-client-php",
"homepage": "https://github.com/doublechen/gradio-client-php",
"license": "MIT",
"authors": [
{
Expand Down
10 changes: 5 additions & 5 deletions src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private function preparePayload(array $arguments): array
*/
private function websocketLoop(Endpoint $endpoint, array $payload): ?Output
{
$ws = $this->ws(self::QUEUE_JOIN);
$ws = $this->ws(str_replace('/', '', $this->config->api_prefix).'/'.self::QUEUE_JOIN);

while (true) {
$data = $ws->receive();
Expand Down Expand Up @@ -191,10 +191,10 @@ private function websocketLoop(Endpoint $endpoint, array $payload): ?Output
private function sseLoop(Endpoint $endpoint, array $payload, string $protocol, ?int $triggerId): ?Output
{
if ($protocol === 'sse') {
$getEndpoint = self::QUEUE_JOIN;
$getEndpoint = str_replace('/', '', $this->config->api_prefix).'/'.self::QUEUE_JOIN;
} else {
$getEndpoint = self::SSE_QUEUE_DATA;
$response = $this->httpRaw('post', self::QUEUE_JOIN, [
$getEndpoint = str_replace('/', '', $this->config->api_prefix).'/'.self::SSE_QUEUE_DATA;
$response = $this->httpRaw('post', str_replace('/', '', $this->config->api_prefix).'/'.self::QUEUE_JOIN, [
'data' => $payload,
'fn_index' => $endpoint->index,
'session_hash' => $this->sessionHash,
Expand Down Expand Up @@ -239,7 +239,7 @@ private function sseLoop(Endpoint $endpoint, array $payload, string $protocol, ?
$message = $this->hydrator->hydrateWithJson(Message::class, $buffer);

if ($message instanceof SendData && $protocol === 'sse') {
$sendData = $this->httpRaw('post', self::SSE_QUEUE_DATA, [
$sendData = $this->httpRaw('post', str_replace('/', '', $this->config->api_prefix).'/'.self::SSE_QUEUE_DATA, [
'data' => $payload,
'fn_index' => $endpoint->index,
'session_hash' => $this->sessionHash,
Expand Down
1 change: 1 addition & 0 deletions src/Client/RemoteClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public function __construct(string $src, array $httpClientOptions = [])

protected function http(string $method, string $uri, array $params = [], array $opt = [], ?string $dto = null)
{

$response = $this->httpRaw($method, $uri, $params, $opt);

return $this->decodeResponse($response, $dto);
Expand Down
2 changes: 1 addition & 1 deletion src/DTO/Resolvers/MessageResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#[\Attribute] class MessageResolver extends ConcreteResolver
{
public function concreteFor(array $data): ?string
public function concreteFor(array $data, array $all): ?string
{
$msg = $data['msg'] ?? throw new InvalidArgumentException('Missing msg key');

Expand Down