Skip to content

Changed all these to reagent_systems, MANUALLY #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThyFriendlyFox wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed all these to reagent_systems, MANUALLY #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
124 changes: 124 additions & 0 deletions .idea/caches/deviceStreaming.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Spark/.idea/AndroidProjectSystem.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Spark/.idea/deviceManager.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Spark/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ plugins {
}

android {
namespace = "com.example.spark"
namespace = "com.reagent_systems.spark"
compileSdk = 35

lint {
disable.add("NullSafeMutableLiveData")
}

defaultConfig {
applicationId = "com.example.spark"
applicationId = "com.reagent_systems.spark"
minSdk = 26
targetSdk = 35
versionCode = 7
versionName = "1.0.6"
versionCode = 8
versionName = "1.0.8"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Binary file added Spark/app/release/app-release.aab
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Spark/app/src/androidTest/java/com/example/spark/ExampleInstrumentedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark
package com.reagent_systems.spark

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
32 changes: 16 additions & 16 deletions ...in/java/com/example/spark/MainActivity.kt → ...com/reagent_systems/spark/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark
package com.reagent_systems.spark

import android.content.Context
import android.content.Intent
Expand All @@ -22,20 +22,20 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.example.spark.data.repository.LLMRepositoryImpl
import com.example.spark.data.repository.UpdateRepositoryImpl
import com.example.spark.network.server.ApiServer
import com.example.spark.presentation.ui.screens.*
import com.example.spark.presentation.ui.components.ModelLoadingDialog
import com.example.spark.presentation.ui.components.HuggingFaceTokenDialog
import com.example.spark.presentation.ui.components.HuggingFaceSettingsDialog
import com.example.spark.presentation.ui.components.CustomUrlDownloadDialog
import com.example.spark.presentation.ui.components.DeleteModelConfirmationDialog
import com.example.spark.presentation.ui.components.UpdateDialog
import com.example.spark.presentation.ui.components.ChangelogDialog
import com.example.spark.presentation.viewmodel.MainViewModel
import com.example.spark.ui.theme.SparkTheme
import com.example.spark.utils.HuggingFaceAuth
import com.reagent_systems.spark.data.repository.LLMRepositoryImpl
import com.reagent_systems.spark.data.repository.UpdateRepositoryImpl
import com.reagent_systems.spark.network.server.ApiServer
import com.reagent_systems.spark.presentation.ui.screens.*
import com.reagent_systems.spark.presentation.ui.components.ModelLoadingDialog
import com.reagent_systems.spark.presentation.ui.components.HuggingFaceTokenDialog
import com.reagent_systems.spark.presentation.ui.components.HuggingFaceSettingsDialog
import com.reagent_systems.spark.presentation.ui.components.CustomUrlDownloadDialog
import com.reagent_systems.spark.presentation.ui.components.DeleteModelConfirmationDialog
import com.reagent_systems.spark.presentation.ui.components.UpdateDialog
import com.reagent_systems.spark.presentation.ui.components.ChangelogDialog
import com.reagent_systems.spark.presentation.viewmodel.MainViewModel
import com.reagent_systems.spark.ui.theme.SparkTheme
import com.reagent_systems.spark.utils.HuggingFaceAuth

class MainActivity : ComponentActivity() {
private lateinit var viewModel: MainViewModel
Expand Down Expand Up @@ -329,4 +329,4 @@ data class BottomNavItem(
val route: String,
val title: String,
val icon: androidx.compose.ui.graphics.vector.ImageVector
)
)
12 changes: 6 additions & 6 deletions ...park/data/repository/LLMRepositoryImpl.kt → ...park/data/repository/LLMRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.example.spark.data.repository
package com.reagent_systems.spark.data.repository

import android.content.Context
import android.util.Log
import com.example.spark.domain.models.*
import com.example.spark.domain.repository.LLMRepository
import com.example.spark.utils.HuggingFaceAuth
import com.reagent_systems.spark.domain.models.*
import com.reagent_systems.spark.domain.repository.LLMRepository
import com.reagent_systems.spark.utils.HuggingFaceAuth
import com.google.mediapipe.tasks.genai.llminference.LlmInference
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
Expand Down Expand Up @@ -445,7 +445,7 @@ class LLMRepositoryImpl(
Result.failure(e)
}
}

override suspend fun downloadModel(
availableModel: AvailableModel,
onProgress: (Float) -> Unit
Expand Down Expand Up @@ -609,4 +609,4 @@ class LLMRepositoryImpl(
private fun savePersistedChatSessions() {
persistenceManager.savePersistedChatSessions(chatSessions.toList())
}
}
}
8 changes: 4 additions & 4 deletions ...k/data/repository/ModelDownloadManager.kt → ...k/data/repository/ModelDownloadManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.example.spark.data.repository
package com.reagent_systems.spark.data.repository

import android.content.Context
import android.util.Log
import com.example.spark.domain.models.AvailableModel
import com.example.spark.domain.models.LLMModel
import com.example.spark.utils.HuggingFaceAuth
import com.reagent_systems.spark.domain.models.AvailableModel
import com.reagent_systems.spark.domain.models.LLMModel
import com.reagent_systems.spark.utils.HuggingFaceAuth
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.coroutines.currentCoroutineContext
Expand Down
2 changes: 1 addition & 1 deletion ...spark/data/repository/ModelFileManager.kt → ...spark/data/repository/ModelFileManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.data.repository
package com.reagent_systems.spark.data.repository

import android.content.Context
import android.net.Uri
Expand Down
6 changes: 3 additions & 3 deletions ...ata/repository/ModelPersistenceManager.kt → ...ata/repository/ModelPersistenceManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.example.spark.data.repository
package com.reagent_systems.spark.data.repository

import android.content.Context
import android.util.Log
import com.example.spark.domain.models.LLMModel
import com.example.spark.domain.models.ChatSession
import com.reagent_systems.spark.domain.models.LLMModel
import com.reagent_systems.spark.domain.models.ChatSession
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import java.io.File
Expand Down
6 changes: 3 additions & 3 deletions ...k/data/repository/UpdateRepositoryImpl.kt → ...k/data/repository/UpdateRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.data.repository
package com.reagent_systems.spark.data.repository

import android.content.Context
import android.content.Intent
Expand All @@ -7,8 +7,8 @@ import android.net.Uri
import android.os.Build
import android.util.Log
import androidx.core.content.FileProvider
import com.example.spark.domain.models.*
import com.example.spark.domain.repository.UpdateRepository
import com.reagent_systems.spark.domain.models.*
import com.reagent_systems.spark.domain.repository.UpdateRepository
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
2 changes: 1 addition & 1 deletion ...m/example/spark/domain/models/LLMModel.kt → ...t_systems/spark/domain/models/LLMModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.domain.models
package com.reagent_systems.spark.domain.models

import kotlinx.serialization.Serializable

Expand Down
2 changes: 1 addition & 1 deletion ...ample/spark/domain/models/UpdateModels.kt → ...stems/spark/domain/models/UpdateModels.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.domain.models
package com.reagent_systems.spark.domain.models

import kotlinx.serialization.Serializable

Expand Down
15 changes: 8 additions & 7 deletions .../spark/domain/repository/LLMRepository.kt → .../spark/domain/repository/LLMRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.example.spark.domain.repository
package com.reagent_systems.spark.domain.repository

import com.example.spark.domain.models.LLMModel
import com.example.spark.domain.models.ChatMessage
import com.example.spark.domain.models.ChatSession
import com.example.spark.domain.models.ModelConfig
import com.reagent_systems.spark.domain.models.LLMModel
import com.reagent_systems.spark.domain.models.ChatMessage
import com.reagent_systems.spark.domain.models.ChatSession
import com.reagent_systems.spark.domain.models.ModelConfig
// It might be beneficial to add: import com.reagent_systems.spark.domain.models.AvailableModel;
import kotlinx.coroutines.flow.Flow

interface LLMRepository {
Expand Down Expand Up @@ -41,7 +42,7 @@ interface LLMRepository {

// Model downloading
suspend fun downloadModel(
availableModel: com.example.spark.domain.models.AvailableModel,
availableModel: com.reagent_systems.spark.domain.models.AvailableModel, // Corrected package
onProgress: (Float) -> Unit
): Result<LLMModel>

Expand All @@ -58,4 +59,4 @@ interface LLMRepository {

// Model deletion
suspend fun deleteModel(modelId: String): Result<Unit>
}
}
8 changes: 4 additions & 4 deletions ...ark/domain/repository/UpdateRepository.kt → ...ark/domain/repository/UpdateRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.spark.domain.repository
package com.reagent_systems.spark.domain.repository

import com.example.spark.domain.models.UpdateCheckResult
import com.example.spark.domain.models.UpdateInfo
import com.reagent_systems.spark.domain.models.UpdateCheckResult
import com.reagent_systems.spark.domain.models.UpdateInfo
import kotlinx.coroutines.flow.Flow

/**
Expand Down Expand Up @@ -32,7 +32,7 @@ interface UpdateRepository {
/**
* Get update status as a flow
*/
fun getUpdateStatusFlow(): Flow<com.example.spark.domain.models.UpdateStatus>
fun getUpdateStatusFlow(): Flow<com.reagent_systems.spark.domain.models.UpdateStatus>

/**
* Check if an update is currently being downloaded
Expand Down
2 changes: 1 addition & 1 deletion ...om/example/spark/network/api/ApiModels.kt → ...nt_systems/spark/network/api/ApiModels.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.network.api
package com.reagent_systems.spark.network.api

import kotlinx.serialization.Serializable

Expand Down
8 changes: 4 additions & 4 deletions ...example/spark/network/server/ApiServer.kt → ...systems/spark/network/server/ApiServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.example.spark.network.server
package com.reagent_systems.spark.network.server

import android.content.Context
import android.util.Log
import com.example.spark.domain.repository.LLMRepository
import com.example.spark.domain.models.ModelConfig
import com.example.spark.network.api.*
import com.reagent_systems.spark.domain.repository.LLMRepository
import com.reagent_systems.spark.domain.models.ModelConfig
import com.reagent_systems.spark.network.api.*
import io.ktor.http.*
import io.ktor.serialization.kotlinx.json.*
import io.ktor.server.application.*
Expand Down
6 changes: 3 additions & 3 deletions ...ation/ui/components/AvailableModelCard.kt → ...ation/ui/components/AvailableModelCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
Expand All @@ -13,8 +13,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.example.spark.domain.models.AvailableModel
import com.example.spark.domain.models.ModelType
import com.reagent_systems.spark.domain.models.AvailableModel
import com.reagent_systems.spark.domain.models.ModelType

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
4 changes: 2 additions & 2 deletions .../presentation/ui/components/ChatBubble.kt → .../presentation/ui/components/ChatBubble.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
Expand All @@ -16,7 +16,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Done
import androidx.compose.material.icons.filled.Close
import com.example.spark.domain.models.ChatMessage
import com.reagent_systems.spark.domain.models.ChatMessage
import java.text.SimpleDateFormat
import java.util.*
import android.widget.Toast
Expand Down
4 changes: 2 additions & 2 deletions ...tion/ui/components/ChatSessionsSidebar.kt → ...tion/ui/components/ChatSessionsSidebar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
Expand All @@ -13,7 +13,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import com.example.spark.domain.models.ChatSession
import com.reagent_systems.spark.domain.models.ChatSession

@Composable
fun ChatSessionsSidebar(
Expand Down
2 changes: 1 addition & 1 deletion .../ui/components/CustomUrlDownloadDialog.kt → .../ui/components/CustomUrlDownloadDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand Down
2 changes: 1 addition & 1 deletion ...mponents/DeleteModelConfirmationDialog.kt → ...mponents/DeleteModelConfirmationDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand Down
2 changes: 1 addition & 1 deletion ...i/components/HuggingFaceSettingsDialog.kt → ...i/components/HuggingFaceSettingsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
Expand Down
2 changes: 1 addition & 1 deletion ...n/ui/components/HuggingFaceTokenDialog.kt → ...n/ui/components/HuggingFaceTokenDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.text.selection.SelectionContainer
Expand Down
4 changes: 2 additions & 2 deletions ...k/presentation/ui/components/ModelCard.kt → ...k/presentation/ui/components/ModelCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
Expand All @@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.example.spark.domain.models.LLMModel
import com.reagent_systems.spark.domain.models.LLMModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
2 changes: 1 addition & 1 deletion ...ation/ui/components/ModelLoadingDialog.kt → ...ation/ui/components/ModelLoadingDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.animation.core.*
import androidx.compose.foundation.layout.*
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/ui/components/SharedComponents.kt → ...ntation/ui/components/SharedComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.layout.*
import androidx.compose.material3.*
Expand Down
2 changes: 1 addition & 1 deletion ...entation/ui/components/TypingIndicator.kt → ...entation/ui/components/TypingIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.animation.core.*
import androidx.compose.foundation.background
Expand Down
8 changes: 4 additions & 4 deletions ...resentation/ui/components/UpdateDialog.kt → ...resentation/ui/components/UpdateDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spark.presentation.ui.components
package com.reagent_systems.spark.presentation.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
Expand All @@ -19,9 +19,9 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.example.spark.domain.models.ChangeType
import com.example.spark.domain.models.ChangelogItem
import com.example.spark.domain.models.UpdateInfo
import com.reagent_systems.spark.domain.models.ChangeType
import com.reagent_systems.spark.domain.models.ChangelogItem
import com.reagent_systems.spark.domain.models.UpdateInfo
import androidx.compose.ui.platform.LocalContext
import android.content.pm.PackageManager

Expand Down
Loading