Merge branch 'master' of github.com:apioo/fusio-impl into feat/issue-661-commit-log

# Conflicts:
#	src/Migrations/Version20230508210151.php
#	tests/Backend/Api/Connection/Database/Table/CollectionTest.php

Author: chriskapp

README.md

@@ -16,6 +16,7 @@ This overview shows all Fusio related composer dependencies and the build status
 | [fusio/cli](https://github.com/apioo/fusio-cli)                                     | ![Status](https://github.com/apioo/fusio-cli/actions/workflows/ci.yml/badge.svg)                   |
 | [fusio/model](https://github.com/apioo/fusio-model)                                 | ![Status](https://github.com/apioo/fusio-model/actions/workflows/ci.yml/badge.svg)                 |
 | [fusio/engine](https://github.com/apioo/fusio-engine)                               | ![Status](https://github.com/apioo/fusio-engine/actions/workflows/ci.yml/badge.svg)                |
+| [fusio/adapter-ai](https://github.com/apioo/fusio-adapter-ai)                       | ![Status](https://github.com/apioo/fusio-adapter-ai/actions/workflows/ci.yml/badge.svg)          |
 | [fusio/adapter-amqp](https://github.com/apioo/fusio-adapter-amqp)                   | ![Status](https://github.com/apioo/fusio-adapter-amqp/actions/workflows/ci.yml/badge.svg)          |
 | [fusio/adapter-beanstalk](https://github.com/apioo/fusio-adapter-beanstalk)         | ![Status](https://github.com/apioo/fusio-adapter-beanstalk/actions/workflows/ci.yml/badge.svg)     |
 | [fusio/adapter-cli](https://github.com/apioo/fusio-adapter-cli)                     | ![Status](https://github.com/apioo/fusio-adapter-cli/actions/workflows/ci.yml/badge.svg)           |

composer.json

@@ -10,10 +10,6 @@
       "homepage": "https://chrisk.app"
     }
   ],
-  "scripts": {
-    "tests": "@php vendor/phpunit/phpunit/phpunit --configuration phpunit.xml tests",
-    "psalm": "@php vendor/vimeo/psalm/psalm"
-  },
   "require": {
     "php": ">=8.1",
     "psx/framework": "^8.0",
@@ -22,6 +18,7 @@
     "fusio/cli": "^4.0",
     "fusio/model": "^4.0",
     "fusio/engine": "^6.0",
+    "fusio/adapter-ai": "^0.1",
     "fusio/adapter-amqp": "^6.0",
     "fusio/adapter-beanstalk": "^6.0",
     "fusio/adapter-cli": "^6.0",
@@ -44,9 +41,9 @@
     "symfony/mailer": "^6.0|^7.0",
     "symfony/doctrine-messenger": "^6.0|^7.0",
     "dragonmantank/cron-expression": "^3.3",
-    "phpstan/phpdoc-parser": "^1.0",
-    "logiscape/mcp-sdk-php": "^1.2",
-    "webonyx/graphql-php": "^15.24"
+    "phpstan/phpdoc-parser": "^1.0|^2.0",
+    "webonyx/graphql-php": "^15.24",
+    "mcp/sdk": "^0.3"
   },
   "require-dev": {
     "phpunit/phpunit": "^12.0",
@@ -61,5 +58,10 @@
     "psr-4": {
       "Fusio\\Impl\\Tests\\": "tests/"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": false
+    }
   }
 }

provider.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    \Fusio\Adapter\Ai\Adapter::class,
     \Fusio\Adapter\Amqp\Adapter::class,
     \Fusio\Adapter\Beanstalk\Adapter::class,
     \Fusio\Adapter\Cli\Adapter::class,

resources/container.php

@@ -3,6 +3,7 @@
 use Fusio\Cli;
 use Fusio\Engine\Action;
 use Fusio\Engine\Adapter\ServiceBuilder;
+use Fusio\Engine\Agent\ToolsInterface;
 use Fusio\Engine\ConnectorInterface;
 use Fusio\Engine\DispatcherInterface;
 use Fusio\Engine\Repository;
@@ -14,10 +15,13 @@
 use Fusio\Impl\Provider;
 use Fusio\Impl\Repository as ImplRepository;
 use Fusio\Impl\Service\Action\Producer;
+use Fusio\Impl\Service\Agent;
 use Fusio\Impl\Service\Event\Dispatcher;
+use Fusio\Impl\Service\Mcp\ReferenceHandler;
 use Fusio\Impl\Service\Tenant\LimiterInterface;
 use Fusio\Impl\Service\User\Captcha;
 use Fusio\Impl\Tenant\UnlimitedLimiter;
+use Mcp\Capability\Registry\ReferenceHandlerInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\SimpleCache\CacheInterface;
 use PSX\Api;
@@ -30,10 +34,15 @@
 use PSX\Framework\Migration\DependencyFactoryFactory;
 use PSX\Http\Filter\UserAgentEnforcer;
 use PSX\Schema;
+use Symfony\AI\Agent\Toolbox\Toolbox;
+use Symfony\AI\Agent\Toolbox\ToolboxInterface;
+use Symfony\AI\Agent\Toolbox\ToolCallArgumentResolverInterface;
+use Symfony\AI\Agent\Toolbox\ToolFactoryInterface;
 use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 
 return static function (ContainerConfigurator $container) {
     $services = ServiceBuilder::build($container);
@@ -62,6 +71,9 @@
     $services->set(Dispatcher::class);
     $services->alias(DispatcherInterface::class, Dispatcher::class);
 
+    $services->set(Agent\Tools::class);
+    $services->alias(ToolsInterface::class, Agent\Tools::class);
+
     $services->alias('test_connector', ConnectorInterface::class)
         ->public();
 
@@ -112,6 +124,19 @@
     $services->set(SDKgenConfig::class);
     $services->alias(Api\Repository\SDKgen\ConfigInterface::class, SDKgenConfig::class);
 
+    $services->set(Agent\OperationToolFactory::class);
+    $services->alias(ToolFactoryInterface::class, Agent\OperationToolFactory::class);
+
+    $services->set(Agent\OperationToolCallArgumentResolver::class);
+    $services->alias(ToolCallArgumentResolverInterface::class, Agent\OperationToolCallArgumentResolver::class);
+
+    $services->set(Agent\OperationTool::class)
+        ->tag('fusio.ai.tool');
+
+    $services->set(Toolbox::class)
+        ->arg('$tools', tagged_iterator('fusio.ai.tool'));
+    $services->alias(ToolboxInterface::class, Toolbox::class);
+
     // psx
     $services->set(Framework\Loader\RoutingParser\DatabaseParser::class);
     $services->set(Framework\Loader\RoutingParser\CompositeParser::class);

src/Backend/Action/Action/Execute.php

@@ -20,6 +20,7 @@
 
 namespace Fusio\Impl\Backend\Action\Action;
 
+use Doctrine\DBAL\Connection;
 use Fusio\Engine\ActionInterface;
 use Fusio\Engine\ContextInterface;
 use Fusio\Engine\ParametersInterface;
@@ -31,6 +32,8 @@
 use PSX\Http\Environment\HttpResponseInterface;
 use PSX\Http\Response;
 use PSX\Http\Writer\WriterInterface;
+use stdClass;
+use Throwable;
 
 /**
  * Execute
@@ -39,14 +42,12 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-class Execute implements ActionInterface
+readonly class Execute implements ActionInterface
 {
-    private Action\Executor $actionExecutorService;
     private Converter $exceptionConverter;
 
-    public function __construct(Action\Executor $actionExecutorService)
+    public function __construct(private Action\Executor $actionExecutorService, private Connection $connection)
     {
-        $this->actionExecutorService = $actionExecutorService;
         $this->exceptionConverter = new Converter(true);
     }
 
@@ -56,6 +57,8 @@ public function handle(RequestInterface $request, ParametersInterface $configura
 
         assert($body instanceof ActionExecuteRequest);
 
+        $this->connection->beginTransaction();
+
         try {
             $response = $this->actionExecutorService->execute(
                 $request->get('action_id'),
@@ -74,30 +77,34 @@ public function handle(RequestInterface $request, ParametersInterface $configura
                     $body = (string) $tempResponse->getBody();
                 }
 
-                return [
+                $return = [
                     'statusCode' => $response->getStatusCode(),
                     'headers' => $headers,
                     'body' => $body,
                 ];
             } else {
-                return [
+                $return = [
                     'statusCode' => 200,
-                    'headers' => new \stdClass(),
+                    'headers' => new stdClass(),
                     'body' => $response,
                 ];
             }
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             if ($e instanceof MessageException) {
                 $body = $e->getPayload();
             } else {
                 $body = $this->exceptionConverter->convert($e);
             }
 
-            return [
+            $return = [
                 'statusCode' => 500,
-                'headers' => new \stdClass(),
+                'headers' => new stdClass(),
                 'body' => $body,
             ];
         }
+
+        $this->connection->rollBack();
+
+        return $return;
     }
 }

src/Backend/Action/Connection/Agent/AgentAbstract.php

@@ -0,0 +1,60 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Connection\Agent;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\Connector;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Service\System\FrameworkConfig;
+use PSX\Http\Exception as StatusCode;
+use PSX\Http\Exception\BadRequestException;
+use Symfony\AI\Agent\AgentInterface;
+
+/**
+ * AgentAbstract
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+abstract readonly class AgentAbstract implements ActionInterface
+{
+    public function __construct(private Connector $connector, private FrameworkConfig $frameworkConfig)
+    {
+    }
+
+    protected function getConnection(int $connectionId): AgentInterface
+    {
+        $connection = $this->connector->getConnection($connectionId);
+        if (!$connection instanceof AgentInterface) {
+            throw new BadRequestException('Provided an invalid connection');
+        }
+
+        return $connection;
+    }
+
+    protected function assertConnectionEnabled(): void
+    {
+        if (!$this->frameworkConfig->isConnectionEnabled()) {
+            throw new StatusCode\ServiceUnavailableException('Agent is not enabled, please change the setting "fusio_connection" at the configuration.php to "true" in order to activate the agent');
+        }
+    }
+}

src/Backend/Action/Connection/Agent/Get.php

@@ -0,0 +1,60 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Connection\Agent;
+
+use Fusio\Engine\Connector;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Backend\View;
+use Fusio\Impl\Service\Agent\Intent;
+use Fusio\Impl\Service\System\FrameworkConfig;
+use PSX\Http\Environment\HttpResponse;
+use PSX\Http\Exception\BadRequestException;
+
+/**
+ * Get
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Get extends AgentAbstract
+{
+    public function __construct(private View\Connection\Agent $view, Connector $connector, FrameworkConfig $frameworkConfig)
+    {
+        parent::__construct($connector, $frameworkConfig);
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        $this->assertConnectionEnabled();
+
+        $connectionId = (int) $request->get('connection_id');
+        if (empty($connectionId)) {
+            throw new BadRequestException('Provided no connection');
+        }
+
+        $intent = Intent::tryFrom($request->get('intent') ?? '');
+
+        return new HttpResponse(200, [], $this->view->getCollection($connectionId, $intent, $context));
+    }
+}

src/Backend/Action/Connection/Agent/Reset.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Connection\Agent;
+
+use Fusio\Engine\Connector;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Service\System\FrameworkConfig;
+use Fusio\Impl\Table;
+use PSX\Http\Environment\HttpResponse;
+use PSX\Http\Exception\BadRequestException;
+
+/**
+ * Reset
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Reset extends AgentAbstract
+{
+    public function __construct(private Table\Agent $agentTable, Connector $connector, FrameworkConfig $frameworkConfig)
+    {
+        parent::__construct($connector, $frameworkConfig);
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        $this->assertConnectionEnabled();
+
+        $connectionId = (int) $request->get('connection_id');
+        if (empty($connectionId)) {
+            throw new BadRequestException('Provided no connection');
+        }
+
+        $this->agentTable->reset($context->getUser()->getId(), $connectionId);
+
+        return new HttpResponse(200, [], [
+            'success' => true,
+            'message' => 'Chat successfully reset',
+        ]);
+    }
+}