1.0.39 (#43)

* 1.0.39 * 1.0.39 * wip * misc * Update ActorOptTest.kt * misc * misc * fixes * AWSSDK2 * FailedToImplementException * Update DataStorage.kt * wip
SimiaCryptus · Nov 26, 2023 · 21f5894 · 21f5894
1 parent d68f0ff
commit 21f5894
Show file tree

Hide file tree

Showing 58 changed files with 1,354 additions and 1,583 deletions.
diff --git a/README.md b/README.md
@@ -76,18 +76,18 @@ Maven:
 <dependency>
     <groupId>com.simiacryptus</groupId>
     <artifactId>skyenet-webui</artifactId>
-    <version>1.0.38</version>
+    <version>1.0.39</version>
 </dependency>
 ```
 
 Gradle:
 
 ```groovy
-implementation group: 'com.simiacryptus', name: 'skyenet', version: '1.0.38'
+implementation group: 'com.simiacryptus', name: 'skyenet', version: '1.0.39'
 ```
 
 ```kotlin
-implementation("com.simiacryptus:skyenet:1.0.38")
+implementation("com.simiacryptus:skyenet:1.0.39")
 ```
 
 ### 🌟 To Use

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -28,14 +28,19 @@ kotlin {
 
 val junit_version = "5.10.1"
 val logback_version = "1.4.11"
+val jackson_version = "2.15.3"
 
 dependencies {
 
-    implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.35")
+    implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.36")
 
     implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.9")
     implementation(group = "commons-io", name = "commons-io", version = "2.15.0")
 
+    implementation(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = jackson_version)
+    implementation(group = "com.fasterxml.jackson.core", name = "jackson-annotations", version = jackson_version)
+    implementation(group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version = jackson_version)
+
     compileOnlyApi(kotlin("stdlib"))
     implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3")
     testImplementation(kotlin("stdlib"))
@@ -46,16 +51,16 @@ dependencies {
     compileOnlyApi(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit_version)
     compileOnlyApi(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junit_version)
 
-    compileOnlyApi(group = "com.google.cloud", name = "google-cloud-texttospeech", version = "2.28.0")
-    compileOnlyApi(group = "com.amazonaws", name = "aws-java-sdk", version = "1.12.587")
+    compileOnlyApi(platform("software.amazon.awssdk:bom:2.21.29"))
+    compileOnlyApi(group = "software.amazon.awssdk", name = "aws-sdk-java", version = "2.21.9")
+    testImplementation(platform("software.amazon.awssdk:bom:2.21.29"))
+    testImplementation(group = "software.amazon.awssdk", name = "aws-sdk-java", version = "2.21.9")
+
     compileOnlyApi(group = "ch.qos.logback", name = "logback-classic", version = logback_version)
     compileOnlyApi(group = "ch.qos.logback", name = "logback-core", version = logback_version)
-
-    testImplementation(group = "com.google.cloud", name = "google-cloud-texttospeech", version = "2.28.0")
-    testImplementation(group = "com.amazonaws", name = "aws-java-sdk", version = "1.12.587")
     testImplementation(group = "ch.qos.logback", name = "logback-classic", version = logback_version)
     testImplementation(group = "ch.qos.logback", name = "logback-core", version = logback_version)
-    //mockito
+
     testImplementation(group = "org.mockito", name = "mockito-core", version = "5.7.0")
 
 }

diff --git a/core/src/main/kotlin/com/simiacryptus/skyenet/core/Brain.kt b/core/src/main/kotlin/com/simiacryptus/skyenet/core/Brain.kt
diff --git a/...in/com/simiacryptus/skyenet/core/Heart.kt → .../simiacryptus/skyenet/core/Interpreter.kt b/...in/com/simiacryptus/skyenet/core/Heart.kt → .../simiacryptus/skyenet/core/Interpreter.kt
@@ -1,8 +1,9 @@
 package com.simiacryptus.skyenet.core
 
-interface Heart {
+interface Interpreter {
 
     fun getLanguage(): String
+    fun symbols() : Map<String, Any>
     fun run(code: String): Any?
     fun validate(code: String): Throwable?
 
@@ -18,7 +19,7 @@ interface Heart {
             fun square(x: Int): Int
         }
         @JvmStatic
-        fun test(factory: java.util.function.Function<Map<String, Any>, Heart>) {
+        fun test(factory: java.util.function.Function<Map<String, Any>, Interpreter>) {
             val testImpl = object : TestInterface {
                 override fun square(x: Int): Int = x * x
             }

diff --git a/core/src/main/kotlin/com/simiacryptus/skyenet/core/Mouth.kt b/core/src/main/kotlin/com/simiacryptus/skyenet/core/Mouth.kt
diff --git a/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/ActorSystem.kt b/core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/ActorSystem.kt
@@ -12,13 +12,13 @@ import com.simiacryptus.skyenet.core.util.JsonFunctionRecorder
 import java.io.File
 
 open class ActorSystem<T:Enum<*>>(
-    private val actors: Map<T, BaseActor<*>>,
+    private val actors: Map<T, BaseActor<*,*>>,
     val dataStorage: DataStorage,
     val user: User?,
     val session: Session
 ) {
     private val sessionDir = dataStorage.getSessionDir(user, session)
-    fun getActor(actor: T): BaseActor<*> {
+    fun getActor(actor: T): BaseActor<*,*> {
         val wrapper = getWrapper(actor.name)
         return when (val baseActor = actors[actor]) {
             null -> throw RuntimeException("No actor for $actor")