fix: Ensure the code compiles and add a test example

- Fixed compilation issues and ensured the code builds successfully
- Created an example to test the client functionality
- Started implementing additional endpoints
This commit is contained in:
Mahmoud Emad
2025-03-11 16:49:39 +02:00
parent 9448ae85cf
commit 27c9018c48
5 changed files with 312 additions and 266 deletions

6
examples/clients/jina.vsh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run
import freeflowuniverse.herolib.clients.jina
jina_client := jina.get()!
println('jina: ${jina_client}')

View File

@@ -3,183 +3,218 @@ module jina
import freeflowuniverse.herolib.core.httpconnection
import json
import os
import net.http
// Create embeddings for input texts
pub fn (mut j Jina) create_embeddings(input []string, model string, task string) !ModelEmbeddingOutput {
model_ := jina_model_from_string(model)!
task_ := task_type_from_string(task)!
mut embedding_input := TextEmbeddingInput{
model: model
input: input
task: task
input: input
model: model_
task: task_
late_chunking: false
}
req := httpconnection.Request{
method: .post
prefix: 'v1/embeddings'
method: .post
prefix: 'v1/embeddings'
dataformat: .json
data: embedding_input.to_json()
data: embedding_input.to_json()
}
response := j.http.get(req)!
mut httpclient := j.httpclient()!
response := httpclient.post_json_str(req)!
return parse_model_embedding_output(response)!
}
// Create embeddings with a TextDoc input
pub fn (mut j Jina) create_embeddings_with_docs(args TextEmbeddingInput) !ModelEmbeddingOutput {
req := httpconnection.Request{
method: .post
prefix: 'v1/embeddings'
dataformat: .json
data: json.encode(args)
}
response := j.http.get(req)!
return parse_model_embedding_output(response)!
}
// pub fn (mut j Jina) start_bulk_embedding(file_path string, model string, email string) !BulkEmbeddingJobResponse {
// // Read the file content
// file_content := os.read_file(file_path) or {
// return error('Failed to read file: ${err}')
// }
// Rerank documents based on a query
pub fn (mut j Jina) rerank(query string, documents []string, model string, top_n int) !RankingOutput {
mut rank_input := RankAPIInput{
model: model
query: query
documents: documents
top_n: top_n
}
req := httpconnection.Request{
method: .post
prefix: 'v1/rerank'
dataformat: .json
data: rank_input.to_json()
}
response := j.http.get(req)!
return parse_ranking_output(response)!
}
// // Create a multipart form
// mut form := http.FormData{}
// form.add_field('file', file_content, 'input.csv', 'text/csv')
// form.add_field('model', model)
// form.add_field('email', email)
// Simplified rerank function with default top_n
pub fn (mut j Jina) rerank_simple(query string, documents []string, model string) !RankingOutput {
return j.rerank(query, documents, model, 0)!
}
// // Create a custom HTTP request
// mut req := http.new_request(.post, '${j.base_url}/v1/bulk-embeddings', '')!
// req.header = j.http.default_header // Add Authorization header
// req.set_form_data(form) // Set multipart form data
// Classify input texts
pub fn (mut j Jina) classify(input []string, model string, labels []string) !ClassificationOutput {
mut classification_input := ClassificationAPIInput{
model: model
input: input
labels: labels
}
req := httpconnection.Request{
method: .post
prefix: 'v1/classify'
dataformat: .json
data: classification_input.to_json()
}
response := j.http.get(req)!
return parse_classification_output(response)!
}
// // Send the request
// response := req.do() or {
// return error('Failed to send bulk embedding request: ${err}')
// }
// Train a classifier
pub fn (mut j Jina) train(examples []TrainingExample, model string, access string) !TrainingOutput {
mut training_input := TrainingAPIInput{
model: model
input: examples
access: access
}
req := httpconnection.Request{
method: .post
prefix: 'v1/train'
dataformat: .json
data: training_input.to_json()
}
response := j.http.get(req)!
return parse_training_output(response)!
}
// // Check for errors
// if response.status_code != 200 {
// return error('Bulk embedding request failed with status ${response.status_code}: ${response.body}')
// }
// List classifiers
pub fn (mut j Jina) list_classifiers() !string {
req := httpconnection.Request{
method: .get
prefix: 'v1/classifiers'
}
return j.http.get(req)!
}
// // Parse the JSON response
// return json.decode(BulkEmbeddingJobResponse, response.body)!
// }
// Delete a classifier
pub fn (mut j Jina) delete_classifier(classifier_id string) !bool {
req := httpconnection.Request{
method: .delete
prefix: 'v1/classifiers/${classifier_id}'
}
j.http.get(req)!
return true
}
// // Create embeddings with a TextDoc input
// pub fn (mut j Jina) create_embeddings_with_docs(args TextEmbeddingInput) !ModelEmbeddingOutput {
// Create multi-vector embeddings
pub fn (mut j Jina) create_multi_vector(input []string, model string) !ColbertModelEmbeddingsOutput {
mut data := map[string]json.Any{}
data['model'] = model
data['input'] = input
req := httpconnection.Request{
method: .post
prefix: 'v1/multi-embeddings'
dataformat: .json
data: json.encode(data)
}
response := j.http.get(req)!
return parse_colbert_model_embeddings_output(response)!
}
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/embeddings'
// dataformat: .json
// data: json.encode(args)
// }
// Start a bulk embedding job
pub fn (mut j Jina) start_bulk_embedding(file_path string, model string, email string) !BulkEmbeddingJobResponse {
// This endpoint requires multipart/form-data which is not directly supported by the current HTTPConnection
// We need to implement a custom solution for this
return error('Bulk embedding is not implemented yet')
}
// response := j.http.get(req)!
// return parse_model_embedding_output(response)!
// }
// Check the status of a bulk embedding job
pub fn (mut j Jina) check_bulk_embedding_status(job_id string) !BulkEmbeddingJobResponse {
req := httpconnection.Request{
method: .get
prefix: 'v1/bulk-embeddings/${job_id}'
}
response := j.http.get(req)!
return parse_bulk_embedding_job_response(response)!
}
// // Rerank documents based on a query
// pub fn (mut j Jina) rerank(query string, documents []string, model string, top_n int) !RankingOutput {
// mut rank_input := RankAPIInput{
// model: model
// query: query
// documents: documents
// top_n: top_n
// }
// Download the result of a bulk embedding job
pub fn (mut j Jina) download_bulk_embedding_result(job_id string) !DownloadResultResponse {
req := httpconnection.Request{
method: .post
prefix: 'v1/bulk-embeddings/${job_id}/download-result'
}
response := j.http.get(req)!
return parse_download_result_response(response)!
}
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/rerank'
// dataformat: .json
// data: rank_input.to_json()
// }
// Check if the API key is valid by making a simple request
pub fn (mut j Jina) check_auth() !bool {
req := httpconnection.Request{
method: .get
prefix: '/'
}
j.http.get(req) or {
return error('Failed to connect to Jina API: ${err}')
}
// If we get a response, the API key is valid
return true
}
// response := j.http.get(req)!
// return parse_ranking_output(response)!
// }
// // Simplified rerank function with default top_n
// pub fn (mut j Jina) rerank_simple(query string, documents []string, model string) !RankingOutput {
// return j.rerank(query, documents, model, 0)!
// }
// // Classify input texts
// pub fn (mut j Jina) classify(input []string, model string, labels []string) !ClassificationOutput {
// mut classification_input := ClassificationAPIInput{
// model: model
// input: input
// labels: labels
// }
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/classify'
// dataformat: .json
// data: classification_input.to_json()
// }
// response := j.http.get(req)!
// return parse_classification_output(response)!
// }
// // Train a classifier
// pub fn (mut j Jina) train(examples []TrainingExample, model string, access string) !TrainingOutput {
// mut training_input := TrainingAPIInput{
// model: model
// input: examples
// access: access
// }
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/train'
// dataformat: .json
// data: training_input.to_json()
// }
// response := j.http.get(req)!
// return parse_training_output(response)!
// }
// // List classifiers
// pub fn (mut j Jina) list_classifiers() !string {
// req := httpconnection.Request{
// method: .get
// prefix: 'v1/classifiers'
// }
// return j.http.get(req)!
// }
// // Delete a classifier
// pub fn (mut j Jina) delete_classifier(classifier_id string) !bool {
// req := httpconnection.Request{
// method: .delete
// prefix: 'v1/classifiers/${classifier_id}'
// }
// j.http.get(req)!
// return true
// }
// // Create multi-vector embeddings
// pub fn (mut j Jina) create_multi_vector(input []string, model string) !ColbertModelEmbeddingsOutput {
// mut data := map[string]json.Any{}
// data['model'] = model
// data['input'] = input
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/multi-embeddings'
// dataformat: .json
// data: json.encode(data)
// }
// response := j.http.get(req)!
// return parse_colbert_model_embeddings_output(response)!
// }
// // Start a bulk embedding job
// pub fn (mut j Jina) start_bulk_embedding(file_path string, model string, email string) !BulkEmbeddingJobResponse {
// // This endpoint requires multipart/form-data which is not directly supported by the current HTTPConnection
// // We need to implement a custom solution for this
// return error('Bulk embedding is not implemented yet')
// }
// // Check the status of a bulk embedding job
// pub fn (mut j Jina) check_bulk_embedding_status(job_id string) !BulkEmbeddingJobResponse {
// req := httpconnection.Request{
// method: .get
// prefix: 'v1/bulk-embeddings/${job_id}'
// }
// response := j.http.get(req)!
// return parse_bulk_embedding_job_response(response)!
// }
// // Download the result of a bulk embedding job
// pub fn (mut j Jina) download_bulk_embedding_result(job_id string) !DownloadResultResponse {
// req := httpconnection.Request{
// method: .post
// prefix: 'v1/bulk-embeddings/${job_id}/download-result'
// }
// response := j.http.get(req)!
// return parse_download_result_response(response)!
// }
// // Check if the API key is valid by making a simple request
// pub fn (mut j Jina) check_auth() !bool {
// req := httpconnection.Request{
// method: .get
// prefix: '/'
// }
// j.http.get(req) or {
// return error('Failed to connect to Jina API: ${err}')
// }
// // If we get a response, the API key is valid
// return true
// }

