phoenix-oss/llama-stack
1
0
Fork 0
forked from phoenix-oss/llama-stack-mirror
Code Pull requests Releases Packages 2 Activity Actions

LocalInferenceImpl update for LS013 (#1242)

Browse source 
# What does this PR do?
[Provide a short summary of what this PR does and why. Link to relevant
issues if applicable.]

[//]: # (If resolving an issue, uncomment and update the line below)
[//]: # (Closes #[issue-number])

## Test Plan
[Describe the tests you ran to verify your changes with result
summaries. *Provide clear instructions so the plan can be easily
re-executed.*]

[//]: # (## Documentation)
This commit is contained in:
Jeff Tang 2025-02-25 09:58:34 -08:00 • committed by GitHub
parent dc3c881ffe
commit 73a0c7a0e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

58
llama_stack/providers/inline/ios/inference/LocalInferenceImpl/LocalInference.swift
View file

@ -45,7 +45,7 @@ public class LocalInference: Inference {
var tokens: [String] = [] var tokens: [String] = []
let prompt = try encodeDialogPrompt(messages: prepareMessages(request: request)) let prompt = try encodeDialogPrompt(messages: prepareMessages(request: request))
var stopReason: Components.Schemas.StopReason? = nil var stopReason: Components.Schemas.CompletionMessage.stop_reasonPayload? = nil
var buffer = "" var buffer = ""
var ipython = false var ipython = false
var echoDropped = false var echoDropped = false
@ -69,13 +69,13 @@ public class LocalInference: Inference {
continuation.yield( continuation.yield(
Components.Schemas.ChatCompletionResponseStreamChunk( Components.Schemas.ChatCompletionResponseStreamChunk(
event: Components.Schemas.ChatCompletionResponseEvent( event: Components.Schemas.ChatCompletionResponseEvent(
event_type: .progress,
delta: .tool_call(Components.Schemas.ToolCallDelta( delta: .tool_call(Components.Schemas.ToolCallDelta(
parse_status: Components.Schemas.ToolCallParseStatus.started, _type: Components.Schemas.ToolCallDelta._typePayload.tool_call,
tool_call: .case1(""), tool_call: .case1(""),
_type: Components.Schemas.ToolCallDelta._typePayload.tool_call parse_status: Components.Schemas.ToolCallDelta.parse_statusPayload.started
) )
), )
event_type: .progress
) )
) )
) )
@ -89,9 +89,9 @@ public class LocalInference: Inference {
var text = "" var text = ""
if token == "<|eot_id|>" { if token == "<|eot_id|>" {
stopReason = Components.Schemas.StopReason.end_of_turn stopReason = Components.Schemas.CompletionMessage.stop_reasonPayload.end_of_turn
} else if token == "<|eom_id|>" { } else if token == "<|eom_id|>" {
stopReason = Components.Schemas.StopReason.end_of_message stopReason = Components.Schemas.CompletionMessage.stop_reasonPayload.end_of_message
} else { } else {
text = token text = token
} }
@ -99,14 +99,15 @@ public class LocalInference: Inference {
var delta: Components.Schemas.ContentDelta var delta: Components.Schemas.ContentDelta
if ipython { if ipython {
delta = .tool_call(Components.Schemas.ToolCallDelta( delta = .tool_call(Components.Schemas.ToolCallDelta(
parse_status: .in_progress, _type: .tool_call,
tool_call: .case1(text), tool_call: .case1(text),
_type: .tool_call parse_status: .in_progress
)) ))
} else { } else {
delta = .text(Components.Schemas.TextDelta( delta = .text(Components.Schemas.TextDelta(
text: text, _type: Components.Schemas.TextDelta._typePayload.text,
_type: Components.Schemas.TextDelta._typePayload.text) text: text
)
) )
} }
@ -114,8 +115,8 @@ public class LocalInference: Inference {
continuation.yield( continuation.yield(
Components.Schemas.ChatCompletionResponseStreamChunk( Components.Schemas.ChatCompletionResponseStreamChunk(
event: Components.Schemas.ChatCompletionResponseEvent( event: Components.Schemas.ChatCompletionResponseEvent(
delta: delta, event_type: .progress,
event_type: .progress delta: delta
) )
) )
) )
@ -123,41 +124,41 @@ public class LocalInference: Inference {
} }
if stopReason == nil { if stopReason == nil {
stopReason = Components.Schemas.StopReason.out_of_tokens stopReason = Components.Schemas.CompletionMessage.stop_reasonPayload.out_of_tokens
} }
let message = decodeAssistantMessage(tokens: tokens.joined(), stopReason: stopReason!) let message = decodeAssistantMessage(tokens: tokens.joined(), stopReason: stopReason!)
// TODO: non-streaming support // TODO: non-streaming support
let didParseToolCalls = message.tool_calls.count > 0 let didParseToolCalls = message.tool_calls?.count ?? 0 > 0
if ipython && !didParseToolCalls { if ipython && !didParseToolCalls {
continuation.yield( continuation.yield(
Components.Schemas.ChatCompletionResponseStreamChunk( Components.Schemas.ChatCompletionResponseStreamChunk(
event: Components.Schemas.ChatCompletionResponseEvent( event: Components.Schemas.ChatCompletionResponseEvent(
event_type: .progress,
delta: .tool_call(Components.Schemas.ToolCallDelta( delta: .tool_call(Components.Schemas.ToolCallDelta(
parse_status: Components.Schemas.ToolCallParseStatus.failed, _type: Components.Schemas.ToolCallDelta._typePayload.tool_call,
tool_call: .case1(""), tool_call: .case1(""),
_type: Components.Schemas.ToolCallDelta._typePayload.tool_call parse_status: Components.Schemas.ToolCallDelta.parse_statusPayload.failed
) )
), )
event_type: .progress
) )
// TODO: stopReason // TODO: stopReason
) )
) )
} }
for toolCall in message.tool_calls { for toolCall in message.tool_calls! {
continuation.yield( continuation.yield(
Components.Schemas.ChatCompletionResponseStreamChunk( Components.Schemas.ChatCompletionResponseStreamChunk(
event: Components.Schemas.ChatCompletionResponseEvent( event: Components.Schemas.ChatCompletionResponseEvent(
event_type: .progress,
delta: .tool_call(Components.Schemas.ToolCallDelta( delta: .tool_call(Components.Schemas.ToolCallDelta(
parse_status: Components.Schemas.ToolCallParseStatus.succeeded, _type: Components.Schemas.ToolCallDelta._typePayload.tool_call,
tool_call: Components.Schemas.ToolCallDelta.tool_callPayload.ToolCall(toolCall), tool_call: Components.Schemas.ToolCallDelta.tool_callPayload.ToolCall(toolCall),
_type: Components.Schemas.ToolCallDelta._typePayload.tool_call parse_status: Components.Schemas.ToolCallDelta.parse_statusPayload.succeeded
) )
), )
event_type: .progress
) )
// TODO: stopReason // TODO: stopReason
) )
@ -167,11 +168,12 @@ public class LocalInference: Inference {
continuation.yield( continuation.yield(
Components.Schemas.ChatCompletionResponseStreamChunk( Components.Schemas.ChatCompletionResponseStreamChunk(
event: Components.Schemas.ChatCompletionResponseEvent( event: Components.Schemas.ChatCompletionResponseEvent(
event_type: .complete,
delta: .text(Components.Schemas.TextDelta( delta: .text(Components.Schemas.TextDelta(
text: "", _type: Components.Schemas.TextDelta._typePayload.text,
_type: Components.Schemas.TextDelta._typePayload.text) text: ""
), )
event_type: .complete )
) )
// TODO: stopReason // TODO: stopReason
) )

23
llama_stack/providers/inline/ios/inference/LocalInferenceImpl/Parsing.swift
View file

@ -38,10 +38,10 @@ func encodeMessage(message: Components.Schemas.Message) -> String {
switch (message) { switch (message) {
case .assistant(let m): case .assistant(let m):
if (m.tool_calls.count > 0) { if (m.tool_calls?.count ?? 0 > 0) {
prompt += "<|python_tag|>" prompt += "<|python_tag|>"
} }
default: default:0
break break
} }
@ -91,7 +91,7 @@ func encodeMessage(message: Components.Schemas.Message) -> String {
// for t in m.tool_calls { // for t in m.tool_calls {
// _processContent(t.) // _processContent(t.)
//} //}
eom = m.stop_reason == Components.Schemas.StopReason.end_of_message eom = m.stop_reason == Components.Schemas.CompletionMessage.stop_reasonPayload.end_of_message
case .system(_): case .system(_):
break break
case .tool(_): case .tool(_):
@ -124,8 +124,9 @@ func prepareMessages(request: Components.Schemas.ChatCompletionRequest) throws -
sysContent += try defaultTemplate.render() sysContent += try defaultTemplate.render()
messages.append(.system(Components.Schemas.SystemMessage( messages.append(.system(Components.Schemas.SystemMessage(
content: .case1(sysContent), role: .system,
role: .system)) content: .case1(sysContent)
))
) )
if request.tools?.isEmpty == false { if request.tools?.isEmpty == false {
@ -134,8 +135,8 @@ func prepareMessages(request: Components.Schemas.ChatCompletionRequest) throws -
let toolTemplate = try toolGen.gen(customTools: request.tools!) let toolTemplate = try toolGen.gen(customTools: request.tools!)
let tools = try toolTemplate.render() let tools = try toolTemplate.render()
messages.append(.user(Components.Schemas.UserMessage( messages.append(.user(Components.Schemas.UserMessage(
content: .case1(tools), role: .user,
role: .user) content: .case1(tools))
)) ))
} }
@ -193,9 +194,9 @@ public func maybeExtractCustomToolCalls(input: String) -> [Components.Schemas.To
result.append( result.append(
Components.Schemas.ToolCall( Components.Schemas.ToolCall(
arguments: .init(additionalProperties: props),
call_id: UUID().uuidString, call_id: UUID().uuidString,
tool_name: .case2(name) // custom_tool tool_name: .case2(name), // custom_tool
arguments: .init(additionalProperties: props)
) )
) )
} }
@ -206,7 +207,7 @@ public func maybeExtractCustomToolCalls(input: String) -> [Components.Schemas.To
} }
} }
func decodeAssistantMessage(tokens: String, stopReason: Components.Schemas.StopReason) -> Components.Schemas.CompletionMessage { func decodeAssistantMessage(tokens: String, stopReason: Components.Schemas.CompletionMessage.stop_reasonPayload) -> Components.Schemas.CompletionMessage {
var content = tokens var content = tokens
let roles = ["user", "system", "assistant"] let roles = ["user", "system", "assistant"]
@ -229,8 +230,8 @@ func decodeAssistantMessage(tokens: String, stopReason: Components.Schemas.StopR
} }
return Components.Schemas.CompletionMessage( return Components.Schemas.CompletionMessage(
content: .case1(content),
role: .assistant, role: .assistant,
content: .case1(content),
stop_reason: stopReason, stop_reason: stopReason,
tool_calls: maybeExtractCustomToolCalls(input: content) tool_calls: maybeExtractCustomToolCalls(input: content)
) )