Update flare-ui/src/app/dialogs/version-edit-dialog/version-edit-dialog.component.ts

flare-ui/src/app/dialogs/version-edit-dialog/version-edit-dialog.component.ts

@@ -391,32 +391,41 @@ export default class VersionEditDialogComponent implements OnInit {
     });
   }
 
-  async loadVersions() {
-    this.loading = true;
-    try {
-      const project = await this.apiService.getProject(this.project.id).toPromise();
-      if (project) {
-        this.project = project;
-        this.versions = project.versions || [];
-        
-        // Re-select current version if it still exists
-        if (this.selectedVersion) {
-          const currentVersion = this.versions.find(v => v.id === this.selectedVersion!.id);
-          if (currentVersion) {
-            this.loadVersion(currentVersion);
-          } else if (this.versions.length > 0) {
-            this.loadVersion(this.versions[0]);
-          }
-        } else if (this.versions.length > 0) {
-          this.loadVersion(this.versions[0]);
+  loadVersion(version: Version) {
+    this.selectedVersion = version;
+    
+    // Form değerlerini set et
+    this.versionForm.patchValue({
+      id: version.id,
+      caption: version.caption || '',
+      published: version.published || false,
+      general_prompt: (version as any).general_prompt || '', // Backend'den gelen general_prompt
+      last_update_date: version.last_update_date || ''
+    });
+  
+    // LLM config'i ayrı set et
+    if (version.llm) {
+      this.versionForm.patchValue({
+        llm: {
+          repo_id: version.llm.repo_id || '',
+          generation_config: version.llm.generation_config || {
+            max_new_tokens: 512,
+            temperature: 0.7,
+            top_p: 0.95,
+            repetition_penalty: 1.1
+          },
+          use_fine_tune: version.llm.use_fine_tune || false,
+          fine_tune_zip: version.llm.fine_tune_zip || ''
         }
-      }
-    } catch (error) {
-      this.snackBar.open('Failed to reload versions', 'Close', { duration: 3000 });
-    } finally {
-      this.loading = false;
+      });
     }
-  }  
+  
+    // Clear and rebuild intents
+    this.intents.clear();
+    (version.intents || []).forEach(intent => {
+      this.intents.push(this.createIntentFormGroup(intent));
+    });
+  } 
 
   async saveVersion() {
     if (!this.selectedVersion) {
@@ -445,55 +454,40 @@ export default class VersionEditDialogComponent implements OnInit {
       return;
     }
   
-    // selectedVersion null check'i yukarıda yapıldı, artık güvenle kullanabiliriz
-    const currentVersion = this.selectedVersion!; // Non-null assertion
+    const currentVersion = this.selectedVersion!;
   
     this.saving = true;
     
     try {
       const formValue = this.versionForm.getRawValue();
       
-      // LLM config'i düzgün formatta hazırla
-      const llmConfig = {
-        repo_id: formValue.llm.repo_id,
-        generation_config: formValue.llm.generation_config,
-        use_fine_tune: formValue.llm.use_fine_tune,
-        fine_tune_zip: formValue.llm.fine_tune_zip
-      };
-      
-      // Intent verilerini düzgün formatta hazırla
-      const intents = formValue.intents.map((intent: any) => ({
-        name: intent.name,
-        caption: intent.caption,
-        locale: intent.locale,
-        detection_prompt: intent.detection_prompt,
-        examples: Array.isArray(intent.examples) ? intent.examples.filter((ex: any) => ex) : [],
-        parameters: Array.isArray(intent.parameters) ? intent.parameters.map((param: any) => ({
-          name: param.name,
-          caption: param.caption,
-          type: param.type,
-          required: param.required,
-          variable_name: param.variable_name,
-          extraction_prompt: param.extraction_prompt,
-          validation_regex: param.validation_regex,
-          invalid_prompt: param.invalid_prompt,
-          type_error_prompt: param.type_error_prompt
-        })) : [],
-        action: intent.action,
-        fallback_timeout_prompt: intent.fallback_timeout_prompt,
-        fallback_error_prompt: intent.fallback_error_prompt
-      }));
-  
-      // updateData'yı burada tanımla - currentVersion kullan
+      // updateData'yı backend'in beklediği formatta hazırla
       const updateData = {
         caption: formValue.caption,
-        description: formValue.caption,
-        default_api: currentVersion.default_api || '',
-        published: currentVersion.published,
-        llm: llmConfig,
-        intents: intents,
-        parameters: [],
-        last_update_date: currentVersion.last_update_date
+        general_prompt: formValue.general_prompt, // Bu alan eksikti
+        llm: formValue.llm,
+        intents: formValue.intents.map((intent: any) => ({
+          name: intent.name,
+          caption: intent.caption,
+          locale: intent.locale,
+          detection_prompt: intent.detection_prompt,
+          examples: Array.isArray(intent.examples) ? intent.examples.filter((ex: any) => ex) : [],
+          parameters: Array.isArray(intent.parameters) ? intent.parameters.map((param: any) => ({
+            name: param.name,
+            caption: param.caption,
+            type: param.type,
+            required: param.required,
+            variable_name: param.variable_name,
+            extraction_prompt: param.extraction_prompt,
+            validation_regex: param.validation_regex,
+            invalid_prompt: param.invalid_prompt,
+            type_error_prompt: param.type_error_prompt
+          })) : [],
+          action: intent.action,
+          fallback_timeout_prompt: intent.fallback_timeout_prompt,
+          fallback_error_prompt: intent.fallback_error_prompt
+        })),
+        last_update_date: currentVersion.last_update_date || ''
       };
   
       console.log('Saving version data:', JSON.stringify(updateData, null, 2));
@@ -506,7 +500,6 @@ export default class VersionEditDialogComponent implements OnInit {
   
       this.snackBar.open('Version saved successfully', 'Close', { duration: 3000 });
       
-      // Update version data locally
       if (result) {
         this.selectedVersion = result;
         this.versionForm.patchValue({
@@ -514,47 +507,33 @@ export default class VersionEditDialogComponent implements OnInit {
         });
       }
       
-      // Reload versions
       await this.loadVersions();
       
     } catch (error: any) {
       console.error('Save error:', error);
       
       if (error.status === 409) {
-        // updateData'ya burada da ihtiyacımız var
+        // Race condition handling
         const formValue = this.versionForm.getRawValue();
-        const llmConfig = {
-          repo_id: formValue.llm.repo_id,
-          generation_config: formValue.llm.generation_config,
-          use_fine_tune: formValue.llm.use_fine_tune,
-          fine_tune_zip: formValue.llm.fine_tune_zip
-        };
         
-        const intents = formValue.intents.map((intent: any) => ({
-          name: intent.name,
-          caption: intent.caption,
-          locale: intent.locale,
-          detection_prompt: intent.detection_prompt,
-          examples: Array.isArray(intent.examples) ? intent.examples.filter((ex: any) => ex) : [],
-          parameters: Array.isArray(intent.parameters) ? intent.parameters : [],
-          action: intent.action,
-          fallback_timeout_prompt: intent.fallback_timeout_prompt,
-          fallback_error_prompt: intent.fallback_error_prompt
-        }));
-  
         const retryUpdateData = {
           caption: formValue.caption,
-          description: formValue.caption,
-          default_api: currentVersion.default_api || '',
-          published: currentVersion.published,
-          llm: llmConfig,
-          intents: intents,
-          parameters: [],
-          last_update_date: currentVersion.last_update_date
+          general_prompt: formValue.general_prompt,
+          llm: formValue.llm,
+          intents: formValue.intents.map((intent: any) => ({
+            name: intent.name,
+            caption: intent.caption,
+            locale: intent.locale,
+            detection_prompt: intent.detection_prompt,
+            examples: Array.isArray(intent.examples) ? intent.examples.filter((ex: any) => ex) : [],
+            parameters: Array.isArray(intent.parameters) ? intent.parameters : [],
+            action: intent.action,
+            fallback_timeout_prompt: intent.fallback_timeout_prompt,
+            fallback_error_prompt: intent.fallback_error_prompt
+          })),
+          last_update_date: currentVersion.last_update_date || ''
         };
   
-        const { default: ConfirmDialogComponent } = await import('../confirm-dialog/confirm-dialog.component');
-        
         const dialogRef = this.dialog.open(ConfirmDialogComponent, {
           width: '500px',
           data: {
@@ -568,13 +547,12 @@ export default class VersionEditDialogComponent implements OnInit {
   
         dialogRef.afterClosed().subscribe(async (forceSave) => {
           if (forceSave) {
-            // Force save
             try {
               await this.apiService.updateVersion(
                 this.project.id, 
                 currentVersion.id, 
                 retryUpdateData,
-                true  // force flag
+                true
               ).toPromise();
               this.snackBar.open('Version force saved', 'Close', { duration: 3000 });
               await this.loadVersions();
@@ -585,7 +563,6 @@ export default class VersionEditDialogComponent implements OnInit {
               });
             }
           } else {
-            // Reload
             await this.loadVersions();
           }
         });
@@ -600,7 +577,7 @@ export default class VersionEditDialogComponent implements OnInit {
       this.saving = false;
     }
   }
-
+  
   async publishVersion() {
     if (!this.selectedVersion) return;