fix: various issues with Python codegen

server/src/main/kotlin/com/larsreimann/api_editor/codegen/StubCodeGenerator.kt

@@ -5,10 +5,15 @@ import com.larsreimann.api_editor.mutable_model.PythonAttribute
 import com.larsreimann.api_editor.mutable_model.PythonClass
 import com.larsreimann.api_editor.mutable_model.PythonEnum
 import com.larsreimann.api_editor.mutable_model.PythonEnumInstance
+import com.larsreimann.api_editor.mutable_model.PythonExpression
 import com.larsreimann.api_editor.mutable_model.PythonFunction
 import com.larsreimann.api_editor.mutable_model.PythonModule
+import com.larsreimann.api_editor.mutable_model.PythonNamedType
 import com.larsreimann.api_editor.mutable_model.PythonParameter
 import com.larsreimann.api_editor.mutable_model.PythonResult
+import com.larsreimann.api_editor.mutable_model.PythonStringifiedExpression
+import com.larsreimann.api_editor.mutable_model.PythonStringifiedType
+import com.larsreimann.api_editor.mutable_model.PythonType
 import de.unibonn.simpleml.constant.SmlFileExtension
 import de.unibonn.simpleml.emf.createSmlAnnotationUse
 import de.unibonn.simpleml.emf.createSmlArgument
@@ -124,7 +129,7 @@ internal fun PythonAttribute.toSmlAttribute(): SmlAttribute {
                 add(createSmlDescriptionAnnotationUse(description))
             }
         },
-        type = typeInDocs.toSmlType()
+        type = type.toSmlType()
     )
 }
 
@@ -181,7 +186,7 @@ internal fun PythonParameter.toSmlParameterOrNull(): SmlParameter? {
                 add(createSmlDescriptionAnnotationUse(description))
             }
         },
-        type = typeInDocs.toSmlType(),
+        type = type.toSmlType(),
         defaultValue = defaultValue?.toSmlExpression()
     )
 }
