Refactor parameter order in OpenAIService methods for consistency and clarity

Author: StevenU21

app/Http/Controllers/ChatBotController.php

@@ -28,13 +28,13 @@ public function index(): Response
     public function store(ChatBotRequest $request)
     {
         $this->authorize('makeRequest', auth()->user());
-        
+
         $text = $request->validated()['text'];
         $model = $request->validated()['model'];
-        $prompt = $request->validated()['prompt'];
         $temperature = $request->validated()['temperature'];
+        $prompt = $request->validated()['prompt'];
 
-        $response = $this->OpenAIService->conversation($text, $model, $prompt, $temperature);
+        $response = $this->OpenAIService->conversation($text, $model, $temperature, $prompt);
 
         return response()->json([
             'bot_message' => $response['bot_message'],

app/Http/Controllers/ImageController.php

@@ -35,15 +35,15 @@ public function store(ImageRequest $request)
     {
         $this->authorize('makeRequest', auth()->user());
 
-        $model = $request->validated()['model'];
-        $quality = $request->validated()['quality'];
         $prompt = $request->validated()['prompt'];
         $style = $request->validated()['style'];
         $size = $request->validated()['size'];
+        $model = $request->validated()['model'];
+        $quality = $request->validated()['quality'];
 
         event(new ProcessStatusStarted(auth()->id(), 'Generating image'));
         // Dispatch job
-        ProcessImage::dispatch($model, $prompt, $style, $size, $quality, auth()->id());
+        ProcessImage::dispatch($prompt, $style, $size, $model, $quality, auth()->id());
 
         return redirect()->route('images.index');
     }

app/Jobs/ProcessImage.php

@@ -15,22 +15,22 @@
 class ProcessImage implements ShouldQueue
 {
     use Queueable;
-    protected $model;
     protected $prompt;
     protected $style;
     protected $size;
+    protected $model;
     protected $quality;
     protected $userId;
 
     /**
      * Create a new job instance.
      */
-    public function __construct($model,$prompt, $style, $size, $quality, $userId)
+    public function __construct($prompt, $style, $size, $model, $quality, $userId)
     {
-        $this->model = $model;
         $this->prompt = $prompt;
         $this->style = $style;
         $this->size = $size;
+        $this->model = $model;
         $this->quality = $quality;
         $this->userId = $userId;
     }
@@ -41,7 +41,7 @@ public function __construct($model,$prompt, $style, $size, $quality, $userId)
     public function handle(OpenAIService $openAIService)
     {
         // Generate image using OpenAIService
-        $response = $openAIService->textToImage($this->model, $this->prompt, $this->style, $this->size, $this->quality);
+        $response = $openAIService->textToImage($this->prompt, $this->style, $this->size,$this->model, $this->quality);
 
         // Extract URL and enhanced prompt from response
         $imageUrl = $response['url'];

app/Services/OpenAIService.php

@@ -49,7 +49,7 @@ public function textToSpeech($text, $voice, $model = 'tts-1', $responseFormat =
         return $response;
     }
 
-    public function textToImage($model = 'dall-e-2', $prompt, $style, $size, $quality = 'standard')
+    public function textToImage($prompt, $style, $size, $model = 'dall-e-2', $quality = 'standard')
     {
         $styleDescriptions = [
             'realistic' => 'with photorealistic details and natural lighting',
@@ -77,7 +77,7 @@ public function textToImage($model = 'dall-e-2', $prompt, $style, $size, $qualit
         ];
     }
 
-    public function conversation($text, $model, $prompt = 'assistant', $temperature)
+    public function conversation($text, $model, $temperature, $prompt = 'assistant')
     {
         $messages = [
             ['role' => 'system', 'content' => $this->getPromptDescription($prompt)],