feat: replace deprecated OpenAI model

move to "Edit Model" to "Chat Completion Model" render updated editor content resolve #24
bsorrentino · Sep 12, 2023 · a3b1690 · a3b1690
1 parent 9e736ec
commit a3b1690
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 38 deletions.
diff --git a/PlantUML/PlantUML+OpenAI.swift b/PlantUML/PlantUML+OpenAI.swift
@@ -86,7 +86,7 @@ class LILOFixedSizeQueue<T> : LILOQueue<T> {
 
 class OpenAIService : ObservableObject {
 
-    enum Status {
+    enum Status : Equatable {
         case Ready
         case Error( String )
         case Editing
@@ -181,7 +181,7 @@ class OpenAIService : ObservableObject {
                 ChatMessage(role: .system, content:
                                     """
                                     You are my plantUML assistant.
-                                    Please respond exclusively with diagram code.
+                                    You must answer exclusively with diagram syntax.
                                     """),
                 ChatMessage(role: .assistant, content: input),
                 ChatMessage(role: .user, content: instruction),

diff --git a/PlantUML/PlantUMLContentView.swift b/PlantUML/PlantUMLContentView.swift
@@ -48,12 +48,31 @@ struct PlantUMLContentView: View {
     @State private var saving = false
     @State private var diagramImage:UIImage?
 
+    @State private var editorViewId  = 1
     var body: some View {
 
         VStack {
             GeometryReader { geometry in
+
                 if( isEditorVisible ) {
-                    EditorView_Fragment
+                    VStack {
+                        PlantUMLEditorView( content: $document.text,
+                                            darkTheme: CodeWebView.Theme(rawValue: darkTheme)!,
+                                            lightTheme: CodeWebView.Theme(rawValue: lightTheme)!,
+                                            isReadOnly: false,
+                                            fontSize: CGFloat(fontSize),
+                                            showGutter: showLine
+                        )
+                        .id( editorViewId )
+                        .if( isRunningTests ) { /// this need for catching current editor data from UI test
+                            $0.overlay(alignment: .bottom) {
+                                Text( document.text )
+                                    .frame( width: 0, height: 0)
+                                    .opacity(0)
+                                    .accessibilityIdentifier("editor-text")
+                            }
+                        }
+                    }
                 }
 
                 if isDiagramVisible {
@@ -71,8 +90,16 @@ struct PlantUMLContentView: View {
                 }
             }
             if isOpenAIVisible /* && interfaceOrientation.value.isPortrait */ {
-                OpenAIView_Fragment
+                OpenAIView( service: openAIService, result: $document.text )
                     .frame( height: 200 )
+                    .onChange(of: openAIService.status ) { newStatus in
+                        if( .Ready == newStatus ) {
+                            // Force rendering editor view
+//                            print( "FORCE RENDERING OF EDITOR VIEW")
+                            editorViewId += 1
+                        }
+                    }
+
             }
         }
         .onChange(of: document.text ) { _ in
@@ -127,45 +154,11 @@ struct PlantUMLContentView: View {
     }
 }
 
-//
-// MARK: - OpenAI extension -
-//
-extension PlantUMLContentView {
-
-    var OpenAIView_Fragment: some View {
-
-        OpenAIView( service: openAIService, result: $document.text )
-
-    }
-
-}
-
 //
 // MARK: - Editor extension -
 //
 extension PlantUMLContentView {
 
-    var EditorView_Fragment: some View {
-
-        VStack {
-            PlantUMLEditorView( content: $document.text,
-                                darkTheme: CodeWebView.Theme(rawValue: darkTheme)!,
-                                lightTheme: CodeWebView.Theme(rawValue: lightTheme)!,
-                                isReadOnly: false,
-                                fontSize: CGFloat(fontSize),
-                                showGutter: showLine
-            )
-            .if( isRunningTests ) { /// this need for catching current editor data from UI test
-                $0.overlay(alignment: .bottom) {
-                    Text( document.text )
-                        .frame( width: 0, height: 0)
-                        .opacity(0)
-                        .accessibilityIdentifier("editor-text")
-                }
-            }
-        }
-    }
-
     // [SwiftUI Let View disappear automatically](https://stackoverflow.com/a/60820491/521197)
     struct SavedStateView: View {
         @Binding var visible: Bool