@@ -258,21 +263,34 @@ private fun String.snakeCaseToCamelCase(): String {
 
 // Type conversions ----------------------------------------------------------------------------------------------------
 
-internal fun String.toSmlType(): SmlAbstractType {
+internal fun PythonType?.toSmlType(): SmlAbstractType {
     return when (this) {
-        "bool" -> createSmlNamedType(
-            declaration = createSmlClass("Boolean")
-        )
-        "float" -> createSmlNamedType(
-            declaration = createSmlClass("Float")
-        )
-        "int" -> createSmlNamedType(
-            declaration = createSmlClass("Int")
-        )
-        "str" -> createSmlNamedType(
-            declaration = createSmlClass("String")
-        )
-        else -> createSmlNamedType(
+        is PythonNamedType -> {
+            createSmlNamedType(
+                declaration = createSmlClass(this.declaration!!.name)
+            )
+        }
+        is PythonStringifiedType -> {
+            when (this.string) {
+                "bool" -> createSmlNamedType(
+                    declaration = createSmlClass("Boolean")
+                )
+                "float" -> createSmlNamedType(
+                    declaration = createSmlClass("Float")
+                )
+                "int" -> createSmlNamedType(
+                    declaration = createSmlClass("Int")
+                )
+                "str" -> createSmlNamedType(
+                    declaration = createSmlClass("String")
+                )
+                else -> createSmlNamedType(
+                    declaration = createSmlClass("Any"),
+                    isNullable = true
+                )
+            }
+        }
+        null -> createSmlNamedType(
             declaration = createSmlClass("Any"),
             isNullable = true
         )
@@ -281,16 +299,20 @@ internal fun String.toSmlType(): SmlAbstractType {
 
 // Value conversions ---------------------------------------------------------------------------------------------------
 
-internal fun String.toSmlExpression(): SmlAbstractExpression? {
+internal fun PythonExpression.toSmlExpression(): SmlAbstractExpression? {
+    if (this !is PythonStringifiedExpression) {
+        return createSmlString("###invalid###$this###")
+    }
+
     return when {
-        isBlank() -> null
-        this == "False" -> createSmlBoolean(false)
-        this == "True" -> createSmlBoolean(true)
-        this == "None" -> createSmlNull()
-        isIntLiteral() -> createSmlInt(toInt())
-        isFloatLiteral() -> createSmlFloat(toDouble())
-        isStringLiteral() -> createSmlString(substring(1, length - 1))
-        else -> createSmlString("###invalid###$this###")
+        string.isBlank() -> null
+        string == "False" -> createSmlBoolean(false)
+        string == "True" -> createSmlBoolean(true)
+        string == "None" -> createSmlNull()
+        string.isIntLiteral() -> createSmlInt(string.toInt())
+        string.isFloatLiteral() -> createSmlFloat(string.toDouble())
+        string.isStringLiteral() -> createSmlString(string.substring(1, string.length - 1))
+        else -> createSmlString("###invalid###$string###")
     }
 }
 

server/src/main/kotlin/com/larsreimann/api_editor/model/editorAnnotations.kt

@@ -71,7 +71,7 @@ data class EnumAnnotation(val enumName: String, val pairs: List<EnumPair>) : Edi
 data class EnumPair(val stringValue: String, val instanceName: String)
 
 @Serializable
-data class GroupAnnotation(val groupName: String, val parameters: List<String>) : EditorAnnotation() {
+data class GroupAnnotation(val groupName: String, val parameters: MutableList<String>) : EditorAnnotation() {
 
     @Transient
     override val validTargets = FUNCTIONS
@@ -129,14 +129,14 @@ sealed class DefaultValue
 @Serializable
 class DefaultBoolean(val value: Boolean) : DefaultValue() {
     override fun toString(): String {
-        return "$value"
+        return value.toString().replaceFirstChar { it.uppercase() }
     }
 }
 
 @Serializable
 class DefaultNumber(val value: Double) : DefaultValue() {
     override fun toString(): String {
-        return "$value"
+        return value.toString()
     }
 }
 

server/src/main/kotlin/com/larsreimann/api_editor/mutable_model/ConverterToMutableModel.kt

@@ -36,12 +36,11 @@ fun convertClass(pythonClass: SerializablePythonClass): PythonClass {
     return PythonClass(
         name = pythonClass.name,
         decorators = pythonClass.decorators.toMutableList(),
-        superclasses = pythonClass.superclasses.toMutableList(),
+        superclasses = pythonClass.superclasses.map { PythonNamedType(PythonClass(name = it)) }.toMutableList(),
         attributes = pythonClass.attributes.map { convertAttribute(it) },
         methods = pythonClass.methods.map { convertFunction(it) },
         isPublic = pythonClass.isPublic,
         description = pythonClass.description,
-        fullDocstring = pythonClass.fullDocstring,
         annotations = pythonClass.annotations
     )
 }
@@ -57,7 +56,7 @@ fun convertEnum(pythonEnum: SerializablePythonEnum): PythonEnum {
 fun convertEnumInstance(pythonEnumInstance: SerializablePythonEnumInstance): PythonEnumInstance {
     return PythonEnumInstance(
         name = pythonEnumInstance.name,
-        value = pythonEnumInstance.value,
+        value = PythonStringifiedExpression(pythonEnumInstance.value),
         description = pythonEnumInstance.description,
         annotations = mutableListOf()
     )
@@ -71,8 +70,6 @@ fun convertFunction(pythonFunction: SerializablePythonFunction): PythonFunction
         results = pythonFunction.results.map { convertResult(it) },
         isPublic = pythonFunction.isPublic,
         description = pythonFunction.description,
-        fullDocstring = pythonFunction.fullDocstring,
-//        calledAfter = pythonFunction.calledAfter,
         isPure = pythonFunction.isPure,
         annotations = pythonFunction.annotations,
     )
@@ -81,9 +78,9 @@ fun convertFunction(pythonFunction: SerializablePythonFunction): PythonFunction
 fun convertAttribute(pythonAttribute: SerializablePythonAttribute): PythonAttribute {
     return PythonAttribute(
         name = pythonAttribute.name,
-        value = pythonAttribute.defaultValue,
+        type = PythonStringifiedType(pythonAttribute.typeInDocs),
+        value = pythonAttribute.defaultValue?.let { PythonStringifiedExpression(it) },
         isPublic = pythonAttribute.isPublic,
-        typeInDocs = pythonAttribute.typeInDocs,
         description = pythonAttribute.description,
         boundary = pythonAttribute.boundary,
         annotations = pythonAttribute.annotations,
@@ -93,9 +90,9 @@ fun convertAttribute(pythonAttribute: SerializablePythonAttribute): PythonAttrib
 fun convertParameter(pythonParameter: SerializablePythonParameter): PythonParameter {
     return PythonParameter(
         name = pythonParameter.name,
-        defaultValue = pythonParameter.defaultValue,
+        type = PythonStringifiedType(pythonParameter.typeInDocs),
+        defaultValue = pythonParameter.defaultValue?.let { PythonStringifiedExpression(it) },
         assignedBy = pythonParameter.assignedBy,
-        typeInDocs = pythonParameter.typeInDocs,
         description = pythonParameter.description,
         boundary = pythonParameter.boundary,
         annotations = pythonParameter.annotations,
@@ -105,8 +102,7 @@ fun convertParameter(pythonParameter: SerializablePythonParameter): PythonParame
 fun convertResult(pythonResult: SerializablePythonResult): PythonResult {
     return PythonResult(
         name = pythonResult.name,
-        type = pythonResult.type,
-        typeInDocs = pythonResult.typeInDocs,
+        type = PythonStringifiedType(pythonResult.type),
         description = pythonResult.description,
         boundary = pythonResult.boundary,
         annotations = pythonResult.annotations,