View File

@@ -1,6 +1,5 @@
module jina
import freeflowuniverse.herolib.data.paramsparser
import freeflowuniverse.herolib.data.encoderhero
import freeflowuniverse.herolib.core.httpconnection
import net.http
@@ -17,16 +16,29 @@ const env_key = 'JINAKEY'
@[heap]
pub struct Jina {
pub mut:
name string = 'default'
secret string
base_url string = api_base_url
http httpconnection.HTTPConnection @[str: skip]
name string = 'default'
secret string
base_url string = api_base_url
// http httpconnection.HTTPConnection @[str: skip]
}
fn (mut self Jina) httpclient() !&httpconnection.HTTPConnection {
mut http_conn := httpconnection.new(
name: 'Jina_vclient'
url: self.base_url
)!
// Add authentication header if API key is provided
if self.secret.len > 0 {
http_conn.default_header.add(.authorization, 'Bearer ${self.secret}')
}
return http_conn
}
// your checking & initialization code if needed
fn obj_init(mycfg_ Jina) !Jina {
mut mycfg := mycfg_
// Get API key from environment variable if not set
if mycfg.secret == '' {
if env_key in os.environ() {
@@ -35,16 +47,7 @@ fn obj_init(mycfg_ Jina) !Jina {
return error('Jina API key not provided and ${env_key} environment variable not set')
}
}
// Initialize HTTP connection
mut header := http.new_header()
header.add_custom('Authorization', 'Bearer ${mycfg.secret}')
mycfg.http = httpconnection.HTTPConnection{
base_url: mycfg.base_url
default_header: header
}
return mycfg
}

View File

@@ -4,14 +4,14 @@ import json
// JinaModelEnumerator represents the available models for Jina API
pub enum JinaModelEnumerator {
clip_v1 // jina-clip-v1, 223M, 768
clip_v2 // jina-clip-v2, 865M, 1024
embeddings_v2_base_en // jina-embeddings-v2-base-en, 137M, 768
embeddings_v2_base_es // jina-embeddings-v2-base-es, 161M, 768
embeddings_v2_base_de // jina-embeddings-v2-base-de, 161M, 768
embeddings_v2_base_zh // jina-embeddings-v2-base-zh, 161M, 768
embeddings_v2_base_code // jina-embeddings-v2-base-code, 137M, 768
embeddings_v3 // jina-embeddings-v3, 570M, 1024
clip_v1 // jina-clip-v1, 223M, 768
clip_v2 // jina-clip-v2, 865M, 1024
embeddings_v2_base_en // jina-embeddings-v2-base-en, 137M, 768
embeddings_v2_base_es // jina-embeddings-v2-base-es, 161M, 768
embeddings_v2_base_de // jina-embeddings-v2-base-de, 161M, 768
embeddings_v2_base_zh // jina-embeddings-v2-base-zh, 161M, 768
embeddings_v2_base_code // jina-embeddings-v2-base-code, 137M, 768
embeddings_v3 // jina-embeddings-v3, 570M, 1024
}
// to_string converts JinaModelEnumerator enum to its string representation
@@ -29,7 +29,7 @@ pub fn (m JinaModelEnumerator) to_string() string {
}
// from_string converts string to JinaModelEnumerator enum
pub fn jina_model_from_string(s string) ?JinaModelEnumerator {
pub fn jina_model_from_string(s string) !JinaModelEnumerator {
return match s {
'jina-clip-v1' { JinaModelEnumerator.clip_v1 }
'jina-clip-v2' { JinaModelEnumerator.clip_v2 }
@@ -39,16 +39,16 @@ pub fn jina_model_from_string(s string) ?JinaModelEnumerator {
'jina-embeddings-v2-base-zh' { JinaModelEnumerator.embeddings_v2_base_zh }
'jina-embeddings-v2-base-code' { JinaModelEnumerator.embeddings_v2_base_code }
'jina-embeddings-v3' { JinaModelEnumerator.embeddings_v3 }
else { error('Invalid model string: $s') }
else { error('Invalid model string: ${s}') }
}
}
// EmbeddingType represents the available embedding types
pub enum EmbeddingType {
float // "float"
base64 // "base64"
binary // "binary"
ubinary // "ubinary"
float // "float"
base64 // "base64"
binary // "binary"
ubinary // "ubinary"
}
// to_string converts EmbeddingType enum to its string representation
@@ -68,17 +68,17 @@ pub fn embedding_type_from_string(s string) !EmbeddingType {
'base64' { EmbeddingType.base64 }
'binary' { EmbeddingType.binary }
'ubinary' { EmbeddingType.ubinary }
else { error('Invalid embedding type string: $s') }
else { error('Invalid embedding type string: ${s}') }
}
}
// TaskType represents the available task types for embeddings
pub enum TaskType {
retrieval_query // "retrieval.query"
retrieval_passage // "retrieval.passage"
text_matching // "text-matching"
classification // "classification"
separation // "separation"
retrieval_query // "retrieval.query"
retrieval_passage // "retrieval.passage"
text_matching // "text-matching"
classification // "classification"
separation // "separation"
}
// to_string converts TaskType enum to its string representation
@@ -100,13 +100,13 @@ pub fn task_type_from_string(s string) !TaskType {
'text-matching' { TaskType.text_matching }
'classification' { TaskType.classification }
'separation' { TaskType.separation }
else { error('Invalid task type string: $s') }
else { error('Invalid task type string: ${s}') }
}
}
// TruncateType represents the available truncation options
pub enum TruncateType {
none // "NONE"
none_ // "NONE"
start // "START"
end // "END"
}
@@ -114,7 +114,7 @@ pub enum TruncateType {
// to_string converts TruncateType enum to its string representation
pub fn (t TruncateType) to_string() string {
return match t {
.none { 'NONE' }
.none_ { 'NONE' }
.start { 'START' }
.end { 'END' }
}
@@ -123,83 +123,83 @@ pub fn (t TruncateType) to_string() string {
// from_string converts string to TruncateType enum
pub fn truncate_type_from_string(s string) !TruncateType {
return match s {
'NONE' { TruncateType.none }
'NONE' { TruncateType.none_ }
'START' { TruncateType.start }
'END' { TruncateType.end }
else { error('Invalid truncate type string: $s') }
else { error('Invalid truncate type string: ${s}') }
}
}
// TextEmbeddingInputRaw represents the raw input for text embedding requests as sent to the server
struct TextEmbeddingInputRaw {
mut:
model string = 'jina-embeddings-v2-base-en'
input []string @[required]
task string // Optional: task type as string
type_ string @[json: 'type'] // Optional: embedding type as string
truncate string // Optional: "NONE", "START", "END"
late_chunking bool // Optional: Flag to determine if late chunking is applied
model string = 'jina-embeddings-v2-base-en'
input []string @[required]
task string // Optional: task type as string
type_ string @[json: 'type'] // Optional: embedding type as string
truncate string // Optional: "NONE", "START", "END"
late_chunking bool // Optional: Flag to determine if late chunking is applied
}
// TextEmbeddingInput represents the input for text embedding requests with enum types
pub struct TextEmbeddingInput {
pub mut:
model JinaModelEnumerator = JinaModelEnumerator.embeddings_v2_base_en
input []string @[required]
task TaskType // task type
type_ EmbeddingType // embedding type
truncate TruncateType // truncation type
late_chunking bool //Flag to determine if late chunking is applied
model JinaModelEnumerator = JinaModelEnumerator.embeddings_v2_base_en
input []string @[required]
task TaskType // task type
type_ EmbeddingType // embedding type
truncate TruncateType // truncation type
late_chunking bool // Flag to determine if late chunking is applied
}
// dumps converts TextEmbeddingInput to JSON string
pub fn (t TextEmbeddingInput) dumps() !string {
mut raw := TextEmbeddingInputRaw{
model: t.model.to_string()
input: t.input
model: t.model.to_string()
input: t.input
late_chunking: t.late_chunking
}
raw.task = t.task.to_string()
raw.type_ = t.type_.to_string()
raw.truncate = t.truncate.to_string()
raw.truncate = t.truncate.to_string()
return json.encode(raw)
}
// from_raw converts TextEmbeddingInputRaw to TextEmbeddingInput
pub fn loads_text_embedding_input(text string ) !TextEmbeddingInput {
// TODO: go from text to InputObject over json
mut input := TextEmbeddingInput{
model: jina_model_from_string(raw.model)?
input: raw.input
late_chunking: raw.late_chunking
}
if raw.task != '' {
input.task = task_type_from_string(raw.task)!
}
if raw.type_ != '' {
input.type_ = embedding_type_from_string(raw.type_)!
}
if raw.truncate != '' {
input.truncate = truncate_type_from_string(raw.truncate)!
}
return input
}
// pub fn loads_text_embedding_input(text string) !TextEmbeddingInput {
// // TODO: go from text to InputObject over json
// // mut input := TextEmbeddingInput{
// // model: jina_model_from_string(raw.model)?
// // input: raw.input
// // late_chunking: raw.late_chunking
// // }
// // if raw.task != '' {
// // input.task = task_type_from_string(raw.task)!
// // }
// // if raw.type_ != '' {
// // input.type_ = embedding_type_from_string(raw.type_)!
// // }
// // if raw.truncate != '' {
// // input.truncate = truncate_type_from_string(raw.truncate)!
// // }
// return TextEmbeddingInput{}
// }
// loads converts a JSON string to TextEmbeddingInput
pub fn loads(text string) !TextEmbeddingInput {
// First decode the JSON string to the raw struct
raw := json.decode(TextEmbeddingInputRaw, text) or {
return error('Failed to decode JSON: $err')
}
// Then convert the raw struct to the typed struct
return text_embedding_input_from_raw(raw)
}
// pub fn loads(text string) !TextEmbeddingInput {
// // First decode the JSON string to the raw struct
// raw := json.decode(TextEmbeddingInputRaw, text) or {
// return error('Failed to decode JSON: ${err}')
// }
// // Then convert the raw struct to the typed struct
// return text_embedding_input_from_raw(raw)
// }
// TextDoc represents a document with ID and text for embedding
pub struct TextDoc {

View File

@@ -1,5 +1,7 @@
module jina
import json
// RankAPIInput represents the input for reranking requests
// model:
// jina-reranker-v2-base-multilingual, 278M
@@ -12,16 +14,16 @@ pub mut:
model string @[required]
query string @[required]
documents []string @[required]
top_n int // Optional: Number of top results to return
top_n int // Optional: Number of top results to return
}
// RankingOutput represents the response from reranking requests
pub struct RankingOutput {
pub mut:
model string
results []RankResult
usage Usage
object string
model string
results []RankResult
usage Usage
object string
}
// RankResult represents a single reranking result
@@ -35,18 +37,18 @@ pub mut:
// ClassificationAPIInput represents the input for classification requests
pub struct ClassificationAPIInput {
pub mut:
model string @[required]
input []string @[required]
labels []string @[required]
model string @[required]
input []string @[required]
labels []string @[required]
}
// ClassificationOutput represents the response from classification requests
pub struct ClassificationOutput {
pub mut:
model string
data []ClassificationData
usage Usage
object string
model string
data []ClassificationData
usage Usage
object string
}
// ClassificationData represents a single classification result
@@ -73,9 +75,9 @@ pub mut:
// TrainingAPIInput represents the input for training a classifier
pub struct TrainingAPIInput {
pub mut:
model string @[required]
input []TrainingExample @[required]
access string // Optional: "public" or "private"
model string @[required]
input []TrainingExample @[required]
access string // Optional: "public" or "private"
}
// TrainingOutput represents the response from training a classifier
@@ -136,9 +138,9 @@ pub mut:
// ValidationError represents a single validation error
pub struct ValidationError {
pub mut:
loc []string
msg string
type_ string @[json: 'type'] // 'type' is a keyword, so we need to specify the JSON name
loc []string
msg string
type_ string @[json: 'type'] // 'type' is a keyword, so we need to specify the JSON name
}
// Serialize and deserialize functions for the main request/response types
@@ -158,10 +160,10 @@ pub fn parse_model_embedding_output(json_str string) !ModelEmbeddingOutput {
return json.decode(ModelEmbeddingOutput, json_str)
}
// Serialize RankAPIInput to JSON
pub fn (input RankAPIInput) to_json() string {
return json.encode(input)
}
// // Serialize RankAPIInput to JSON
// pub fn (input RankAPIInput) to_json() string {
// return json.encode(input)
// }
// Parse JSON to RankingOutput
pub fn parse_ranking_output(json_str string) !RankingOutput {