Merge pull request #2 from illegalstudio/database-prefix

Database prefix - Requests

Author: nahime0

.gitignore

@@ -1 +1,8 @@
-.idea
+.idea
+build
+vendor
+composer.lock
+phpunit.xml
+.env
+.phpunit.result.cache
+.php-cs-fixer.cache

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Unreleased
+
+# v0.1.3
+
+**Release date**: 2023-04-30
+
+- Added support for db prefix. **IMPORTANT**, if you come from a previous version, your setup is without prefix. 
+Either rename all your table with the `ai-` prefix (or whatever you configure via the `.env` file) or setup an empty prefix
+in your `.env` file:
+
+```dotenv
+AI_DB_PREFIX=
+```
+
+- Added a new table `requests` to store all the requests made to the API. In the table are stored token usage - expect for image requests on the openai provider
+
+
+# v0.1.2
+
+**Relase date**: 2023-04-02
+
+Base version of the module, with basic functionality and support for Laravel 10

composer.json

@@ -23,6 +23,7 @@
     "require": {
         "php": "^8.1",
         "guzzlehttp/guzzle": "^7.2",
+        "illegal/laravel-utils": "^1.1",
         "laravel/framework": "^9.19|^10",
         "openai-php/client": "^0.3.5"
     },

config/laravel-ai.php

@@ -1,6 +1,9 @@
 <?php
 
 return [
+    'db'     => [
+        'prefix' => env('AI_DB_PREFIX', 'ai_'),
+    ],
     'openai' => [
         'api_key'             => env('AI_OPENAI_API_KEY', null),
         'default_max_tokens'  => env('AI_OPENAI_DEFAULT_MAX_TOKENS', 5),

database/migrations/2023_03_15_221528_create_models_table.php

@@ -1,13 +1,14 @@
 <?php
 
+use Illegal\LaravelAI\Models\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('models', function (Blueprint $table) {
+        Schema::create(Model::getTableName(), function (Blueprint $table) {
             $table->id();
             $table->boolean('is_active')->default(false);
             $table->string('provider');
@@ -19,6 +20,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('models');
+        Schema::dropIfExists(Model::getTableName());
     }
 };

database/migrations/2023_03_17_233538_create_chats_table.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illegal\LaravelAI\Models\Chat;
 use Illegal\LaravelAI\Models\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
@@ -8,9 +9,9 @@
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('chats', function (Blueprint $table) {
+        Schema::create(Chat::getTableName(), function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Model::class)->constrained();
+            $table->foreignIdFor(Model::class)->constrained(Model::getTableName());
             $table->string('external_id')->nullable();
             $table->json('messages')->nullable();
             $table->timestamps();
@@ -19,6 +20,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('chats');
+        Schema::dropIfExists(Chat::getTableName());
     }
 };

database/migrations/2023_03_18_155642_create_completions_table.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illegal\LaravelAI\Models\Completion;
 use Illegal\LaravelAI\Models\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
@@ -8,9 +9,9 @@
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('completions', function (Blueprint $table) {
+        Schema::create(Completion::getTableName(), function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Model::class)->constrained();
+            $table->foreignIdFor(Model::class)->constrained(Model::getTableName());
             $table->string('external_id')->nullable();
             $table->string('prompt');
             $table->string('answer');
@@ -20,6 +21,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('completions');
+        Schema::dropIfExists(Completion::getTableName());
     }
 };

database/migrations/2023_03_20_232708_create_images_table.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illegal\LaravelAI\Models\Image;
 use Illegal\LaravelAI\Models\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
@@ -8,9 +9,9 @@
 return new class extends Migration {
     public function up(): void
     {
-        Schema::create('images', function (Blueprint $table) {
+        Schema::create(Image::getTableName(), function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Model::class)->nullable()->constrained();
+            $table->foreignIdFor(Model::class)->nullable()->constrained(Model::getTableName());
             $table->string('external_id')->nullable();
             $table->string('prompt');
             $table->integer('width');
@@ -22,6 +23,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists('images');
+        Schema::dropIfExists(Image::getTableName());
     }
 };

database/migrations/2023_04_30_132212_change_completions_data_type.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illegal\LaravelAI\Models\Completion;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table(Completion::getTableName(), function (Blueprint $table) {
+            $table->text('prompt')->change();
+            $table->text('answer')->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table(Completion::getTableName(), function (Blueprint $table) {
+            $table->string('prompt')->change();
+            $table->string('answer')->change();
+        });
+    }
+};

database/migrations/2023_04_30_140940_create_api_requests_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illegal\LaravelAI\Models\ApiRequest;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::create(ApiRequest::getTableName(), function (Blueprint $table) {
+            $table->id();
+            $table->string('external_id')->nullable();
+            $table->integer('prompt_tokens')->default(0);
+            $table->integer('completion_tokens')->default(0);
+            $table->integer('total_tokens')->default(0);
+            $table->nullableMorphs('requestable');
+
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists(ApiRequest::getTableName());
+    }
+};