Update
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
use App\Helpers\FirstParty\Credits\CreditsService;
|
use App\Helpers\FirstParty\Credits\CreditsService;
|
||||||
use App\Jobs\GenerateMemeJob;
|
use App\Jobs\GenerateMemeJob;
|
||||||
|
use App\Models\UserMemeGeneration;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Models\Category;
|
use App\Models\Category;
|
||||||
use Auth;
|
use Auth;
|
||||||
@@ -16,6 +17,23 @@ public function generateMeme(Request $request)
|
|||||||
{
|
{
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
|
// Check if user has an active job
|
||||||
|
$activeJobId = Cache::get("user_active_job_{$user->id}");
|
||||||
|
if ($activeJobId) {
|
||||||
|
$activeGeneration = UserMemeGeneration::where('job_id', $activeJobId)
|
||||||
|
->where('user_id', $user->id)
|
||||||
|
->whereIn('status', ['pending', 'processing'])
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if ($activeGeneration) {
|
||||||
|
return response()->json([
|
||||||
|
'error' => [
|
||||||
|
'message' => 'You already have a meme generation in progress. Please wait for it to complete.',
|
||||||
|
],
|
||||||
|
], 400);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!CreditsService::canSpend($user->id, 2)) {
|
if (!CreditsService::canSpend($user->id, 2)) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'error' => [
|
'error' => [
|
||||||
@@ -28,6 +46,18 @@ public function generateMeme(Request $request)
|
|||||||
|
|
||||||
$jobId = Str::uuid()->toString();
|
$jobId = Str::uuid()->toString();
|
||||||
|
|
||||||
|
// Create database record
|
||||||
|
$generation = UserMemeGeneration::create([
|
||||||
|
'user_id' => $user->id,
|
||||||
|
'job_id' => $jobId,
|
||||||
|
'prompt' => $request->prompt,
|
||||||
|
'status' => 'pending',
|
||||||
|
'credits_to_be_charged' => 2,
|
||||||
|
'credits_are_processed' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Set active job in cache
|
||||||
|
Cache::put("user_active_job_{$user->id}", $jobId, 300);
|
||||||
Cache::put("meme_job_status_{$jobId}", 'pending', 300);
|
Cache::put("meme_job_status_{$jobId}", 'pending', 300);
|
||||||
|
|
||||||
$job = new GenerateMemeJob($user->id, $request->prompt, $jobId);
|
$job = new GenerateMemeJob($user->id, $request->prompt, $jobId);
|
||||||
@@ -89,6 +119,104 @@ public function checkMemeJobStatus(Request $request)
|
|||||||
return response()->json($response);
|
return response()->json($response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getActiveJob()
|
||||||
|
{
|
||||||
|
$user = Auth::user();
|
||||||
|
|
||||||
|
$activeJobId = Cache::get("user_active_job_{$user->id}");
|
||||||
|
|
||||||
|
if (!$activeJobId) {
|
||||||
|
return response()->json([
|
||||||
|
'success' => [
|
||||||
|
'data' => null,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$generation = UserMemeGeneration::where('job_id', $activeJobId)
|
||||||
|
->where('user_id', $user->id)
|
||||||
|
->with('meme.meme_media', 'meme.background_media')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if (!$generation) {
|
||||||
|
// Clean up stale cache
|
||||||
|
Cache::forget("user_active_job_{$user->id}");
|
||||||
|
return response()->json([
|
||||||
|
'success' => [
|
||||||
|
'data' => null,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$response = [
|
||||||
|
'success' => [
|
||||||
|
'data' => [
|
||||||
|
'job_id' => $generation->job_id,
|
||||||
|
'status' => $generation->status,
|
||||||
|
'prompt' => $generation->prompt,
|
||||||
|
'created_at' => $generation->created_at,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
// If completed, include the meme result
|
||||||
|
if ($generation->status === 'completed' && $generation->meme) {
|
||||||
|
$meme = $generation->meme;
|
||||||
|
$meme_media = $generation->meme->meme_media;
|
||||||
|
|
||||||
|
$response['success']['data']['result'] = [
|
||||||
|
'generate' => [
|
||||||
|
'info' => $meme,
|
||||||
|
'caption' => $meme->caption,
|
||||||
|
'meme' => $meme_media,
|
||||||
|
'background' => $meme->background_media,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json($response);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMemeHistory()
|
||||||
|
{
|
||||||
|
$user = Auth::user();
|
||||||
|
|
||||||
|
$generations = UserMemeGeneration::where('user_id', $user->id)
|
||||||
|
->with('meme.meme_media', 'meme.background_media')
|
||||||
|
->orderBy('created_at', 'desc')
|
||||||
|
->limit(20)
|
||||||
|
->get();
|
||||||
|
|
||||||
|
$history = $generations->map(function ($generation) {
|
||||||
|
$data = [
|
||||||
|
'job_id' => $generation->job_id,
|
||||||
|
'prompt' => $generation->prompt,
|
||||||
|
'status' => $generation->status,
|
||||||
|
'created_at' => $generation->created_at,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($generation->status === 'completed' && $generation->meme) {
|
||||||
|
$meme = $generation->meme;
|
||||||
|
$data['meme'] = [
|
||||||
|
'info' => $meme,
|
||||||
|
'caption' => $meme->caption,
|
||||||
|
'meme_media' => $meme->meme_media,
|
||||||
|
'background_media' => $meme->background_media,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
|
});
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'success' => [
|
||||||
|
'data' => [
|
||||||
|
'history' => $history,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
public function aiHints()
|
public function aiHints()
|
||||||
{
|
{
|
||||||
$categories = Category::whereNotNull('keywords')
|
$categories = Category::whereNotNull('keywords')
|
||||||
|
|||||||
@@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Jobs;
|
namespace App\Jobs;
|
||||||
|
|
||||||
|
use App\Helpers\FirstParty\Credits\CreditsService;
|
||||||
use App\Helpers\FirstParty\Meme\MemeGenerator;
|
use App\Helpers\FirstParty\Meme\MemeGenerator;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Models\UserMemeGeneration;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
@@ -23,7 +25,7 @@ class GenerateMemeJob implements ShouldQueue
|
|||||||
protected $prompt;
|
protected $prompt;
|
||||||
protected $jobId;
|
protected $jobId;
|
||||||
|
|
||||||
public function __construct(int $userId, string $prompt, string $jobId = null)
|
public function __construct(int $userId, string $prompt, ?string $jobId)
|
||||||
{
|
{
|
||||||
$this->userId = $userId;
|
$this->userId = $userId;
|
||||||
$this->prompt = $prompt;
|
$this->prompt = $prompt;
|
||||||
@@ -33,12 +35,27 @@ public function __construct(int $userId, string $prompt, string $jobId = null)
|
|||||||
|
|
||||||
public function handle(): void
|
public function handle(): void
|
||||||
{
|
{
|
||||||
|
$userGeneration = UserMemeGeneration::where('job_id', $this->jobId)->first();
|
||||||
|
|
||||||
|
if (!$userGeneration) {
|
||||||
|
throw new \Exception("User generation record not found for job {$this->jobId}");
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Update status to processing
|
||||||
|
$userGeneration->update(['status' => 'processing']);
|
||||||
Cache::put("meme_job_status_{$this->jobId}", 'processing', 300);
|
Cache::put("meme_job_status_{$this->jobId}", 'processing', 300);
|
||||||
|
|
||||||
$meme = MemeGenerator::generateMemeByKeyword($this->prompt);
|
$meme = MemeGenerator::generateMemeByKeyword($this->prompt);
|
||||||
$meme_media = MemeGenerator::getSuitableMemeMedia($meme, 2);
|
$meme_media = MemeGenerator::getSuitableMemeMedia($meme, 2);
|
||||||
|
|
||||||
|
// Update the generation record with the meme
|
||||||
|
$userGeneration->update([
|
||||||
|
'meme_id' => $meme->id,
|
||||||
|
'status' => 'completed',
|
||||||
|
'credits_are_processed' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
$result = [
|
$result = [
|
||||||
'generate' => [
|
'generate' => [
|
||||||
'info' => $meme,
|
'info' => $meme,
|
||||||
@@ -50,15 +67,61 @@ public function handle(): void
|
|||||||
|
|
||||||
Cache::put("meme_job_result_{$this->jobId}", $result, 300);
|
Cache::put("meme_job_result_{$this->jobId}", $result, 300);
|
||||||
Cache::put("meme_job_status_{$this->jobId}", 'completed', 300);
|
Cache::put("meme_job_status_{$this->jobId}", 'completed', 300);
|
||||||
|
|
||||||
|
// Clear active job from cache
|
||||||
|
Cache::forget("user_active_job_{$this->userId}");
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
// Handle failure with credit refund
|
||||||
|
if (!$userGeneration->credits_are_processed) {
|
||||||
|
if ($userGeneration->credits_to_be_charged > 0) {
|
||||||
|
CreditsService::depositAlacarte(
|
||||||
|
$userGeneration->user_id,
|
||||||
|
$userGeneration->credits_to_be_charged,
|
||||||
|
'Refunded credits for failed generation due to provider issue.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$userGeneration->update([
|
||||||
|
'credits_are_processed' => true,
|
||||||
|
'status' => 'failed',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
Cache::put("meme_job_status_{$this->jobId}", 'failed', 300);
|
Cache::put("meme_job_status_{$this->jobId}", 'failed', 300);
|
||||||
Cache::put("meme_job_error_{$this->jobId}", $e->getMessage(), 300);
|
Cache::put("meme_job_error_{$this->jobId}", $e->getMessage(), 300);
|
||||||
|
|
||||||
|
// Clear active job from cache
|
||||||
|
Cache::forget("user_active_job_{$this->userId}");
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function failed(\Throwable $exception): void
|
||||||
|
{
|
||||||
|
$userGeneration = UserMemeGeneration::where('job_id', $this->jobId)->first();
|
||||||
|
|
||||||
|
if ($userGeneration && !$userGeneration->credits_are_processed) {
|
||||||
|
if ($userGeneration->credits_to_be_charged > 0) {
|
||||||
|
CreditsService::depositAlacarte(
|
||||||
|
$userGeneration->user_id,
|
||||||
|
$userGeneration->credits_to_be_charged,
|
||||||
|
'Refunded credits for failed generation due to system error.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$userGeneration->update([
|
||||||
|
'credits_are_processed' => true,
|
||||||
|
'status' => 'failed',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Cache::put("meme_job_status_{$this->jobId}", 'failed', 300);
|
||||||
|
Cache::forget("user_active_job_{$this->userId}");
|
||||||
|
}
|
||||||
|
|
||||||
public function getJobId(): string
|
public function getJobId(): string
|
||||||
{
|
{
|
||||||
return $this->jobId;
|
return $this->jobId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
34
app/Models/UserMemeGeneration.php
Normal file
34
app/Models/UserMemeGeneration.php
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
|
class UserMemeGeneration extends Model
|
||||||
|
{
|
||||||
|
protected $fillable = [
|
||||||
|
'user_id',
|
||||||
|
'meme_id',
|
||||||
|
'job_id',
|
||||||
|
'prompt',
|
||||||
|
'status',
|
||||||
|
'credits_to_be_charged',
|
||||||
|
'credits_are_processed',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected $casts = [
|
||||||
|
'credits_are_processed' => 'boolean',
|
||||||
|
'credits_to_be_charged' => 'integer',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function user(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function meme(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Meme::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::create('user_meme_generations', function (Blueprint $table) {
|
||||||
|
$table->id();
|
||||||
|
$table->foreignId('user_id')->constrained()->onDelete('cascade');
|
||||||
|
$table->foreignId('meme_id')->nullable()->constrained()->onDelete('set null');
|
||||||
|
$table->uuid('job_id')->unique();
|
||||||
|
$table->text('prompt');
|
||||||
|
$table->enum('status', ['pending', 'processing', 'completed', 'failed'])->default('pending');
|
||||||
|
$table->integer('credits_to_be_charged');
|
||||||
|
$table->boolean('credits_are_processed')->default(false);
|
||||||
|
$table->timestamps();
|
||||||
|
|
||||||
|
$table->index(['user_id', 'job_id']);
|
||||||
|
$table->index('status');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('user_meme_generations');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -17,7 +17,7 @@ const EditorAISheet = () => {
|
|||||||
const [isOpen, setIsOpen] = useState(false);
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
const [prompt, setPrompt] = useState('');
|
const [prompt, setPrompt] = useState('');
|
||||||
const emitter = useMitt();
|
const emitter = useMitt();
|
||||||
const { generateMeme, isGeneratingMeme, keywords, isLoadingAIHints, fetchAIHints, checkMemeJobStatus, updateMemeResult, setGeneratingMeme } = useMediaStore();
|
const { generateMeme, isGeneratingMeme, keywords, isLoadingAIHints, fetchAIHints, checkMemeJobStatus, updateMemeResult, setGeneratingMeme, checkActiveJob } = useMediaStore();
|
||||||
|
|
||||||
const pollingIntervalRef = useRef(null);
|
const pollingIntervalRef = useRef(null);
|
||||||
const currentJobIdRef = useRef(null);
|
const currentJobIdRef = useRef(null);
|
||||||
@@ -38,6 +38,36 @@ const EditorAISheet = () => {
|
|||||||
};
|
};
|
||||||
}, [emitter, fetchAIHints]);
|
}, [emitter, fetchAIHints]);
|
||||||
|
|
||||||
|
// Check for active job on component mount
|
||||||
|
useEffect(() => {
|
||||||
|
if (auth.user) {
|
||||||
|
checkForActiveJob();
|
||||||
|
}
|
||||||
|
}, [auth.user]);
|
||||||
|
|
||||||
|
const checkForActiveJob = async () => {
|
||||||
|
try {
|
||||||
|
const response = await checkActiveJob();
|
||||||
|
if (response?.success?.data) {
|
||||||
|
const { job_id, status, result } = response.success.data;
|
||||||
|
|
||||||
|
if (status === 'pending' || status === 'processing') {
|
||||||
|
// Resume polling for active job
|
||||||
|
setGeneratingMeme(true);
|
||||||
|
currentJobIdRef.current = job_id;
|
||||||
|
startPolling(job_id);
|
||||||
|
} else if (status === 'completed' && result) {
|
||||||
|
// Show completed result
|
||||||
|
updateMemeResult(result);
|
||||||
|
toast.success('Your previous meme generation completed!');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// No active job or error - continue normally
|
||||||
|
console.log('No active job found or error checking:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleOpenChange = (open) => {
|
const handleOpenChange = (open) => {
|
||||||
setIsOpen(open);
|
setIsOpen(open);
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ const Home = () => {
|
|||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-neutral-50 dark:bg-black">
|
<div className="min-h-screen bg-neutral-50 dark:bg-black">
|
||||||
<Editor />
|
<Editor />
|
||||||
{/* <div className="dark:bg-neutral-800">What is MEMEAIGEN?</div> */}
|
<div className="dark:bg-neutral-800">MEMEAIGEN HERO</div>
|
||||||
|
<div className="dark:bg-neutral-800">MEMEAIGEN features</div>
|
||||||
|
<div className="dark:bg-neutral-800">MEMEAIGEN FAQ</div>
|
||||||
<FlashMessages />
|
<FlashMessages />
|
||||||
<AuthUser />
|
<AuthUser />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -118,6 +118,26 @@ const useMediaStore = create(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
checkActiveJob: async () => {
|
||||||
|
try {
|
||||||
|
const response = await axiosInstance.post(route('api.user.get_active_job'));
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error checking active job:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
getMemeHistory: async () => {
|
||||||
|
try {
|
||||||
|
const response = await axiosInstance.post(route('api.user.get_meme_history'));
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error getting meme history:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
updateMemeResult: (result) => {
|
updateMemeResult: (result) => {
|
||||||
set({
|
set({
|
||||||
currentCaption: result.generate.caption,
|
currentCaption: result.generate.caption,
|
||||||
|
|||||||
@@ -38,6 +38,8 @@
|
|||||||
Route::group(['prefix' => 'generate_meme'], function () {
|
Route::group(['prefix' => 'generate_meme'], function () {
|
||||||
Route::post('/', [UserAIController::class, 'generateMeme'])->name('api.user.generate_meme');
|
Route::post('/', [UserAIController::class, 'generateMeme'])->name('api.user.generate_meme');
|
||||||
Route::post('/status', [UserAIController::class, 'checkMemeJobStatus'])->name('api.user.check_meme_job_status');
|
Route::post('/status', [UserAIController::class, 'checkMemeJobStatus'])->name('api.user.check_meme_job_status');
|
||||||
|
Route::post('/active', [UserAIController::class, 'getActiveJob'])->name('api.user.get_active_job');
|
||||||
|
Route::post('/history', [UserAIController::class, 'getMemeHistory'])->name('api.user.get_meme_history');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user