Skip to content

Commit

Permalink
Resolves deprecations and warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
ljuti committed Feb 8, 2024
1 parent cf05e28 commit ae9b867
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 13 deletions.
6 changes: 1 addition & 5 deletions lib/roseflow/actions/ai/resolve_model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ class ResolveModel

executed do |context|
model = Registry.get(:models).find(context[:model])

unless model
context.fail_and_return!("Model #{context[:model]} not found")
end

context.fail_and_return!("Model #{context[:model]} not found") unless model
context[:llm] = model
end
end
Expand Down
2 changes: 0 additions & 2 deletions lib/roseflow/actions/ai/resolve_provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ class ResolveProvider
context[:provider] = resolve_provider(context[:provider])
end

private_class_method

def self.resolve_provider(provider)
Registry.get(:providers).find(provider)
end
Expand Down
2 changes: 2 additions & 0 deletions lib/roseflow/chat/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class UserMessage < Message
attribute :role, Types::String.constrained(included_in: %w(user))

def self.from(input)
input = input.is_a?(Roseflow::Prompt) ? input.call : input
new(
role: "user",
content: input
Expand All @@ -43,6 +44,7 @@ class SystemMessage < Message
attribute :role, Types::String.constrained(included_in: %w(system))

def self.from(input)
input = input.is_a?(Roseflow::Prompt) ? input.call : input
new(
role: "system",
content: input
Expand Down
7 changes: 1 addition & 6 deletions lib/roseflow/primitives/vector.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# frozen_string_literal: true

require "dry-types"

module Types
include Dry.Types()
Number = Types::Float | Types::Integer
end
require "roseflow/types"

module Roseflow
module Primitives
Expand Down
45 changes: 45 additions & 0 deletions spec/chat/message_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# frozen_string_literal: true

require "spec_helper"

require "roseflow/chat/message"

module Roseflow
module Chat
RSpec.describe Message do
describe "System messages" do
describe ".from" do
it "creates a system message from a string" do
message = SystemMessage.from("Hello, AI!")
expect(message.content).to eq "Hello, AI!"
expect(message.role).to eq "system"
end

it "creates a system message from a prompt" do
prompt = SimplePrompt.new
message = SystemMessage.from(prompt)
expect(message.content).to eq "Hello, AI!"
expect(message.role).to eq "system"
end
end
end

describe "User messages" do
describe ".from" do
it "creates a user message from a string" do
message = UserMessage.from("Hello, AI!")
expect(message.content).to eq "Hello, AI!"
expect(message.role).to eq "user"
end

it "creates a user message from a prompt" do
prompt = SimplePrompt.new
message = UserMessage.from(prompt)
expect(message.content).to eq "Hello, AI!"
expect(message.role).to eq "user"
end
end
end
end
end
end

0 comments on commit ae9b867

Please sign in to comment.