Skip to content

Commit 64e79ac

Browse files
committed
wip
1 parent 4b1430e commit 64e79ac

26 files changed

+73
-721
lines changed

core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/ActorSystem.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/CodingActor.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,6 @@ Correct the code and try again.
457457
}
458458
}
459459

460-
fun String.upperSnakeCase(locale: Locale = Locale.getDefault()): String =
461-
fromPascalCase().split(" ").map { it.trim() }.filter { it.isNotEmpty() }.joinToString("_") {
462-
it.replaceFirstChar { c ->
463-
when {
464-
c.isLowerCase() -> c.titlecase(locale)
465-
else -> c.toString()
466-
}
467-
}
468-
}.uppercase(locale)
469-
470460
fun String.imports(): List<String> {
471461
return this.split("\n").filter { it.trim().startsWith("import ") }.distinct().sorted()
472462
}

core/src/main/kotlin/com/simiacryptus/skyenet/core/actors/ParsedResponse.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ abstract class ParsedResponse<T>(val clazz: Class<T>) {
44
abstract val text: String
55
abstract val obj: T
66
override fun toString() = text
7-
open fun <V> map(cls: Class<V>, fn: (T) -> V): ParsedResponse<V> = MappedResponse(cls, this.clazz, fn, this)
7+
open fun <V> map(cls: Class<V>, fn: (T) -> V): ParsedResponse<V> = MappedResponse(cls, fn, this)
88
}
99

1010
class MappedResponse<F, T>(
1111
clazz: Class<T>,
12-
private val cls: Class<F>,
1312
private val fn: (F) -> T,
1413
private val inner: ParsedResponse<F>
1514
) : ParsedResponse<T>(clazz) {
@@ -19,6 +18,6 @@ class MappedResponse<F, T>(
1918
get() = fn(inner.obj)
2019

2120
override fun <V> map(cls: Class<V>, fn: (T) -> V): ParsedResponse<V> {
22-
return MappedResponse(cls, this.clazz, fn, this)
21+
return MappedResponse(cls, fn, this)
2322
}
2423
}

core/src/main/kotlin/com/simiacryptus/skyenet/core/platform/hsql/HSQLUsageManager.kt

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.simiacryptus.skyenet.core.platform.hsql
22

3-
import com.google.common.util.concurrent.AtomicDouble
43
import com.simiacryptus.jopenai.models.ApiModel
54
import com.simiacryptus.jopenai.models.ChatModel
65
import com.simiacryptus.jopenai.models.OpenAIModel
@@ -12,7 +11,6 @@ import java.sql.Connection
1211
import java.sql.DriverManager
1312
import java.sql.ResultSet
1413
import java.sql.Timestamp
15-
import java.util.concurrent.atomic.AtomicLong
1614

1715
class HSQLUsageManager(private val dbFile: File) : UsageInterface {
1816

@@ -44,17 +42,6 @@ class HSQLUsageManager(private val dbFile: File) : UsageInterface {
4442
}
4543

4644

47-
private fun updateSchema() {
48-
log.info("Updating database schema if needed")
49-
// Add schema update logic here if needed
50-
}
51-
52-
private fun deleteSchema() {
53-
log.info("Deleting database schema if exists")
54-
connection.createStatement().executeUpdate("DROP TABLE IF EXISTS usage")
55-
log.debug("Schema deleted")
56-
}
57-
5845
override fun incrementUsage(session: Session, apiKey: String?, model: OpenAIModel, tokens: ApiModel.Usage) {
5946
try {
6047
log.debug("Incrementing usage for session: ${session.sessionId}, apiKey: $apiKey, model: ${model.modelName}")
@@ -103,27 +90,6 @@ class HSQLUsageManager(private val dbFile: File) : UsageInterface {
10390
connection.createStatement().executeUpdate("DELETE FROM usage")
10491
}
10592

106-
private fun getUsageValues(usageKey: UsageInterface.UsageKey): UsageInterface.UsageValues {
107-
log.debug("Getting usage values for session: ${usageKey.session.sessionId}, apiKey: ${usageKey.apiKey}, model: ${usageKey.model.modelName}")
108-
val statement = connection.prepareStatement(
109-
"""
110-
SELECT COALESCE(SUM(prompt_tokens), 0), COALESCE(SUM(completion_tokens), 0), COALESCE(SUM(cost), 0)
111-
FROM usage
112-
WHERE session_id = ? AND api_key = ? AND model = ?
113-
"""
114-
)
115-
statement.setString(1, usageKey.session.sessionId)
116-
statement.setString(2, usageKey.apiKey ?: "")
117-
statement.setString(3, usageKey.model.toString())
118-
val resultSet = statement.executeQuery()
119-
resultSet.next()
120-
return UsageInterface.UsageValues(
121-
AtomicLong(resultSet.getLong(1)),
122-
AtomicLong(resultSet.getLong(2)),
123-
AtomicDouble(resultSet.getDouble(3))
124-
)
125-
}
126-
12793
private fun saveUsageValues(usageKey: UsageInterface.UsageKey, usageValues: UsageInterface.UsageValues) {
12894
log.debug("Saving usage values for session: ${usageKey.session.sessionId}, apiKey: ${usageKey.apiKey}, model: ${usageKey.model.modelName}")
12995
val statement = connection.prepareStatement(

0 commit comments

Comments
 (0)