Skip to content
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

Ensure full model names #22

Merged
merged 4 commits into from
Dec 19, 2023
Merged

Ensure full model names #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
888297b
Add the fullModelName method
daymxn Dec 19, 2023
a531da2
Create changelog
daymxn Dec 19, 2023
650801b
Remove the models from the domain
daymxn Dec 19, 2023
4786338
Migrate model name to APIController
daymxn Dec 19, 2023
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
1 change: 1 addition & 0 deletions .changes/apparatus-bubble-direction-drug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"MINOR","changes":["Ensure model names are always prefixed with 'models/'"]}
14 changes: 12 additions & 2 deletions generativeai/src/main/java/com/google/ai/client/generativeai/internal/api/APIController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.json.Json

// TODO: Should these stay here or be moved elsewhere?
internal const val DOMAIN = "https://generativelanguage.googleapis.com/v1/models"
internal const val DOMAIN = "https://generativelanguage.googleapis.com/v1"

internal val JSON = Json {
ignoreUnknownKeys = true
Expand All @@ -63,9 +63,11 @@ internal val JSON = Json {
*/
internal class APIController(
private val key: String,
private val model: String,
model: String,
httpEngine: HttpClientEngine = OkHttp.create()
) {
private val model = fullModelName(model)

private val client =
HttpClient(httpEngine) {
install(HttpTimeout) {
Expand Down Expand Up @@ -106,6 +108,14 @@ internal class APIController(
}
}

/**
* Ensures the model name provided has a `models/` prefix
*
* Models must be prepended with the `models/` prefix when communicating with the backend.
*/
private fun fullModelName(name: String): String =
name.takeIf { it.startsWith("models/") } ?: "models/$name"

/**
* Makes a POST request to the specified [url] and returns a [Flow] of deserialized response objects
* of type [R]. The response is expected to be a stream of JSON objects that are parsed in real-time
Expand Down